diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index b693ce07ef..b0c7216058 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -25,11 +25,11 @@
 
 object ProjectVersions {
     const val launcherVersion = "2.2.0"
-    const val rlVersion = "1.7.11.2"
+    const val rlVersion = "1.7.12"
 
-    const val openosrsVersion = "4.8.1"
+    const val openosrsVersion = "4.8.2"
 
-    const val rsversion = 196.2
+    const val rsversion = 197
     const val cacheversion = 165
 
     const val lombokVersion = "1.18.20"
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
index 8048b9386c..246fd0aef8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
@@ -201,7 +201,7 @@ public class InfoPanel extends PluginPanel
 
 		actionsContainer.add(buildLinkPanel(GITHUB_ICON, "Report an issue or", "make a suggestion", githubLink));
 		actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "Discord server", discordInvite));
-		actionsContainer.add(buildLinkPanel(PATREON_ICON, "Become a patron to", "help support RuneLite", patreonLink));
+		actionsContainer.add(buildLinkPanel(PATREON_ICON, "Become a patron to", "help support OpenOSRS", patreonLink));
 		actionsContainer.add(buildLinkPanel(WIKI_ICON, "Information about", "RuneLite and plugins", wikiLink));
 
 		add(versionPanel, BorderLayout.NORTH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java
index 214bb30fcd..5d20aa8f7e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java
@@ -23,57 +23,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-<<<<<<< HEAD:deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java
-package net.runelite.deob.deobfuscators.lvt;
-
-import java.util.Objects;
-
-public class MapKey
-{
-	private final int idx;
-	private final LVTType type;
-
-	public MapKey(int idx, LVTType type)
-	{
-		this.idx = idx;
-		this.type = type;
-	}
-
-	@Override
-	public int hashCode()
-	{
-		int hash = 7;
-		hash = 89 * hash + this.idx;
-		hash = 89 * hash + Objects.hashCode(this.type);
-		return hash;
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-		{
-			return true;
-		}
-		if (obj == null)
-		{
-			return false;
-		}
-		if (getClass() != obj.getClass())
-		{
-			return false;
-		}
-		final MapKey other = (MapKey) obj;
-		if (this.idx != other.idx)
-		{
-			return false;
-		}
-		if (this.type != other.type)
-		{
-			return false;
-		}
-		return true;
-=======
 package net.runelite.client.plugins.itemstats.potions;
 
 import net.runelite.api.Client;
@@ -105,6 +54,5 @@ public class StaminaPotion extends StatBoost
 			}
 		}
 		return 20;
->>>>>>> upstream/master:runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/StaminaPotion.java
 	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/queries/HotColdLocationTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocationTest.java
similarity index 83%
rename from runelite-api/src/main/java/net/runelite/api/queries/HotColdLocationTest.java
rename to runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocationTest.java
index 01636a6754..70820f0c41 100644
--- a/runelite-api/src/main/java/net/runelite/api/queries/HotColdLocationTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocationTest.java
@@ -22,11 +22,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-<<<<<<< HEAD:deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java
-package net.runelite.deob.deobfuscators.unusedclass;
-
-public interface EmptyInterface {}
-=======
 package net.runelite.client.plugins.cluescrolls.clues.hotcold;
 
 import org.junit.Test;
@@ -38,5 +33,4 @@ public class HotColdLocationTest
 	{
 		HotColdLocation.values(); // test clinit
 	}
-}
->>>>>>> upstream/master:runelite-api/src/main/java/net/runelite/api/queries/HotColdLocationTest.java
+}
\ No newline at end of file
diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java
index 77f221e7a7..4f21791d6c 100644
--- a/runescape-client/src/main/java/AbstractArchive.java
+++ b/runescape-client/src/main/java/AbstractArchive.java
@@ -4,81 +4,93 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jv")
+@ObfuscatedName("jp")
 @Implements("AbstractArchive")
 public abstract class AbstractArchive {
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Log;"
+		descriptor = "Lor;"
 	)
 	@Export("gzipDecompressor")
 	static GZipDecompressor gzipDecompressor;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = 269464329
+		intValue = -592681403
 	)
-	static int field3589;
-	@ObfuscatedName("c")
+	static int field3599;
+	@ObfuscatedName("ba")
+	@ObfuscatedSignature(
+		descriptor = "Lkn;"
+	)
+	@Export("clientLanguage")
+	static Language clientLanguage;
+	@ObfuscatedName("fn")
+	@ObfuscatedSignature(
+		descriptor = "Lel;"
+	)
+	@Export("socketTask")
+	static Task socketTask;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 15338207
+		intValue = 2033401093
 	)
 	@Export("groupCount")
 	int groupCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("groupIds")
 	int[] groupIds;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("groupNameHashes")
 	int[] groupNameHashes;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lou;"
+		descriptor = "Lox;"
 	)
 	@Export("groupNameHashTable")
 	IntHashTable groupNameHashTable;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("groupCrcs")
 	int[] groupCrcs;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("groupVersions")
 	int[] groupVersions;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("fileCounts")
 	int[] fileCounts;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("fileIds")
 	int[][] fileIds;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("fileNameHashes")
 	int[][] fileNameHashes;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "[Lou;"
+		descriptor = "[Lox;"
 	)
 	@Export("fileNameHashTables")
 	IntHashTable[] fileNameHashTables;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("groups")
 	Object[] groups;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@Export("files")
 	Object[][] files;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 2055325169
+		intValue = -1153167145
 	)
 	@Export("hash")
 	public int hash;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("releaseGroups")
 	boolean releaseGroups;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("shallowFiles")
 	boolean shallowFiles;
 
 	static {
 		gzipDecompressor = new GZipDecompressor(); // L: 23
-		field3589 = 0; // L: 27
+		field3599 = 0; // L: 27
 	}
 
 	AbstractArchive(boolean var1, boolean var2) {
@@ -86,646 +98,787 @@ public abstract class AbstractArchive {
 		this.shallowFiles = var2; // L: 33
 	} // L: 34
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "108"
+		descriptor = "(II)V",
+		garbageValue = "341986030"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
-	} // L: 123
+	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
+		descriptor = "(II)V",
+		garbageValue = "1768582746"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
-	} // L: 209
+	} // L: 204
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-1767586109"
+		garbageValue = "1362561714"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
-		return this.groups[var1] != null ? 100 : 0; // L: 179 180
+		return this.groups[var1] != null ? 100 : 0;
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
 		descriptor = "([BI)V",
-		garbageValue = "994270424"
+		garbageValue = "619109968"
 	)
 	@Export("decodeIndex")
 	void decodeIndex(byte[] var1) {
-		int var3 = var1.length; // L: 38
-		int var2 = GrandExchangeOfferOwnWorldComparator.method1176(var1, 0, var3); // L: 40
-		this.hash = var2; // L: 42
-		Buffer var4 = new Buffer(UserComparator6.decompressBytes(var1)); // L: 43
-		int var5 = var4.readUnsignedByte(); // L: 44
-		if (var5 >= 5 && var5 <= 7) { // L: 45
-			if (var5 >= 6) { // L: 46
-				var4.readInt(); // L: 47
+		this.hash = ItemLayer.method3863(var1, var1.length); // L: 37
+		Buffer var2 = new Buffer(class106.decompressBytes(var1)); // L: 38
+		int var3 = var2.readUnsignedByte(); // L: 39
+		if (var3 >= 5 && var3 <= 7) { // L: 40
+			if (var3 >= 6) { // L: 41
+				var2.readInt(); // L: 42
 			}
 
-			int var6 = var4.readUnsignedByte(); // L: 50
-			if (var5 >= 7) { // L: 51
-				this.groupCount = var4.method6569();
+			int var4 = var2.readUnsignedByte();
+			if (var3 >= 7) {
+				this.groupCount = var2.method6629();
 			} else {
-				this.groupCount = var4.readUnsignedShort(); // L: 52
+				this.groupCount = var2.readUnsignedShort(); // L: 47
 			}
 
-			int var7 = 0; // L: 53
-			int var8 = -1; // L: 54
-			this.groupIds = new int[this.groupCount]; // L: 55
+			int var5 = 0; // L: 48
+			int var6 = -1; // L: 49
+			this.groupIds = new int[this.groupCount]; // L: 50
+			int var7;
+			if (var3 >= 7) { // L: 51
+				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52
+					this.groupIds[var7] = var5 += var2.method6629(); // L: 53
+					if (this.groupIds[var7] > var6) { // L: 54
+						var6 = this.groupIds[var7];
+					}
+				}
+			} else {
+				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58
+					this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59
+					if (this.groupIds[var7] > var6) { // L: 60
+						var6 = this.groupIds[var7];
+					}
+				}
+			}
+
+			this.groupCrcs = new int[var6 + 1]; // L: 63
+			this.groupVersions = new int[var6 + 1]; // L: 64
+			this.fileCounts = new int[var6 + 1]; // L: 65
+			this.fileIds = new int[var6 + 1][]; // L: 66
+			this.groups = new Object[var6 + 1]; // L: 67
+			this.files = new Object[var6 + 1][]; // L: 68
+			if (var4 != 0) { // L: 69
+				this.groupNameHashes = new int[var6 + 1]; // L: 70
+
+				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71
+					this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
+				}
+
+				this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72
+			}
+
+			for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74
+				this.groupCrcs[this.groupIds[var7]] = var2.readInt();
+			}
+
+			for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75
+				this.groupVersions[this.groupIds[var7]] = var2.readInt();
+			}
+
+			for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76
+				this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
+			}
+
+			int var8;
 			int var9;
-			if (var5 >= 7) { // L: 56
-				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 57
-					this.groupIds[var9] = var7 += var4.method6569(); // L: 58
-					if (this.groupIds[var9] > var8) { // L: 59
-						var8 = this.groupIds[var9];
-					}
-				}
-			} else {
-				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 63
-					this.groupIds[var9] = var7 += var4.readUnsignedShort(); // L: 64
-					if (this.groupIds[var9] > var8) { // L: 65
-						var8 = this.groupIds[var9];
-					}
-				}
-			}
-
-			this.groupCrcs = new int[var8 + 1]; // L: 68
-			this.groupVersions = new int[var8 + 1]; // L: 69
-			this.fileCounts = new int[var8 + 1]; // L: 70
-			this.fileIds = new int[var8 + 1][]; // L: 71
-			this.groups = new Object[var8 + 1]; // L: 72
-			this.files = new Object[var8 + 1][]; // L: 73
-			if (var6 != 0) { // L: 74
-				this.groupNameHashes = new int[var8 + 1]; // L: 75
-
-				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 76
-					this.groupNameHashes[this.groupIds[var9]] = var4.readInt();
-				}
-
-				this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 77
-			}
-
-			for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 79
-				this.groupCrcs[this.groupIds[var9]] = var4.readInt();
-			}
-
-			for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 80
-				this.groupVersions[this.groupIds[var9]] = var4.readInt();
-			}
-
-			for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 81
-				this.fileCounts[this.groupIds[var9]] = var4.readUnsignedShort();
-			}
-
 			int var10;
 			int var11;
 			int var12;
-			int var13;
-			int var14;
-			if (var5 >= 7) { // L: 82
-				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 83
-					var10 = this.groupIds[var9]; // L: 84
-					var11 = this.fileCounts[var10];
-					var7 = 0;
-					var12 = -1;
-					this.fileIds[var10] = new int[var11]; // L: 88
+			if (var3 >= 7) { // L: 77
+				for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78
+					var8 = this.groupIds[var7]; // L: 79
+					var9 = this.fileCounts[var8]; // L: 80
+					var5 = 0; // L: 81
+					var10 = -1; // L: 82
+					this.fileIds[var8] = new int[var9]; // L: 83
 
-					for (var13 = 0; var13 < var11; ++var13) { // L: 89
-						var14 = this.fileIds[var10][var13] = var7 += var4.method6569();
-						if (var14 > var12) {
-							var12 = var14;
+					for (var11 = 0; var11 < var9; ++var11) { // L: 84
+						var12 = this.fileIds[var8][var11] = var5 += var2.method6629(); // L: 85
+						if (var12 > var10) { // L: 86
+							var10 = var12;
 						}
 					}
 
-					this.files[var10] = new Object[var12 + 1];
+					this.files[var8] = new Object[var10 + 1]; // L: 88
 				}
 			} else {
-				for (var9 = 0; var9 < this.groupCount; ++var9) {
-					var10 = this.groupIds[var9];
-					var11 = this.fileCounts[var10]; // L: 99
-					var7 = 0; // L: 100
-					var12 = -1;
-					this.fileIds[var10] = new int[var11];
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
+					var8 = this.groupIds[var7];
+					var9 = this.fileCounts[var8];
+					var5 = 0;
+					var10 = -1;
+					this.fileIds[var8] = new int[var9]; // L: 97
 
-					for (var13 = 0; var13 < var11; ++var13) {
-						var14 = this.fileIds[var10][var13] = var7 += var4.readUnsignedShort(); // L: 104
-						if (var14 > var12) {
-							var12 = var14;
+					for (var11 = 0; var11 < var9; ++var11) { // L: 98
+						var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort();
+						if (var12 > var10) {
+							var10 = var12;
 						}
 					}
 
-					this.files[var10] = new Object[var12 + 1]; // L: 107
+					this.files[var8] = new Object[var10 + 1];
 				}
 			}
 
-			if (var6 != 0) { // L: 110
-				this.fileNameHashes = new int[var8 + 1][]; // L: 111
-				this.fileNameHashTables = new IntHashTable[var8 + 1]; // L: 112
+			if (var4 != 0) {
+				this.fileNameHashes = new int[var6 + 1][]; // L: 106
+				this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107
 
-				for (var9 = 0; var9 < this.groupCount; ++var9) { // L: 113
-					var10 = this.groupIds[var9]; // L: 114
-					var11 = this.fileCounts[var10]; // L: 115
-					this.fileNameHashes[var10] = new int[this.files[var10].length]; // L: 116
+				for (var7 = 0; var7 < this.groupCount; ++var7) {
+					var8 = this.groupIds[var7];
+					var9 = this.fileCounts[var8];
+					this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111
 
-					for (var12 = 0; var12 < var11; ++var12) { // L: 117
-						this.fileNameHashes[var10][this.fileIds[var10][var12]] = var4.readInt();
+					for (var10 = 0; var10 < var9; ++var10) {
+						this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
 					}
 
-					this.fileNameHashTables[var10] = new IntHashTable(this.fileNameHashes[var10]); // L: 118
+					this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]);
 				}
 			}
 
 		} else {
 			throw new RuntimeException("");
 		}
-	} // L: 121
+	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(III)[B",
-		garbageValue = "-26460885"
+		descriptor = "(IIS)[B",
+		garbageValue = "-23090"
 	)
 	@Export("takeFile")
 	public byte[] takeFile(int var1, int var2) {
-		return this.takeFileEncrypted(var1, var2, (int[])null); // L: 126
+		return this.takeFileEncrypted(var1, var2, (int[])null);
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
 		descriptor = "(II[II)[B",
-		garbageValue = "744457350"
+		garbageValue = "456038683"
 	)
 	@Export("takeFileEncrypted")
 	public byte[] takeFileEncrypted(int var1, int var2, int[] var3) {
-		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 130
-			if (this.files[var1][var2] == null) { // L: 131
-				boolean var4 = this.buildFiles(var1, var3); // L: 132
-				if (!var4) { // L: 133
-					this.loadGroup(var1); // L: 134
-					var4 = this.buildFiles(var1, var3); // L: 135
-					if (!var4) { // L: 136
+		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125
+			if (this.files[var1][var2] == null) { // L: 126
+				boolean var4 = this.buildFiles(var1, var3);
+				if (!var4) { // L: 128
+					this.loadGroup(var1); // L: 129
+					var4 = this.buildFiles(var1, var3);
+					if (!var4) {
 						return null;
 					}
 				}
 			}
 
-			byte[] var5 = ByteArrayPool.method5573(this.files[var1][var2], false); // L: 139
+			byte[] var5 = class304.method5597(this.files[var1][var2], false);
 			if (this.shallowFiles) {
-				this.files[var1][var2] = null; // L: 140
+				this.files[var1][var2] = null;
 			}
 
-			return var5; // L: 141
+			return var5;
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "57"
+		descriptor = "(III)Z",
+		garbageValue = "974691239"
 	)
 	@Export("tryLoadFile")
 	public boolean tryLoadFile(int var1, int var2) {
-		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 145
-			if (this.files[var1][var2] != null) {
-				return true; // L: 146
-			} else if (this.groups[var1] != null) { // L: 147
+		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) {
+			if (this.files[var1][var2] != null) { // L: 141
+				return true;
+			} else if (this.groups[var1] != null) { // L: 142
 				return true;
 			} else {
-				this.loadGroup(var1); // L: 148
-				return this.groups[var1] != null; // L: 149
+				this.loadGroup(var1);
+				return this.groups[var1] != null;
 			}
 		} else {
-			return false; // L: 150
+			return false;
+		}
+	}
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "14"
+	)
+	public boolean method5071(int var1) {
+		if (this.files.length == 1) {
+			return this.tryLoadFile(0, var1);
+		} else if (this.files[var1].length == 1) {
+			return this.tryLoadFile(var1, 0); // L: 150
+		} else {
+			throw new RuntimeException(); // L: 151
 		}
 	}
 
 	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
 		descriptor = "(IB)Z",
-		garbageValue = "0"
-	)
-	public boolean method4963(int var1) {
-		if (this.files.length == 1) { // L: 154
-			return this.tryLoadFile(0, var1);
-		} else if (this.files[var1].length == 1) {
-			return this.tryLoadFile(var1, 0); // L: 155
-		} else {
-			throw new RuntimeException(); // L: 156
-		}
-	}
-
-	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "112"
+		garbageValue = "14"
 	)
 	@Export("tryLoadGroup")
 	public boolean tryLoadGroup(int var1) {
-		if (this.groups[var1] != null) { // L: 160
+		if (this.groups[var1] != null) { // L: 155
 			return true;
 		} else {
-			this.loadGroup(var1); // L: 161
-			return this.groups[var1] != null; // L: 162
+			this.loadGroup(var1);
+			return this.groups[var1] != null;
 		}
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "2118992751"
+		garbageValue = "-1206998992"
 	)
 	@Export("isFullyLoaded")
 	public boolean isFullyLoaded() {
-		boolean var1 = true; // L: 167
+		boolean var1 = true;
 
-		for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 168
-			int var3 = this.groupIds[var2]; // L: 169
-			if (this.groups[var3] == null) { // L: 170
-				this.loadGroup(var3); // L: 171
-				if (this.groups[var3] == null) { // L: 172
+		for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163
+			int var3 = this.groupIds[var2]; // L: 164
+			if (this.groups[var3] == null) {
+				this.loadGroup(var3);
+				if (this.groups[var3] == null) {
 					var1 = false;
 				}
 			}
 		}
 
-		return var1; // L: 175
+		return var1; // L: 170
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[B",
-		garbageValue = "-116"
+		descriptor = "(II)[B",
+		garbageValue = "-1122798118"
 	)
 	@Export("takeFileFlat")
 	public byte[] takeFileFlat(int var1) {
-		if (this.files.length == 1) { // L: 184
+		if (this.files.length == 1) {
 			return this.takeFile(0, var1);
 		} else if (this.files[var1].length == 1) {
-			return this.takeFile(var1, 0); // L: 185
+			return this.takeFile(var1, 0);
 		} else {
-			throw new RuntimeException(); // L: 186
+			throw new RuntimeException();
 		}
 	}
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
 		descriptor = "(III)[B",
-		garbageValue = "791709889"
+		garbageValue = "1973943836"
 	)
 	@Export("getFile")
 	public byte[] getFile(int var1, int var2) {
-		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 190
-			if (this.files[var1][var2] == null) { // L: 191
-				boolean var3 = this.buildFiles(var1, (int[])null); // L: 192
-				if (!var3) { // L: 193
-					this.loadGroup(var1); // L: 194
-					var3 = this.buildFiles(var1, (int[])null); // L: 195
-					if (!var3) { // L: 196
+		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185
+			if (this.files[var1][var2] == null) {
+				boolean var3 = this.buildFiles(var1, (int[])null); // L: 187
+				if (!var3) { // L: 188
+					this.loadGroup(var1); // L: 189
+					var3 = this.buildFiles(var1, (int[])null); // L: 190
+					if (!var3) { // L: 191
 						return null;
 					}
 				}
 			}
 
-			byte[] var4 = ByteArrayPool.method5573(this.files[var1][var2], false); // L: 199
-			return var4; // L: 200
+			byte[] var4 = class304.method5597(this.files[var1][var2], false); // L: 194
+			return var4; // L: 195
 		} else {
 			return null;
 		}
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		descriptor = "(II)[B",
-		garbageValue = "444746714"
+		garbageValue = "2061465489"
 	)
 	@Export("getFileFlat")
 	public byte[] getFileFlat(int var1) {
-		if (this.files.length == 1) { // L: 204
+		if (this.files.length == 1) { // L: 199
 			return this.getFile(0, var1);
 		} else if (this.files[var1].length == 1) {
-			return this.getFile(var1, 0); // L: 205
+			return this.getFile(var1, 0); // L: 200
 		} else {
-			throw new RuntimeException(); // L: 206
+			throw new RuntimeException(); // L: 201
 		}
 	}
 
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		descriptor = "(II)[I",
+		garbageValue = "1723486034"
+	)
+	@Export("getGroupFileIds")
+	public int[] getGroupFileIds(int var1) {
+		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210
+	}
+
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "-404024789"
+	)
+	@Export("getGroupFileCount")
+	public int getGroupFileCount(int var1) {
+		return this.files[var1].length; // L: 214
+	}
+
+	@ObfuscatedName("af")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-95"
+	)
+	@Export("getGroupCount")
+	public int getGroupCount() {
+		return this.files.length; // L: 218
+	}
+
 	@ObfuscatedName("bq")
-	@ObfuscatedSignature(
-		descriptor = "(IB)[I",
-		garbageValue = "8"
-	)
-	@Export("getGroupFileIds")
-	public int[] getGroupFileIds(int var1) {
-		return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 212 213 215
-	}
-
-	@ObfuscatedName("bu")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "997984533"
-	)
-	@Export("getGroupFileCount")
-	public int getGroupFileCount(int var1) {
-		return this.files[var1].length; // L: 219
-	}
-
-	@ObfuscatedName("bl")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "756558186"
-	)
-	@Export("getGroupCount")
-	public int getGroupCount() {
-		return this.files.length; // L: 223
-	}
-
-	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "2"
+		garbageValue = "102"
 	)
 	@Export("clearGroups")
 	public void clearGroups() {
-		for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 227
+		for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222
 			this.groups[var1] = null;
 		}
 
-	} // L: 228
+	} // L: 223
 
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1987732503"
+		garbageValue = "282074373"
 	)
 	@Export("clearFilesGroup")
 	public void clearFilesGroup(int var1) {
-		for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 231
+		for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226
 			this.files[var1][var2] = null;
 		}
 
-	} // L: 232
+	} // L: 227
 
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "94"
+		descriptor = "(I)V",
+		garbageValue = "-952876246"
 	)
 	@Export("clearFiles")
 	public void clearFiles() {
-		for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 235
-			if (this.files[var1] != null) { // L: 236
-				for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 237
+		for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230
+			if (this.files[var1] != null) { // L: 231
+				for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232
 					this.files[var1][var2] = null;
 				}
 			}
 		}
 
-	} // L: 240
+	} // L: 235
 
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
-		descriptor = "(I[II)Z",
-		garbageValue = "1746231171"
+		descriptor = "(I[IB)Z",
+		garbageValue = "0"
 	)
 	@Export("buildFiles")
 	boolean buildFiles(int var1, int[] var2) {
-		if (this.groups[var1] == null) { // L: 243
+		if (this.groups[var1] == null) { // L: 238
 			return false;
 		} else {
-			int var3 = this.fileCounts[var1]; // L: 244
-			int[] var4 = this.fileIds[var1]; // L: 245
-			Object[] var5 = this.files[var1]; // L: 246
-			boolean var6 = true; // L: 247
+			int var3 = this.fileCounts[var1]; // L: 239
+			int[] var4 = this.fileIds[var1]; // L: 240
+			Object[] var5 = this.files[var1]; // L: 241
+			boolean var6 = true; // L: 242
 
-			for (int var7 = 0; var7 < var3; ++var7) { // L: 248
-				if (var5[var4[var7]] == null) { // L: 249
-					var6 = false; // L: 250
+			for (int var7 = 0; var7 < var3; ++var7) { // L: 243
+				if (var5[var4[var7]] == null) { // L: 244
+					var6 = false; // L: 245
 					break;
 				}
 			}
 
-			if (var6) { // L: 254
+			if (var6) { // L: 249
 				return true;
 			} else {
-				byte[] var18;
-				if (var2 != null && (var2[0] != 0 || var2[1] != 0 || var2[2] != 0 || var2[3] != 0)) { // L: 256
-					var18 = ByteArrayPool.method5573(this.groups[var1], true); // L: 257
-					Buffer var8 = new Buffer(var18); // L: 258
-					var8.xteaDecrypt(var2, 5, var8.array.length); // L: 259
+				byte[] var21;
+				if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251
+					var21 = class304.method5597(this.groups[var1], false); // L: 256
 				} else {
-					var18 = ByteArrayPool.method5573(this.groups[var1], false); // L: 261
+					var21 = class304.method5597(this.groups[var1], true); // L: 252
+					Buffer var8 = new Buffer(var21); // L: 253
+					var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254
 				}
 
-				byte[] var20 = UserComparator6.decompressBytes(var18); // L: 264
-				if (this.releaseGroups) { // L: 282
+				byte[] var25 = class106.decompressBytes(var21); // L: 259
+				if (this.releaseGroups) { // L: 264
 					this.groups[var1] = null;
 				}
 
-				if (var3 > 1) { // L: 283
-					int var9 = var20.length; // L: 284
-					--var9;
-					int var10 = var20[var9] & 255; // L: 285
-					var9 -= var10 * var3 * 4; // L: 286
-					Buffer var11 = new Buffer(var20); // L: 287
-					int[] var12 = new int[var3]; // L: 288
-					var11.offset = var9; // L: 289
+				int var10;
+				if (var3 > 1) { // L: 265
+					int var22 = var25.length; // L: 266
+					--var22; // L: 267
+					var10 = var25[var22] & 255;
+					var22 -= var3 * var10 * 4; // L: 268
+					Buffer var11 = new Buffer(var25); // L: 269
+					int[] var12 = new int[var3]; // L: 270
+					var11.offset = var22; // L: 271
 
 					int var14;
 					int var15;
-					for (int var13 = 0; var13 < var10; ++var13) { // L: 290
-						var14 = 0; // L: 291
+					for (int var13 = 0; var13 < var10; ++var13) { // L: 272
+						var14 = 0; // L: 273
 
-						for (var15 = 0; var15 < var3; ++var15) { // L: 292
-							var14 += var11.readInt(); // L: 293
-							var12[var15] += var14; // L: 294
+						for (var15 = 0; var15 < var3; ++var15) { // L: 274
+							var14 += var11.readInt(); // L: 275
+							var12[var15] += var14; // L: 276
 						}
 					}
 
-					byte[][] var19 = new byte[var3][]; // L: 297
+					byte[][] var23 = new byte[var3][]; // L: 279
 
-					for (var14 = 0; var14 < var3; ++var14) { // L: 298
-						var19[var14] = new byte[var12[var14]]; // L: 299
-						var12[var14] = 0; // L: 300
+					for (var14 = 0; var14 < var3; ++var14) { // L: 280
+						var23[var14] = new byte[var12[var14]]; // L: 281
+						var12[var14] = 0; // L: 282
 					}
 
-					var11.offset = var9; // L: 302
-					var14 = 0; // L: 303
+					var11.offset = var22; // L: 284
+					var14 = 0; // L: 285
 
-					for (var15 = 0; var15 < var10; ++var15) { // L: 304
-						int var16 = 0; // L: 305
+					int var17;
+					for (var15 = 0; var15 < var10; ++var15) { // L: 286
+						int var24 = 0; // L: 287
 
-						for (int var17 = 0; var17 < var3; ++var17) { // L: 306
-							var16 += var11.readInt(); // L: 307
-							System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 308
-							var12[var17] += var16; // L: 309
-							var14 += var16; // L: 310
+						for (var17 = 0; var17 < var3; ++var17) { // L: 288
+							var24 += var11.readInt(); // L: 289
+							System.arraycopy(var25, var14, var23[var17], var12[var17], var24); // L: 290
+							var12[var17] += var24; // L: 291
+							var14 += var24; // L: 292
 						}
 					}
 
-					for (var15 = 0; var15 < var3; ++var15) { // L: 313
-						if (!this.shallowFiles) { // L: 314
-							var5[var4[var15]] = GrandExchangeOfferWorldComparator.method5079(var19[var15], false);
+					for (var15 = 0; var15 < var3; ++var15) { // L: 295
+						if (!this.shallowFiles) { // L: 296
+							var17 = var4[var15]; // L: 298
+							byte[] var19 = var23[var15]; // L: 300
+							Object var18;
+							if (var19 == null) { // L: 302
+								var18 = null; // L: 303
+							} else if (var19.length > 136) { // L: 306
+								DirectByteArrayCopier var20 = new DirectByteArrayCopier(); // L: 308
+								var20.set(var19); // L: 309
+								var18 = var20; // L: 310
+							} else {
+								var18 = var19; // L: 315
+							}
+
+							var5[var17] = var18; // L: 317
 						} else {
-							var5[var4[var15]] = var19[var15]; // L: 315
+							var5[var4[var15]] = var23[var15]; // L: 319
 						}
 					}
-				} else if (!this.shallowFiles) { // L: 319
-					var5[var4[0]] = GrandExchangeOfferWorldComparator.method5079(var20, false);
+				} else if (!this.shallowFiles) { // L: 323
+					var10 = var4[0]; // L: 325
+					Object var26;
+					if (var25 == null) { // L: 328
+						var26 = null; // L: 329
+					} else if (var25.length > 136) { // L: 332
+						DirectByteArrayCopier var27 = new DirectByteArrayCopier(); // L: 334
+						var27.set(var25); // L: 335
+						var26 = var27; // L: 336
+					} else {
+						var26 = var25; // L: 341
+					}
+
+					var5[var10] = var26; // L: 343
 				} else {
-					var5[var4[0]] = var20; // L: 320
+					var5[var4[0]] = var25; // L: 345
 				}
 
-				return true; // L: 322
+				return true; // L: 347
 			}
 		}
 	}
 
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-1575580840"
+		descriptor = "(Ljava/lang/String;B)I",
+		garbageValue = "48"
 	)
 	@Export("getGroupId")
 	public int getGroupId(String var1) {
-		var1 = var1.toLowerCase(); // L: 326
-		return this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 327
+		var1 = var1.toLowerCase(); // L: 351
+		return this.groupNameHashTable.get(FontName.hashString(var1)); // L: 352
 	}
 
-	@ObfuscatedName("br")
+	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)I",
-		garbageValue = "1997157248"
+		garbageValue = "1136247668"
 	)
 	@Export("getFileId")
 	public int getFileId(int var1, String var2) {
-		var2 = var2.toLowerCase(); // L: 331
-		return this.fileNameHashTables[var1].get(GraphicsObject.hashString(var2)); // L: 332
+		var2 = var2.toLowerCase(); // L: 356
+		return this.fileNameHashTables[var1].get(FontName.hashString(var2)); // L: 357
 	}
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z",
-		garbageValue = "0"
+		garbageValue = "-116"
 	)
 	@Export("isValidFileName")
 	public boolean isValidFileName(String var1, String var2) {
-		var1 = var1.toLowerCase(); // L: 336
-		var2 = var2.toLowerCase(); // L: 337
-		int var3 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 338
-		if (var3 < 0) { // L: 339
+		var1 = var1.toLowerCase(); // L: 361
+		var2 = var2.toLowerCase(); // L: 362
+		int var3 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 363
+		if (var3 < 0) { // L: 364
 			return false;
 		} else {
-			int var4 = this.fileNameHashTables[var3].get(GraphicsObject.hashString(var2)); // L: 340
-			return var4 >= 0; // L: 341
+			int var4 = this.fileNameHashTables[var3].get(FontName.hashString(var2)); // L: 365
+			return var4 >= 0; // L: 366
 		}
 	}
 
-	@ObfuscatedName("ba")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B",
-		garbageValue = "-2113660686"
-	)
-	@Export("takeFileByNames")
-	public byte[] takeFileByNames(String var1, String var2) {
-		var1 = var1.toLowerCase(); // L: 346
-		var2 = var2.toLowerCase(); // L: 347
-		int var3 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 348
-		int var4 = this.fileNameHashTables[var3].get(GraphicsObject.hashString(var2)); // L: 349
-		return this.takeFile(var3, var4); // L: 350
-	}
-
 	@ObfuscatedName("be")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B",
+		garbageValue = "1041405463"
+	)
+	@Export("takeFileByNames")
+	public byte[] takeFileByNames(String var1, String var2) {
+		var1 = var1.toLowerCase(); // L: 371
+		var2 = var2.toLowerCase(); // L: 372
+		int var3 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 373
+		int var4 = this.fileNameHashTables[var3].get(FontName.hashString(var2)); // L: 374
+		return this.takeFile(var3, var4); // L: 375
+	}
+
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-		garbageValue = "-1619143397"
+		garbageValue = "1893660482"
 	)
 	@Export("tryLoadFileByNames")
 	public boolean tryLoadFileByNames(String var1, String var2) {
-		var1 = var1.toLowerCase(); // L: 354
-		var2 = var2.toLowerCase(); // L: 355
-		int var3 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 356
-		int var4 = this.fileNameHashTables[var3].get(GraphicsObject.hashString(var2)); // L: 357
-		return this.tryLoadFile(var3, var4); // L: 358
+		var1 = var1.toLowerCase(); // L: 379
+		var2 = var2.toLowerCase(); // L: 380
+		int var3 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 381
+		int var4 = this.fileNameHashTables[var3].get(FontName.hashString(var2)); // L: 382
+		return this.tryLoadFile(var3, var4); // L: 383
 	}
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)Z",
-		garbageValue = "1308287337"
+		garbageValue = "2073972058"
 	)
 	@Export("tryLoadGroupByName")
 	public boolean tryLoadGroupByName(String var1) {
-		var1 = var1.toLowerCase(); // L: 362
-		int var2 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 363
-		return this.tryLoadGroup(var2); // L: 364
+		var1 = var1.toLowerCase(); // L: 387
+		int var2 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 388
+		return this.tryLoadGroup(var2); // L: 389
 	}
 
-	@ObfuscatedName("bx")
+	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-13"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "2081300499"
 	)
 	@Export("loadRegionFromName")
 	public void loadRegionFromName(String var1) {
-		var1 = var1.toLowerCase(); // L: 368
-		int var2 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 369
-		if (var2 >= 0) { // L: 370
-			this.loadRegionFromGroup(var2); // L: 371
+		var1 = var1.toLowerCase(); // L: 393
+		int var2 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 394
+		if (var2 >= 0) { // L: 395
+			this.loadRegionFromGroup(var2); // L: 396
 		}
-	} // L: 372
+	} // L: 397
 
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-469747920"
+		garbageValue = "366192275"
 	)
 	@Export("groupLoadPercentByName")
 	public int groupLoadPercentByName(String var1) {
-		var1 = var1.toLowerCase(); // L: 375
-		int var2 = this.groupNameHashTable.get(GraphicsObject.hashString(var1)); // L: 376
-		return this.groupLoadPercent(var2); // L: 377
+		var1 = var1.toLowerCase(); // L: 400
+		int var2 = this.groupNameHashTable.get(FontName.hashString(var1)); // L: 401
+		return this.groupLoadPercent(var2); // L: 402
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;IIB)Lkt;",
-		garbageValue = "7"
+		descriptor = "(Lns;B)V",
+		garbageValue = "101"
 	)
-	public static Font method5018(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
-		byte[] var5 = var0.takeFile(var2, var3); // L: 85
-		boolean var4;
-		if (var5 == null) { // L: 86
-			var4 = false; // L: 87
-		} else {
-			ItemLayer.SpriteBuffer_decode(var5); // L: 90
-			var4 = true; // L: 91
+	static final void method5160(PacketBuffer var0) {
+		int var1 = 0; // L: 89
+		var0.importIndex(); // L: 90
+
+		byte[] var10000;
+		int var2;
+		int var4;
+		int var5;
+		for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 91
+			var5 = Players.Players_indices[var2]; // L: 92
+			if ((Players.field1372[var5] & 1) == 0) { // L: 93
+				if (var1 > 0) { // L: 94
+					--var1; // L: 95
+					var10000 = Players.field1372; // L: 96
+					var10000[var5] = (byte)(var10000[var5] | 2);
+				} else {
+					var4 = var0.readBits(1); // L: 99
+					if (var4 == 0) { // L: 100
+						var1 = class244.method4805(var0); // L: 101
+						var10000 = Players.field1372; // L: 102
+						var10000[var5] = (byte)(var10000[var5] | 2);
+					} else {
+						GrandExchangeOfferWorldComparator.readPlayerUpdate(var0, var5); // L: 105
+					}
+				}
+			}
 		}
 
-		if (!var4) { // L: 93
-			return null;
+		var0.exportIndex(); // L: 108
+		if (var1 != 0) { // L: 109
+			throw new RuntimeException(); // L: 110
 		} else {
-			byte[] var6 = var1.takeFile(var2, var3); // L: 95
-			Font var8;
-			if (var6 == null) { // L: 97
-				var8 = null; // L: 98
-			} else {
-				Font var7 = new Font(var6, WorldMapDecoration.SpriteBuffer_xOffsets, Calendar.SpriteBuffer_yOffsets, class396.SpriteBuffer_spriteWidths, class302.SpriteBuffer_spriteHeights, MilliClock.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 101
-				MilliClock.method2587(); // L: 102
-				var8 = var7; // L: 103
+			var0.importIndex(); // L: 112
+
+			for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 113
+				var5 = Players.Players_indices[var2]; // L: 114
+				if ((Players.field1372[var5] & 1) != 0) { // L: 115
+					if (var1 > 0) { // L: 116
+						--var1; // L: 117
+						var10000 = Players.field1372; // L: 118
+						var10000[var5] = (byte)(var10000[var5] | 2);
+					} else {
+						var4 = var0.readBits(1); // L: 121
+						if (var4 == 0) { // L: 122
+							var1 = class244.method4805(var0); // L: 123
+							var10000 = Players.field1372; // L: 124
+							var10000[var5] = (byte)(var10000[var5] | 2);
+						} else {
+							GrandExchangeOfferWorldComparator.readPlayerUpdate(var0, var5); // L: 127
+						}
+					}
+				}
 			}
 
-			return var8; // L: 105
+			var0.exportIndex(); // L: 130
+			if (var1 != 0) { // L: 131
+				throw new RuntimeException(); // L: 132
+			} else {
+				var0.importIndex(); // L: 134
+
+				for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 135
+					var5 = Players.Players_emptyIndices[var2]; // L: 136
+					if ((Players.field1372[var5] & 1) != 0) { // L: 137
+						if (var1 > 0) { // L: 138
+							--var1; // L: 139
+							var10000 = Players.field1372; // L: 140
+							var10000[var5] = (byte)(var10000[var5] | 2);
+						} else {
+							var4 = var0.readBits(1); // L: 143
+							if (var4 == 0) { // L: 144
+								var1 = class244.method4805(var0); // L: 145
+								var10000 = Players.field1372; // L: 146
+								var10000[var5] = (byte)(var10000[var5] | 2);
+							} else if (class35.updateExternalPlayer(var0, var5)) { // L: 149
+								var10000 = Players.field1372;
+								var10000[var5] = (byte)(var10000[var5] | 2);
+							}
+						}
+					}
+				}
+
+				var0.exportIndex(); // L: 152
+				if (var1 != 0) { // L: 153
+					throw new RuntimeException(); // L: 154
+				} else {
+					var0.importIndex(); // L: 156
+
+					for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 157
+						var5 = Players.Players_emptyIndices[var2]; // L: 158
+						if ((Players.field1372[var5] & 1) == 0) { // L: 159
+							if (var1 > 0) { // L: 160
+								--var1; // L: 161
+								var10000 = Players.field1372; // L: 162
+								var10000[var5] = (byte)(var10000[var5] | 2);
+							} else {
+								var4 = var0.readBits(1); // L: 165
+								if (var4 == 0) { // L: 166
+									var1 = class244.method4805(var0); // L: 167
+									var10000 = Players.field1372; // L: 168
+									var10000[var5] = (byte)(var10000[var5] | 2);
+								} else if (class35.updateExternalPlayer(var0, var5)) { // L: 171
+									var10000 = Players.field1372;
+									var10000[var5] = (byte)(var10000[var5] | 2);
+								}
+							}
+						}
+					}
+
+					var0.exportIndex(); // L: 174
+					if (var1 != 0) { // L: 175
+						throw new RuntimeException(); // L: 176
+					} else {
+						Players.Players_count = 0; // L: 178
+						Players.Players_emptyIdxCount = 0; // L: 179
+
+						for (var2 = 1; var2 < 2048; ++var2) { // L: 180
+							var10000 = Players.field1372; // L: 181
+							var10000[var2] = (byte)(var10000[var2] >> 1);
+							Player var3 = Client.players[var2]; // L: 182
+							if (var3 != null) { // L: 183
+								Players.Players_indices[++Players.Players_count - 1] = var2;
+							} else {
+								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 184
+							}
+						}
+
+					}
+				}
+			}
 		}
+	} // L: 186
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "1724921062"
+	)
+	@Export("Messages_getHistorySize")
+	static int Messages_getHistorySize(int var0) {
+		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44
+		return var1 == null ? 0 : var1.size(); // L: 45 46
 	}
 }
diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index 6b2499328f..391bb86774 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -1,57 +1,31 @@
 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("im")
+@ObfuscatedName("ii")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
-	@ObfuscatedName("ry")
-	@ObfuscatedGetter(
-		intValue = -941868037
-	)
-	static int field3119;
+	@ObfuscatedName("b")
+	@Export("Tiles_lightness")
+	static int[] Tiles_lightness;
 
 	AbstractByteArrayCopier() {
 	} // L: 4
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "74"
+		descriptor = "(I)[B",
+		garbageValue = "895258324"
 	)
 	@Export("get")
 	abstract byte[] get();
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "([BB)V",
-		garbageValue = "43"
+		descriptor = "([BI)V",
+		garbageValue = "894306984"
 	)
 	@Export("set")
-	abstract void set(byte[] var1);
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;III)Lop;",
-		garbageValue = "1690865732"
-	)
-	static IndexedSprite method4802(AbstractArchive var0, int var1, int var2) {
-		if (!class339.method6015(var0, var1, var2)) { // L: 28
-			return null;
-		} else {
-			IndexedSprite var4 = new IndexedSprite(); // L: 31
-			var4.width = class396.SpriteBuffer_spriteWidth; // L: 32
-			var4.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 33
-			var4.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[0]; // L: 34
-			var4.yOffset = Calendar.SpriteBuffer_yOffsets[0]; // L: 35
-			var4.subWidth = class396.SpriteBuffer_spriteWidths[0]; // L: 36
-			var4.subHeight = class302.SpriteBuffer_spriteHeights[0]; // L: 37
-			var4.palette = MilliClock.SpriteBuffer_spritePalette; // L: 38
-			var4.pixels = class396.SpriteBuffer_pixels[0]; // L: 39
-			MilliClock.method2587(); // L: 40
-			return var4; // L: 43
-		}
-	}
+	public abstract void set(byte[] var1);
 }
diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java
index 71648e5639..c8b855dce0 100644
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -4,76 +4,76 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kc")
+@ObfuscatedName("kr")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "[Lof;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("widths")
 	int[] widths;
 	@ObfuscatedName("y")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -91,15 +91,9 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_lines = new String[100]; // L: 33
 	}
 
-	AbstractFont(byte[] var1) {
+	AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
 		this.pixels = new byte[256][];
 		this.ascent = 0;
-		this.readMetrics(var1); // L: 53
-	} // L: 54
-
-	AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
-		this.pixels = new byte[256][]; // L: 12
-		this.ascent = 0; // L: 18
 		this.leftBearings = var2; // L: 36
 		this.topBearings = var3; // L: 37
 		this.widths = var4; // L: 38
@@ -123,15 +117,21 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.maxDescent = var9 - this.ascent; // L: 49
 	} // L: 50
 
-	@ObfuscatedName("v")
+	AbstractFont(byte[] var1) {
+		this.pixels = new byte[256][]; // L: 12
+		this.ascent = 0; // L: 18
+		this.readMetrics(var1); // L: 53
+	} // L: 54
+
+	@ObfuscatedName("f")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
 	@Export("readMetrics")
 	void readMetrics(byte[] var1) {
 		this.advances = new int[256]; // L: 57
@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 				if (var13 != 32 && var13 != 160) { // L: 89
 					for (var8 = 0; var8 < 256; ++var8) { // L: 90
 						if (var8 != 32 && var8 != 160) { // L: 91
-							this.kerning[var8 + (var13 << 8)] = (byte)method5350(var11, var12, var4, this.advances, var10, var13, var8); // L: 92
+							this.kerning[var8 + (var13 << 8)] = (byte)method5476(var11, var12, var4, this.advances, var10, var13, var8); // L: 92
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	} // L: 97
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) { // L: 122
 			var1 = ' ';
 		}
 
-		return this.advances[ServerPacket.charToByteCp1252(var1) & 255]; // L: 123
+		return this.advances[class125.charToByteCp1252(var1) & 255]; // L: 123
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("z")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) { // L: 127
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var7.equals("gt")) { // L: 141
 								if (var7.startsWith("img=")) { // L: 142
 									try {
-										int var8 = class82.method1908(var7.substring(4)); // L: 144
+										int var8 = FontName.method6335(var7.substring(4)); // L: 144
 										var4 += AbstractFont_modIconSprites[var8].width; // L: 145
 										var3 = -1; // L: 146
 									} catch (Exception var10) { // L: 148
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 					}
 
 					if (var2 == -1) { // L: 154
-						var4 += this.advances[(char)(ServerPacket.charToByteCp1252(var6) & 255)]; // L: 155
+						var4 += this.advances[(char)(class125.charToByteCp1252(var6) & 255)]; // L: 155
 						if (this.kerning != null && var3 != -1) { // L: 156
 							var4 += this.kerning[var6 + (var3 << 8)];
 						}
@@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("b")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) { // L: 164
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							var11 = '>'; // L: 203
 						} else if (var16.startsWith("img=")) { // L: 205
 							try {
-								int var17 = class82.method1908(var16.substring(4)); // L: 207
+								int var17 = FontName.method6335(var16.substring(4)); // L: 207
 								var4 += AbstractFont_modIconSprites[var17].width; // L: 208
 								var11 = 0; // L: 209
 							} catch (Exception var20) { // L: 211
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("i")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248
@@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4; // L: 254
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("t")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) { // L: 279
@@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 282
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("x")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 285
@@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 289
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("u")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) { // L: 292
@@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 295
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("q")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) { // L: 298
@@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 301
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("s")
 	@Export("drawLines")
 	public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		if (var1 == null) { // L: 304
@@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 339
@@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 344
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 347
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 356
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("n")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) { // L: 359
@@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 366
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("l")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) { // L: 369
@@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	} // L: 380
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("w")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1; // L: 383
@@ -582,105 +582,95 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0; // L: 389
 	} // L: 390
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("a")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
-			int var2;
-			String var3;
 			if (var1.startsWith("col=")) { // L: 394
-				var3 = var1.substring(4); // L: 396
-				var2 = class24.method260(var3, 16, true); // L: 398
-				AbstractFont_color = var2; // L: 400
-			} else if (var1.equals("/col")) { // L: 402
+				AbstractFont_color = ItemContainer.method2183(var1.substring(4), 16);
+			} else if (var1.equals("/col")) { // L: 395
 				AbstractFont_color = AbstractFont_previousColor;
-			} else if (var1.startsWith("str=")) { // L: 403
-				var3 = var1.substring(4); // L: 405
-				var2 = class24.method260(var3, 16, true); // L: 407
-				AbstractFont_strike = var2; // L: 409
-			} else if (var1.equals("str")) { // L: 411
+			} else if (var1.startsWith("str=")) { // L: 396
+				AbstractFont_strike = ItemContainer.method2183(var1.substring(4), 16);
+			} else if (var1.equals("str")) { // L: 397
 				AbstractFont_strike = 8388608;
-			} else if (var1.equals("/str")) { // L: 412
+			} else if (var1.equals("/str")) { // L: 398
 				AbstractFont_strike = -1;
-			} else if (var1.startsWith("u=")) { // L: 413
-				var3 = var1.substring(2); // L: 415
-				var2 = class24.method260(var3, 16, true); // L: 417
-				AbstractFont_underline = var2; // L: 419
-			} else if (var1.equals("u")) { // L: 421
+			} else if (var1.startsWith("u=")) { // L: 399
+				AbstractFont_underline = ItemContainer.method2183(var1.substring(2), 16);
+			} else if (var1.equals("u")) { // L: 400
 				AbstractFont_underline = 0;
-			} else if (var1.equals("/u")) { // L: 422
+			} else if (var1.equals("/u")) { // L: 401
 				AbstractFont_underline = -1;
-			} else if (var1.startsWith("shad=")) { // L: 423
-				var3 = var1.substring(5); // L: 425
-				var2 = class24.method260(var3, 16, true); // L: 427
-				AbstractFont_shadow = var2; // L: 429
-			} else if (var1.equals("shad")) { // L: 431
+			} else if (var1.startsWith("shad=")) { // L: 402
+				AbstractFont_shadow = ItemContainer.method2183(var1.substring(5), 16);
+			} else if (var1.equals("shad")) { // L: 403
 				AbstractFont_shadow = 0;
-			} else if (var1.equals("/shad")) { // L: 432
+			} else if (var1.equals("/shad")) { // L: 404
 				AbstractFont_shadow = AbstractFont_previousShadow;
-			} else if (var1.equals("br")) {
-				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); // L: 433
+			} else if (var1.equals("br")) { // L: 405
+				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
 			}
-		} catch (Exception var5) { // L: 435
+		} catch (Exception var3) { // L: 407
 		}
 
-	} // L: 436
+	} // L: 408
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("aw")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
-		int var3 = 0; // L: 439
-		boolean var4 = false; // L: 440
+		int var3 = 0; // L: 411
+		boolean var4 = false; // L: 412
 
-		for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 441
-			char var6 = var1.charAt(var5); // L: 442
-			if (var6 == '<') { // L: 443
+		for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 413
+			char var6 = var1.charAt(var5); // L: 414
+			if (var6 == '<') { // L: 415
 				var4 = true;
-			} else if (var6 == '>') { // L: 444
+			} else if (var6 == '>') { // L: 416
 				var4 = false;
-			} else if (!var4 && var6 == ' ') { // L: 445
+			} else if (!var4 && var6 == ' ') { // L: 417
 				++var3;
 			}
 		}
 
-		if (var3 > 0) { // L: 447
+		if (var3 > 0) { // L: 419
 			AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3;
 		}
 
-	} // L: 448
+	} // L: 420
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ak")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
-		var3 -= this.ascent; // L: 451
-		int var4 = -1; // L: 452
-		int var5 = -1; // L: 453
+		var3 -= this.ascent; // L: 423
+		int var4 = -1; // L: 424
+		int var5 = -1; // L: 425
 
-		for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 454
-			if (var1.charAt(var6) != 0) { // L: 455
-				char var7 = (char)(ServerPacket.charToByteCp1252(var1.charAt(var6)) & 255); // L: 456
-				if (var7 == '<') { // L: 457
-					var4 = var6; // L: 458
+		for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426
+			if (var1.charAt(var6) != 0) { // L: 427
+				char var7 = (char)(class125.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428
+				if (var7 == '<') { // L: 429
+					var4 = var6; // L: 430
 				} else {
 					int var9;
-					if (var7 == '>' && var4 != -1) { // L: 461
-						String var8 = var1.substring(var4 + 1, var6); // L: 462
-						var4 = -1; // L: 463
-						if (var8.equals("lt")) { // L: 464
+					if (var7 == '>' && var4 != -1) { // L: 433
+						String var8 = var1.substring(var4 + 1, var6); // L: 434
+						var4 = -1; // L: 435
+						if (var8.equals("lt")) { // L: 436
 							var7 = '<';
 						} else {
-							if (!var8.equals("gt")) { // L: 465
-								if (var8.startsWith("img=")) { // L: 466
+							if (!var8.equals("gt")) { // L: 437
+								if (var8.startsWith("img=")) { // L: 438
 									try {
-										var9 = class82.method1908(var8.substring(4)); // L: 468
-										IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 469
-										var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 470
-										var2 += var10.width; // L: 471
-										var5 = -1; // L: 472
-									} catch (Exception var14) { // L: 474
+										var9 = FontName.method6335(var8.substring(4)); // L: 440
+										IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 441
+										var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 442
+										var2 += var10.width; // L: 443
+										var5 = -1; // L: 444
+									} catch (Exception var14) { // L: 446
 									}
 								} else {
-									this.decodeTag(var8); // L: 478
+									this.decodeTag(var8); // L: 450
 								}
 								continue;
 							}
@@ -689,103 +679,103 @@ public abstract class AbstractFont extends Rasterizer2D {
 						}
 					}
 
-					if (var7 == 160) { // L: 482
+					if (var7 == 160) { // L: 454
 						var7 = ' ';
 					}
 
-					if (var4 == -1) { // L: 483
-						if (this.kerning != null && var5 != -1) { // L: 484
+					if (var4 == -1) { // L: 455
+						if (this.kerning != null && var5 != -1) { // L: 456
 							var2 += this.kerning[var7 + (var5 << 8)];
 						}
 
-						int var12 = this.widths[var7]; // L: 485
-						var9 = this.heights[var7]; // L: 486
-						if (var7 != ' ') { // L: 487
-							if (AbstractFont_alpha == 256) { // L: 488
-								if (AbstractFont_shadow != -1) { // L: 489
+						int var12 = this.widths[var7]; // L: 457
+						var9 = this.heights[var7]; // L: 458
+						if (var7 != ' ') { // L: 459
+							if (AbstractFont_alpha == 256) { // L: 460
+								if (AbstractFont_shadow != -1) { // L: 461
 									AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow);
 								}
 
-								this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 490
+								this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 462
 							} else {
-								if (AbstractFont_shadow != -1) { // L: 493
+								if (AbstractFont_shadow != -1) { // L: 465
 									AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha);
 								}
 
-								this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 494
+								this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 466
 							}
-						} else if (AbstractFont_justificationTotal > 0) { // L: 498
-							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 499
-							var2 += AbstractFont_justificationCurrent >> 8; // L: 500
-							AbstractFont_justificationCurrent &= 255; // L: 501
+						} else if (AbstractFont_justificationTotal > 0) { // L: 470
+							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 471
+							var2 += AbstractFont_justificationCurrent >> 8; // L: 472
+							AbstractFont_justificationCurrent &= 255; // L: 473
 						}
 
-						int var13 = this.advances[var7]; // L: 504
-						if (AbstractFont_strike != -1) { // L: 505
+						int var13 = this.advances[var7]; // L: 476
+						if (AbstractFont_strike != -1) { // L: 477
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
 						}
 
-						if (AbstractFont_underline != -1) { // L: 506
+						if (AbstractFont_underline != -1) { // L: 478
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
 						}
 
-						var2 += var13; // L: 507
-						var5 = var7; // L: 508
+						var2 += var13; // L: 479
+						var5 = var7; // L: 480
 					}
 				}
 			}
 		}
 
-	} // L: 511
+	} // L: 483
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ad")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
-		var3 -= this.ascent; // L: 514
-		int var6 = -1; // L: 515
-		int var7 = -1; // L: 516
-		int var8 = 0; // L: 517
+		var3 -= this.ascent; // L: 486
+		int var6 = -1; // L: 487
+		int var7 = -1; // L: 488
+		int var8 = 0; // L: 489
 
-		for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 518
-			if (var1.charAt(var9) != 0) { // L: 519
-				char var10 = (char)(ServerPacket.charToByteCp1252(var1.charAt(var9)) & 255); // L: 520
-				if (var10 == '<') { // L: 521
-					var6 = var9; // L: 522
+		for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490
+			if (var1.charAt(var9) != 0) { // L: 491
+				char var10 = (char)(class125.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492
+				if (var10 == '<') { // L: 493
+					var6 = var9; // L: 494
 				} else {
 					int var12;
 					int var13;
 					int var14;
-					if (var10 == '>' && var6 != -1) { // L: 525
-						String var11 = var1.substring(var6 + 1, var9); // L: 526
-						var6 = -1; // L: 527
-						if (var11.equals("lt")) { // L: 528
+					if (var10 == '>' && var6 != -1) { // L: 497
+						String var11 = var1.substring(var6 + 1, var9); // L: 498
+						var6 = -1; // L: 499
+						if (var11.equals("lt")) { // L: 500
 							var10 = '<';
 						} else {
-							if (!var11.equals("gt")) { // L: 529
-								if (var11.startsWith("img=")) { // L: 530
+							if (!var11.equals("gt")) { // L: 501
+								if (var11.startsWith("img=")) { // L: 502
 									try {
-										if (var4 != null) { // L: 533
+										if (var4 != null) { // L: 505
 											var12 = var4[var8];
 										} else {
-											var12 = 0; // L: 534
+											var12 = 0; // L: 506
 										}
 
-										if (var5 != null) { // L: 536
+										if (var5 != null) { // L: 508
 											var13 = var5[var8];
 										} else {
-											var13 = 0; // L: 537
+											var13 = 0; // L: 509
 										}
 
-										++var8; // L: 538
-										var14 = class82.method1908(var11.substring(4)); // L: 539
-										IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 540
-										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 541
-										var2 += var15.width; // L: 542
-										var7 = -1; // L: 543
-									} catch (Exception var19) { // L: 545
+										++var8; // L: 510
+										var14 = FontName.method6335(var11.substring(4)); // L: 511
+										IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 512
+										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 513
+										var2 += var15.width; // L: 514
+										var7 = -1; // L: 515
+									} catch (Exception var19) { // L: 517
 									}
 								} else {
-									this.decodeTag(var11); // L: 549
+									this.decodeTag(var11); // L: 521
 								}
 								continue;
 							}
@@ -794,70 +784,70 @@ public abstract class AbstractFont extends Rasterizer2D {
 						}
 					}
 
-					if (var10 == 160) { // L: 553
+					if (var10 == 160) { // L: 525
 						var10 = ' ';
 					}
 
-					if (var6 == -1) { // L: 554
-						if (this.kerning != null && var7 != -1) { // L: 555
+					if (var6 == -1) { // L: 526
+						if (this.kerning != null && var7 != -1) { // L: 527
 							var2 += this.kerning[var10 + (var7 << 8)];
 						}
 
-						int var17 = this.widths[var10]; // L: 556
-						var12 = this.heights[var10]; // L: 557
-						if (var4 != null) { // L: 559
+						int var17 = this.widths[var10]; // L: 528
+						var12 = this.heights[var10]; // L: 529
+						if (var4 != null) { // L: 531
 							var13 = var4[var8];
 						} else {
-							var13 = 0; // L: 560
+							var13 = 0; // L: 532
 						}
 
-						if (var5 != null) { // L: 562
+						if (var5 != null) { // L: 534
 							var14 = var5[var8];
 						} else {
-							var14 = 0; // L: 563
+							var14 = 0; // L: 535
 						}
 
-						++var8; // L: 564
-						if (var10 != ' ') { // L: 565
-							if (AbstractFont_alpha == 256) { // L: 566
-								if (AbstractFont_shadow != -1) { // L: 567
+						++var8; // L: 536
+						if (var10 != ' ') { // L: 537
+							if (AbstractFont_alpha == 256) { // L: 538
+								if (AbstractFont_shadow != -1) { // L: 539
 									AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow);
 								}
 
-								this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 568
+								this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 540
 							} else {
-								if (AbstractFont_shadow != -1) { // L: 571
+								if (AbstractFont_shadow != -1) { // L: 543
 									AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha);
 								}
 
-								this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 572
+								this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 544
 							}
-						} else if (AbstractFont_justificationTotal > 0) { // L: 576
-							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 577
-							var2 += AbstractFont_justificationCurrent >> 8; // L: 578
-							AbstractFont_justificationCurrent &= 255; // L: 579
+						} else if (AbstractFont_justificationTotal > 0) { // L: 548
+							AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 549
+							var2 += AbstractFont_justificationCurrent >> 8; // L: 550
+							AbstractFont_justificationCurrent &= 255; // L: 551
 						}
 
-						int var18 = this.advances[var10]; // L: 582
-						if (AbstractFont_strike != -1) { // L: 583
+						int var18 = this.advances[var10]; // L: 554
+						if (AbstractFont_strike != -1) { // L: 555
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
 						}
 
-						if (AbstractFont_underline != -1) { // L: 584
+						if (AbstractFont_underline != -1) { // L: 556
 							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
 						}
 
-						var2 += var18; // L: 585
-						var7 = var10; // L: 586
+						var2 += var18; // L: 557
+						var7 = var10; // L: 558
 					}
 				}
 			}
 		}
 
-	} // L: 589
+	} // L: 561
 
-	@ObfuscatedName("s")
-	static int method5350(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	@ObfuscatedName("h")
+	static int method5476(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
 		int var7 = var2[var5]; // L: 100
 		int var8 = var7 + var4[var5]; // L: 101
 		int var9 = var2[var6]; // L: 102
@@ -921,157 +911,157 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString(); // L: 275
 	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("at")
 	@Export("AbstractFont_drawGlyph")
 	static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
-		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 595
-		int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 596
-		int var8 = 0; // L: 597
-		int var9 = 0; // L: 598
+		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 567
+		int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568
+		int var8 = 0; // L: 569
+		int var9 = 0; // L: 570
 		int var10;
-		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 599
-			var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 600
-			var4 -= var10; // L: 601
-			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 602
-			var9 += var3 * var10; // L: 603
-			var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 604
+		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 571
+			var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 572
+			var4 -= var10; // L: 573
+			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 574
+			var9 += var3 * var10; // L: 575
+			var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 576
 		}
 
-		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 606
+		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 578
 			var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
 		}
 
-		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 607
-			var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 608
-			var3 -= var10; // L: 609
-			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 610
-			var9 += var10; // L: 611
-			var6 += var10; // L: 612
-			var8 += var10; // L: 613
-			var7 += var10; // L: 614
+		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 579
+			var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 580
+			var3 -= var10; // L: 581
+			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 582
+			var9 += var10; // L: 583
+			var6 += var10; // L: 584
+			var8 += var10; // L: 585
+			var7 += var10; // L: 586
 		}
 
-		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 616
-			var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 617
-			var3 -= var10; // L: 618
-			var8 += var10; // L: 619
-			var7 += var10; // L: 620
+		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 588
+			var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 589
+			var3 -= var10; // L: 590
+			var8 += var10; // L: 591
+			var7 += var10; // L: 592
 		}
 
-		if (var3 > 0 && var4 > 0) { // L: 622
-			AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 623
+		if (var3 > 0 && var4 > 0) { // L: 594
+			AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 595
 		}
-	} // L: 624
+	} // L: 596
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ah")
 	@Export("AbstractFont_placeGlyph")
 	static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		int var9 = -(var5 >> 2); // L: 627
-		var5 = -(var5 & 3); // L: 628
+		int var9 = -(var5 >> 2); // L: 599
+		var5 = -(var5 & 3); // L: 600
 
-		for (int var10 = -var6; var10 < 0; ++var10) { // L: 629
+		for (int var10 = -var6; var10 < 0; ++var10) { // L: 601
 			int var11;
-			for (var11 = var9; var11 < 0; ++var11) { // L: 630
-				if (var1[var3++] != 0) { // L: 631
+			for (var11 = var9; var11 < 0; ++var11) { // L: 602
+				if (var1[var3++] != 0) { // L: 603
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 632
+					++var4; // L: 604
 				}
 
-				if (var1[var3++] != 0) { // L: 633
+				if (var1[var3++] != 0) { // L: 605
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 634
+					++var4; // L: 606
 				}
 
-				if (var1[var3++] != 0) { // L: 635
+				if (var1[var3++] != 0) { // L: 607
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 636
+					++var4; // L: 608
 				}
 
-				if (var1[var3++] != 0) { // L: 637
+				if (var1[var3++] != 0) { // L: 609
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 638
+					++var4; // L: 610
 				}
 			}
 
-			for (var11 = var5; var11 < 0; ++var11) { // L: 640
-				if (var1[var3++] != 0) { // L: 641
+			for (var11 = var5; var11 < 0; ++var11) { // L: 612
+				if (var1[var3++] != 0) { // L: 613
 					var0[var4++] = var2;
 				} else {
-					++var4; // L: 642
+					++var4; // L: 614
 				}
 			}
 
-			var4 += var7; // L: 644
-			var3 += var8; // L: 645
+			var4 += var7; // L: 616
+			var3 += var8; // L: 617
 		}
 
-	} // L: 647
+	} // L: 619
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("az")
 	@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; // L: 650
-		int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 651
-		int var9 = 0; // L: 652
-		int var10 = 0; // L: 653
+		int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 622
+		int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623
+		int var9 = 0; // L: 624
+		int var10 = 0; // L: 625
 		int var11;
-		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 654
-			var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 655
-			var4 -= var11; // L: 656
-			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 657
-			var10 += var3 * var11; // L: 658
-			var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 659
+		if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 626
+			var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 627
+			var4 -= var11; // L: 628
+			var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 629
+			var10 += var3 * var11; // L: 630
+			var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 631
 		}
 
-		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 661
+		if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 633
 			var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
 		}
 
-		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 662
-			var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 663
-			var3 -= var11; // L: 664
-			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 665
-			var10 += var11; // L: 666
-			var7 += var11; // L: 667
-			var9 += var11; // L: 668
-			var8 += var11; // L: 669
+		if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 634
+			var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 635
+			var3 -= var11; // L: 636
+			var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 637
+			var10 += var11; // L: 638
+			var7 += var11; // L: 639
+			var9 += var11; // L: 640
+			var8 += var11; // L: 641
 		}
 
-		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 671
-			var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 672
-			var3 -= var11; // L: 673
-			var9 += var11; // L: 674
-			var8 += var11; // L: 675
+		if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 643
+			var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 644
+			var3 -= var11; // L: 645
+			var9 += var11; // L: 646
+			var8 += var11; // L: 647
 		}
 
-		if (var3 > 0 && var4 > 0) { // L: 677
-			AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 678
+		if (var3 > 0 && var4 > 0) { // L: 649
+			AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 650
 		}
-	} // L: 679
+	} // L: 651
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ap")
 	@Export("AbstractFont_placeGlyphAlpha")
 	static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
-		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 682
-		var9 = 256 - var9; // L: 683
+		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 654
+		var9 = 256 - var9; // L: 655
 
-		for (int var10 = -var6; var10 < 0; ++var10) { // L: 684
-			for (int var11 = -var5; var11 < 0; ++var11) { // L: 685
-				if (var1[var3++] != 0) { // L: 686
-					int var12 = var0[var4]; // L: 687
-					var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 688
+		for (int var10 = -var6; var10 < 0; ++var10) { // L: 656
+			for (int var11 = -var5; var11 < 0; ++var11) { // L: 657
+				if (var1[var3++] != 0) { // L: 658
+					int var12 = var0[var4]; // L: 659
+					var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 660
 				} else {
-					++var4; // L: 690
+					++var4; // L: 662
 				}
 			}
 
-			var4 += var7; // L: 692
-			var3 += var8; // L: 693
+			var4 += var7; // L: 664
+			var3 += var8; // L: 665
 		}
 
-	} // L: 695
+	} // L: 667
 }
diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java
index 2dc0467c46..c51ed81005 100644
--- a/runescape-client/src/main/java/AbstractRasterProvider.java
+++ b/runescape-client/src/main/java/AbstractRasterProvider.java
@@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oe")
+@ObfuscatedName("om")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("pixels")
 	public int[] pixels;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -740510445
+		intValue = -1710221011
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 460788765
+		intValue = -2113427401
 	)
 	@Export("height")
 	public int height;
@@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	} // L: 8
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-974946505"
+		garbageValue = "-474214385"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "331056379"
+		descriptor = "(IIIIS)V",
+		garbageValue = "640"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "872029974"
+		garbageValue = "-832848769"
 	)
 	@Export("apply")
 	public final void apply() {
diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java
index 82c39ac6c0..098e639356 100644
--- a/runescape-client/src/main/java/AbstractSocket.java
+++ b/runescape-client/src/main/java/AbstractSocket.java
@@ -4,39 +4,39 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ls")
+@ObfuscatedName("lk")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
-	@ObfuscatedName("gt")
+	@ObfuscatedName("fw")
 	@ObfuscatedSignature(
-		descriptor = "Lgt;"
+		descriptor = "Lkj;"
 	)
-	@Export("scene")
-	static Scene scene;
+	@Export("fontPlain12")
+	static Font fontPlain12;
 
 	protected AbstractSocket() {
 	} // L: 7
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1654713390"
+		garbageValue = "1854440694"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "479468921"
+		garbageValue = "574875272"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1659206769"
+		garbageValue = "-2063198043"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
@@ -44,44 +44,49 @@ public abstract class AbstractSocket {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-211935081"
+		garbageValue = "-2019948581"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "-2041736219"
+		garbageValue = "-334344092"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "263213011"
+		garbageValue = "-1206684972"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1943221493"
+		descriptor = "(I)Loa;",
+		garbageValue = "-2039946675"
 	)
-	static int method5901() {
-		return 12;
-	}
+	static SpritePixels method5940() {
+		SpritePixels var0 = new SpritePixels(); // L: 124
+		var0.width = class397.SpriteBuffer_spriteWidth; // L: 125
+		var0.height = class244.SpriteBuffer_spriteHeight; // L: 126
+		var0.xOffset = class397.SpriteBuffer_xOffsets[0]; // L: 127
+		var0.yOffset = class26.SpriteBuffer_yOffsets[0]; // L: 128
+		var0.subWidth = Canvas.SpriteBuffer_spriteWidths[0]; // L: 129
+		var0.subHeight = Clock.SpriteBuffer_spriteHeights[0]; // L: 130
+		int var1 = var0.subHeight * var0.subWidth; // L: 131
+		byte[] var2 = class126.SpriteBuffer_pixels[0]; // L: 132
+		var0.pixels = new int[var1]; // L: 133
 
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;Ljava/lang/String;Ljava/lang/String;B)Lkt;",
-		garbageValue = "88"
-	)
-	public static Font method5900(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
-		int var4 = var0.getGroupId(var2); // L: 121
-		int var5 = var0.getFileId(var4, var3); // L: 122
-		return AbstractArchive.method5018(var0, var1, var4, var5); // L: 123
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 134
+			var0.pixels[var3] = class397.SpriteBuffer_spritePalette[var2[var3] & 255];
+		}
+
+		ArchiveDisk.method5993(); // L: 135
+		return var0; // L: 136
 	}
 }
diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java
index a16b107a26..d96d5bd5c7 100644
--- a/runescape-client/src/main/java/AbstractSound.java
+++ b/runescape-client/src/main/java/AbstractSound.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("bp")
+@ObfuscatedName("bj")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("position")
 	int position;
 
diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java
index 24d4e1bdf2..4738d3dab3 100644
--- 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("ln")
+@ObfuscatedName("lr")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	} // L: 8
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/Comparator;I)V",
-		garbageValue = "-82971499"
+		garbageValue = "809923869"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	} // L: 17
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;Llx;B)I",
-		garbageValue = "0"
+		descriptor = "(Llf;Llf;B)I",
+		garbageValue = "62"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java
index 911f8f25d6..b062d08691 100644
--- a/runescape-client/src/main/java/AbstractWorldMapData.java
+++ b/runescape-client/src/main/java/AbstractWorldMapData.java
@@ -5,108 +5,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fm")
+@ObfuscatedName("fy")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("p")
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		descriptor = "Lom;"
+	)
+	@Export("rasterProvider")
+	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1347091631
+		intValue = 1453035113
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -868813013
+		intValue = -1514255955
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1253594293
+		intValue = -721187647
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 174092143
+		intValue = -338323933
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1260242687
+		intValue = -75895465
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1482547443
+		intValue = -1081572037
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -630921225
+		intValue = -418249645
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -373998791
+		intValue = 873736715
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("e")
-	byte[][][] field2067;
 	@ObfuscatedName("g")
-	byte[][][] field2065;
-	@ObfuscatedName("a")
+	byte[][][] field2068;
+	@ObfuscatedName("t")
+	byte[][][] field2074;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "[[[[Lfh;"
+		descriptor = "[[[[Lfw;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("k")
-	boolean field2068;
-	@ObfuscatedName("m")
-	boolean field2069;
+	@ObfuscatedName("u")
+	boolean field2066;
+	@ObfuscatedName("q")
+	boolean field2073;
 
 	AbstractWorldMapData() {
 		this.groupId = -1; // L: 14
 		this.fileId = -1; // L: 15
 		new LinkedList();
-		this.field2068 = false; // L: 26
-		this.field2069 = false; // L: 27
+		this.field2066 = false; // L: 26
+		this.field2073 = false; // L: 27
 	} // L: 29
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1223315238"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1563875465"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "25"
+		descriptor = "(I)Z",
+		garbageValue = "1807805876"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field2068 && this.field2069; // L: 32
+		return this.field2066 && this.field2073; // L: 32
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;I)V",
-		garbageValue = "-1881595992"
+		descriptor = "(Ljp;I)V",
+		garbageValue = "39585450"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -114,53 +120,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37
 			if (var2 != null) { // L: 38
 				this.readGeography(new Buffer(var2)); // L: 39
-				this.field2068 = true; // L: 40
-				this.field2069 = true; // L: 41
+				this.field2066 = true; // L: 40
+				this.field2073 = true; // L: 41
 			}
 
 		}
 	} // L: 43
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "244458309"
+		descriptor = "(B)V",
+		garbageValue = "84"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null; // L: 46
 		this.floorOverlayIds = null; // L: 47
-		this.field2067 = null; // L: 48
-		this.field2065 = null; // L: 49
+		this.field2068 = null; // L: 48
+		this.field2074 = null; // L: 49
 		this.decorations = null; // L: 50
-		this.field2068 = false; // L: 51
-		this.field2069 = false; // L: 52
+		this.field2066 = false; // L: 51
+		this.field2073 = false; // L: 52
 	} // L: 53
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(IILnd;I)V",
-		garbageValue = "-570193983"
+		descriptor = "(IILnt;B)V",
+		garbageValue = "-90"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte(); // L: 56
 		if (var4 != 0) { // L: 57
 			if ((var4 & 1) != 0) { // L: 60
-				this.method3602(var1, var2, var3, var4); // L: 61
+				this.method3683(var1, var2, var3, var4); // L: 61
 			} else {
-				this.method3622(var1, var2, var3, var4); // L: 64
+				this.method3693(var1, var2, var3, var4); // L: 64
 			}
 
 		}
 	} // L: 58 66
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(IILnd;II)V",
-		garbageValue = "-300212411"
+		descriptor = "(IILnt;IB)V",
+		garbageValue = "-56"
 	)
-	void method3602(int var1, int var2, Buffer var3, int var4) {
+	void method3683(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0; // L: 69
 		if (var5) { // L: 70
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 71
@@ -169,12 +175,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73
 	} // L: 74
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(IILnd;II)V",
-		garbageValue = "-2123814102"
+		descriptor = "(IILnt;II)V",
+		garbageValue = "-1310691805"
 	)
-	void method3622(int var1, int var2, Buffer var3, int var4) {
+	void method3693(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1; // L: 77
 		boolean var6 = (var4 & 2) != 0; // L: 78
 		boolean var7 = (var4 & 4) != 0; // L: 79
@@ -190,8 +196,8 @@ public abstract class AbstractWorldMapData {
 				if (var14 != 0) { // L: 85
 					this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86
 					var11 = var3.readUnsignedByte(); // L: 87
-					this.field2067[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
-					this.field2065[var9][var1][var2] = (byte)(var11 & 3); // L: 89
+					this.field2068[var9][var1][var2] = (byte)(var11 >> 2); // L: 88
+					this.field2074[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -203,7 +209,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99
 
 					for (var11 = 0; var11 < var9; ++var11) { // L: 100
-						int var12 = var3.method6583(); // L: 101
+						int var12 = var3.method6630(); // L: 101
 						int var13 = var3.readUnsignedByte(); // L: 102
 						var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103
 					}
@@ -213,23 +219,34 @@ public abstract class AbstractWorldMapData {
 
 	} // L: 107
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-802989109"
+		garbageValue = "-1191625155"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX; // L: 112
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-49"
+		descriptor = "(I)I",
+		garbageValue = "210506971"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY; // L: 116
 	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(Ljp;Ljp;Ljava/lang/String;Ljava/lang/String;I)Lkj;",
+		garbageValue = "907646932"
+	)
+	public static Font method3696(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
+		int var4 = var0.getGroupId(var2); // L: 89
+		int var5 = var0.getFileId(var4, var3); // L: 90
+		return Bounds.method6034(var0, var1, var4, var5); // L: 91
+	}
 }
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index 401d076cb3..ea82ca4a59 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -4,78 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gq")
+@ObfuscatedName("gh")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liw;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liw;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1619813951
+		intValue = 1204437349
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1123629873
+		intValue = -525287981
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lii;Lii;)V"
+		descriptor = "(Liw;Liw;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1; // L: 13
 		this.coord2 = var2; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2145882550"
+		garbageValue = "1717389517"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lfv;",
-		garbageValue = "39460369"
+		descriptor = "(I)Lfd;",
+		garbageValue = "1736510941"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1949510660"
+		descriptor = "(B)I",
+		garbageValue = "-60"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-85"
+		descriptor = "(I)I",
+		garbageValue = "-401407374"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IIS)Z",
-		garbageValue = "3474"
+		descriptor = "(III)Z",
+		garbageValue = "370652147"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -86,62 +86,62 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-143687139"
+		descriptor = "(B)Z",
+		garbageValue = "53"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
-		return this.getElement() >= 0; // L: 33
+		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
-		garbageValue = "561352542"
+		descriptor = "(IIB)Z",
+		garbageValue = "-88"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) { // L: 37
 			return false;
 		} else {
-			WorldMapElement var3 = class6.WorldMapElement_get(this.getElement()); // L: 38
+			WorldMapElement var3 = Archive.WorldMapElement_get(this.getElement()); // L: 38
 			int var4 = this.getSubWidth(); // L: 39
 			int var5 = this.getSubHeight(); // L: 40
 			switch(var3.horizontalAlignment.value) { // L: 41
 			case 0:
-				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { // L: 54
+				if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 44
+					return false;
+				}
+				break;
+			case 1:
+				if (var1 > this.screenX - var4 && var1 <= this.screenX) { // L: 54
 					break;
 				}
 
 				return false;
-			case 1:
-				if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 44
-					return false;
-				}
-				break;
 			case 2:
-				if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 49
+				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 49
 					return false;
 				}
 			}
 
 			switch(var3.verticalAlignment.value) { // L: 58
 			case 0:
-				if (var2 > this.screenY - var5 && var2 <= this.screenY) { // L: 66
+				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 66
 					break;
 				}
 
 				return false;
 			case 1:
-				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { // L: 61
+				if (var2 >= this.screenY && var2 < var5 + this.screenY) { // L: 71
 					break;
 				}
 
 				return false;
 			case 2:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 71
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 61
 					return false;
 				}
 			}
@@ -150,10 +150,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "280751135"
+		garbageValue = "-663056522"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -161,9 +161,92 @@ public abstract class AbstractWorldMapIcon {
 		if (var3 == null) { // L: 80
 			return false; // L: 81
 		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83
-			return var2 >= this.screenY && var2 <= var3.height + this.screenY; // L: 84
+			return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84
 		} else {
 			return false; // L: 85
 		}
 	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIII)I",
+		garbageValue = "-860022326"
+	)
+	public static int method3787(int var0, int var1, int var2, int var3, int var4, int var5) {
+		if ((var5 & 1) == 1) { // L: 25
+			int var6 = var3; // L: 26
+			var3 = var4; // L: 27
+			var4 = var6; // L: 28
+		}
+
+		var2 &= 3; // L: 30
+		if (var2 == 0) { // L: 31
+			return var0;
+		} else if (var2 == 1) { // L: 32
+			return var1;
+		} else {
+			return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); // L: 33 34
+		}
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "1784757970"
+	)
+	public static int method3785(int var0, int var1, int var2) {
+		int var3 = UserComparator2.method6890(var2 - var1 + 1); // L: 51
+		var3 <<= var1; // L: 52
+		return var0 & ~var3; // L: 53
+	}
+
+	@ObfuscatedName("fz")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;III)V",
+		garbageValue = "605397793"
+	)
+	@Export("checkIfMinimapClicked")
+	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
+		if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3812
+			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3813
+				SpriteMask var3 = var0.getSpriteMask(true); // L: 3814
+				if (var3 == null) { // L: 3815
+					return;
+				}
+
+				int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3816
+				int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3817
+				if (var3.contains(var4, var5)) { // L: 3818
+					var4 -= var3.width / 2; // L: 3819
+					var5 -= var3.height / 2; // L: 3820
+					int var6 = Client.camAngleY & 2047; // L: 3821
+					int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3822
+					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3823
+					int var9 = var5 * var7 + var4 * var8 >> 11; // L: 3824
+					int var10 = var5 * var8 - var4 * var7 >> 11; // L: 3825
+					int var11 = var9 + class262.localPlayer.x >> 7; // L: 3826
+					int var12 = class262.localPlayer.y - var10 >> 7; // L: 3827
+					PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); // L: 3829
+					var13.packetBuffer.writeByte(18); // L: 3830
+					var13.packetBuffer.writeShort(var12 + WorldMapSprite.baseY); // L: 3831
+					var13.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3832
+					var13.packetBuffer.method6649(var11 + class15.baseX); // L: 3833
+					var13.packetBuffer.writeByte(var4); // L: 3834
+					var13.packetBuffer.writeByte(var5); // L: 3835
+					var13.packetBuffer.writeShort(Client.camAngleY); // L: 3836
+					var13.packetBuffer.writeByte(57); // L: 3837
+					var13.packetBuffer.writeByte(0); // L: 3838
+					var13.packetBuffer.writeByte(0); // L: 3839
+					var13.packetBuffer.writeByte(89); // L: 3840
+					var13.packetBuffer.writeShort(class262.localPlayer.x); // L: 3841
+					var13.packetBuffer.writeShort(class262.localPlayer.y); // L: 3842
+					var13.packetBuffer.writeByte(63); // L: 3843
+					Client.packetWriter.addNode(var13); // L: 3844
+					Client.destinationX = var11; // L: 3845
+					Client.destinationY = var12; // L: 3846
+				}
+			}
+
+		}
+	} // L: 3849
 }
diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java
index 5dde8f0183..bf7b640bd0 100644
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -9,21 +9,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nm")
+@ObfuscatedName("np")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
+	static byte[][][] field4098;
+	@ObfuscatedName("f")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = 5188253846465837923L
+		longValue = 3438090752021469399L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = 8167831269062289551L
+		longValue = 5591435214435484409L
 	)
 	@Export("offset")
 	long offset;
@@ -49,21 +51,21 @@ public final class AccessFile {
 		this.file.seek(0L); // L: 23
 	} // L: 24
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1); // L: 27
 		this.offset = var1; // L: 28
 	} // L: 29
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)V",
-		garbageValue = "29"
+		descriptor = "([BIII)V",
+		garbageValue = "53562428"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
-		if (this.offset + (long)var3 > this.maxSize) { // L: 32
+		if ((long)var3 + this.offset > this.maxSize) { // L: 32
 			this.file.seek(this.maxSize); // L: 33
 			this.file.write(1); // L: 34
 			throw new EOFException(); // L: 35
@@ -73,10 +75,10 @@ public final class AccessFile {
 		}
 	} // L: 39
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-520775983"
+		garbageValue = "1532680077"
 	)
 	@Export("close")
 	public final void close() throws IOException {
@@ -85,8 +87,8 @@ public final class AccessFile {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-891531898"
+		descriptor = "(ZB)V",
+		garbageValue = "31"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +106,20 @@ public final class AccessFile {
 
 	} // L: 56
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)J",
-		garbageValue = "1700064140"
+		garbageValue = "-419220313"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length(); // L: 59
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "([BIIB)I",
-		garbageValue = "-59"
+		descriptor = "([BIII)I",
+		garbageValue = "-803541857"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {
@@ -136,4 +138,18 @@ public final class AccessFile {
 		}
 
 	} // L: 73
+
+	@ObfuscatedName("ie")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "715885494"
+	)
+	static final void method6437(int var0, int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7760
+			if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7761
+				Client.field831[var4] = true;
+			}
+		}
+
+	} // L: 7763
 }
diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java
index 9aa022f098..83f2e26707 100644
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -4,332 +4,320 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cy")
+@ObfuscatedName("cl")
 @Implements("Actor")
 public abstract class Actor extends Renderable {
-	@ObfuscatedName("fh")
-	@ObfuscatedSignature(
-		descriptor = "Lkt;"
-	)
-	@Export("fontPlain11")
-	static Font fontPlain11;
-	@ObfuscatedName("nr")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -371192105
-	)
-	@Export("widgetDragDuration")
-	static int widgetDragDuration;
-	@ObfuscatedName("ad")
-	@ObfuscatedGetter(
-		intValue = -130212619
+		intValue = 1424519155
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 1248597615
+		intValue = 936237979
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -1073291133
+		intValue = 874219119
 	)
 	@Export("rotation")
 	int rotation;
 	@ObfuscatedName("ag")
 	@Export("isWalking")
 	boolean isWalking;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = 1868694145
+		intValue = 1485342149
 	)
-	int field1239;
-	@ObfuscatedName("as")
+	int field1225;
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -1698768263
+		intValue = -509558101
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -932232515
+		intValue = -1206124803
 	)
 	@Export("idleSequence")
 	int idleSequence;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 2010968993
+		intValue = 202553539
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -144191447
+		intValue = -133909051
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -152072953
+		intValue = 1178791293
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -1808202573
+		intValue = -1446612939
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 1341114765
+		intValue = 1219850051
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -1993879825
+		intValue = 474611297
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1401897961
+		intValue = 1091145941
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("am")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("af")
-	boolean field1248;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aa")
+	boolean field1253;
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = -1654949393
+		intValue = 158954669
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -275691641
+		intValue = 217502675
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 1592365515
+		intValue = -1564304399
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("an")
+	@ObfuscatedName("af")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bx")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bi")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bz")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "Lki;"
+		descriptor = "Lkz;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = 637535539
+		intValue = -1033786515
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 800070667
+		intValue = -340306785
 	)
-	int field1264;
+	int field1280;
 	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -330797761
+		intValue = -556285409
 	)
 	@Export("movementSequence")
 	int movementSequence;
 	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 1832573289
+		intValue = -565094245
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = 572579455
+		intValue = -1564505139
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -1762760413
+		intValue = -2104532797
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 2078717111
+		intValue = 115504749
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = 643131463
+		intValue = -460250755
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -1848146093
+		intValue = -1967513789
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 272217185
+		intValue = 971305057
 	)
-	int field1245;
-	@ObfuscatedName("bn")
+	int field1258;
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = -1915525677
+		intValue = 1049041031
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = 479634489
+		intValue = -1411850169
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -1084268575
+		intValue = 1298560263
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = 58747199
+		intValue = 469123257
 	)
-	int field1287;
-	@ObfuscatedName("bb")
+	int field1262;
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = -1377519793
+		intValue = -1144657861
 	)
-	int field1277;
+	int field1263;
+	@ObfuscatedName("bp")
+	@ObfuscatedGetter(
+		intValue = 1464146757
+	)
+	int field1264;
 	@ObfuscatedName("bk")
 	@ObfuscatedGetter(
-		intValue = 721291573
-	)
-	int field1278;
-	@ObfuscatedName("bg")
-	@ObfuscatedGetter(
-		intValue = 1049471373
-	)
-	int field1269;
-	@ObfuscatedName("by")
-	@ObfuscatedGetter(
-		intValue = 690610019
-	)
-	int field1280;
-	@ObfuscatedName("bc")
-	@ObfuscatedGetter(
-		intValue = -1504119385
-	)
-	int field1238;
-	@ObfuscatedName("cd")
-	@ObfuscatedGetter(
-		intValue = -611848265
+		intValue = 610282849
 	)
 	int field1265;
+	@ObfuscatedName("bh")
+	@ObfuscatedGetter(
+		intValue = 847021677
+	)
+	int field1268;
+	@ObfuscatedName("bf")
+	@ObfuscatedGetter(
+		intValue = 1338394283
+	)
+	int field1267;
 	@ObfuscatedName("cm")
 	@ObfuscatedGetter(
-		intValue = -61946015
+		intValue = 927939297
 	)
-	int field1283;
-	@ObfuscatedName("cv")
+	int field1276;
+	@ObfuscatedName("cx")
 	@ObfuscatedGetter(
-		intValue = 165021719
+		intValue = -406517487
 	)
-	int field1284;
-	@ObfuscatedName("cp")
+	int field1269;
+	@ObfuscatedName("cq")
 	@ObfuscatedGetter(
-		intValue = 1280286129
+		intValue = -1759311977
+	)
+	int field1270;
+	@ObfuscatedName("cz")
+	@ObfuscatedGetter(
+		intValue = -429335855
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cc")
 	@ObfuscatedGetter(
-		intValue = -881485665
+		intValue = 191753551
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = -1173912475
+		intValue = 2031424695
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cp")
 	@ObfuscatedGetter(
-		intValue = -906983361
+		intValue = -1087482181
 	)
-	int field1282;
-	@ObfuscatedName("cr")
+	int field1274;
+	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = -1889632377
+		intValue = 731045615
 	)
-	int field1289;
+	int field1275;
 	@ObfuscatedName("cf")
 	@ObfuscatedGetter(
-		intValue = -664818219
+		intValue = 1585830935
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cb")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cg")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("ca")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 110165637
+		intValue = 1081774257
 	)
-	int field1294;
-	@ObfuscatedName("ck")
+	int field1242;
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = 313310131
+		intValue = 815259821
 	)
-	int field1274;
+	int field1281;
 
 	Actor() {
 		this.isWalking = false; // L: 13
-		this.field1239 = 1; // L: 14
+		this.field1225 = 1; // L: 14
 		this.idleSequence = -1; // L: 16
 		this.turnLeftSequence = -1; // L: 17
 		this.turnRightSequence = -1; // L: 18
@@ -339,7 +327,7 @@ public abstract class Actor extends Renderable {
 		this.walkRightSequence = -1; // L: 22
 		this.runSequence = -1; // L: 23
 		this.overheadText = null; // L: 24
-		this.field1248 = false; // L: 26
+		this.field1253 = false; // L: 26
 		this.overheadTextCyclesRemaining = 100; // L: 27
 		this.overheadTextColor = 0; // L: 28
 		this.overheadTextEffect = 0; // L: 29
@@ -352,7 +340,7 @@ public abstract class Actor extends Renderable {
 		this.healthBars = new IterableNodeDeque(); // L: 37
 		this.targetIndex = -1; // L: 38
 		this.false0 = false; // L: 39
-		this.field1264 = -1; // L: 40
+		this.field1280 = -1; // L: 40
 		this.movementSequence = -1; // L: 41
 		this.movementFrame = 0; // L: 42
 		this.movementFrameCycle = 0; // L: 43
@@ -360,46 +348,46 @@ public abstract class Actor extends Renderable {
 		this.sequenceFrame = 0; // L: 45
 		this.sequenceFrameCycle = 0; // L: 46
 		this.sequenceDelay = 0; // L: 47
-		this.field1245 = 0; // L: 48
+		this.field1258 = 0; // L: 48
 		this.spotAnimation = -1; // L: 49
 		this.spotAnimationFrame = 0; // L: 50
 		this.spotAnimationFrameCycle = 0; // L: 51
 		this.npcCycle = 0; // L: 61
 		this.defaultHeight = 200; // L: 62
-		this.field1282 = 0; // L: 64
-		this.field1289 = 32; // L: 65
+		this.field1274 = 0; // L: 64
+		this.field1275 = 32; // L: 65
 		this.pathLength = 0; // L: 66
 		this.pathX = new int[10]; // L: 67
 		this.pathY = new int[10]; // L: 68
 		this.pathTraversed = new byte[10]; // L: 69
-		this.field1294 = 0; // L: 70
-		this.field1274 = 0; // L: 71
-	} // L: 73
+		this.field1242 = 0; // L: 70
+		this.field1281 = 0; // L: 71
+	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-6"
+		garbageValue = "3"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false; // L: 81
 	}
 
-	@ObfuscatedName("be")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1557316570"
+		garbageValue = "-2136835932"
 	)
-	final void method2171() {
-		this.pathLength = 0; // L: 76
-		this.field1274 = 0; // L: 77
+	final void method2263() {
+		this.pathLength = 0;
+		this.field1281 = 0; // L: 77
 	} // L: 78
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIB)V",
-		garbageValue = "31"
+		garbageValue = "-22"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -419,9 +407,9 @@ public abstract class Actor extends Renderable {
 		int var10 = -1; // L: 92
 		int var11 = 0; // L: 93
 		if (var1 >= 0) { // L: 94
-			HitSplatDefinition var12 = Projectile.method1966(var1); // L: 95
-			var10 = var12.field1743; // L: 96
-			var11 = var12.field1731; // L: 97
+			HitSplatDefinition var12 = Decimator.method1171(var1); // L: 95
+			var10 = var12.field1747; // L: 96
+			var11 = var12.field1738; // L: 97
 		}
 
 		int var14;
@@ -441,8 +429,8 @@ public abstract class Actor extends Renderable {
 			for (int var13 = 1; var13 < 4; ++var13) { // L: 105
 				if (var10 == 0) { // L: 106
 					if (this.hitSplatCycles[var13] < var14) { // L: 107
-						var9 = var13;
-						var14 = this.hitSplatCycles[var13];
+						var9 = var13; // L: 108
+						var14 = this.hitSplatCycles[var13]; // L: 109
 					}
 				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 112 113
 					var9 = var13; // L: 114
@@ -450,26 +438,26 @@ public abstract class Actor extends Renderable {
 				}
 			}
 
-			if (var10 == 1 && var14 >= var2) { // L: 119
+			if (var10 == 1 && var14 >= var2) {
 				return;
 			}
 		} else {
-			if (var7) { // L: 122
+			if (var7) {
 				this.hitSplatCount = 0;
 			}
 
-			for (var14 = 0; var14 < 4; ++var14) { // L: 123
-				byte var15 = this.hitSplatCount; // L: 124
-				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 125
-				if (this.hitSplatCycles[var15] <= var5) { // L: 126
-					var9 = var15; // L: 127
-					break; // L: 128
+			for (var14 = 0; var14 < 4; ++var14) {
+				byte var15 = this.hitSplatCount;
+				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
+				if (this.hitSplatCycles[var15] <= var5) {
+					var9 = var15;
+					break;
 				}
 			}
 		}
 
 		if (var9 >= 0) { // L: 132
-			this.hitSplatTypes[var9] = var1; // L: 133
+			this.hitSplatTypes[var9] = var1;
 			this.hitSplatValues[var9] = var2; // L: 134
 			this.hitSplatTypes2[var9] = var3; // L: 135
 			this.hitSplatValues2[var9] = var4; // L: 136
@@ -477,14 +465,14 @@ public abstract class Actor extends Renderable {
 		}
 	} // L: 138
 
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIB)V",
-		garbageValue = "-127"
+		garbageValue = "1"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var7 = UserComparator6.method2492(var1); // L: 141
+		HealthBarDefinition var7 = class287.method5260(var1); // L: 141
 		HealthBar var8 = null; // L: 142
 		HealthBar var9 = null; // L: 143
 		int var10 = var7.int2; // L: 144
@@ -493,7 +481,7 @@ public abstract class Actor extends Renderable {
 		HealthBar var12;
 		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 146
 			++var11; // L: 147
-			if (var12.definition.field1596 == var7.field1596) { // L: 148
+			if (var12.definition.field1602 == var7.field1602) { // L: 148
 				var12.put(var2 + var4, var5, var6, var3); // L: 149
 				return; // L: 150
 			}
@@ -524,14 +512,14 @@ public abstract class Actor extends Renderable {
 		}
 	} // L: 164
 
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-36"
+		descriptor = "(II)V",
+		garbageValue = "-1204819993"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = UserComparator6.method2492(var1); // L: 167
+		HealthBarDefinition var2 = class287.method5260(var1); // L: 167
 
 		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 168
 			if (var2 == var3.definition) { // L: 169
@@ -542,56 +530,161 @@ public abstract class Actor extends Renderable {
 
 	} // L: 174
 
-	@ObfuscatedName("o")
-	static final void method2191(long var0) {
-		ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 108
-	} // L: 109
-
-	@ObfuscatedName("iz")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;I)V",
-		garbageValue = "325868949"
+		descriptor = "(Ljp;Ljp;ZI)V",
+		garbageValue = "1669535387"
 	)
-	static void method2192(int var0, String var1) {
-		int var2 = Players.Players_count; // L: 8588
-		int[] var3 = Players.Players_indices; // L: 8589
-		boolean var4 = false; // L: 8590
-		Username var5 = new Username(var1, WorldMapSection0.loginType); // L: 8591
+	public static void method2262(AbstractArchive var0, AbstractArchive var1, boolean var2) {
+		ObjectComposition.ObjectDefinition_archive = var0; // L: 73
+		ObjectComposition.ObjectDefinition_modelsArchive = var1; // L: 74
+		ObjectComposition.ObjectDefinition_isLowDetail = var2; // L: 75
+	} // L: 76
 
-		for (int var6 = 0; var6 < var2; ++var6) { // L: 8592
-			Player var7 = Client.players[var3[var6]]; // L: 8593
-			if (var7 != null && var7 != class93.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8594
-				PacketBufferNode var8;
-				if (var0 == 1) { // L: 8595
-					var8 = class21.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8597
-					var8.packetBuffer.method6619(var3[var6]); // L: 8598
-					var8.packetBuffer.method6584(0); // L: 8599
-					Client.packetWriter.addNode(var8); // L: 8600
-				} else if (var0 == 4) { // L: 8602
-					var8 = class21.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 8604
-					var8.packetBuffer.method6619(var3[var6]); // L: 8605
-					var8.packetBuffer.method6584(0); // L: 8606
-					Client.packetWriter.addNode(var8); // L: 8607
-				} else if (var0 == 6) { // L: 8609
-					var8 = class21.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 8611
-					var8.packetBuffer.method6581(0); // L: 8612
-					var8.packetBuffer.method6602(var3[var6]); // L: 8613
-					Client.packetWriter.addNode(var8); // L: 8614
-				} else if (var0 == 7) { // L: 8616
-					var8 = class21.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8618
-					var8.packetBuffer.writeByte(0); // L: 8619
-					var8.packetBuffer.method6602(var3[var6]); // L: 8620
-					Client.packetWriter.addNode(var8); // L: 8621
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "13"
+	)
+	@Export("savePreferences")
+	static void savePreferences() {
+		AccessFile var0 = null; // L: 117
+
+		try {
+			var0 = class262.getPreferencesFile("", class182.field2114.name, true); // L: 119
+			Buffer var1 = class4.clientPreferences.toBuffer(); // L: 120
+			var0.write(var1.array, 0, var1.offset);
+		} catch (Exception var3) {
+		}
+
+		try {
+			if (var0 != null) {
+				var0.closeSync(true);
+			}
+		} catch (Exception var2) {
+		}
+
+	} // L: 130
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "([BIIB)Ljava/lang/String;",
+		garbageValue = "-81"
+	)
+	@Export("decodeStringCp1252")
+	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
+		char[] var3 = new char[var2]; // L: 121
+		int var4 = 0; // L: 122
+
+		for (int var5 = 0; var5 < var2; ++var5) { // L: 123
+			int var6 = var0[var5 + var1] & 255; // L: 124
+			if (var6 != 0) { // L: 125
+				if (var6 >= 128 && var6 < 160) { // L: 126
+					char var7 = class302.cp1252AsciiExtension[var6 - 128]; // L: 127
+					if (var7 == 0) { // L: 128
+						var7 = '?';
+					}
+
+					var6 = var7; // L: 129
 				}
 
-				var4 = true; // L: 8623
-				break;
+				var3[var4++] = (char)var6; // L: 131
 			}
 		}
 
-		if (!var4) { // L: 8627
-			World.addGameMessage(4, "", "Unable to find " + var1);
-		}
+		return new String(var3, 0, var4); // L: 133
+	}
 
-	} // L: 8628
+	@ObfuscatedName("ij")
+	@ObfuscatedSignature(
+		descriptor = "(Lcj;IIII)V",
+		garbageValue = "55903720"
+	)
+	@Export("addPlayerToMenu")
+	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
+		if (class262.localPlayer != var0) { // L: 9282
+			if (Client.menuOptionsCount < 400) { // L: 9283
+				String var4;
+				int var7;
+				if (var0.skillLevel == 0) { // L: 9285
+					String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9286
+					var7 = var0.combatLevel; // L: 9288
+					int var8 = class262.localPlayer.combatLevel; // L: 9289
+					int var9 = var8 - var7; // L: 9291
+					String var6;
+					if (var9 < -9) { // L: 9292
+						var6 = SecureRandomFuture.colorStartTag(16711680); // L: 9293
+					} else if (var9 < -6) { // L: 9296
+						var6 = SecureRandomFuture.colorStartTag(16723968); // L: 9297
+					} else if (var9 < -3) { // L: 9300
+						var6 = SecureRandomFuture.colorStartTag(16740352); // L: 9301
+					} else if (var9 < 0) { // L: 9304
+						var6 = SecureRandomFuture.colorStartTag(16756736); // L: 9305
+					} else if (var9 > 9) { // L: 9308
+						var6 = SecureRandomFuture.colorStartTag(65280); // L: 9309
+					} else if (var9 > 6) { // L: 9312
+						var6 = SecureRandomFuture.colorStartTag(4259584); // L: 9313
+					} else if (var9 > 3) { // L: 9316
+						var6 = SecureRandomFuture.colorStartTag(8453888); // L: 9317
+					} else if (var9 > 0) { // L: 9320
+						var6 = SecureRandomFuture.colorStartTag(12648192); // L: 9321
+					} else {
+						var6 = SecureRandomFuture.colorStartTag(16776960); // L: 9324
+					}
+
+					var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9326
+				} else {
+					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9328
+				}
+
+				int var10;
+				if (Client.isItemSelected == 1) { // L: 9329
+					class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9330
+				} else if (Client.isSpellSelected) { // L: 9333
+					if ((LoginPacket.selectedSpellFlags & 8) == 8) { // L: 9334
+						class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9335
+					}
+				} else {
+					for (var10 = 7; var10 >= 0; --var10) { // L: 9340
+						if (Client.playerMenuActions[var10] != null) { // L: 9341
+							short var11 = 0; // L: 9342
+							if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9343
+								if (Client.playerAttackOption == AttackOption.AttackOption_hidden) { // L: 9344
+									continue;
+								}
+
+								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class262.localPlayer.combatLevel) { // L: 9345
+									var11 = 2000; // L: 9346
+								}
+
+								if (class262.localPlayer.team != 0 && var0.team != 0) { // L: 9348
+									if (var0.team == class262.localPlayer.team) { // L: 9349
+										var11 = 2000;
+									} else {
+										var11 = 0; // L: 9350
+									}
+								} else if (var0.isClanMember()) { // L: 9352
+									var11 = 2000; // L: 9353
+								}
+							} else if (Client.playerOptionsPriorities[var10]) { // L: 9356
+								var11 = 2000;
+							}
+
+							boolean var12 = false; // L: 9357
+							var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9358
+							class22.insertMenuItemNoShift(Client.playerMenuActions[var10], SecureRandomFuture.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9359
+						}
+					}
+				}
+
+				for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9364
+					if (Client.menuOpcodes[var10] == 23) { // L: 9365
+						Client.menuTargets[var10] = SecureRandomFuture.colorStartTag(16777215) + var4; // L: 9366
+						break;
+					}
+				}
+
+			}
+		}
+	} // L: 9370
 }
diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java
index d0505ca9f9..50c8fcc603 100644
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -3,51 +3,51 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gu")
+@ObfuscatedName("gz")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("v")
-	static int[] field2229;
-	@ObfuscatedName("n")
-	static int[] field2225;
 	@ObfuscatedName("f")
+	static int[] field2231;
+	@ObfuscatedName("e")
+	static int[] field2224;
+	@ObfuscatedName("v")
 	static int[] field2226;
 	@ObfuscatedName("y")
-	static int[] field2224;
-	@ObfuscatedName("p")
+	static int[] field2227;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lge;"
+		descriptor = "Lgb;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field2229 = new int[500]; // L: 8
-		field2225 = new int[500]; // L: 9
+		field2231 = new int[500]; // L: 8
+		field2224 = new int[500]; // L: 9
 		field2226 = new int[500]; // L: 10
-		field2224 = new int[500]; // L: 11
+		field2227 = new int[500]; // L: 11
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "([BLge;)V"
+		descriptor = "([BLgb;)V"
 	)
 	Animation(byte[] var1, Skeleton var2) {
 		this.skeleton = null; // L: 12
@@ -69,26 +69,26 @@ public class Animation {
 				if (this.skeleton.transformTypes[var8] != 0) { // L: 32
 					for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33
 						if (this.skeleton.transformTypes[var10] == 0) { // L: 34
-							field2229[var7] = var10; // L: 35
-							field2225[var7] = 0; // L: 36
+							field2231[var7] = var10; // L: 35
+							field2224[var7] = 0; // L: 36
 							field2226[var7] = 0; // L: 37
-							field2224[var7] = 0; // L: 38
+							field2227[var7] = 0; // L: 38
 							++var7; // L: 39
 							break;
 						}
 					}
 				}
 
-				field2229[var7] = var8; // L: 44
+				field2231[var7] = var8; // L: 44
 				short var11 = 0; // L: 45
 				if (this.skeleton.transformTypes[var8] == 3) { // L: 46
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) { // L: 47
-					field2225[var7] = var4.readShortSmart();
+					field2224[var7] = var4.readShortSmart();
 				} else {
-					field2225[var7] = var11; // L: 48
+					field2224[var7] = var11; // L: 48
 				}
 
 				if ((var9 & 2) != 0) { // L: 49
@@ -98,9 +98,9 @@ public class Animation {
 				}
 
 				if ((var9 & 4) != 0) { // L: 51
-					field2224[var7] = var4.readShortSmart();
+					field2227[var7] = var4.readShortSmart();
 				} else {
-					field2224[var7] = var11; // L: 52
+					field2227[var7] = var11; // L: 52
 				}
 
 				var6 = var8; // L: 53
@@ -121,10 +121,10 @@ public class Animation {
 			this.transformZs = new int[var7]; // L: 65
 
 			for (var8 = 0; var8 < var7; ++var8) { // L: 66
-				this.transformSkeletonLabels[var8] = field2229[var8]; // L: 67
-				this.transformXs[var8] = field2225[var8]; // L: 68
+				this.transformSkeletonLabels[var8] = field2231[var8]; // L: 67
+				this.transformXs[var8] = field2224[var8]; // L: 68
 				this.transformYs[var8] = field2226[var8]; // L: 69
-				this.transformZs[var8] = field2224[var8]; // L: 70
+				this.transformZs[var8] = field2227[var8]; // L: 70
 			}
 
 		}
diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java
index 3e31bede62..15a80398e8 100644
--- a/runescape-client/src/main/java/ApproximateRouteStrategy.java
+++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java
@@ -4,193 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bb")
+@ObfuscatedName("bd")
 @Implements("ApproximateRouteStrategy")
 public class ApproximateRouteStrategy extends RouteStrategy {
-	@ObfuscatedName("qx")
-	@ObfuscatedSignature(
-		descriptor = "Ly;"
-	)
-	@Export("guestClanChannel")
-	static ClanChannel guestClanChannel;
-	@ObfuscatedName("o")
+	@ObfuscatedName("tj")
 	@ObfuscatedGetter(
-		intValue = -344685783
+		intValue = -1879997491
 	)
-	static int field629;
+	@Export("foundItemIdCount")
+	static int foundItemIdCount;
 
 	ApproximateRouteStrategy() {
-	} // L: 11604
+	} // L: 11765
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIILfz;I)Z",
-		garbageValue = "496202097"
+		descriptor = "(IIILfl;B)Z",
+		garbageValue = "11"
 	)
 	@Export("hasArrived")
-	protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
-		return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11607
+	public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) {
+		return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 11768
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lcf;",
-		garbageValue = "-26460885"
+		descriptor = "(I)Z",
+		garbageValue = "2082645900"
 	)
-	@Export("getScript")
-	static Script getScript(int var0) {
-		Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26
-		if (var1 != null) { // L: 27
-			return var1;
+	public static boolean method1269() {
+		return class233.musicPlayerStatus != 0 ? true : class233.midiPcmStream.isReady(); // L: 70 71
+	}
+
+	@ObfuscatedName("fp")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1872242824"
+	)
+	static final void method1268() {
+		if (Client.logoutTimer > 0) { // L: 3170
+			PcmPlayer.logOut(); // L: 3171
 		} else {
-			byte[] var2 = UserComparator5.archive12.takeFile(var0, 0); // L: 28
-			if (var2 == null) { // L: 29
-				return null; // L: 30
-			} else {
-				var1 = UserList.newScript(var2); // L: 32
-				Script.Script_cached.put(var1, (long)var0); // L: 33
-				return var1; // L: 34
-			}
+			Client.timer.method5672(); // L: 3174
+			Projectile.updateGameState(40); // L: 3175
+			DefaultsGroup.field3887 = Client.packetWriter.getSocket(); // L: 3176
+			Client.packetWriter.removeSocket(); // L: 3177
 		}
-	}
-
-	@ObfuscatedName("kk")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1598600139"
-	)
-	@Export("changeGameOptions")
-	static final void changeGameOptions(int var0) {
-		class170.method3554(); // L: 10932
-		ClientPacket.method4354(); // L: 10933
-		int var1 = ClanSettings.VarpDefinition_get(var0).type; // L: 10934
-		if (var1 != 0) { // L: 10935
-			int var2 = Varps.Varps_main[var0]; // L: 10936
-			if (var1 == 1) { // L: 10937
-				if (var2 == 1) { // L: 10938
-					InterfaceParent.method2082(0.9D);
-				}
-
-				if (var2 == 2) { // L: 10939
-					InterfaceParent.method2082(0.8D);
-				}
-
-				if (var2 == 3) { // L: 10940
-					InterfaceParent.method2082(0.7D);
-				}
-
-				if (var2 == 4) { // L: 10941
-					InterfaceParent.method2082(0.6D);
-				}
-			}
-
-			if (var1 == 3) { // L: 10943
-				if (var2 == 0) { // L: 10944
-					PacketWriter.method2402(255);
-				}
-
-				if (var2 == 1) { // L: 10945
-					PacketWriter.method2402(192);
-				}
-
-				if (var2 == 2) { // L: 10946
-					PacketWriter.method2402(128);
-				}
-
-				if (var2 == 3) { // L: 10947
-					PacketWriter.method2402(64);
-				}
-
-				if (var2 == 4) { // L: 10948
-					PacketWriter.method2402(0);
-				}
-			}
-
-			if (var1 == 4) { // L: 10950
-				if (var2 == 0) { // L: 10951
-					WorldMapLabelSize.updateSoundEffectVolume(127);
-				}
-
-				if (var2 == 1) { // L: 10952
-					WorldMapLabelSize.updateSoundEffectVolume(96);
-				}
-
-				if (var2 == 2) { // L: 10953
-					WorldMapLabelSize.updateSoundEffectVolume(64);
-				}
-
-				if (var2 == 3) { // L: 10954
-					WorldMapLabelSize.updateSoundEffectVolume(32);
-				}
-
-				if (var2 == 4) { // L: 10955
-					WorldMapLabelSize.updateSoundEffectVolume(0);
-				}
-			}
-
-			if (var1 == 5) { // L: 10957
-				Client.leftClickOpensMenu = var2;
-			}
-
-			if (var1 == 6) { // L: 10958
-				Client.chatEffects = var2;
-			}
-
-			if (var1 == 9) { // L: 10959
-				Client.field912 = var2;
-			}
-
-			if (var1 == 10) { // L: 10960
-				if (var2 == 0) { // L: 10961
-					LoginPacket.method4373(127);
-				}
-
-				if (var2 == 1) { // L: 10962
-					LoginPacket.method4373(96);
-				}
-
-				if (var2 == 2) { // L: 10963
-					LoginPacket.method4373(64);
-				}
-
-				if (var2 == 3) { // L: 10964
-					LoginPacket.method4373(32);
-				}
-
-				if (var2 == 4) { // L: 10965
-					LoginPacket.method4373(0);
-				}
-			}
-
-			if (var1 == 17) { // L: 10967
-				Client.followerIndex = var2 & 65535; // L: 10968
-			}
-
-			AttackOption[] var3;
-			if (var1 == 18) { // L: 10970
-				var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 10973
-				Client.playerAttackOption = (AttackOption)Messages.findEnumerated(var3, var2); // L: 10975
-				if (Client.playerAttackOption == null) { // L: 10976
-					Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-				}
-			}
-
-			if (var1 == 19) { // L: 10978
-				if (var2 == -1) { // L: 10979
-					Client.combatTargetPlayerIndex = -1;
-				} else {
-					Client.combatTargetPlayerIndex = var2 & 2047; // L: 10980
-				}
-			}
-
-			if (var1 == 22) { // L: 10982
-				var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 10985
-				Client.npcAttackOption = (AttackOption)Messages.findEnumerated(var3, var2); // L: 10987
-				if (Client.npcAttackOption == null) { // L: 10988
-					Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-				}
-			}
-
-		}
-	} // L: 10990
+	} // L: 3172 3178
 }
diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java
index 0e2f08ee4e..47944d25f1 100644
--- a/runescape-client/src/main/java/Archive.java
+++ b/runescape-client/src/main/java/Archive.java
@@ -5,432 +5,484 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jp")
+@ObfuscatedName("jf")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Llh;"
+		descriptor = "Lla;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Llh;"
+		descriptor = "Lla;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1695957245
+		intValue = 935537311
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("j")
-	volatile boolean field3571;
+	@ObfuscatedName("o")
+	volatile boolean field3562;
+	@ObfuscatedName("m")
+	boolean field3566;
 	@ObfuscatedName("r")
-	boolean field3572;
-	@ObfuscatedName("b")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1472783963
+		intValue = 449580407
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -2140198139
+		intValue = 1844159497
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1353605799
+		intValue = -1224107027
 	)
-	int field3566;
+	int field3572;
 
 	static {
 		Archive_crc = new CRC32(); // L: 17
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Llh;Llh;IZZZ)V"
+		descriptor = "(Lla;Lla;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5); // L: 23
-		this.field3571 = false; // L: 14
-		this.field3572 = false; // L: 15
-		this.field3566 = -1; // L: 20
+		this.field3562 = false; // L: 14
+		this.field3566 = false; // L: 15
+		this.field3572 = -1; // L: 20
 		this.archiveDisk = var1; // L: 24
 		this.masterDisk = var2; // L: 25
 		this.index = var3; // L: 26
-		this.field3572 = var6; // L: 27
-		class179.method3633(this, this.index); // L: 28
-	} // L: 29
+		this.field3566 = var6; // L: 27
+		int var8 = this.index; // L: 29
+		if (UserComparator6.NetCache_reference != null) { // L: 31
+			UserComparator6.NetCache_reference.offset = var8 * 8 + 5; // L: 32
+			int var9 = UserComparator6.NetCache_reference.readInt();
+			int var10 = UserComparator6.NetCache_reference.readInt();
+			this.loadIndex(var9, var10);
+		} else {
+			MenuAction.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
+			NetCache.NetCache_archives[var8] = this;
+		}
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "212573310"
-	)
-	public boolean method4869() {
-		return this.field3571; // L: 32
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "53"
+		descriptor = "(I)Z",
+		garbageValue = "-1162495531"
+	)
+	public boolean method5044() {
+		return this.field3562;
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "976210931"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3571) { // L: 36
+		if (this.field3562) { // L: 48
 			return 100;
-		} else if (super.groups != null) { // L: 37
+		} else if (super.groups != null) { // L: 49
 			return 99;
 		} else {
-			int var1 = class125.method2502(255, this.index); // L: 38
-			if (var1 >= 100) { // L: 39
-				var1 = 99;
+			int var2 = this.index; // L: 51
+			long var3 = (long)(var2 + 16711680); // L: 53
+			int var1;
+			if (class34.NetCache_currentResponse != null && var3 == class34.NetCache_currentResponse.key) { // L: 54
+				var1 = class254.NetCache_responseArchiveBuffer.offset * 99 / (class254.NetCache_responseArchiveBuffer.array.length - class34.NetCache_currentResponse.padding) + 1; // L: 58
+			} else {
+				var1 = 0; // L: 55
 			}
 
-			return var1; // L: 40
+			int var5 = var1; // L: 60
+			if (var1 >= 100) { // L: 61
+				var5 = 99;
+			}
+
+			return var5; // L: 62
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "341986030"
+	)
+	@Export("loadRegionFromGroup")
+	void loadRegionFromGroup(int var1) {
+		int var2 = this.index; // L: 66
+		long var3 = (long)((var2 << 16) + var1); // L: 68
+		NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); // L: 69
+		if (var5 != null) { // L: 70
+			NetCache.NetCache_pendingWritesQueue.addLast(var5); // L: 71
+		}
+
+	} // L: 73
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1768582746"
+	)
+	@Export("loadGroup")
+	void loadGroup(int var1) {
+		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 76
+			PendingSpawn.method2261(var1, this.archiveDisk, this);
+		} else {
+			MenuAction.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 77
+		}
+
+	} // L: 78
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "1807724358"
+	)
+	@Export("loadIndex")
+	public void loadIndex(int var1, int var2) {
+		this.indexCrc = var1; // L: 81
+		this.indexVersion = var2; // L: 82
+		if (this.masterDisk != null) { // L: 83
+			PendingSpawn.method2261(this.index, this.masterDisk, this);
+		} else {
+			MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 84
+		}
+
+	} // L: 85
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I[BZZI)V",
+		garbageValue = "1456040345"
+	)
+	@Export("write")
+	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
+		if (var3) { // L: 88
+			if (this.field3562) { // L: 89
+				throw new RuntimeException(); // L: 90
+			}
+
+			if (this.masterDisk != null) { // L: 92
+				int var5 = this.index; // L: 93
+				ArchiveDisk var6 = this.masterDisk; // L: 94
+				ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 96
+				var7.type = 0; // L: 97
+				var7.key = (long)var5; // L: 98
+				var7.data = var2; // L: 99
+				var7.archiveDisk = var6; // L: 100
+				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 101
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 102
+				} // L: 103
+
+				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 105
+					if (ArchiveDiskActionHandler.field3557 == 0) { // L: 106
+						class305.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 107
+						class305.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 108
+						class305.ArchiveDiskActionHandler_thread.start(); // L: 109
+						class305.ArchiveDiskActionHandler_thread.setPriority(5); // L: 110
+					}
+
+					ArchiveDiskActionHandler.field3557 = 600; // L: 112
+				}
+			}
+
+			this.decodeIndex(var2); // L: 117
+			this.loadAllLocal(); // L: 118
+		} else {
+			var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 121
+			var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 122
+			if (this.archiveDisk != null) { // L: 123
+				ArchiveDisk var13 = this.archiveDisk; // L: 124
+				ArchiveDiskAction var19 = new ArchiveDiskAction(); // L: 126
+				var19.type = 0; // L: 127
+				var19.key = (long)var1; // L: 128
+				var19.data = var2; // L: 129
+				var19.archiveDisk = var13; // L: 130
+				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 131
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var19); // L: 132
+				} // L: 133
+
+				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 135
+					if (ArchiveDiskActionHandler.field3557 == 0) { // L: 136
+						class305.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 137
+						class305.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 138
+						class305.ArchiveDiskActionHandler_thread.start(); // L: 139
+						class305.ArchiveDiskActionHandler_thread.setPriority(5); // L: 140
+					}
+
+					ArchiveDiskActionHandler.field3557 = 600; // L: 142
+				}
+
+				this.validGroups[var1] = true; // L: 146
+			}
+
+			if (var4) { // L: 148
+				Object[] var21 = super.groups; // L: 149
+				Object var20;
+				if (var2 == null) {
+					var20 = null; // L: 154
+				} else if (var2.length > 136) { // L: 157
+					DirectByteArrayCopier var8 = new DirectByteArrayCopier(); // L: 159
+					var8.set(var2); // L: 160
+					var20 = var8; // L: 161
+				} else {
+					var20 = var2; // L: 166
+				}
+
+				var21[var1] = var20; // L: 168
+			}
+		}
+
+	} // L: 171
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lla;I[BZI)V",
+		garbageValue = "2098263983"
+	)
+	@Export("load")
+	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
+		int var5;
+		if (var1 == this.masterDisk) { // L: 174
+			if (this.field3562) {
+				throw new RuntimeException(); // L: 176
+			}
+
+			if (var3 == null) { // L: 178
+				MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 179
+				return; // L: 180
+			}
+
+			Archive_crc.reset(); // L: 182
+			Archive_crc.update(var3, 0, var3.length); // L: 183
+			var5 = (int)Archive_crc.getValue(); // L: 184
+			if (var5 != this.indexCrc) { // L: 185
+				MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 186
+				return; // L: 187
+			}
+
+			Buffer var11 = new Buffer(class106.decompressBytes(var3)); // L: 189
+			int var12 = var11.readUnsignedByte(); // L: 190
+			if (var12 != 5 && var12 != 6) { // L: 191
+				throw new RuntimeException(var12 + "," + this.index + "," + var2);
+			}
+
+			int var8 = 0; // L: 192
+			if (var12 >= 6) { // L: 193
+				var8 = var11.readInt();
+			}
+
+			if (var8 != this.indexVersion) { // L: 194
+				MenuAction.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 195
+				return; // L: 196
+			}
+
+			this.decodeIndex(var3); // L: 198
+			this.loadAllLocal(); // L: 199
+		} else {
+			if (!var4 && var2 == this.field3572) { // L: 202
+				this.field3562 = true; // L: 203
+			}
+
+			if (var3 == null || var3.length <= 2) { // L: 205
+				this.validGroups[var2] = false; // L: 206
+				if (this.field3566 || var4) { // L: 207
+					MenuAction.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				}
+
+				return; // L: 208
+			}
+
+			Archive_crc.reset(); // L: 210
+			Archive_crc.update(var3, 0, var3.length - 2); // L: 211
+			var5 = (int)Archive_crc.getValue(); // L: 212
+			int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 213
+			if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 214
+				this.validGroups[var2] = false; // L: 215
+				if (this.field3566 || var4) { // L: 216
+					MenuAction.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+				}
+
+				return; // L: 217
+			}
+
+			this.validGroups[var2] = true; // L: 219
+			if (var4) { // L: 220
+				Object[] var7 = super.groups; // L: 221
+				Object var9;
+				if (var3 == null) { // L: 225
+					var9 = null; // L: 226
+				} else if (var3.length > 136) { // L: 229
+					DirectByteArrayCopier var10 = new DirectByteArrayCopier(); // L: 231
+					var10.set(var3); // L: 232
+					var9 = var10; // L: 233
+				} else {
+					var9 = var3; // L: 238
+				}
+
+				var7[var2] = var9; // L: 240
+			}
+		}
+
+	} // L: 243
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "16"
+	)
+	@Export("loadAllLocal")
+	void loadAllLocal() {
+		this.validGroups = new boolean[super.groups.length]; // L: 246
+
+		int var1;
+		for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 247
+			this.validGroups[var1] = false;
+		}
+
+		if (this.archiveDisk == null) { // L: 248
+			this.field3562 = true; // L: 249
+		} else {
+			this.field3572 = -1; // L: 252
+
+			for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 253
+				if (super.fileCounts[var1] > 0) { // L: 254
+					MouseHandler.method727(var1, this.archiveDisk, this); // L: 255
+					this.field3572 = var1; // L: 256
+				}
+			}
+
+			if (this.field3572 == -1) { // L: 259
+				this.field3562 = true;
+			}
+
+		}
+	} // L: 250 260
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "1362561714"
+	)
+	@Export("groupLoadPercent")
+	int groupLoadPercent(int var1) {
+		if (super.groups[var1] != null) { // L: 263
+			return 100;
+		} else {
+			return this.validGroups[var1] ? 100 : class248.method4915(this.index, var1); // L: 264 265
+		}
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-1991091922"
+	)
+	public boolean method5030(int var1) {
+		return this.validGroups[var1]; // L: 269
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "14"
+	)
+	public boolean method5031(int var1) {
+		return this.getGroupFileIds(var1) != null; // L: 273
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "21"
+	)
+	@Export("loadPercent")
+	public int loadPercent() {
+		int var1 = 0; // L: 277
+		int var2 = 0; // L: 278
+
+		int var3;
+		for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 279
+			if (super.fileCounts[var3] > 0) { // L: 280
+				var1 += 100; // L: 281
+				var2 += this.groupLoadPercent(var3); // L: 282
+			}
+		}
+
+		if (var1 == 0) { // L: 285
+			return 100;
+		} else {
+			var3 = var2 * 100 / var1; // L: 286
+			return var3; // L: 287
 		}
 	}
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "108"
+		descriptor = "(II)Lek;",
+		garbageValue = "681923343"
 	)
-	@Export("loadRegionFromGroup")
-	void loadRegionFromGroup(int var1) {
-		class280.method5071(this.index, var1); // L: 44
-	} // L: 45
+	@Export("WorldMapElement_get")
+	public static WorldMapElement WorldMapElement_get(int var0) {
+		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 44 45
+	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
+		descriptor = "(ZZI)Lof;",
+		garbageValue = "447770531"
 	)
-	@Export("loadGroup")
-	void loadGroup(int var1) {
-		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48
-			ArchiveDisk var2 = this.archiveDisk; // L: 49
-			byte[] var4 = null; // L: 52
-			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 53
-				for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 54
-					if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 55
-						var4 = var6.data; // L: 56
-						break; // L: 57
-					}
-				}
-			}
+	static IndexedSprite method5021(boolean var0, boolean var1) {
+		return var0 ? (var1 ? Login.field1005 : WorldMapCacheName.options_buttons_2Sprite) : (var1 ? NetFileRequest.field3577 : Login.options_buttons_0Sprite); // L: 175
+	}
 
-			if (var4 != null) { // L: 61
-				this.load(var2, var1, var4, true); // L: 62
-			} else {
-				byte[] var5 = var2.read(var1); // L: 65
-				this.load(var2, var1, var5, true); // L: 66
-			}
-		} else {
-			DirectByteArrayCopier.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 69
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "-64"
+	)
+	public static void method5060(int var0, int var1) {
+		VarbitComposition var2 = WorldMapSection2.method3329(var0); // L: 33
+		int var3 = var2.baseVar; // L: 34
+		int var4 = var2.startBit; // L: 35
+		int var5 = var2.endBit; // L: 36
+		int var6 = Varps.Varps_masks[var5 - var4]; // L: 37
+		if (var1 < 0 || var1 > var6) { // L: 38
+			var1 = 0;
 		}
 
-	} // L: 70
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-887756709"
-	)
-	@Export("loadIndex")
-	public void loadIndex(int var1, int var2) {
-		this.indexCrc = var1; // L: 73
-		this.indexVersion = var2; // L: 74
-		if (this.masterDisk != null) { // L: 75
-			int var3 = this.index; // L: 76
-			ArchiveDisk var4 = this.masterDisk; // L: 77
-			byte[] var6 = null; // L: 80
-			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 81
-				for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 82
-					if ((long)var3 == var8.key && var4 == var8.archiveDisk && var8.type == 0) { // L: 83
-						var6 = var8.data; // L: 84
-						break; // L: 85
-					}
-				}
-			}
-
-			if (var6 != null) { // L: 89
-				this.load(var4, var3, var6, true); // L: 90
-			} else {
-				byte[] var7 = var4.read(var3); // L: 93
-				this.load(var4, var3, var7, true); // L: 94
-			}
-		} else {
-			DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 97
-		}
-
-	} // L: 98
+		var6 <<= var4; // L: 39
+		Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40
+	} // L: 41
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I[BZZI)V",
-		garbageValue = "525734565"
+		descriptor = "(ZZI)I",
+		garbageValue = "-513021878"
 	)
-	@Export("write")
-	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
-		if (var3) { // L: 101
-			if (this.field3571) { // L: 102
-				throw new RuntimeException(); // L: 103
-			}
-
-			if (this.masterDisk != null) { // L: 105
-				int var5 = this.index; // L: 106
-				ArchiveDisk var6 = this.masterDisk; // L: 107
-				ArchiveDiskAction var7 = new ArchiveDiskAction(); // L: 109
-				var7.type = 0; // L: 110
-				var7.key = (long)var5; // L: 111
-				var7.data = var2; // L: 112
-				var7.archiveDisk = var6; // L: 113
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 114
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); // L: 115
-				} // L: 116
-
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 118
-					if (ArchiveDiskActionHandler.field3562 == 0) { // L: 119
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 120
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 121
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 122
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 123
-					}
-
-					ArchiveDiskActionHandler.field3562 = 600; // L: 125
-				}
-			}
-
-			this.decodeIndex(var2); // L: 130
-			this.loadAllLocal(); // L: 131
-		} else {
-			var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 134
-			var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 135
-			if (this.archiveDisk != null) { // L: 136
-				ArchiveDisk var13 = this.archiveDisk; // L: 137
-				ArchiveDiskAction var18 = new ArchiveDiskAction(); // L: 139
-				var18.type = 0; // L: 140
-				var18.key = (long)var1; // L: 141
-				var18.data = var2; // L: 142
-				var18.archiveDisk = var13; // L: 143
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 144
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var18); // L: 145
-				} // L: 146
-
-				synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 148
-					if (ArchiveDiskActionHandler.field3562 == 0) { // L: 149
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 150
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 151
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 152
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 153
-					}
-
-					ArchiveDiskActionHandler.field3562 = 600; // L: 155
-				}
-
-				this.validGroups[var1] = true; // L: 159
-			}
-
-			if (var4) { // L: 161
-				super.groups[var1] = GrandExchangeOfferWorldComparator.method5079(var2, false);
-			}
-		}
-
-	} // L: 163
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(Llh;I[BZB)V",
-		garbageValue = "-59"
-	)
-	@Export("load")
-	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
-		int var5;
-		if (var1 == this.masterDisk) { // L: 166
-			if (this.field3571) { // L: 167
-				throw new RuntimeException(); // L: 168
-			} else if (var3 == null) { // L: 170
-				DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 171
-			} else {
-				Archive_crc.reset(); // L: 174
-				Archive_crc.update(var3, 0, var3.length); // L: 175
-				var5 = (int)Archive_crc.getValue(); // L: 176
-				if (var5 != this.indexCrc) { // L: 177
-					DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 178
-				} else {
-					Buffer var9 = new Buffer(UserComparator6.decompressBytes(var3)); // L: 181
-					int var7 = var9.readUnsignedByte(); // L: 182
-					if (var7 != 5 && var7 != 6) { // L: 183
-						throw new RuntimeException(var7 + "," + this.index + "," + var2);
-					} else {
-						int var8 = 0; // L: 184
-						if (var7 >= 6) { // L: 185
-							var8 = var9.readInt();
-						}
-
-						if (var8 != this.indexVersion) { // L: 186
-							DirectByteArrayCopier.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 187
-						} else {
-							this.decodeIndex(var3); // L: 190
-							this.loadAllLocal(); // L: 191
-						}
-					}
-				}
-			}
-		} else {
-			if (!var4 && var2 == this.field3566) { // L: 194
-				this.field3571 = true; // L: 195
-			}
-
-			if (var3 != null && var3.length > 2) { // L: 197
-				Archive_crc.reset(); // L: 202
-				Archive_crc.update(var3, 0, var3.length - 2); // L: 203
-				var5 = (int)Archive_crc.getValue(); // L: 204
-				int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 205
-				if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { // L: 206
-					this.validGroups[var2] = true; // L: 211
-					if (var4) { // L: 212
-						super.groups[var2] = GrandExchangeOfferWorldComparator.method5079(var3, false);
-					}
-
-				} else {
-					this.validGroups[var2] = false; // L: 207
-					if (this.field3572 || var4) { // L: 208
-						DirectByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
-					}
-
-				}
-			} else {
-				this.validGroups[var2] = false; // L: 198
-				if (this.field3572 || var4) { // L: 199
-					DirectByteArrayCopier.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
-				}
-
-			}
-		}
-	} // L: 172 179 188 200 209 214
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2113858228"
-	)
-	@Export("loadAllLocal")
-	void loadAllLocal() {
-		this.validGroups = new boolean[super.groups.length]; // L: 217
-
-		int var1;
-		for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 218
-			this.validGroups[var1] = false;
-		}
-
-		if (this.archiveDisk == null) { // L: 219
-			this.field3571 = true; // L: 220
-		} else {
-			this.field3566 = -1; // L: 223
-
-			for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 224
-				if (super.fileCounts[var1] > 0) { // L: 225
-					ArchiveDisk var2 = this.archiveDisk; // L: 226
-					ArchiveDiskAction var4 = new ArchiveDiskAction(); // L: 229
-					var4.type = 1; // L: 230
-					var4.key = (long)var1; // L: 231
-					var4.archiveDisk = var2; // L: 232
-					var4.archive = this; // L: 233
-					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 234
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4); // L: 235
-					} // L: 236
-
-					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 238
-						if (ArchiveDiskActionHandler.field3562 == 0) { // L: 239
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 240
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 241
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); // L: 242
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); // L: 243
-						}
-
-						ArchiveDiskActionHandler.field3562 = 600; // L: 245
-					}
-
-					this.field3566 = var1; // L: 249
-				}
-			}
-
-			if (this.field3566 == -1) { // L: 252
-				this.field3571 = true;
-			}
-
-		}
-	} // L: 221 253
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1767586109"
-	)
-	@Export("groupLoadPercent")
-	int groupLoadPercent(int var1) {
-		if (super.groups[var1] != null) { // L: 256
-			return 100;
-		} else {
-			return this.validGroups[var1] ? 100 : class125.method2502(this.index, var1); // L: 257 258
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "510058915"
-	)
-	public boolean method4884(int var1) {
-		return this.validGroups[var1]; // L: 262
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1677083054"
-	)
-	public boolean method4887(int var1) {
-		return this.getGroupFileIds(var1) != null; // L: 266
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1371864603"
-	)
-	@Export("loadPercent")
-	public int loadPercent() {
-		int var1 = 0; // L: 270
-		int var2 = 0; // L: 271
-
-		int var3;
-		for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 272
-			if (super.fileCounts[var3] > 0) { // L: 273
-				var1 += 100; // L: 274
-				var2 += this.groupLoadPercent(var3); // L: 275
-			}
-		}
-
-		if (var1 == 0) { // L: 278
-			return 100;
-		} else {
-			var3 = var2 * 100 / var1; // L: 279
-			return var3; // L: 280
-		}
+	public static int method5061(boolean var0, boolean var1) {
+		byte var2 = 0; // L: 151
+		int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 152
+		return var3; // L: 153
 	}
 }
diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java
index 1c9c142656..af41f1c3c7 100644
--- a/runescape-client/src/main/java/ArchiveDisk.java
+++ b/runescape-client/src/main/java/ArchiveDisk.java
@@ -6,38 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lh")
+@ObfuscatedName("la")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("ru")
-	@ObfuscatedGetter(
-		intValue = 1117053017
-	)
-	static int field3886;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Lna;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Lna;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1496779987
+		intValue = -1822948391
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 322921177
+		intValue = -1175009945
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -47,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(ILnf;Lnf;I)V"
+		descriptor = "(ILna;Lna;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null; // L: 8
@@ -59,10 +54,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4; // L: 17
 	} // L: 18
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[B",
-		garbageValue = "1"
+		descriptor = "(II)[B",
+		garbageValue = "-1703583799"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -117,14 +112,14 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 8; // L: 53
-								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54
+								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); // L: 54
 								var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55
 								var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56
 								var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57
 								var12 = ArchiveDisk_buffer[7] & 255; // L: 58
 							}
 
-							if (var9 != var1 || var10 != var7 || var12 != this.archive) { // L: 60
+							if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60
 								var10000 = null;
 								return (byte[])var10000;
 							}
@@ -153,10 +148,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I[BIB)Z",
-		garbageValue = "77"
+		descriptor = "(I[BII)Z",
+		garbageValue = "53032426"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -174,10 +169,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I[BIZI)Z",
-		garbageValue = "-1453784211"
+		descriptor = "(I[BIZB)Z",
+		garbageValue = "-96"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -218,18 +213,18 @@ public final class ArchiveDisk {
 
 				while (true) {
 					if (var7 < var3) { // L: 111
-						label172: {
+						label171: {
 							int var9 = 0; // L: 112
 							int var10;
 							if (var4) { // L: 113
-								this.datFile.seek((long)var6 * 520L); // L: 114
+								this.datFile.seek(520L * (long)var6); // L: 114
 								int var11;
 								int var12;
 								if (var1 > 65535) { // L: 118
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120
 									} catch (EOFException var17) { // L: 122
-										break label172; // L: 123
+										break label171; // L: 123
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125
@@ -240,7 +235,7 @@ public final class ArchiveDisk {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132
 									} catch (EOFException var16) { // L: 134
-										break label172; // L: 135
+										break label171; // L: 135
 									}
 
 									var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137
@@ -267,7 +262,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var6 == var9) { // L: 149
+								if (var9 == var6) { // L: 149
 									++var9;
 								}
 							}
@@ -287,7 +282,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160
 								ArchiveDisk_buffer[8] = (byte)var9; // L: 161
 								ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162
-								this.datFile.seek(520L * (long)var6); // L: 163
+								this.datFile.seek((long)var6 * 520L); // L: 163
 								this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164
 								var10 = var3 - var7; // L: 165
 								if (var10 > 510) { // L: 166
@@ -309,11 +304,11 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[5] = (byte)(var9 >> 8); // L: 177
 								ArchiveDisk_buffer[6] = (byte)var9; // L: 178
 								ArchiveDisk_buffer[7] = (byte)this.archive; // L: 179
-								this.datFile.seek(520L * (long)var6); // L: 180
+								this.datFile.seek((long)var6 * 520L); // L: 180
 								this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181
 								var10 = var3 - var7; // L: 182
-								if (var10 > 512) {
-									var10 = 512; // L: 183
+								if (var10 > 512) { // L: 183
+									var10 = 512;
 								}
 
 								this.datFile.write(var2, var7, var10); // L: 184
@@ -329,8 +324,8 @@ public final class ArchiveDisk {
 					var10000 = true; // L: 190
 					return var10000;
 				}
-			} catch (IOException var18) { // L: 192
-				return false; // L: 193
+			} catch (IOException var18) {
+				return false;
 			}
 		}
 	}
@@ -338,4 +333,18 @@ public final class ArchiveDisk {
 	public String toString() {
 		return "" + this.archive; // L: 198
 	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-16"
+	)
+	public static void method5993() {
+		class397.SpriteBuffer_xOffsets = null; // L: 191
+		class26.SpriteBuffer_yOffsets = null; // L: 192
+		Canvas.SpriteBuffer_spriteWidths = null; // L: 193
+		Clock.SpriteBuffer_spriteHeights = null; // L: 194
+		class397.SpriteBuffer_spritePalette = null; // L: 195
+		class126.SpriteBuffer_pixels = null; // L: 196
+	} // L: 197
 }
diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java
index 652a563f7c..8cfc227c02 100644
--- a/runescape-client/src/main/java/ArchiveDiskAction.java
+++ b/runescape-client/src/main/java/ArchiveDiskAction.java
@@ -4,35 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jy")
+@ObfuscatedName("jw")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("dy")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = -6353355391446000035L
-	)
-	static long field3556;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1287454433
+		intValue = 1353855841
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("data")
-	public byte[] data;
-	@ObfuscatedName("f")
+	byte[] data;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Llh;"
+		descriptor = "Lla;"
 	)
 	@Export("archiveDisk")
-	public ArchiveDisk archiveDisk;
+	ArchiveDisk archiveDisk;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Ljf;"
 	)
 	@Export("archive")
-	public Archive archive;
+	Archive archive;
 
 	ArchiveDiskAction() {
 	} // L: 12
diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
index dc0f5a7d33..c4188f896e 100644
--- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java
+++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
@@ -4,37 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jg")
+@ObfuscatedName("jn")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
-	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("n")
+	static NodeDeque ArchiveDiskActionHandler_requestQueue;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
-	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("f")
+	static NodeDeque ArchiveDiskActionHandler_responseQueue;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 2106150539
+		intValue = 264350285
 	)
-	static int field3562;
+	static int field3557;
 	@ObfuscatedName("y")
 	@Export("ArchiveDiskActionHandler_lock")
 	static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("p")
-	@Export("ArchiveDiskActionHandler_thread")
-	static Thread ArchiveDiskActionHandler_thread;
+	@ObfuscatedName("fj")
+	@ObfuscatedSignature(
+		descriptor = "Ldz;"
+	)
+	@Export("urlRequester")
+	static UrlRequester urlRequester;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10
-		field3562 = 0; // L: 11
+		field3557 = 0; // L: 11
 		ArchiveDiskActionHandler_lock = new Object();
 	} // L: 12
 
@@ -45,67 +48,47 @@ public class ArchiveDiskActionHandler implements Runnable {
 		try {
 			while (true) {
 				ArchiveDiskAction var1;
-				synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 21
-					var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 22
-				} // L: 23
+				synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 72
+					var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 73
+				} // L: 74
 
-				if (var1 != null) { // L: 24
-					if (var1.type == 0) { // L: 25
-						var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 26
-						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 27
-							var1.remove(); // L: 28
-						} // L: 29
-					} else if (var1.type == 1) { // L: 31
-						var1.data = var1.archiveDisk.read((int)var1.key); // L: 32
-						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 33
-							ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 34
-						} // L: 35
+				if (var1 != null) { // L: 75
+					if (var1.type == 0) { // L: 76
+						var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 77
+						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 78
+							var1.remove(); // L: 79
+						} // L: 80
+					} else if (var1.type == 1) { // L: 82
+						var1.data = var1.archiveDisk.read((int)var1.key); // L: 83
+						synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 84
+							ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 85
+						} // L: 86
 					}
 
-					synchronized(ArchiveDiskActionHandler_lock) { // L: 37
-						if (field3562 <= 1) { // L: 38
-							field3562 = 0; // L: 39
-							ArchiveDiskActionHandler_lock.notifyAll(); // L: 40
-							return; // L: 41
+					synchronized(ArchiveDiskActionHandler_lock) { // L: 88
+						if (field3557 <= 1) { // L: 89
+							field3557 = 0; // L: 90
+							ArchiveDiskActionHandler_lock.notifyAll(); // L: 91
+							return; // L: 92
 						}
 
-						field3562 = 600; // L: 43
+						field3557 = 600; // L: 94
 					}
 				} else {
-					long var8 = 99L; // L: 50
-
-					try {
-						Thread.sleep(var8); // L: 53
-					} catch (InterruptedException var15) { // L: 55
-					}
-
-					try {
-						Thread.sleep(1L); // L: 59
-					} catch (InterruptedException var14) { // L: 61
-					}
-
-					synchronized(ArchiveDiskActionHandler_lock) { // L: 71
-						if (field3562 <= 1) { // L: 72
-							field3562 = 0; // L: 73
-							ArchiveDiskActionHandler_lock.notifyAll(); // L: 74
-							return; // L: 75
+					class18.method272(100L); // L: 98
+					synchronized(ArchiveDiskActionHandler_lock) { // L: 99
+						if (field3557 <= 1) { // L: 100
+							field3557 = 0; // L: 101
+							ArchiveDiskActionHandler_lock.notifyAll(); // L: 102
+							return; // L: 103
 						}
 
-						--field3562; // L: 77
+						--field3557; // L: 105
 					}
 				}
 			}
-		} catch (Exception var17) { // L: 82
-			class266.RunException_sendStackTrace((String)null, var17); // L: 83
+		} catch (Exception var13) { // L: 110
+			FriendsChat.RunException_sendStackTrace((String)null, var13); // L: 111
 		}
-	} // L: 85
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "13"
-	)
-	public static void method4867(int var0) {
-		MouseHandler.MouseHandler_idleCycles = var0; // L: 51
-	} // L: 52
+	} // L: 113
 }
diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java
index 39321d3ccc..dfa6d163f3 100644
--- a/runescape-client/src/main/java/ArchiveLoader.java
+++ b/runescape-client/src/main/java/ArchiveLoader.java
@@ -4,41 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ck")
+@ObfuscatedName("ce")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("m")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Ly;"
+		descriptor = "Lio;"
 	)
-	static ClanChannel field1147;
-	@ObfuscatedName("ho")
+	@Export("musicTrack")
+	static MusicTrack musicTrack;
+	@ObfuscatedName("x")
+	@Export("cacheParentPaths")
+	public static String[] cacheParentPaths;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "[Loh;"
-	)
-	@Export("crossSprites")
-	static SpritePixels[] crossSprites;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Ljf;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 605141689
+		intValue = -1724172575
 	)
 	@Export("groupCount")
 	final int groupCount;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1897441913
+		intValue = -1090866547
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljp;Ljava/lang/String;)V"
+		descriptor = "(Ljf;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0; // L: 9
@@ -46,17 +44,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount(); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "14"
+		descriptor = "(I)Z",
+		garbageValue = "1253534662"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0; // L: 17
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18
-			if (!this.archive.method4887(var1) || this.archive.method4884(var1)) {
+			if (!this.archive.method5031(var1) || this.archive.method5030(var1)) {
 				++this.loadedCount; // L: 19
 			}
 		}
@@ -64,51 +62,16 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount; // L: 21
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lei;",
-		garbageValue = "598444391"
+		descriptor = "(I)Lhg;",
+		garbageValue = "-283445178"
 	)
-	@Export("StructDefinition_getStructDefinition")
-	public static StructComposition StructDefinition_getStructDefinition(int var0) {
-		StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 23
-		if (var1 != null) { // L: 24
-			return var1;
-		} else {
-			byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25
-			var1 = new StructComposition(); // L: 26
-			if (var2 != null) { // L: 27
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode(); // L: 28
-			StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
-			return var1; // L: 30
-		}
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIII)Z",
-		garbageValue = "1961168244"
-	)
-	static final boolean method2059(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 156
-		if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 157
-			return false;
-		} else {
-			var7 = ViewportMouse.ViewportMouse_y - var6; // L: 158
-			if (var7 > var0 && var7 > var1 && var7 > var2) {
-				return false; // L: 159
-			} else {
-				var7 = ViewportMouse.ViewportMouse_x + var6; // L: 160
-				if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 161
-					return false;
-				} else {
-					var7 = ViewportMouse.ViewportMouse_x - var6; // L: 162
-					return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 163
-				}
-			}
-		}
+	public static PacketBufferNode method2162() {
+		PacketBufferNode var0 = WorldMapData_1.method3583(); // L: 50
+		var0.clientPacket = null; // L: 51
+		var0.clientPacketLength = 0; // L: 52
+		var0.packetBuffer = new PacketBuffer(5000); // L: 53
+		return var0; // L: 54
 	}
 }
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index 1e4b224e77..a4b4fa194e 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -1,65 +1,146 @@
+import java.awt.Desktop;
+import java.awt.Desktop.Action;
+import java.net.URI;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dj")
+@ObfuscatedName("dh")
 @Implements("AttackOption")
-public enum AttackOption implements Enumerated {
-	@ObfuscatedName("v")
+public enum AttackOption implements Enumerated
+{
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ldj;"
+		descriptor = "Ldh;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ldj;"
+		descriptor = "Ldh;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Ldj;"
+		descriptor = "Ldh;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Ldj;"
+		descriptor = "Ldh;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("rp")
 	@ObfuscatedGetter(
-		intValue = 198709193
+		intValue = -31458981
+	)
+	static int field1351;
+	@ObfuscatedName("qv")
+	@ObfuscatedSignature(
+		descriptor = "Ly;"
+	)
+	@Export("guestClanChannel")
+	static ClanChannel guestClanChannel;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("Widget_archive")
+	static AbstractArchive Widget_archive;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 2122478907
+	)
+	@Export("canvasWidth")
+	public static int canvasWidth;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -183653165
 	)
 	@Export("id")
 	final int id;
 
 	AttackOption(int var3) {
-		this.id = var3; // L: 11562
-	} // L: 11563
+		this.id = var3; // L: 11723
+	} // L: 11724
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id; // L: 11566
+		return this.id; // L: 11727
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "-114"
+		descriptor = "(Ljava/lang/String;ZZB)V",
+		garbageValue = "98"
 	)
-	@Export("Widget_unpackTargetMask")
-	public static int Widget_unpackTargetMask(int var0) {
-		return var0 >> 11 & 63; // L: 13
+	@Export("openURL")
+	public static void openURL(String var0, boolean var1, boolean var2) {
+		if (var1) { // L: 28
+			if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 29
+				try {
+					Desktop.getDesktop().browse(new URI(var0)); // L: 31
+					return; // L: 52
+				} catch (Exception var4) { // L: 34
+				}
+			}
+
+			if (class44.field309.startsWith("win")) { // L: 36
+				StudioGame.method4982(var0, 0); // L: 38
+			} else if (class44.field309.startsWith("mac")) { // L: 42
+				HealthBarUpdate.method2284(var0, 1, "openjs"); // L: 43
+			} else {
+				StudioGame.method4982(var0, 2); // L: 46
+			}
+		} else {
+			StudioGame.method4982(var0, 3); // L: 49
+		}
+
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-1819864841"
+	)
+	static final int method2382(int var0, int var1, int var2) {
+		int var3 = var0 / var2; // L: 801
+		int var4 = var0 & var2 - 1; // L: 802
+		int var5 = var1 / var2; // L: 803
+		int var6 = var1 & var2 - 1; // L: 804
+		int var7 = UrlRequester.method2509(var3, var5); // L: 805
+		int var8 = UrlRequester.method2509(var3 + 1, var5); // L: 806
+		int var9 = UrlRequester.method2509(var3, var5 + 1); // L: 807
+		int var10 = UrlRequester.method2509(var3 + 1, var5 + 1); // L: 808
+		int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 811
+		int var11 = ((65536 - var12) * var7 >> 16) + (var8 * var12 >> 16); // L: 812
+		int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 817
+		int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); // L: 818
+		int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 823
+		int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); // L: 824
+		return var15; // L: 826
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-2129644810"
+	)
+	static final int method2378(int var0, int var1) {
+		int var2 = var1 * 57 + var0; // L: 837
+		var2 ^= var2 << 13; // L: 838
+		int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 839
+		return var3 >> 19 & 255; // L: 840
 	}
 }
diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java
index 75af1848d7..1174711bcc 100644
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -3,51 +3,51 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bj")
+@ObfuscatedName("bg")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("j")
-	static float[][] field562;
-	@ObfuscatedName("r")
+	@ObfuscatedName("o")
+	static float[][] field532;
+	@ObfuscatedName("m")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("b")
-	static float field561;
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
+	static float field534;
+	@ObfuscatedName("h")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("f")
-	int[][][] field556;
+	@ObfuscatedName("v")
+	int[][][] field533;
 	@ObfuscatedName("y")
-	int[][][] field565;
-	@ObfuscatedName("p")
-	int[] field558;
+	int[][][] field530;
+	@ObfuscatedName("j")
+	int[] field531;
 
 	static {
-		field562 = new float[2][8]; // L: 13
+		field532 = new float[2][8]; // L: 13
 		coefficients = new int[2][8]; // L: 14
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2]; // L: 8
-		this.field556 = new int[2][2][4]; // L: 10
-		this.field565 = new int[2][2][4]; // L: 11
-		this.field558 = new int[2]; // L: 12
+		this.field533 = new int[2][2][4]; // L: 10
+		this.field530 = new int[2][2][4]; // L: 11
+		this.field531 = new int[2]; // L: 12
 	} // L: 21
 
-	@ObfuscatedName("v")
-	float method1087(int var1, int var2, float var3) {
-		float var4 = (float)this.field565[var1][0][var2] + var3 * (float)(this.field565[var1][1][var2] - this.field565[var1][0][var2]); // L: 24
+	@ObfuscatedName("f")
+	float method1191(int var1, int var2, float var3) {
+		float var4 = (float)this.field530[var1][0][var2] + var3 * (float)(this.field530[var1][1][var2] - this.field530[var1][0][var2]); // L: 24
 		var4 *= 0.0015258789F; // L: 25
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26
 	}
 
-	@ObfuscatedName("f")
-	float method1078(int var1, int var2, float var3) {
-		float var4 = (float)this.field556[var1][0][var2] + var3 * (float)(this.field556[var1][1][var2] - this.field556[var1][0][var2]); // L: 35
+	@ObfuscatedName("v")
+	float method1177(int var1, int var2, float var3) {
+		float var4 = (float)this.field533[var1][0][var2] + var3 * (float)(this.field533[var1][1][var2] - this.field533[var1][0][var2]); // L: 35
 		var4 *= 1.2207031E-4F; // L: 36
 		return normalize(var4); // L: 37
 	}
@@ -57,100 +57,100 @@ public class AudioFilter {
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) { // L: 41
-			var3 = (float)this.field558[0] + (float)(this.field558[1] - this.field558[0]) * var2; // L: 42
+			var3 = (float)this.field531[0] + (float)(this.field531[1] - this.field531[0]) * var2; // L: 42
 			var3 *= 0.0030517578F; // L: 43
-			field561 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
-			forwardMultiplier = (int)(field561 * 65536.0F); // L: 45
+			field534 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44
+			forwardMultiplier = (int)(field534 * 65536.0F); // L: 45
 		}
 
 		if (this.pairs[var1] == 0) { // L: 47
 			return 0;
 		} else {
-			var3 = this.method1087(var1, 0, var2); // L: 48
-			field562[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1078(var1, 0, var2)); // L: 49
-			field562[var1][1] = var3 * var3; // L: 50
+			var3 = this.method1191(var1, 0, var2); // L: 48
+			field532[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method1177(var1, 0, var2)); // L: 49
+			field532[var1][1] = var3 * var3; // L: 50
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51
-				var3 = this.method1087(var1, var4, var2); // L: 52
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1078(var1, var4, var2)); // L: 53
+				var3 = this.method1191(var1, var4, var2); // L: 52
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method1177(var1, var4, var2)); // L: 53
 				float var6 = var3 * var3; // L: 54
-				field562[var1][var4 * 2 + 1] = field562[var1][var4 * 2 - 1] * var6; // L: 55
-				field562[var1][var4 * 2] = field562[var1][var4 * 2 - 1] * var5 + field562[var1][var4 * 2 - 2] * var6; // L: 56
+				field532[var1][var4 * 2 + 1] = field532[var1][var4 * 2 - 1] * var6; // L: 55
+				field532[var1][var4 * 2] = field532[var1][var4 * 2 - 1] * var5 + field532[var1][var4 * 2 - 2] * var6; // L: 56
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57
-					var10000 = field562[var1];
-					var10000[var7] += field562[var1][var7 - 1] * var5 + field562[var1][var7 - 2] * var6;
+					var10000 = field532[var1];
+					var10000[var7] += field532[var1][var7 - 1] * var5 + field532[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field562[var1]; // L: 58
-				var10000[1] += field562[var1][0] * var5 + var6;
-				var10000 = field562[var1]; // L: 59
+				var10000 = field532[var1]; // L: 58
+				var10000[1] += field532[var1][0] * var5 + var6;
+				var10000 = field532[var1]; // L: 59
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) { // L: 61
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field562[0];
-					var10000[var4] *= field561;
+					var10000 = field532[0];
+					var10000[var4] *= field534;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62
-				coefficients[var1][var4] = (int)(field562[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field532[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2; // L: 63
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Lbt;)V"
+		descriptor = "(Lnt;Lbx;)V"
 	)
-	final void method1080(Buffer var1, SoundEnvelope var2) {
+	final void method1176(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte(); // L: 67
 		this.pairs[0] = var3 >> 4; // L: 68
 		this.pairs[1] = var3 & 15; // L: 69
 		if (var3 != 0) { // L: 70
-			this.field558[0] = var1.readUnsignedShort(); // L: 71
-			this.field558[1] = var1.readUnsignedShort(); // L: 72
+			this.field531[0] = var1.readUnsignedShort(); // L: 71
+			this.field531[1] = var1.readUnsignedShort(); // L: 72
 			int var7 = var1.readUnsignedByte(); // L: 73
 
 			int var5;
 			int var6;
 			for (var5 = 0; var5 < 2; ++var5) { // L: 74
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75
-					this.field556[var5][0][var6] = var1.readUnsignedShort(); // L: 76
-					this.field565[var5][0][var6] = var1.readUnsignedShort(); // L: 77
+					this.field533[var5][0][var6] = var1.readUnsignedShort(); // L: 76
+					this.field530[var5][0][var6] = var1.readUnsignedShort(); // L: 77
 				}
 			}
 
 			for (var5 = 0; var5 < 2; ++var5) { // L: 80
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81
 					if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82
-						this.field556[var5][1][var6] = var1.readUnsignedShort(); // L: 83
-						this.field565[var5][1][var6] = var1.readUnsignedShort(); // L: 84
+						this.field533[var5][1][var6] = var1.readUnsignedShort(); // L: 83
+						this.field530[var5][1][var6] = var1.readUnsignedShort(); // L: 84
 					} else {
-						this.field556[var5][1][var6] = this.field556[var5][0][var6]; // L: 87
-						this.field565[var5][1][var6] = this.field565[var5][0][var6]; // L: 88
+						this.field533[var5][1][var6] = this.field533[var5][0][var6]; // L: 87
+						this.field530[var5][1][var6] = this.field530[var5][0][var6]; // L: 88
 					}
 				}
 			}
 
-			if (var7 != 0 || this.field558[1] != this.field558[0]) { // L: 92
+			if (var7 != 0 || this.field531[1] != this.field531[0]) { // L: 92
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var4 = this.field558; // L: 95
-			this.field558[1] = 0; // L: 96
+			int[] var4 = this.field531; // L: 95
+			this.field531[1] = 0; // L: 96
 			var4[0] = 0; // L: 97
 		}
 
 	} // L: 99
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30
diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java
index 7cdfc01324..c1f9e5dc74 100644
--- a/runescape-client/src/main/java/BZip2Decompressor.java
+++ b/runescape-client/src/main/java/BZip2Decompressor.java
@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nt")
+@ObfuscatedName("no")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lnh;"
+		descriptor = "Lny;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State(); // L: 13
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("BZip2Decompressor_decompress")
 	public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
 		synchronized(BZip2Decompressor_state) { // L: 20
@@ -29,7 +29,7 @@ public final class BZip2Decompressor {
 			BZip2Decompressor_state.bsLive = 0; // L: 26
 			BZip2Decompressor_state.bsBuff = 0; // L: 27
 			BZip2Decompressor_state.nextBit_unused = 0; // L: 28
-			BZip2Decompressor_state.field4177 = 0; // L: 29
+			BZip2Decompressor_state.field4175 = 0; // L: 29
 			BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30
 			var1 -= BZip2Decompressor_state.outputLength; // L: 31
 			BZip2Decompressor_state.inputArray = null; // L: 32
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnh;)V"
+		descriptor = "(Lny;)V"
 	)
-	static void method6788(BZip2State var0) {
+	static void method6862(BZip2State var0) {
 		byte var2 = var0.out_char; // L: 40
 		int var3 = var0.su_rNToGo; // L: 41
 		int var4 = var0.nblocks_used; // L: 42
 		int var5 = var0.su_ch2; // L: 43
-		int[] var6 = class375.BZip2Decompressor_block; // L: 44
-		int var7 = var0.field4195; // L: 45
+		int[] var6 = BZip2State.BZip2Decompressor_block; // L: 44
+		int var7 = var0.field4182; // L: 45
 		byte[] var8 = var0.outputArray; // L: 46
 		int var9 = var0.next_out; // L: 47
 		int var10 = var0.outputLength; // L: 48
-		int var12 = var0.field4174 + 1; // L: 50
+		int var12 = var0.field4201 + 1; // L: 50
 
 		label70:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break; // L: 73
 		}
 
-		int var13 = var0.field4177; // L: 133
-		var0.field4177 += var10 - var10; // L: 134
-		if (var0.field4177 < var13) { // L: 135
+		int var13 = var0.field4175; // L: 133
+		var0.field4175 += var10 - var10; // L: 134
+		if (var0.field4175 < var13) { // L: 135
 		}
 
 		var0.out_char = var2; // L: 136
 		var0.su_rNToGo = var3; // L: 137
 		var0.nblocks_used = var4; // L: 138
 		var0.su_ch2 = var5; // L: 139
-		class375.BZip2Decompressor_block = var6; // L: 140
-		var0.field4195 = var7; // L: 141
+		BZip2State.BZip2Decompressor_block = var6; // L: 140
+		var0.field4182 = var7; // L: 141
 		var0.outputArray = var8; // L: 142
 		var0.next_out = var9; // L: 143
 		var0.outputLength = var10; // L: 144
 	} // L: 145
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnh;)V"
+		descriptor = "(Lny;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -192,9 +192,9 @@ public final class BZip2Decompressor {
 		int[] var23 = null; // L: 170
 		int[] var24 = null; // L: 171
 		int[] var25 = null; // L: 172
-		var0.blockSize100k = -1565112471; // L: 173
-		if (class375.BZip2Decompressor_block == null) { // L: 174
-			class375.BZip2Decompressor_block = new int[var0.blockSize100k * -162652768];
+		var0.blockSize100k = -1495192005; // L: 173
+		if (BZip2State.BZip2Decompressor_block == null) { // L: 174
+			BZip2State.BZip2Decompressor_block = new int[var0.blockSize100k * -293926432];
 		}
 
 		boolean var26 = true; // L: 175
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396
-							class375.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
+							BZip2State.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397
 							++var47; // L: 398
 							if (var45 == 0) { // L: 399
 								++var43; // L: 400
@@ -489,7 +489,7 @@ public final class BZip2Decompressor {
 							var10000 = var0.unzftab; // L: 332
 
 							for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336
-								class375.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
+								BZip2State.BZip2Decompressor_block[var47] = var1 & 255; // L: 334
 								++var47; // L: 335
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) { // L: 426
-						var1 = (byte)(class375.BZip2Decompressor_block[var36] & 255); // L: 427
-						var10000 = class375.BZip2Decompressor_block; // L: 428
+						var1 = (byte)(BZip2State.BZip2Decompressor_block[var36] & 255); // L: 427
+						var10000 = BZip2State.BZip2Decompressor_block; // L: 428
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++; // L: 429
 					}
 
-					var0.field4195 = class375.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
+					var0.field4182 = BZip2State.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431
 					var0.nblocks_used = 0; // L: 432
-					var0.field4195 = class375.BZip2Decompressor_block[var0.field4195]; // L: 433
-					var0.su_ch2 = (byte)(var0.field4195 & 255); // L: 434
-					var0.field4195 >>= 8; // L: 436
+					var0.field4182 = BZip2State.BZip2Decompressor_block[var0.field4182]; // L: 433
+					var0.su_ch2 = (byte)(var0.field4182 & 255); // L: 434
+					var0.field4182 >>= 8; // L: 436
 					++var0.nblocks_used; // L: 437
-					var0.field4174 = var47; // L: 438
-					method6788(var0); // L: 439
-					if (var0.field4174 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
+					var0.field4201 = var47; // L: 438
+					method6862(var0); // L: 439
+					if (var0.field4201 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440
 						var26 = true;
 						break;
 					}
@@ -540,25 +540,25 @@ public final class BZip2Decompressor {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnh;)B"
+		descriptor = "(Lny;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0); // L: 447
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lnh;)B"
+		descriptor = "(Lny;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0); // L: 451
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ILnh;)I"
+		descriptor = "(ILny;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2; // L: 460
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnh;)V"
+		descriptor = "(Lny;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	} // L: 479
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("BZip2Decompressor_createHuffmanTables")
 	static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) {
 		int var7 = 0; // L: 486
diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java
index 177867b933..6c69beaf43 100644
--- a/runescape-client/src/main/java/BZip2State.java
+++ b/runescape-client/src/main/java/BZip2State.java
@@ -2,165 +2,169 @@ 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("nh")
+@ObfuscatedName("ny")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("v")
-	final int field4171;
-	@ObfuscatedName("n")
-	final int field4161;
+	@ObfuscatedName("w")
+	@Export("BZip2Decompressor_block")
+	static int[] BZip2Decompressor_block;
 	@ObfuscatedName("f")
-	final int field4162;
-	@ObfuscatedName("y")
-	final int field4186;
-	@ObfuscatedName("p")
+	final int field4174;
+	@ObfuscatedName("e")
 	final int field4164;
-	@ObfuscatedName("j")
+	@ObfuscatedName("v")
 	final int field4165;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
+	final int field4166;
+	@ObfuscatedName("j")
+	final int field4167;
+	@ObfuscatedName("o")
+	final int field4168;
+	@ObfuscatedName("m")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1851391215
+		intValue = -39933589
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1612509485
+		intValue = -531147281
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1856584985
+		intValue = 1195525677
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -795709793
+		intValue = 1044111453
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -743824809
+		intValue = -974665581
 	)
-	int field4177;
-	@ObfuscatedName("c")
+	int field4175;
+	@ObfuscatedName("k")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1772899085
+		intValue = 1559424305
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -492240629
+		intValue = 1700230051
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1723069525
+		intValue = -416010867
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1146975777
+		intValue = -1898128253
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1768365777
+		intValue = -553596923
 	)
-	int field4195;
-	@ObfuscatedName("z")
+	int field4182;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2146251751
+		intValue = 723737753
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -985271003
+		intValue = -142342171
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -846985049
+		intValue = -1916971597
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
 	@ObfuscatedName("ag")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 375128139
+		intValue = 87198187
 	)
-	int field4174;
+	int field4201;
 
 	BZip2State() {
-		this.field4171 = 4096; // L: 4
-		this.field4161 = 16; // L: 5
-		this.field4162 = 258; // L: 6
-		this.field4186 = 6; // L: 7
-		this.field4164 = 50; // L: 8
-		this.field4165 = 18002; // L: 9
+		this.field4174 = 4096; // L: 4
+		this.field4164 = 16; // L: 5
+		this.field4165 = 258; // L: 6
+		this.field4166 = 6; // L: 7
+		this.field4167 = 50; // L: 8
+		this.field4168 = 18002; // L: 9
 		this.nextByte = 0; // L: 11
 		this.next_out = 0; // L: 14
 		this.unzftab = new int[256]; // L: 25
@@ -178,4 +182,14 @@ public final class BZip2State {
 		this.perm = new int[6][258]; // L: 40
 		this.minLens = new int[6]; // L: 41
 	} // L: 44
+
+	@ObfuscatedName("ez")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lme;",
+		garbageValue = "-1693796296"
+	)
+	@Export("getWorldMap")
+	static WorldMap getWorldMap() {
+		return class80.worldMap; // L: 686
+	}
 }
diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java
index 8af06471d3..9891919583 100644
--- a/runescape-client/src/main/java/BoundaryObject.java
+++ b/runescape-client/src/main/java/BoundaryObject.java
@@ -4,60 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hw")
+@ObfuscatedName("hr")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("v")
+	@ObfuscatedName("dq")
+	@ObfuscatedSignature(
+		descriptor = "Llk;"
+	)
+	@Export("js5Socket")
+	static AbstractSocket js5Socket;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -727989945
+		intValue = 1552806681
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 662711357
+		intValue = 846668797
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1127510877
+		intValue = 1111067733
 	)
 	@Export("y")
 	int y;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 643320237
+		intValue = 1521438593
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1924609359
+		intValue = 33814439
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("renderable1")
 	public Renderable renderable1;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("renderable2")
 	public Renderable renderable2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		longValue = 1374506562499121997L
+		longValue = -5150257183506372715L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1331667357
+		intValue = -1106373897
 	)
 	@Export("flags")
 	int flags;
@@ -66,40 +72,4 @@ public final class BoundaryObject {
 		this.tag = 0L; // L: 11
 		this.flags = 0; // L: 12
 	} // L: 14
-
-	@ObfuscatedName("io")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
-		garbageValue = "-2076246411"
-	)
-	@Export("insertMenuItem")
-	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
-		if (!Client.isMenuOpen) { // L: 8805
-			if (Client.menuOptionsCount < 500) { // L: 8806
-				Client.menuActions[Client.menuOptionsCount] = var0; // L: 8807
-				Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8808
-				Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8809
-				Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8810
-				Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8811
-				Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8812
-				Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8813
-				++Client.menuOptionsCount; // L: 8814
-			}
-
-		}
-	} // L: 8816
-
-	@ObfuscatedName("lo")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I)Ljava/lang/String;",
-		garbageValue = "-502869844"
-	)
-	@Export("Widget_getSpellActionName")
-	static String Widget_getSpellActionName(Widget var0) {
-		if (AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var0)) == 0) { // L: 11377
-			return null;
-		} else {
-			return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11378 11379 11381
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index 88e46693d7..65843b9973 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("li")
+@ObfuscatedName("lw")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1774637825
+		intValue = 713506819
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 47432047
+		intValue = 2022522807
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -250215195
+		intValue = -259492799
 	)
 	@Export("highX")
 	public int highX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1839374135
+		intValue = 67302117
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "1379140744"
+		garbageValue = "74763714"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
 		this.lowY = var2; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1063534704"
+		descriptor = "(IIB)V",
+		garbageValue = "25"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,31 +63,31 @@ public class Bounds {
 		this.highY = var2; // L: 25
 	} // L: 26
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lli;Lli;B)V",
-		garbageValue = "-80"
+		descriptor = "(Llw;Llw;B)V",
+		garbageValue = "-43"
 	)
-	public void method5977(Bounds var1, Bounds var2) {
-		this.method5981(var1, var2); // L: 33
-		this.method5982(var1, var2); // L: 34
+	public void method6009(Bounds var1, Bounds var2) {
+		this.method6010(var1, var2);
+		this.method6031(var1, var2); // L: 34
 	} // L: 35
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lli;Lli;I)V",
-		garbageValue = "-1616583168"
+		descriptor = "(Llw;Llw;B)V",
+		garbageValue = "0"
 	)
-	void method5981(Bounds var1, Bounds var2) {
-		var2.lowX = this.lowX; // L: 38
+	void method6010(Bounds var1, Bounds var2) {
+		var2.lowX = this.lowX;
 		var2.highX = this.highX; // L: 39
-		if (this.lowX < var1.lowX) { // L: 40
-			var2.highX = (var2.highX * -888661779 - (var1.lowX * -888661779 - this.lowX * -888661779)) * -250215195; // L: 41
+		if (this.lowX < var1.lowX) {
+			var2.highX = (var2.highX * -2021811263 - (var1.lowX * -2021811263 - this.lowX * -2021811263)) * -259492799; // L: 41
 			var2.lowX = var1.lowX; // L: 42
 		}
 
-		if (var2.method5983() > var1.method5983()) { // L: 44
-			var2.highX -= var2.method5983() - var1.method5983(); // L: 45
+		if (var2.method6012() > var1.method6012()) { // L: 44
+			var2.highX -= var2.method6012() - var1.method6012(); // L: 45
 		}
 
 		if (var2.highX < 0) { // L: 47
@@ -96,21 +96,21 @@ public class Bounds {
 
 	} // L: 48
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lli;Lli;S)V",
-		garbageValue = "11660"
+		descriptor = "(Llw;Llw;I)V",
+		garbageValue = "-94971019"
 	)
-	void method5982(Bounds var1, Bounds var2) {
+	void method6031(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY; // L: 51
 		var2.highY = this.highY; // L: 52
 		if (this.lowY < var1.lowY) { // L: 53
-			var2.highY = (var2.highY * 1584612999 - (var1.lowY * 1584612999 - this.lowY * 1584612999)) * 1839374135; // L: 54
+			var2.highY = (var2.highY * -1355515155 - (var1.lowY * -1355515155 - this.lowY * -1355515155)) * 67302117; // L: 54
 			var2.lowY = var1.lowY; // L: 55
 		}
 
-		if (var2.method5984() > var1.method5984()) { // L: 57
-			var2.highY -= var2.method5984() - var1.method5984(); // L: 58
+		if (var2.method6032() > var1.method6032()) { // L: 57
+			var2.highY -= var2.method6032() - var1.method6032(); // L: 58
 		}
 
 		if (var2.highY < 0) { // L: 60
@@ -119,25 +119,48 @@ public class Bounds {
 
 	} // L: 61
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-67"
+		garbageValue = "5"
 	)
-	int method5983() {
-		return this.highX + this.lowX; // L: 64
+	int method6012() {
+		return this.lowX + this.highX; // L: 64
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "8"
+		descriptor = "(I)I",
+		garbageValue = "-1071411264"
 	)
-	int method5984() {
-		return this.highY + this.lowY; // L: 68
+	int method6032() {
+		return this.lowY + this.highY; // L: 68
 	}
 
 	public String toString() {
 		return null; // L: 29
 	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Ljp;Ljp;III)Lkj;",
+		garbageValue = "845237448"
+	)
+	public static Font method6034(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+		if (!Message.method1263(var0, var2, var3)) { // L: 28
+			return null;
+		} else {
+			byte[] var5 = var1.takeFile(var2, var3); // L: 30
+			Font var4;
+			if (var5 == null) { // L: 32
+				var4 = null; // L: 33
+			} else {
+				Font var6 = new Font(var5, class397.SpriteBuffer_xOffsets, class26.SpriteBuffer_yOffsets, Canvas.SpriteBuffer_spriteWidths, Clock.SpriteBuffer_spriteHeights, class397.SpriteBuffer_spritePalette, class126.SpriteBuffer_pixels); // L: 36
+				ArchiveDisk.method5993(); // L: 37
+				var4 = var6; // L: 38
+			}
+
+			return var4; // L: 40
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index f1339faf85..bf11812258 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -4,24 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lv")
+@ObfuscatedName("ly")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("p")
+	@ObfuscatedName("dg")
+	@ObfuscatedSignature(
+		descriptor = "Lel;"
+	)
+	@Export("js5SocketTask")
+	static Task js5SocketTask;
+	@ObfuscatedName("iz")
 	@ObfuscatedGetter(
-		intValue = 1693720149
+		intValue = -1354630149
+	)
+	@Export("selectedItemId")
+	static int selectedItemId;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -1822382333
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1023710905
+		intValue = -286288271
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -523203081
+		intValue = -2998287
 	)
 	@Export("rank")
 	public int rank;
@@ -30,10 +42,10 @@ public class Buddy extends User {
 		this.world = -1; // L: 4
 	} // L: 8
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-1819363744"
+		garbageValue = "-1543137847"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -41,23 +53,72 @@ public class Buddy extends User {
 		this.int2 = var2; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1872799310"
+		descriptor = "(B)I",
+		garbageValue = "27"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world; // L: 16
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "2092193613"
+		garbageValue = "-1186976863"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0; // L: 20
 	}
+
+	@ObfuscatedName("fy")
+	@ObfuscatedSignature(
+		descriptor = "(Lfm;IIIB)V",
+		garbageValue = "-89"
+	)
+	static void method5896(SequenceDefinition var0, int var1, int var2, int var3) {
+		if (Client.soundEffectCount < 50 && class4.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3756
+			if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3757
+				int var4 = var0.soundEffects[var1]; // L: 3758
+				if (var4 != 0) { // L: 3759
+					int var5 = var4 >> 8; // L: 3760
+					int var6 = var4 >> 4 & 7; // L: 3761
+					int var7 = var4 & 15; // L: 3762
+					Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3763
+					Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3764
+					Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3765
+					Client.soundEffects[Client.soundEffectCount] = null; // L: 3766
+					int var8 = (var2 - 64) / 128; // L: 3767
+					int var9 = (var3 - 64) / 128; // L: 3768
+					Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3769
+					++Client.soundEffectCount; // L: 3770
+				}
+			}
+		}
+	} // L: 3771
+
+	@ObfuscatedName("hd")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-589209298"
+	)
+	static final void method5892() {
+		Client.field629 = 0; // L: 5422
+		int var0 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 5423
+		int var1 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 5424
+		if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { // L: 5425
+			Client.field629 = 1;
+		}
+
+		if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { // L: 5426
+			Client.field629 = 1;
+		}
+
+		if (Client.field629 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { // L: 5427
+			Client.field629 = 0;
+		}
+
+	} // L: 5428
 }
diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java
index b69b4e05a3..6ecb2e43ec 100644
--- a/runescape-client/src/main/java/BuddyRankComparator.java
+++ b/runescape-client/src/main/java/BuddyRankComparator.java
@@ -3,83 +3,55 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dt")
+@ObfuscatedName("dk")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("sq")
+	@ObfuscatedName("hr")
 	@ObfuscatedSignature(
-		descriptor = "Ljm;"
+		descriptor = "[Loa;"
 	)
-	@Export("grandExchangeEvents")
-	static GrandExchangeEvents grandExchangeEvents;
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "Ljf;"
-	)
-	@Export("NetCache_currentResponse")
-	public static NetFileRequest NetCache_currentResponse;
-	@ObfuscatedName("v")
+	@Export("mapMarkerSprites")
+	static SpritePixels[] mapMarkerSprites;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
 	public BuddyRankComparator(boolean var1) {
 		this.reversed = var1; // L: 10
-	}
+	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;B)I",
-		garbageValue = "17"
+		descriptor = "(Lly;Lly;I)I",
+		garbageValue = "1922516179"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
-		if (var2.rank != var1.rank) {
-			return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank;
+		if (var2.rank != var1.rank) { // L: 14
+			return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15
 		} else {
-			return this.compareUser(var1, var2);
+			return this.compareUser(var1, var2); // L: 17
 		}
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compareBuddy((Buddy)var1, (Buddy)var2);
+		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("fd")
 	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
-		garbageValue = "2136518609"
+		descriptor = "(I)V",
+		garbageValue = "-16777217"
 	)
-	public static String method2484(CharSequence[] var0, int var1, int var2) {
-		if (var2 == 0) { // L: 11
-			return "";
-		} else if (var2 == 1) { // L: 12
-			CharSequence var10 = var0[var1]; // L: 13
-			return var10 == null ? "null" : var10.toString(); // L: 14 15
-		} else {
-			int var3 = var2 + var1; // L: 17
-			int var4 = 0; // L: 18
-
-			for (int var5 = var1; var5 < var3; ++var5) { // L: 19
-				CharSequence var9 = var0[var5]; // L: 20
-				if (var9 == null) { // L: 21
-					var4 += 4;
-				} else {
-					var4 += var9.length(); // L: 22
-				}
+	static final void method2579() {
+		if (class26.ClanChat_inClanChat) { // L: 3802
+			if (class289.friendsChat != null) { // L: 3803
+				class289.friendsChat.sort(); // L: 3804
 			}
 
-			StringBuilder var8 = new StringBuilder(var4); // L: 24
-
-			for (int var6 = var1; var6 < var3; ++var6) { // L: 25
-				CharSequence var7 = var0[var6]; // L: 26
-				if (var7 == null) { // L: 27
-					var8.append("null");
-				} else {
-					var8.append(var7); // L: 28
-				}
-			}
-
-			return var8.toString(); // L: 30
+			WorldMapCacheName.method3788(); // L: 3806
+			class26.ClanChat_inClanChat = false; // L: 3807
 		}
-	}
+
+	} // L: 3809
 }
diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java
index 67b4c74e92..3f12472504 100644
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
@@ -5,21 +5,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nd")
+@ObfuscatedName("nt")
 @Implements("Buffer")
 public class Buffer extends Node {
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("crc32Table")
 	static int[] crc32Table;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("crc64Table")
 	static long[] crc64Table;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("array")
 	public byte[] array;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -442398587
+		intValue = 1763340179
 	)
 	@Export("offset")
 	public int offset;
@@ -61,1059 +61,1029 @@ public class Buffer extends Node {
 	} // L: 42
 
 	public Buffer(int var1) {
-		this.array = class5.ByteArrayPool_getArray(var1); // L: 54
-		this.offset = 0; // L: 55
-	} // L: 56
+		this.array = Occluder.ByteArrayPool_getArray(var1); // L: 58
+		this.offset = 0; // L: 59
+	} // L: 60
 
 	public Buffer(byte[] var1) {
-		this.array = var1; // L: 59
-		this.offset = 0; // L: 60
-	} // L: 61
+		this.array = var1; // L: 63
+		this.offset = 0; // L: 64
+	} // L: 65
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "32"
+		garbageValue = "-106"
 	)
 	@Export("releaseArray")
 	public void releaseArray() {
-		if (this.array != null) { // L: 64
-			ItemLayer.ByteArrayPool_release(this.array);
+		if (this.array != null) { // L: 68
+			SequenceDefinition.ByteArrayPool_release(this.array);
 		}
 
-		this.array = null; // L: 65
-	} // L: 66
-
-	@ObfuscatedName("ag")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "303066737"
-	)
-	@Export("writeByte")
-	public void writeByte(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 69
+		this.array = null; // L: 69
 	} // L: 70
 
-	@ObfuscatedName("ax")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1826329058"
-	)
-	@Export("writeShort")
-	public void writeShort(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 73
-		this.array[++this.offset - 1] = (byte)var1; // L: 74
-	} // L: 75
-
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1756916961"
-	)
-	@Export("writeMedium")
-	public void writeMedium(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 78
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 79
-		this.array[++this.offset - 1] = (byte)var1; // L: 80
-	} // L: 81
-
-	@ObfuscatedName("aj")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1017867447"
-	)
-	@Export("writeInt")
-	public void writeInt(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 84
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 85
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 86
-		this.array[++this.offset - 1] = (byte)var1; // L: 87
-	} // L: 88
-
-	@ObfuscatedName("am")
-	@Export("writeLongMedium")
-	public void writeLongMedium(long var1) {
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 91
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 92
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 93
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 94
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 95
-		this.array[++this.offset - 1] = (byte)((int)var1); // L: 96
-	} // L: 97
-
-	@ObfuscatedName("az")
-	@Export("writeLong")
-	public void writeLong(long var1) {
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 100
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 101
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 102
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 103
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 104
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 105
-		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 106
-		this.array[++this.offset - 1] = (byte)((int)var1); // L: 107
-	} // L: 108
-
-	@ObfuscatedName("av")
-	@ObfuscatedSignature(
-		descriptor = "(ZS)V",
-		garbageValue = "-16479"
-	)
-	@Export("writeBoolean")
-	public void writeBoolean(boolean var1) {
-		this.writeByte(var1 ? 1 : 0); // L: 111
-	} // L: 112
-
-	@ObfuscatedName("at")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-427478981"
-	)
-	@Export("writeStringCp1252NullTerminated")
-	public void writeStringCp1252NullTerminated(String var1) {
-		int var2 = var1.indexOf(0); // L: 119
-		if (var2 >= 0) { // L: 120
-			throw new IllegalArgumentException("");
-		} else {
-			this.offset += Player.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 121
-			this.array[++this.offset - 1] = 0; // L: 122
-		}
-	} // L: 123
-
 	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-39"
-	)
-	@Export("writeStringCp1252NullCircumfixed")
-	public void writeStringCp1252NullCircumfixed(String var1) {
-		int var2 = var1.indexOf(0); // L: 130
-		if (var2 >= 0) { // L: 131
-			throw new IllegalArgumentException("");
-		} else {
-			this.array[++this.offset - 1] = 0; // L: 132
-			this.offset += Player.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 133
-			this.array[++this.offset - 1] = 0; // L: 134
-		}
-	} // L: 135
-
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)V",
-		garbageValue = "499802318"
-	)
-	@Export("writeCESU8")
-	public void writeCESU8(CharSequence var1) {
-		int var3 = var1.length(); // L: 140
-		int var4 = 0; // L: 141
-
-		int var5;
-		for (var5 = 0; var5 < var3; ++var5) { // L: 142
-			char var12 = var1.charAt(var5); // L: 143
-			if (var12 <= 127) { // L: 144
-				++var4;
-			} else if (var12 <= 2047) { // L: 145
-				var4 += 2;
-			} else {
-				var4 += 3; // L: 146
-			}
-		}
-
-		this.array[++this.offset - 1] = 0; // L: 151
-		this.writeVarInt(var4); // L: 152
-		var4 = this.offset * -1025691571; // L: 153
-		byte[] var6 = this.array; // L: 155
-		int var7 = this.offset; // L: 156
-		int var8 = var1.length(); // L: 158
-		int var9 = var7; // L: 159
-
-		for (int var10 = 0; var10 < var8; ++var10) { // L: 160
-			char var11 = var1.charAt(var10); // L: 161
-			if (var11 <= 127) { // L: 162
-				var6[var9++] = (byte)var11; // L: 163
-			} else if (var11 <= 2047) { // L: 165
-				var6[var9++] = (byte)(192 | var11 >> 6); // L: 166
-				var6[var9++] = (byte)(128 | var11 & '?'); // L: 167
-			} else {
-				var6[var9++] = (byte)(224 | var11 >> '\f'); // L: 170
-				var6[var9++] = (byte)(128 | var11 >> 6 & 63); // L: 171
-				var6[var9++] = (byte)(128 | var11 & '?'); // L: 172
-			}
-		}
-
-		var5 = var9 - var7; // L: 175
-		this.offset = (var4 + var5 * -1025691571) * -442398587; // L: 177
-	} // L: 178
-
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "([BIII)V",
-		garbageValue = "1890718426"
-	)
-	@Export("writeBytes")
-	public void writeBytes(byte[] var1, int var2, int var3) {
-		for (int var4 = var2; var4 < var3 + var2; ++var4) {
-			this.array[++this.offset - 1] = var1[var4]; // L: 181
-		}
-
-	} // L: 182
-
-	@ObfuscatedName("af")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;B)V",
-		garbageValue = "8"
-	)
-	public void method6768(Buffer var1) {
-		this.writeBytes(var1.array, 0, var1.offset); // L: 185
-	} // L: 186
-
-	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-665940595"
+		garbageValue = "-1863377440"
 	)
-	@Export("writeLengthInt")
-	public void writeLengthInt(int var1) {
-		if (var1 < 0) { // L: 189
-			throw new IllegalArgumentException(); // L: 190
-		} else {
-			this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 192
-			this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 193
-			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194
-			this.array[this.offset - var1 - 1] = (byte)var1; // L: 195
-		}
-	} // L: 196
-
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "2"
-	)
-	@Export("writeLengthShort")
-	public void writeLengthShort(int var1) {
-		if (var1 >= 0 && var1 <= 65535) { // L: 199
-			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 202
-			this.array[this.offset - var1 - 1] = (byte)var1; // L: 203
-		} else {
-			throw new IllegalArgumentException(); // L: 200
-		}
-	} // L: 204
-
-	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-576610400"
-	)
-	@Export("writeLengthByte")
-	public void writeLengthByte(int var1) {
-		if (var1 >= 0 && var1 <= 255) { // L: 207
-			this.array[this.offset - var1 - 1] = (byte)var1; // L: 210
-		} else {
-			throw new IllegalArgumentException(); // L: 208
-		}
-	} // L: 211
-
-	@ObfuscatedName("au")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1514054821"
-	)
-	@Export("writeSmartByteShort")
-	public void writeSmartByteShort(int var1) {
-		if (var1 >= 0 && var1 < 128) { // L: 214
-			this.writeByte(var1); // L: 215
-		} else if (var1 >= 0 && var1 < 32768) { // L: 218
-			this.writeShort(var1 + 32768); // L: 219
-		} else {
-			throw new IllegalArgumentException(); // L: 222
-		}
-	} // L: 216 220
+	@Export("writeByte")
+	public void writeByte(int var1) {
+		this.array[++this.offset - 1] = (byte)var1; // L: 73
+	} // L: 74
 
 	@ObfuscatedName("an")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "2063951954"
+		garbageValue = "-943246978"
 	)
-	@Export("writeVarInt")
-	public void writeVarInt(int var1) {
-		if ((var1 & -128) != 0) { // L: 226
-			if ((var1 & -16384) != 0) { // L: 227
-				if ((var1 & -2097152) != 0) { // L: 228
-					if ((var1 & -268435456) != 0) { // L: 229
-						this.writeByte(var1 >>> 28 | 128);
-					}
+	@Export("writeShort")
+	public void writeShort(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 77
+		this.array[++this.offset - 1] = (byte)var1; // L: 78
+	} // L: 79
 
-					this.writeByte(var1 >>> 21 | 128); // L: 230
-				}
+	@ObfuscatedName("al")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-255804232"
+	)
+	@Export("writeMedium")
+	public void writeMedium(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 82
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 83
+		this.array[++this.offset - 1] = (byte)var1; // L: 84
+	} // L: 85
 
-				this.writeByte(var1 >>> 14 | 128); // L: 232
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-320118747"
+	)
+	@Export("writeInt")
+	public void writeInt(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 88
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 89
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 90
+		this.array[++this.offset - 1] = (byte)var1; // L: 91
+	} // L: 92
+
+	@ObfuscatedName("ac")
+	@Export("writeLongMedium")
+	public void writeLongMedium(long var1) {
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 95
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 96
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 97
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 98
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 99
+		this.array[++this.offset - 1] = (byte)((int)var1); // L: 100
+	} // L: 101
+
+	@ObfuscatedName("as")
+	@Export("writeLong")
+	public void writeLong(long var1) {
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 104
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 105
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109
+		this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110
+		this.array[++this.offset - 1] = (byte)((int)var1); // L: 111
+	} // L: 112
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "-1604340695"
+	)
+	@Export("writeBoolean")
+	public void writeBoolean(boolean var1) {
+		this.writeByte(var1 ? 1 : 0); // L: 115
+	} // L: 116
+
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;S)V",
+		garbageValue = "18595"
+	)
+	@Export("writeStringCp1252NullTerminated")
+	public void writeStringCp1252NullTerminated(String var1) {
+		int var2 = var1.indexOf(0); // L: 123
+		if (var2 >= 0) { // L: 124
+			throw new IllegalArgumentException("");
+		} else {
+			this.offset += HorizontalAlignment.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 125
+			this.array[++this.offset - 1] = 0; // L: 126
+		}
+	} // L: 127
+
+	@ObfuscatedName("ai")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "856089217"
+	)
+	@Export("writeStringCp1252NullCircumfixed")
+	public void writeStringCp1252NullCircumfixed(String var1) {
+		int var2 = var1.indexOf(0); // L: 134
+		if (var2 >= 0) { // L: 135
+			throw new IllegalArgumentException("");
+		} else {
+			this.array[++this.offset - 1] = 0; // L: 136
+			this.offset += HorizontalAlignment.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 137
+			this.array[++this.offset - 1] = 0; // L: 138
+		}
+	} // L: 139
+
+	@ObfuscatedName("av")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;I)V",
+		garbageValue = "-1762854289"
+	)
+	@Export("writeCESU8")
+	public void writeCESU8(CharSequence var1) {
+		int var2 = Friend.method5774(var1); // L: 142
+		this.array[++this.offset - 1] = 0; // L: 143
+		this.writeVarInt(var2); // L: 144
+		int var3 = this.offset * -1967454565; // L: 145
+		byte[] var5 = this.array; // L: 147
+		int var6 = this.offset; // L: 148
+		int var7 = var1.length(); // L: 150
+		int var8 = var6; // L: 151
+
+		for (int var9 = 0; var9 < var7; ++var9) { // L: 152
+			char var10 = var1.charAt(var9); // L: 153
+			if (var10 <= 127) { // L: 154
+				var5[var8++] = (byte)var10; // L: 155
+			} else if (var10 <= 2047) { // L: 157
+				var5[var8++] = (byte)(192 | var10 >> 6); // L: 158
+				var5[var8++] = (byte)(128 | var10 & '?'); // L: 159
+			} else {
+				var5[var8++] = (byte)(224 | var10 >> '\f'); // L: 162
+				var5[var8++] = (byte)(128 | var10 >> 6 & 63); // L: 163
+				var5[var8++] = (byte)(128 | var10 & '?'); // L: 164
 			}
-
-			this.writeByte(var1 >>> 7 | 128); // L: 234
 		}
 
-		this.writeByte(var1 & 127); // L: 236
-	} // L: 237
+		int var4 = var8 - var6; // L: 167
+		this.offset = (var3 + var4 * -1967454565) * 1763340179; // L: 169
+	} // L: 170
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-236245275"
+		descriptor = "([BIII)V",
+		garbageValue = "1373881808"
 	)
-	@Export("readUnsignedByte")
-	public int readUnsignedByte() {
-		return this.array[++this.offset - 1] & 255; // L: 240
-	}
+	@Export("writeBytes")
+	public void writeBytes(byte[] var1, int var2, int var3) {
+		for (int var4 = var2; var4 < var3 + var2; ++var4) {
+			this.array[++this.offset - 1] = var1[var4]; // L: 173
+		}
 
-	@ObfuscatedName("bt")
+	} // L: 174
+
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(B)B",
-		garbageValue = "-17"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-2065580787"
 	)
-	@Export("readByte")
-	public byte readByte() {
-		return this.array[++this.offset - 1]; // L: 244
-	}
+	public void method6607(Buffer var1) {
+		this.writeBytes(var1.array, 0, var1.offset); // L: 177
+	} // L: 178
+
+	@ObfuscatedName("af")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "-70"
+	)
+	@Export("writeLengthInt")
+	public void writeLengthInt(int var1) {
+		if (var1 < 0) { // L: 181
+			throw new IllegalArgumentException(); // L: 182
+		} else {
+			this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 184
+			this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 185
+			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 186
+			this.array[this.offset - var1 - 1] = (byte)var1; // L: 187
+		}
+	} // L: 188
 
 	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-37"
+		descriptor = "(IB)V",
+		garbageValue = "-1"
 	)
-	@Export("readUnsignedShort")
-	public int readUnsignedShort() {
-		this.offset += 2; // L: 248
-		return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 249
-	}
+	@Export("writeLengthShort")
+	public void writeLengthShort(int var1) {
+		if (var1 >= 0 && var1 <= 65535) { // L: 191
+			this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194
+			this.array[this.offset - var1 - 1] = (byte)var1; // L: 195
+		} else {
+			throw new IllegalArgumentException(); // L: 192
+		}
+	} // L: 196
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1542485131"
+		descriptor = "(II)V",
+		garbageValue = "-256020181"
 	)
-	@Export("readShort")
-	public int readShort() {
-		this.offset += 2; // L: 253
-		int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 254
-		if (var1 > 32767) { // L: 255
-			var1 -= 65536;
+	@Export("writeLengthByte")
+	public void writeLengthByte(int var1) {
+		if (var1 >= 0 && var1 <= 255) { // L: 199
+			this.array[this.offset - var1 - 1] = (byte)var1; // L: 202
+		} else {
+			throw new IllegalArgumentException(); // L: 200
+		}
+	} // L: 203
+
+	@ObfuscatedName("bi")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1840761658"
+	)
+	@Export("writeSmartByteShort")
+	public void writeSmartByteShort(int var1) {
+		if (var1 >= 0 && var1 < 128) { // L: 206
+			this.writeByte(var1); // L: 207
+		} else if (var1 >= 0 && var1 < 32768) { // L: 210
+			this.writeShort(var1 + 32768); // L: 211
+		} else {
+			throw new IllegalArgumentException(); // L: 214
+		}
+	} // L: 208 212
+
+	@ObfuscatedName("bz")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1285798772"
+	)
+	@Export("writeVarInt")
+	public void writeVarInt(int var1) {
+		if ((var1 & -128) != 0) { // L: 218
+			if ((var1 & -16384) != 0) { // L: 219
+				if ((var1 & -2097152) != 0) { // L: 220
+					if ((var1 & -268435456) != 0) { // L: 221
+						this.writeByte(var1 >>> 28 | 128);
+					}
+
+					this.writeByte(var1 >>> 21 | 128); // L: 222
+				}
+
+				this.writeByte(var1 >>> 14 | 128); // L: 224
+			}
+
+			this.writeByte(var1 >>> 7 | 128); // L: 226
 		}
 
-		return var1; // L: 256
-	}
+		this.writeByte(var1 & 127); // L: 228
+	} // L: 229
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-108"
+		garbageValue = "97"
 	)
-	@Export("readMedium")
-	public int readMedium() {
-		this.offset += 3; // L: 260
-		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 261
+	@Export("readUnsignedByte")
+	public int readUnsignedByte() {
+		return this.array[++this.offset - 1] & 255; // L: 232
 	}
 
 	@ObfuscatedName("bv")
+	@ObfuscatedSignature(
+		descriptor = "(S)B",
+		garbageValue = "14690"
+	)
+	@Export("readByte")
+	public byte readByte() {
+		return this.array[++this.offset - 1]; // L: 236
+	}
+
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-62"
+		garbageValue = "61"
 	)
-	@Export("readInt")
-	public int readInt() {
-		this.offset += 4; // L: 265
-		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 266
+	@Export("readUnsignedShort")
+	public int readUnsignedShort() {
+		this.offset += 2; // L: 240
+		return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 241
 	}
 
-	@ObfuscatedName("bm")
+	@ObfuscatedName("be")
 	@ObfuscatedSignature(
-		descriptor = "(I)J",
-		garbageValue = "-1938103618"
+		descriptor = "(I)I",
+		garbageValue = "-1344760160"
 	)
-	@Export("readLong")
-	public long readLong() {
-		long var1 = (long)this.readInt() & 4294967295L; // L: 270
-		long var3 = (long)this.readInt() & 4294967295L; // L: 271
-		return (var1 << 32) + var3; // L: 272
-	}
-
-	@ObfuscatedName("bz")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "788058203"
-	)
-	@Export("readBoolean")
-	public boolean readBoolean() {
-		return (this.readUnsignedByte() & 1) == 1; // L: 276
-	}
-
-	@ObfuscatedName("bh")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-189323230"
-	)
-	@Export("readStringCp1252NullTerminatedOrNull")
-	public String readStringCp1252NullTerminatedOrNull() {
-		if (this.array[this.offset] == 0) { // L: 280
-			++this.offset; // L: 281
-			return null; // L: 282
-		} else {
-			return this.readStringCp1252NullTerminated(); // L: 284
+	@Export("readShort")
+	public int readShort() {
+		this.offset += 2; // L: 245
+		int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 246
+		if (var1 > 32767) { // L: 247
+			var1 -= 65536;
 		}
+
+		return var1; // L: 248
+	}
+
+	@ObfuscatedName("ba")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1626768763"
+	)
+	@Export("readMedium")
+	public int readMedium() {
+		this.offset += 3; // L: 252
+		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 253
 	}
 
 	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-391631059"
+		descriptor = "(I)I",
+		garbageValue = "-299681912"
 	)
-	@Export("readStringCp1252NullTerminated")
-	public String readStringCp1252NullTerminated() {
-		int var1 = this.offset; // L: 288
-
-		while (this.array[++this.offset - 1] != 0) { // L: 289
-		}
-
-		int var2 = this.offset - var1 - 1; // L: 290
-		return var2 == 0 ? "" : class43.decodeStringCp1252(this.array, var1, var2); // L: 291 292
+	@Export("readInt")
+	public int readInt() {
+		this.offset += 4; // L: 257
+		return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 258
 	}
 
 	@ObfuscatedName("br")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "100"
+		descriptor = "(I)J",
+		garbageValue = "1743202445"
 	)
-	@Export("readStringCp1252NullCircumfixed")
-	public String readStringCp1252NullCircumfixed() {
-		byte var1 = this.array[++this.offset - 1]; // L: 296
-		if (var1 != 0) { // L: 297
-			throw new IllegalStateException("");
+	@Export("readLong")
+	public long readLong() {
+		long var1 = (long)this.readInt() & 4294967295L; // L: 262
+		long var3 = (long)this.readInt() & 4294967295L; // L: 263
+		return (var1 << 32) + var3; // L: 264
+	}
+
+	@ObfuscatedName("bw")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "80"
+	)
+	@Export("readBoolean")
+	public boolean readBoolean() {
+		return (this.readUnsignedByte() & 1) == 1; // L: 268
+	}
+
+	@ObfuscatedName("by")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-615032441"
+	)
+	@Export("readStringCp1252NullTerminatedOrNull")
+	public String readStringCp1252NullTerminatedOrNull() {
+		if (this.array[this.offset] == 0) { // L: 272
+			++this.offset; // L: 273
+			return null; // L: 274
 		} else {
-			int var2 = this.offset; // L: 298
-
-			while (this.array[++this.offset - 1] != 0) { // L: 299
-			}
-
-			int var3 = this.offset - var2 - 1; // L: 300
-			return var3 == 0 ? "" : class43.decodeStringCp1252(this.array, var2, var3); // L: 301 302
+			return this.readStringCp1252NullTerminated(); // L: 276
 		}
 	}
 
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bt")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "41"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-1193629653"
+	)
+	@Export("readStringCp1252NullTerminated")
+	public String readStringCp1252NullTerminated() {
+		int var1 = this.offset; // L: 280
+
+		while (this.array[++this.offset - 1] != 0) { // L: 281
+		}
+
+		int var2 = this.offset - var1 - 1; // L: 282
+		return var2 == 0 ? "" : Actor.decodeStringCp1252(this.array, var1, var2); // L: 283 284
+	}
+
+	@ObfuscatedName("bg")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-1964940148"
+	)
+	@Export("readStringCp1252NullCircumfixed")
+	public String readStringCp1252NullCircumfixed() {
+		byte var1 = this.array[++this.offset - 1]; // L: 288
+		if (var1 != 0) { // L: 289
+			throw new IllegalStateException("");
+		} else {
+			int var2 = this.offset; // L: 290
+
+			while (this.array[++this.offset - 1] != 0) { // L: 291
+			}
+
+			int var3 = this.offset - var2 - 1; // L: 292
+			return var3 == 0 ? "" : Actor.decodeStringCp1252(this.array, var2, var3); // L: 293 294
+		}
+	}
+
+	@ObfuscatedName("bm")
+	@ObfuscatedSignature(
+		descriptor = "(S)Ljava/lang/String;",
+		garbageValue = "-14038"
 	)
 	@Export("readCESU8")
 	public String readCESU8() {
-		byte var1 = this.array[++this.offset - 1]; // L: 306
-		if (var1 != 0) { // L: 307
+		byte var1 = this.array[++this.offset - 1]; // L: 298
+		if (var1 != 0) { // L: 299
 			throw new IllegalStateException("");
 		} else {
-			int var2 = this.readVarInt(); // L: 308
-			if (var2 + this.offset > this.array.length) { // L: 309
+			int var2 = this.readVarInt(); // L: 300
+			if (var2 + this.offset > this.array.length) { // L: 301
 				throw new IllegalStateException("");
 			} else {
-				byte[] var4 = this.array; // L: 311
-				int var5 = this.offset; // L: 312
-				char[] var6 = new char[var2]; // L: 314
-				int var7 = 0; // L: 315
-				int var8 = var5; // L: 316
+				byte[] var4 = this.array; // L: 303
+				int var5 = this.offset; // L: 304
+				char[] var6 = new char[var2]; // L: 306
+				int var7 = 0; // L: 307
+				int var8 = var5; // L: 308
 
 				int var11;
-				for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 317 318 349
-					int var10 = var4[var8++] & 255; // L: 319
-					if (var10 < 128) { // L: 321
-						if (var10 == 0) { // L: 322
+				for (int var9 = var2 + var5; var8 < var9; var6[var7++] = (char)var11) { // L: 309 310 341
+					int var10 = var4[var8++] & 255; // L: 311
+					if (var10 < 128) { // L: 313
+						if (var10 == 0) { // L: 314
 							var11 = 65533;
 						} else {
-							var11 = var10; // L: 323
+							var11 = var10; // L: 315
 						}
-					} else if (var10 < 192) { // L: 325
+					} else if (var10 < 192) { // L: 317
 						var11 = 65533;
-					} else if (var10 < 224) { // L: 326
-						if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 327
-							var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 328
-							if (var11 < 128) { // L: 329
+					} else if (var10 < 224) { // L: 318
+						if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 319
+							var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 320
+							if (var11 < 128) { // L: 321
 								var11 = 65533;
 							}
 						} else {
-							var11 = 65533; // L: 331
+							var11 = 65533; // L: 323
 						}
-					} else if (var10 < 240) { // L: 333
-						if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 334
-							var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 335
-							if (var11 < 2048) { // L: 336
+					} else if (var10 < 240) { // L: 325
+						if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 326
+							var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 327
+							if (var11 < 2048) { // L: 328
+								var11 = 65533;
+							}
+						} else {
+							var11 = 65533; // L: 330
+						}
+					} else if (var10 < 248) { // L: 332
+						if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 333
+							var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 334
+							if (var11 >= 65536 && var11 <= 1114111) { // L: 335
+								var11 = 65533; // L: 336
+							} else {
 								var11 = 65533;
 							}
 						} else {
 							var11 = 65533; // L: 338
 						}
-					} else if (var10 < 248) { // L: 340
-						if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 341
-							var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 342
-							if (var11 >= 65536 && var11 <= 1114111) { // L: 343
-								var11 = 65533; // L: 344
-							} else {
-								var11 = 65533;
-							}
-						} else {
-							var11 = 65533; // L: 346
-						}
 					} else {
-						var11 = 65533; // L: 348
+						var11 = 65533; // L: 340
 					}
 				}
 
-				String var3 = new String(var6, 0, var7); // L: 351
-				this.offset += var2; // L: 354
-				return var3; // L: 355
+				String var3 = new String(var6, 0, var7); // L: 343
+				this.offset += var2; // L: 346
+				return var3; // L: 347
 			}
 		}
 	}
 
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "1260377098"
+		garbageValue = "-1720169048"
 	)
 	@Export("readBytes")
 	public void readBytes(byte[] var1, int var2, int var3) {
 		for (int var4 = var2; var4 < var3 + var2; ++var4) {
-			var1[var4] = this.array[++this.offset - 1]; // L: 359
+			var1[var4] = this.array[++this.offset - 1]; // L: 351
 		}
 
-	} // L: 360
+	} // L: 352
 
-	@ObfuscatedName("be")
+	@ObfuscatedName("bo")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "88"
+		garbageValue = "9"
 	)
 	@Export("readShortSmart")
 	public int readShortSmart() {
-		int var1 = this.array[this.offset] & 255; // L: 363
-		return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 364 365
-	}
-
-	@ObfuscatedName("bj")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-104"
-	)
-	@Export("readUShortSmart")
-	public int readUShortSmart() {
-		int var1 = this.array[this.offset] & 255; // L: 369
-		return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 370 371
-	}
-
-	@ObfuscatedName("bx")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1225252005"
-	)
-	public int method6560() {
-		int var1 = 0; // L: 375
-
-		int var2;
-		for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 376 377 379
-			var1 += 32767; // L: 378
-		}
-
-		var1 += var2; // L: 381
-		return var1; // L: 382
-	}
-
-	@ObfuscatedName("bp")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1043655096"
-	)
-	public int method6569() {
-		return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 386 387
+		int var1 = this.array[this.offset] & 255; // L: 355
+		return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 356 357
 	}
 
 	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1957977001"
+		garbageValue = "2144461142"
 	)
-	public int method6583() {
-		if (this.array[this.offset] < 0) { // L: 391
+	@Export("readUShortSmart")
+	public int readUShortSmart() {
+		int var1 = this.array[this.offset] & 255; // L: 361
+		return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 362 363
+	}
+
+	@ObfuscatedName("bu")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1158750007"
+	)
+	public int method6628() {
+		int var1 = 0; // L: 367
+
+		int var2;
+		for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 368 369 371
+			var1 += 32767; // L: 370
+		}
+
+		var1 += var2; // L: 373
+		return var1; // L: 374
+	}
+
+	@ObfuscatedName("bl")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-672544141"
+	)
+	public int method6629() {
+		return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 378 379
+	}
+
+	@ObfuscatedName("bd")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1778675076"
+	)
+	public int method6630() {
+		if (this.array[this.offset] < 0) { // L: 383
 			return this.readInt() & Integer.MAX_VALUE;
 		} else {
-			int var1 = this.readUnsignedShort(); // L: 392
-			return var1 == 32767 ? -1 : var1; // L: 393
+			int var1 = this.readUnsignedShort(); // L: 384
+			return var1 == 32767 ? -1 : var1; // L: 385
 		}
 	}
 
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-70655510"
+		descriptor = "(B)I",
+		garbageValue = "104"
 	)
 	@Export("readVarInt")
 	public int readVarInt() {
-		byte var1 = this.array[++this.offset - 1]; // L: 398
+		byte var1 = this.array[++this.offset - 1]; // L: 390
 
 		int var2;
-		for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 399 400 402
-			var2 = (var2 | var1 & 127) << 7; // L: 401
+		for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 391 392 394
+			var2 = (var2 | var1 & 127) << 7; // L: 393
 		}
 
-		return var2 | var1; // L: 404
+		return var2 | var1; // L: 396
 	}
 
-	@ObfuscatedName("bw")
-	@ObfuscatedSignature(
-		descriptor = "([II)V",
-		garbageValue = "-1937738349"
-	)
-	@Export("xteaEncryptAll")
-	public void xteaEncryptAll(int[] var1) {
-		int var2 = this.offset / 8; // L: 408
-		this.offset = 0; // L: 409
-
-		for (int var3 = 0; var3 < var2; ++var3) { // L: 410
-			int var4 = this.readInt(); // L: 411
-			int var5 = this.readInt(); // L: 412
-			int var6 = 0; // L: 413
-			int var7 = -1640531527; // L: 414
-
-			for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 415 416 419
-				var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 417
-				var6 += var7; // L: 418
-			}
-
-			this.offset -= 8; // L: 421
-			this.writeInt(var4); // L: 422
-			this.writeInt(var5); // L: 423
-		}
-
-	} // L: 425
-
-	@ObfuscatedName("bi")
-	@ObfuscatedSignature(
-		descriptor = "([II)V",
-		garbageValue = "1314548709"
-	)
-	@Export("xteaDecryptAll")
-	public void xteaDecryptAll(int[] var1) {
-		int var2 = this.offset / 8; // L: 428
-		this.offset = 0; // L: 429
-
-		for (int var3 = 0; var3 < var2; ++var3) { // L: 430
-			int var4 = this.readInt(); // L: 431
-			int var5 = this.readInt(); // L: 432
-			int var6 = -957401312; // L: 433
-			int var7 = -1640531527; // L: 434
-
-			for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 435 436 439
-				var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 437
-				var6 -= var7; // L: 438
-			}
-
-			this.offset -= 8; // L: 441
-			this.writeInt(var4); // L: 442
-			this.writeInt(var5); // L: 443
-		}
-
-	} // L: 445
-
-	@ObfuscatedName("bb")
-	@ObfuscatedSignature(
-		descriptor = "([IIIB)V",
-		garbageValue = "-6"
-	)
-	@Export("xteaEncrypt")
-	public void xteaEncrypt(int[] var1, int var2, int var3) {
-		int var4 = this.offset; // L: 448
-		this.offset = var2; // L: 449
-		int var5 = (var3 - var2) / 8; // L: 450
-
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 451
-			int var7 = this.readInt(); // L: 452
-			int var8 = this.readInt(); // L: 453
-			int var9 = 0; // L: 454
-			int var10 = -1640531527; // L: 455
-
-			for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 456 457 460
-				var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 458
-				var9 += var10; // L: 459
-			}
-
-			this.offset -= 8; // L: 462
-			this.writeInt(var7); // L: 463
-			this.writeInt(var8); // L: 464
-		}
-
-		this.offset = var4; // L: 466
-	} // L: 467
-
 	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
-		descriptor = "([IIII)V",
-		garbageValue = "141901592"
+		descriptor = "([IB)V",
+		garbageValue = "57"
 	)
-	@Export("xteaDecrypt")
-	public void xteaDecrypt(int[] var1, int var2, int var3) {
-		int var4 = this.offset; // L: 470
-		this.offset = var2; // L: 471
-		int var5 = (var3 - var2) / 8; // L: 472
+	@Export("xteaEncryptAll")
+	public void xteaEncryptAll(int[] var1) {
+		int var2 = this.offset / 8; // L: 400
+		this.offset = 0; // L: 401
 
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 473
-			int var7 = this.readInt(); // L: 474
-			int var8 = this.readInt(); // L: 475
-			int var9 = -957401312; // L: 476
-			int var10 = -1640531527; // L: 477
+		for (int var3 = 0; var3 < var2; ++var3) { // L: 402
+			int var4 = this.readInt(); // L: 403
+			int var5 = this.readInt(); // L: 404
+			int var6 = 0; // L: 405
+			int var7 = -1640531527; // L: 406
 
-			for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 478 479 482
-				var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 480
-				var9 -= var10; // L: 481
+			for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 407 408 411
+				var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 409
+				var6 += var7; // L: 410
 			}
 
-			this.offset -= 8; // L: 484
-			this.writeInt(var7); // L: 485
-			this.writeInt(var8); // L: 486
+			this.offset -= 8; // L: 413
+			this.writeInt(var4); // L: 414
+			this.writeInt(var5); // L: 415
 		}
 
-		this.offset = var4; // L: 488
-	} // L: 489
+	} // L: 417
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V",
-		garbageValue = "-1634492016"
+		descriptor = "([II)V",
+		garbageValue = "-2067473238"
 	)
-	@Export("encryptRsa")
-	public void encryptRsa(BigInteger var1, BigInteger var2) {
-		int var3 = this.offset; // L: 492
-		this.offset = 0; // L: 493
-		byte[] var4 = new byte[var3]; // L: 494
-		this.readBytes(var4, 0, var3); // L: 495
-		BigInteger var5 = new BigInteger(var4); // L: 496
-		BigInteger var6 = var5.modPow(var1, var2); // L: 497
-		byte[] var7 = var6.toByteArray(); // L: 498
-		this.offset = 0; // L: 499
-		this.writeShort(var7.length); // L: 500
-		this.writeBytes(var7, 0, var7.length); // L: 501
-	} // L: 502
+	@Export("xteaDecryptAll")
+	public void xteaDecryptAll(int[] var1) {
+		int var2 = this.offset / 8; // L: 420
+		this.offset = 0; // L: 421
 
-	@ObfuscatedName("by")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1065581057"
-	)
-	@Export("writeCrc")
-	public int writeCrc(int var1) {
-		byte[] var3 = this.array; // L: 506
-		int var4 = this.offset; // L: 507
-		int var5 = -1; // L: 509
+		for (int var3 = 0; var3 < var2; ++var3) { // L: 422
+			int var4 = this.readInt(); // L: 423
+			int var5 = this.readInt(); // L: 424
+			int var6 = -957401312; // L: 425
+			int var7 = -1640531527; // L: 426
 
-		for (int var6 = var1; var6 < var4; ++var6) { // L: 510
-			var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 511
+			for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 427 428 431
+				var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 429
+				var6 -= var7; // L: 430
+			}
+
+			this.offset -= 8; // L: 433
+			this.writeInt(var4); // L: 434
+			this.writeInt(var5); // L: 435
 		}
 
-		var5 = ~var5; // L: 513
-		this.writeInt(var5); // L: 517
-		return var5; // L: 518
-	}
+	} // L: 437
 
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1907450706"
+		descriptor = "([IIIB)V",
+		garbageValue = "-94"
 	)
-	@Export("checkCrc")
-	public boolean checkCrc() {
-		this.offset -= 4; // L: 522
-		int var1 = GrandExchangeOfferOwnWorldComparator.method1176(this.array, 0, this.offset); // L: 523
-		int var2 = this.readInt(); // L: 524
-		return var2 == var1; // L: 525
-	}
+	@Export("xteaEncrypt")
+	public void xteaEncrypt(int[] var1, int var2, int var3) {
+		int var4 = this.offset; // L: 440
+		this.offset = var2; // L: 441
+		int var5 = (var3 - var2) / 8; // L: 442
 
-	@ObfuscatedName("cd")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "43"
-	)
-	public void method6581(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 530
-	} // L: 531
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 443
+			int var7 = this.readInt(); // L: 444
+			int var8 = this.readInt(); // L: 445
+			int var9 = 0; // L: 446
+			int var10 = -1640531527; // L: 447
+
+			for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 448 449 452
+				var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 450
+				var9 += var10; // L: 451
+			}
+
+			this.offset -= 8; // L: 454
+			this.writeInt(var7); // L: 455
+			this.writeInt(var8); // L: 456
+		}
+
+		this.offset = var4; // L: 458
+	} // L: 459
 
 	@ObfuscatedName("cm")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1524887597"
+		descriptor = "([IIII)V",
+		garbageValue = "-1245486877"
 	)
-	public void method6584(int var1) {
-		this.array[++this.offset - 1] = (byte)(0 - var1); // L: 534
-	} // L: 535
+	@Export("xteaDecrypt")
+	public void xteaDecrypt(int[] var1, int var2, int var3) {
+		int var4 = this.offset; // L: 462
+		this.offset = var2; // L: 463
+		int var5 = (var3 - var2) / 8; // L: 464
 
-	@ObfuscatedName("cv")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "2052004397"
-	)
-	public void method6594(int var1) {
-		this.array[++this.offset - 1] = (byte)(128 - var1); // L: 538
-	} // L: 539
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 465
+			int var7 = this.readInt(); // L: 466
+			int var8 = this.readInt(); // L: 467
+			int var9 = -957401312; // L: 468
+			int var10 = -1640531527; // L: 469
 
-	@ObfuscatedName("cp")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "25540074"
-	)
-	public int method6595() {
-		return this.array[++this.offset - 1] - 128 & 255; // L: 542
-	}
+			for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 470 471 474
+				var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 472
+				var9 -= var10; // L: 473
+			}
 
-	@ObfuscatedName("ci")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-834329867"
-	)
-	public int method6671() {
-		return 0 - this.array[++this.offset - 1] & 255; // L: 546
-	}
+			this.offset -= 8; // L: 476
+			this.writeInt(var7); // L: 477
+			this.writeInt(var8); // L: 478
+		}
 
-	@ObfuscatedName("ct")
+		this.offset = var4; // L: 480
+	} // L: 481
+
+	@ObfuscatedName("cx")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1690497653"
+		descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V",
+		garbageValue = "421245278"
 	)
-	public int method6549() {
-		return 128 - this.array[++this.offset - 1] & 255; // L: 550
-	}
+	@Export("encryptRsa")
+	public void encryptRsa(BigInteger var1, BigInteger var2) {
+		int var3 = this.offset; // L: 484
+		this.offset = 0; // L: 485
+		byte[] var4 = new byte[var3]; // L: 486
+		this.readBytes(var4, 0, var3); // L: 487
+		BigInteger var5 = new BigInteger(var4); // L: 488
+		BigInteger var6 = var5.modPow(var1, var2); // L: 489
+		byte[] var7 = var6.toByteArray(); // L: 490
+		this.offset = 0; // L: 491
+		this.writeShort(var7.length); // L: 492
+		this.writeBytes(var7, 0, var7.length); // L: 493
+	} // L: 494
 
 	@ObfuscatedName("cq")
 	@ObfuscatedSignature(
-		descriptor = "(I)B",
-		garbageValue = "-2114811487"
+		descriptor = "(II)I",
+		garbageValue = "2115415090"
 	)
-	public byte method6597() {
-		return (byte)(this.array[++this.offset - 1] - 128); // L: 554
+	@Export("writeCrc")
+	public int writeCrc(int var1) {
+		byte[] var3 = this.array; // L: 498
+		int var4 = this.offset; // L: 499
+		int var5 = -1; // L: 501
+
+		for (int var6 = var1; var6 < var4; ++var6) { // L: 502
+			var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 503
+		}
+
+		var5 = ~var5; // L: 505
+		this.writeInt(var5); // L: 509
+		return var5; // L: 510
 	}
 
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cz")
 	@ObfuscatedSignature(
-		descriptor = "(B)B",
-		garbageValue = "0"
+		descriptor = "(B)Z",
+		garbageValue = "87"
 	)
-	public byte method6593() {
-		return (byte)(0 - this.array[++this.offset - 1]); // L: 558
+	@Export("checkCrc")
+	public boolean checkCrc() {
+		this.offset -= 4; // L: 514
+		byte[] var2 = this.array; // L: 516
+		int var3 = this.offset; // L: 517
+		int var4 = -1; // L: 519
+
+		int var5;
+		for (var5 = 0; var5 < var3; ++var5) { // L: 520
+			var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; // L: 521
+		}
+
+		var4 = ~var4; // L: 523
+		var5 = this.readInt(); // L: 527
+		return var5 == var4; // L: 528
+	}
+
+	@ObfuscatedName("cc")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "107"
+	)
+	public void method6639(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 533
+	} // L: 534
+
+	@ObfuscatedName("cu")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "402503906"
+	)
+	public void method6640(int var1) {
+		this.array[++this.offset - 1] = (byte)(0 - var1); // L: 537
+	} // L: 538
+
+	@ObfuscatedName("cp")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-2121768907"
+	)
+	public void method6641(int var1) {
+		this.array[++this.offset - 1] = (byte)(128 - var1); // L: 541
+	} // L: 542
+
+	@ObfuscatedName("cv")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "1750858252"
+	)
+	public int method6642() {
+		return this.array[++this.offset - 1] - 128 & 255; // L: 545
 	}
 
 	@ObfuscatedName("cf")
 	@ObfuscatedSignature(
-		descriptor = "(I)B",
-		garbageValue = "15855750"
+		descriptor = "(I)I",
+		garbageValue = "505032315"
 	)
-	public byte method6559() {
-		return (byte)(128 - this.array[++this.offset - 1]); // L: 562
+	public int method6643() {
+		return 0 - this.array[++this.offset - 1] & 255; // L: 549
 	}
 
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cb")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1659882221"
+		descriptor = "(I)I",
+		garbageValue = "-1048113331"
 	)
-	public void method6600(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 566
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 567
-	} // L: 568
-
-	@ObfuscatedName("cs")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-2003773273"
-	)
-	public void method6619(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 571
-		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 572
-	} // L: 573
+	public int method6644() {
+		return 128 - this.array[++this.offset - 1] & 255; // L: 553
+	}
 
 	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "58"
+		descriptor = "(I)B",
+		garbageValue = "258773489"
 	)
-	public void method6602(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 576
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 577
-	} // L: 578
+	public byte method6619() {
+		return (byte)(this.array[++this.offset - 1] - 128); // L: 557
+	}
+
+	@ObfuscatedName("ca")
+	@ObfuscatedSignature(
+		descriptor = "(I)B",
+		garbageValue = "-646501277"
+	)
+	public byte method6682() {
+		return (byte)(0 - this.array[++this.offset - 1]); // L: 561
+	}
+
+	@ObfuscatedName("cd")
+	@ObfuscatedSignature(
+		descriptor = "(I)B",
+		garbageValue = "-637934068"
+	)
+	public byte method6750() {
+		return (byte)(128 - this.array[++this.offset - 1]); // L: 565
+	}
+
+	@ObfuscatedName("ce")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-162656200"
+	)
+	public void method6648(int var1) {
+		this.array[++this.offset - 1] = (byte)var1; // L: 569
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 570
+	} // L: 571
+
+	@ObfuscatedName("cy")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "1"
+	)
+	public void method6705(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 574
+		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 575
+	} // L: 576
+
+	@ObfuscatedName("ct")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1684628461"
+	)
+	public void method6649(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 579
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 580
+	} // L: 581
+
+	@ObfuscatedName("ci")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1073030167"
+	)
+	public int method6651() {
+		this.offset += 2; // L: 584
+		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 585
+	}
+
+	@ObfuscatedName("cs")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-245391743"
+	)
+	public int method6652() {
+		this.offset += 2; // L: 589
+		return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 590
+	}
 
 	@ObfuscatedName("co")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "429131059"
+		garbageValue = "2016753913"
 	)
-	public int method6603() {
-		this.offset += 2; // L: 581
-		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 582
-	}
-
-	@ObfuscatedName("ck")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "777271421"
-	)
-	public int method6604() {
-		this.offset += 2; // L: 586
-		return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 587
+	public int method6653() {
+		this.offset += 2; // L: 594
+		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 595
 	}
 
 	@ObfuscatedName("cj")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1551850883"
+		garbageValue = "-318250344"
 	)
-	public int method6605() {
-		this.offset += 2; // L: 591
-		return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 592
-	}
-
-	@ObfuscatedName("cc")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-896578435"
-	)
-	public int method6621() {
-		this.offset += 2; // L: 596
-		int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 597
-		if (var1 > 32767) { // L: 598
+	public int method6654() {
+		this.offset += 2; // L: 599
+		int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 600
+		if (var1 > 32767) { // L: 601
 			var1 -= 65536;
 		}
 
-		return var1; // L: 599
+		return var1; // L: 602
 	}
 
-	@ObfuscatedName("cu")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1905667053"
-	)
-	public int method6661() {
-		this.offset += 2; // L: 603
-		int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 604
-		if (var1 > 32767) { // L: 605
-			var1 -= 65536;
-		}
-
-		return var1; // L: 606
-	}
-
-	@ObfuscatedName("cz")
+	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-111"
+		garbageValue = "84"
 	)
-	public int method6726() {
-		this.offset += 2; // L: 610
-		int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 611
-		if (var1 > 32767) { // L: 612
+	public int method6757() {
+		this.offset += 2; // L: 606
+		int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 607
+		if (var1 > 32767) { // L: 608
 			var1 -= 65536;
 		}
 
-		return var1; // L: 613
-	}
-
-	@ObfuscatedName("cb")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "643572871"
-	)
-	public void method6758(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 617
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 618
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 619
-	} // L: 620
-
-	@ObfuscatedName("ce")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1373250265"
-	)
-	public int method6610() {
-		this.offset += 3; // L: 623
-		return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); // L: 624
-	}
-
-	@ObfuscatedName("ch")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1878732628"
-	)
-	public void method6611(int var1) {
-		this.array[++this.offset - 1] = (byte)var1; // L: 628
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 629
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 630
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 631
-	} // L: 632
-
-	@ObfuscatedName("cy")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "2"
-	)
-	public void method6612(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 635
-		this.array[++this.offset - 1] = (byte)var1; // L: 636
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 637
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 638
-	} // L: 639
-
-	@ObfuscatedName("cx")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "410819013"
-	)
-	@Export("writeIntME")
-	public void writeIntME(int var1) {
-		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 642
-		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 643
-		this.array[++this.offset - 1] = (byte)var1; // L: 644
-		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 645
-	} // L: 646
-
-	@ObfuscatedName("ca")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1347830086"
-	)
-	public int method6613() {
-		this.offset += 4; // L: 649
-		return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 650
+		return var1; // L: 609
 	}
 
 	@ObfuscatedName("cl")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1599322510"
+		descriptor = "(II)V",
+		garbageValue = "-548315775"
 	)
-	public int method6614() {
-		this.offset += 4; // L: 654
-		return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 655
-	}
+	public void method6660(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 613
+		this.array[++this.offset - 1] = (byte)var1; // L: 614
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 615
+	} // L: 616
 
 	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-248188143"
+		descriptor = "(II)V",
+		garbageValue = "-1682759664"
 	)
-	public int method6598() {
-		this.offset += 4; // L: 659
-		return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 660
+	@Export("writeIntME")
+	public void writeIntME(int var1) {
+		this.array[++this.offset - 1] = (byte)var1; // L: 619
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 620
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 621
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 622
+	} // L: 623
+
+	@ObfuscatedName("ck")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1397915031"
+	)
+	public void method6658(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 626
+		this.array[++this.offset - 1] = (byte)var1; // L: 627
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 628
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 629
+	} // L: 630
+
+	@ObfuscatedName("cn")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-553744545"
+	)
+	public void method6659(int var1) {
+		this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 633
+		this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 634
+		this.array[++this.offset - 1] = (byte)var1; // L: 635
+		this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 636
+	} // L: 637
+
+	@ObfuscatedName("ch")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "1763340179"
+	)
+	public int method6675() {
+		this.offset += 4; // L: 640
+		return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 641
+	}
+
+	@ObfuscatedName("du")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "51"
+	)
+	public int method6725() {
+		this.offset += 4; // L: 645
+		return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 646
 	}
 
 	@ObfuscatedName("db")
 	@ObfuscatedSignature(
-		descriptor = "([BIIS)V",
-		garbageValue = "21226"
+		descriptor = "(I)I",
+		garbageValue = "-638503855"
 	)
-	public void method6677(byte[] var1, int var2, int var3) {
-		for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 664
-			var1[var4] = (byte)(this.array[++this.offset - 1] - 128);
+	public int method6662() {
+		this.offset += 4; // L: 650
+		return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 651
+	}
+
+	@ObfuscatedName("dm")
+	@ObfuscatedSignature(
+		descriptor = "([BIII)V",
+		garbageValue = "-954433939"
+	)
+	public void method6821(byte[] var1, int var2, int var3) {
+		for (int var4 = var2; var4 < var3 + var2; ++var4) {
+			var1[var4] = (byte)(this.array[++this.offset - 1] - 128); // L: 655
 		}
 
-	} // L: 665
+	} // L: 656
 }
diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java
index 7f6cdfb9b0..4b30cffd17 100644
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nf")
+@ObfuscatedName("na")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lnm;"
+		descriptor = "Lnp;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("readBuffer")
 	byte[] readBuffer;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = 4024474701341933375L
+		longValue = 1625805143389921353L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1725800063
+		intValue = -1336939793
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 8737860925507049089L
+		longValue = -8547575166494072957L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -97062741
+		intValue = -1991100171
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		longValue = -3326324260793149209L
+		longValue = -3424275237197031151L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = -6829996619110357721L
+		longValue = 4274241302856356315L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		longValue = 3454228653685997387L
+		longValue = -5713730759396535535L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		longValue = 1780782613106431365L
+		longValue = -9215570933618315831L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnm;II)V"
+		descriptor = "(Lnp;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L; // L: 9
@@ -84,10 +84,10 @@ public class BufferedFile {
 		this.offset = 0L; // L: 24
 	} // L: 25
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "116"
+		descriptor = "(I)V",
+		garbageValue = "-1059998601"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close(); // L: 29
 	} // L: 30
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) { // L: 33
@@ -105,10 +105,10 @@ public class BufferedFile {
 		}
 	} // L: 35
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)J",
-		garbageValue = "17"
+		descriptor = "(I)J",
+		garbageValue = "-1576818774"
 	)
 	@Export("length")
 	public long length() {
@@ -118,17 +118,17 @@ public class BufferedFile {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "([BB)V",
-		garbageValue = "-4"
+		garbageValue = "-110"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "1635241805"
+		garbageValue = "16711680"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48
+			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49
 				this.offset += (long)var3; // L: 50
 				return; // L: 51
@@ -146,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset; // L: 53
 			int var7 = var3; // L: 55
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 56
+			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57
 				if (var8 > var3) { // L: 58
 					var8 = var3;
@@ -184,7 +184,7 @@ public class BufferedFile {
 				this.offset += (long)var8; // L: 83
 			}
 
-			if (-1L != this.writeBufferOffset) { // L: 85
+			if (this.writeBufferOffset != -1L) { // L: 85
 				if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86
 					var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87
 					if (var8 > var3 + var2) { // L: 88
@@ -202,13 +202,13 @@ public class BufferedFile {
 				long var10 = -1L; // L: 96
 				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { // L: 97
 					var13 = this.writeBufferOffset; // L: 98
-				} else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100
+				} else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 100
 					var13 = var4; // L: 101
 				}
 
 				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { // L: 103
-					var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104
-				} else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 106
+					var10 = (long)this.writeBufferLength + this.writeBufferOffset; // L: 104
+				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106
 					var10 = var4 + (long)var7; // L: 107
 				}
 
@@ -231,15 +231,15 @@ public class BufferedFile {
 		}
 	} // L: 125
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "104"
+		descriptor = "(I)V",
+		garbageValue = "537841417"
 	)
 	@Export("load")
 	void load() throws IOException {
 		this.readBufferLength = 0; // L: 128
-		if (this.offset != this.fileOffset) { // L: 129
+		if (this.fileOffset != this.offset) { // L: 129
 			this.accessFile.seek(this.offset); // L: 130
 			this.fileOffset = this.offset; // L: 131
 		}
@@ -261,10 +261,10 @@ public class BufferedFile {
 
 	} // L: 142
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "231162903"
+		garbageValue = "-1975796753"
 	)
 	@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 (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) { // L: 147
+			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147
 				this.flush(); // L: 148
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset + (long)var3 > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150
+			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { // L: 150
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152
 				this.offset += (long)var4; // L: 153
@@ -289,7 +289,7 @@ public class BufferedFile {
 
 			if (var3 <= this.writeBuffer.length) { // L: 159
 				if (var3 > 0) { // L: 188
-					if (-1L == this.writeBufferOffset) { // L: 189
+					if (this.writeBufferOffset == -1L) { // L: 189
 						this.writeBufferOffset = this.offset;
 					}
 
@@ -301,7 +301,7 @@ public class BufferedFile {
 
 				}
 			} else {
-				if (this.fileOffset != this.offset) { // L: 160
+				if (this.offset != this.fileOffset) { // L: 160
 					this.accessFile.seek(this.offset); // L: 161
 					this.fileOffset = this.offset; // L: 162
 				}
@@ -314,16 +314,16 @@ public class BufferedFile {
 
 				long var9 = -1L; // L: 167
 				long var6 = -1L; // L: 168
-				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { // L: 169
+				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169
 					var9 = this.offset; // L: 170
 				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { // L: 172
 					var9 = this.readBufferOffset; // L: 173
 				}
 
 				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175
-					var6 = this.offset + (long)var3; // L: 176
-				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { // L: 178
-					var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179
+					var6 = (long)var3 + this.offset; // L: 176
+				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { // L: 178
+					var6 = (long)this.readBufferLength + this.readBufferOffset; // L: 179
 				}
 
 				if (var9 > -1L && var6 > var9) { // L: 181
@@ -339,37 +339,37 @@ public class BufferedFile {
 		}
 	} // L: 186 193 200
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1231168990"
+		garbageValue = "715951043"
 	)
 	@Export("flush")
 	void flush() throws IOException {
-		if (this.writeBufferOffset != -1L) { // L: 203
-			if (this.fileOffset != this.writeBufferOffset) { // L: 204
+		if (-1L != this.writeBufferOffset) { // L: 203
+			if (this.writeBufferOffset != this.fileOffset) { // L: 204
 				this.accessFile.seek(this.writeBufferOffset); // L: 205
 				this.fileOffset = this.writeBufferOffset; // L: 206
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208
-			this.fileOffset += (long)this.writeBufferLength * -27464314403160063L; // L: 209
+			this.fileOffset += (long)this.writeBufferLength * -3518850809938837503L; // L: 209
 			if (this.fileOffset > this.fileLength) { // L: 210
 				this.fileLength = this.fileOffset;
 			}
 
 			long var1 = -1L; // L: 211
 			long var3 = -1L; // L: 212
-			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { // L: 213
+			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213
 				var1 = this.writeBufferOffset; // L: 214
-			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { // L: 216
+			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216
 				var1 = this.readBufferOffset; // L: 217
 			}
 
-			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { // L: 219
 				var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220
-			} else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 222
-				var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223
+			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222
+				var3 = this.readBufferOffset + (long)this.readBufferLength; // L: 223
 			}
 
 			if (var1 > -1L && var3 > var1) { // L: 225
@@ -382,13 +382,4 @@ public class BufferedFile {
 		}
 
 	} // L: 232
-
-	@ObfuscatedName("ah")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-387323412"
-	)
-	public static int method6418(String var0) {
-		return var0.length() + 2; // L: 126
-	}
 }
diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java
index 76f514ca4b..8ff45f7c0d 100644
--- 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("lg")
+@ObfuscatedName("ll")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Llw;"
+		descriptor = "Llx;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lle;"
+		descriptor = "Llv;"
 	)
 	@Export("sink")
 	BufferedSink sink;
 
-	public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
+	BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
 		this.socket = var1; // L: 12
 		this.socket.setSoTimeout(30000); // L: 13
 		this.socket.setTcpNoDelay(true); // L: 14
@@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18
 	} // L: 19
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1654713390"
+		garbageValue = "1854440694"
 	)
 	@Export("close")
 	public void close() {
@@ -45,26 +45,26 @@ public class BufferedNetSocket extends AbstractSocket {
 
 		try {
 			this.socket.close(); // L: 44
-		} catch (IOException var2) { // L: 46
+		} catch (IOException var2) {
 		}
 
 		this.source.close(); // L: 47
 	} // L: 48
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "479468921"
+		garbageValue = "574875272"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte(); // L: 30
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1659206769"
+		garbageValue = "-2063198043"
 	)
 	@Export("available")
 	public int available() throws IOException {
@@ -74,27 +74,27 @@ public class BufferedNetSocket extends AbstractSocket {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-211935081"
+		garbageValue = "-2019948581"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1); // L: 22
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "-2041736219"
+		garbageValue = "-334344092"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3); // L: 34
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "263213011"
+		garbageValue = "-1206684972"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
@@ -104,4 +104,13 @@ public class BufferedNetSocket extends AbstractSocket {
 	protected void finalize() {
 		this.close(); // L: 51
 	} // L: 52
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Lba;I)V",
+		garbageValue = "-812181835"
+	)
+	public static final void method5960(PlayerProvider var0) {
+		FontName.pcmPlayerProvider = var0; // L: 45
+	} // L: 46
 }
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index 7e794ad3ec..b612cf3bf2 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -5,41 +5,42 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("le")
+@ObfuscatedName("lv")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 255745785
+		intValue = 992988875
 	)
 	@Export("capacity")
 	int capacity;
 	@ObfuscatedName("y")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1232062539
+		intValue = 1280134095
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 956656333
+		intValue = -1968641393
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("closed")
 	boolean closed;
 
@@ -54,10 +55,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start(); // L: 197
 	} // L: 198
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "1"
+		descriptor = "(I)Z",
+		garbageValue = "-1288409472"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -79,10 +80,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "1271901026"
+		garbageValue = "-765694644"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -119,10 +120,10 @@ public class BufferedSink implements Runnable {
 		}
 	} // L: 279
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "21"
+		garbageValue = "70"
 	)
 	@Export("close")
 	void close() {
@@ -197,4 +198,75 @@ public class BufferedSink implements Runnable {
 		} while(!this.isClosed()); // L: 256
 
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "14"
+	)
+	static int method5990(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) { // L: 804
+			var0 -= 1000; // L: 805
+			var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 806
+		} else {
+			var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 808
+		}
+
+		Script.invalidateWidget(var3); // L: 809
+		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 810
+			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 830
+				var3.modelType = 2; // L: 831
+				var3.modelId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 832
+				return 1; // L: 833
+			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 835
+				var3.modelType = 3; // L: 836
+				var3.modelId = class262.localPlayer.appearance.getChatHeadId(); // L: 837
+				return 1; // L: 838
+			} else {
+				return 2; // L: 840
+			}
+		} else {
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 811
+			int var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 812
+			int var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 813
+			var3.itemId = var4; // L: 814
+			var3.itemQuantity = var5; // L: 815
+			ItemComposition var6 = class250.ItemDefinition_get(var4); // L: 816
+			var3.modelAngleX = var6.xan2d; // L: 817
+			var3.modelAngleY = var6.yan2d; // L: 818
+			var3.modelAngleZ = var6.zan2d; // L: 819
+			var3.modelOffsetX = var6.offsetX2d; // L: 820
+			var3.modelOffsetY = var6.offsetY2d; // L: 821
+			var3.modelZoom = var6.zoom2d; // L: 822
+			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { // L: 823
+				var3.itemQuantityMode = 0;
+			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 824
+				var3.itemQuantityMode = 1;
+			} else {
+				var3.itemQuantityMode = 2; // L: 825
+			}
+
+			if (var3.field3011 > 0) { // L: 826
+				var3.modelZoom = var3.modelZoom * 32 / var3.field3011;
+			} else if (var3.rawWidth > 0) { // L: 827
+				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
+			}
+
+			return 1; // L: 828
+		}
+	}
+
+	@ObfuscatedName("gf")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-452745506"
+	)
+	static void method5992() {
+		PacketBufferNode var0 = InterfaceParent.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); // L: 4412
+		var0.packetBuffer.writeByte(class302.getWindowedMode()); // L: 4413
+		var0.packetBuffer.writeShort(AttackOption.canvasWidth); // L: 4414
+		var0.packetBuffer.writeShort(class0.canvasHeight); // L: 4415
+		Client.packetWriter.addNode(var0); // L: 4416
+	} // L: 4417
 }
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index 7e928d1dc6..8077ea5d14 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lw")
+@ObfuscatedName("lx")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1742068389
+		intValue = 285742319
 	)
 	@Export("capacity")
 	int capacity;
 	@ObfuscatedName("y")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -189496199
+		intValue = 931339893
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1909735131
+		intValue = 1604249391
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("exception")
 	IOException exception;
 
@@ -52,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start(); // L: 69
 	} // L: 70
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "6"
+		descriptor = "(II)Z",
+		garbageValue = "-604765371"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-2046252752"
+		garbageValue = "359780647"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,15 +110,15 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "963599553"
+		descriptor = "(B)I",
+		garbageValue = "-58"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
 		synchronized(this) { // L: 135
-			if (this.position == this.limit) { // L: 136
+			if (this.limit == this.position) { // L: 136
 				if (this.exception != null) { // L: 137
 					throw new IOException(this.exception.toString());
 				} else {
@@ -136,7 +136,7 @@ public class BufferedSource implements Runnable {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)I",
-		garbageValue = "-989264976"
+		garbageValue = "315483925"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "715878078"
+		descriptor = "(B)V",
+		garbageValue = "107"
 	)
 	@Export("close")
 	void close() {
@@ -244,21 +244,30 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("fx")
+	@ObfuscatedName("jw")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "1648779145"
+		descriptor = "(IIIIII)V",
+		garbageValue = "-855272666"
 	)
-	@Export("queueSoundEffect")
-	static void queueSoundEffect(int var0, int var1, int var2) {
-		if (ObjectComposition.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3376
-			Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3377
-			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3378
-			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3379
-			Client.soundEffects[Client.soundEffectCount] = null; // L: 3380
-			Client.soundLocations[Client.soundEffectCount] = 0; // L: 3381
-			++Client.soundEffectCount; // L: 3382
+	@Export("drawScrollBar")
+	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+		Client.scrollBarSprites[0].drawAt(var0, var1); // L: 10033
+		Client.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10034
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field685); // L: 10035
+		int var5 = var3 * (var3 - 32) / var4; // L: 10036
+		if (var5 < 8) { // L: 10037
+			var5 = 8;
 		}
 
-	} // L: 3384
+		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10038
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field686); // L: 10039
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field688); // L: 10040
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field688); // L: 10041
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field688); // L: 10042
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field688); // L: 10043
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field818); // L: 10044
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field818); // L: 10045
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field818); // L: 10046
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field818); // L: 10047
+	} // L: 10048
 }
diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java
index abe9163a95..cc2e626dbd 100644
--- a/runescape-client/src/main/java/ByteArrayNode.java
+++ b/runescape-client/src/main/java/ByteArrayNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("mn")
+@ObfuscatedName("mi")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("byteArray")
 	public byte[] byteArray;
 
diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java
index 304ae9dd67..c3f4f2ac0e 100644
--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -4,42 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ke")
+@ObfuscatedName("ky")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1219327977
+		intValue = -679236325
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1748405633
+		intValue = 664960087
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 434807287
+		intValue = 1131523735
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
 	@ObfuscatedName("y")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("r")
-	@Export("ByteArrayPool_alternativeSizes")
-	static int[] ByteArrayPool_alternativeSizes;
-	@ObfuscatedName("b")
-	@Export("ByteArrayPool_altSizeArrayCounts")
-	static int[] ByteArrayPool_altSizeArrayCounts;
 
 	static {
 		ByteArrayPool_smallCount = 0; // L: 4
@@ -50,80 +44,90 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][]; // L: 9
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(IZB)[B",
-		garbageValue = "100"
+		garbageValue = "-120"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
 		byte[] var4;
-		if (var0 != 100) { // L: 35
+		if (var0 != 100) { // L: 20
 			if (var0 < 100) {
 			}
 		} else if (ByteArrayPool_smallCount > 0) {
-			var4 = ByteArrayPool_small[--ByteArrayPool_smallCount];
-			ByteArrayPool_small[ByteArrayPool_smallCount] = null;
-			return var4;
+			var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 21
+			ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 22
+			return var4; // L: 23
 		}
 
-		if (var0 != 5000) { // L: 40
+		if (var0 != 5000) { // L: 25
 			if (var0 < 5000) {
 			}
 		} else if (ByteArrayPool_mediumCount > 0) {
-			var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount];
-			ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 42
-			return var4;
+			var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 26
+			ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 27
+			return var4; // L: 28
 		}
 
-		if (var0 != 30000) {
+		if (var0 != 30000) { // L: 30
 			if (var0 < 30000) {
 			}
 		} else if (ByteArrayPool_largeCount > 0) {
-			var4 = ByteArrayPool_large[--ByteArrayPool_largeCount];
-			ByteArrayPool_large[ByteArrayPool_largeCount] = null;
-			return var4; // L: 48
+			var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 31
+			ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 32
+			return var4; // L: 33
 		}
 
-		if (class20.ByteArrayPool_arrays != null) { // L: 50
-			for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51
-				if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52
-					if (var0 < ByteArrayPool_alternativeSizes[var2]) {
+		if (Tiles.ByteArrayPool_arrays != null) { // L: 35
+			for (int var2 = 0; var2 < class372.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 36
+				if (class372.ByteArrayPool_alternativeSizes[var2] != var0) { // L: 37
+					if (var0 < class372.ByteArrayPool_alternativeSizes[var2]) {
 					}
-				} else if (ByteArrayPool_altSizeArrayCounts[var2] > 0) {
-					byte[] var3 = class20.ByteArrayPool_arrays[var2][--ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53
-					class20.ByteArrayPool_arrays[var2][ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54
-					return var3; // L: 55
+				} else if (WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var2] > 0) {
+					byte[] var3 = Tiles.ByteArrayPool_arrays[var2][--WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var2]]; // L: 38
+					Tiles.ByteArrayPool_arrays[var2][WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var2]] = null;
+					return var3;
 				}
 			}
 		}
 
-		return new byte[var0]; // L: 68
+		return new byte[var0];
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;ZB)[B",
-		garbageValue = "-76"
+		descriptor = "(IIIII)V",
+		garbageValue = "-194411465"
 	)
-	public static byte[] method5573(Object var0, boolean var1) {
-		if (var0 == null) { // L: 30
-			return null;
-		} else if (var0 instanceof byte[]) { // L: 31
-			byte[] var6 = (byte[])((byte[])var0); // L: 32
-			if (var1) { // L: 33
-				int var4 = var6.length; // L: 36
-				byte[] var5 = new byte[var4]; // L: 37
-				System.arraycopy(var6, 0, var5, 0, var4); // L: 38
-				return var5; // L: 41
-			} else {
-				return var6; // L: 43
-			}
-		} else if (var0 instanceof AbstractByteArrayCopier) { // L: 45
-			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 46
-			return var2.get(); // L: 47
-		} else {
-			throw new IllegalArgumentException(); // L: 49
+	@Export("itemContainerSetItem")
+	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
+		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39
+		if (var4 == null) { // L: 40
+			var4 = new ItemContainer(); // L: 41
+			ItemContainer.itemContainers.put(var4, (long)var0); // L: 42
 		}
-	}
+
+		if (var4.ids.length <= var1) { // L: 44
+			int[] var5 = new int[var1 + 1]; // L: 45
+			int[] var6 = new int[var1 + 1]; // L: 46
+
+			int var7;
+			for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
+				var5[var7] = var4.ids[var7]; // L: 48
+				var6[var7] = var4.quantities[var7]; // L: 49
+			}
+
+			for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
+				var5[var7] = -1; // L: 52
+				var6[var7] = 0; // L: 53
+			}
+
+			var4.ids = var5; // L: 55
+			var4.quantities = var6; // L: 56
+		}
+
+		var4.ids[var1] = var2; // L: 58
+		var4.quantities[var1] = var3; // L: 59
+	} // L: 60
 }
diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java
index 644c819e53..678f85792a 100644
--- a/runescape-client/src/main/java/Calendar.java
+++ b/runescape-client/src/main/java/Calendar.java
@@ -2,208 +2,24 @@ import java.util.TimeZone;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ip")
+@ObfuscatedName("ic")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("DAYS_OF_THE_WEEK")
 	public static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("Calendar_calendar")
 	public static java.util.Calendar Calendar_calendar;
-	@ObfuscatedName("p")
-	@Export("SpriteBuffer_yOffsets")
-	public static int[] SpriteBuffer_yOffsets;
 
 	static {
 		MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 7
 		DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 17
 		java.util.Calendar.getInstance(); // L: 21
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); // L: 22
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkk;I)I",
-		garbageValue = "61619413"
-	)
-	@Export("compareStrings")
-	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
-		int var3 = var0.length(); // L: 11
-		int var4 = var1.length(); // L: 12
-		int var5 = 0; // L: 13
-		int var6 = 0; // L: 14
-		char var7 = 0; // L: 15
-		char var8 = 0; // L: 16
-
-		while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18
-			if (var5 - var7 >= var3) { // L: 19
-				return -1;
-			}
-
-			if (var6 - var8 >= var4) { // L: 20
-				return 1;
-			}
-
-			char var9;
-			if (var7 != 0) { // L: 23
-				var9 = var7; // L: 24
-				boolean var14 = false; // L: 25
-			} else {
-				var9 = var0.charAt(var5++); // L: 27
-			}
-
-			char var10;
-			if (var8 != 0) { // L: 28
-				var10 = var8; // L: 29
-				boolean var15 = false; // L: 30
-			} else {
-				var10 = var1.charAt(var6++); // L: 32
-			}
-
-			var7 = MusicPatchPcmStream.method4620(var9); // L: 33
-			var8 = MusicPatchPcmStream.method4620(var10); // L: 34
-			var9 = standardizeChar(var9, var2); // L: 35
-			var10 = standardizeChar(var10, var2); // L: 36
-			if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 37
-				var9 = Character.toLowerCase(var9); // L: 38
-				var10 = Character.toLowerCase(var10); // L: 39
-				if (var9 != var10) { // L: 40
-					return WorldMapLabelSize.lowercaseChar(var9, var2) - WorldMapLabelSize.lowercaseChar(var10, var2);
-				}
-			}
-		}
-
-		int var16 = Math.min(var3, var4); // L: 43
-
-		char var12;
-		int var17;
-		for (var17 = 0; var17 < var16; ++var17) { // L: 44
-			if (var2 == Language.Language_FR) { // L: 45
-				var5 = var3 - 1 - var17; // L: 46
-				var6 = var4 - 1 - var17; // L: 47
-			} else {
-				var6 = var17; // L: 49
-				var5 = var17;
-			}
-
-			char var11 = var0.charAt(var5); // L: 50
-			var12 = var1.charAt(var6); // L: 51
-			if (var11 != var12 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { // L: 52
-				var11 = Character.toLowerCase(var11); // L: 53
-				var12 = Character.toLowerCase(var12); // L: 54
-				if (var12 != var11) { // L: 55
-					return WorldMapLabelSize.lowercaseChar(var11, var2) - WorldMapLabelSize.lowercaseChar(var12, var2);
-				}
-			}
-		}
-
-		var17 = var3 - var4; // L: 58
-		if (var17 != 0) { // L: 59
-			return var17;
-		} else {
-			for (int var18 = 0; var18 < var16; ++var18) { // L: 60
-				var12 = var0.charAt(var18); // L: 61
-				char var13 = var1.charAt(var18); // L: 62
-				if (var13 != var12) { // L: 63
-					return WorldMapLabelSize.lowercaseChar(var12, var2) - WorldMapLabelSize.lowercaseChar(var13, var2);
-				}
-			}
-
-			return 0; // L: 65
-		}
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(CLkk;I)C",
-		garbageValue = "-1670785567"
-	)
-	@Export("standardizeChar")
-	static char standardizeChar(char var0, Language var1) {
-		if (var0 >= 192 && var0 <= 255) { // L: 69
-			if (var0 >= 192 && var0 <= 198) { // L: 70
-				return 'A';
-			}
-
-			if (var0 == 199) { // L: 71
-				return 'C';
-			}
-
-			if (var0 >= 200 && var0 <= 203) { // L: 72
-				return 'E';
-			}
-
-			if (var0 >= 204 && var0 <= 207) { // L: 73
-				return 'I';
-			}
-
-			if (var0 == 209 && var1 != Language.Language_ES) { // L: 74
-				return 'N';
-			}
-
-			if (var0 >= 210 && var0 <= 214) { // L: 75
-				return 'O';
-			}
-
-			if (var0 >= 217 && var0 <= 220) { // L: 76
-				return 'U';
-			}
-
-			if (var0 == 221) { // L: 77
-				return 'Y';
-			}
-
-			if (var0 == 223) { // L: 78
-				return 's';
-			}
-
-			if (var0 >= 224 && var0 <= 230) { // L: 79
-				return 'a';
-			}
-
-			if (var0 == 231) { // L: 80
-				return 'c';
-			}
-
-			if (var0 >= 232 && var0 <= 235) { // L: 81
-				return 'e';
-			}
-
-			if (var0 >= 236 && var0 <= 239) {
-				return 'i'; // L: 82
-			}
-
-			if (var0 == 241 && var1 != Language.Language_ES) { // L: 83
-				return 'n';
-			}
-
-			if (var0 >= 242 && var0 <= 246) { // L: 84
-				return 'o';
-			}
-
-			if (var0 >= 249 && var0 <= 252) { // L: 85
-				return 'u';
-			}
-
-			if (var0 == 253 || var0 == 255) { // L: 86
-				return 'y';
-			}
-		}
-
-		if (var0 == 338) { // L: 88
-			return 'O';
-		} else if (var0 == 339) { // L: 89
-			return 'o';
-		} else if (var0 == 376) { // L: 90
-			return 'Y';
-		} else {
-			return var0; // L: 91
-		}
-	}
+	} // L: 23
 }
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index 547e732dc8..78275abd83 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -1,23 +1,29 @@
 import java.awt.Component;
 import java.awt.Graphics;
-import java.io.File;
-import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ac")
+@ObfuscatedName("aj")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("tf")
+	@ObfuscatedName("o")
+	@Export("SpriteBuffer_spriteWidths")
+	public static int[] SpriteBuffer_spriteWidths;
+	@ObfuscatedName("hw")
 	@ObfuscatedGetter(
-		intValue = 1846107143
+		intValue = -216533437
 	)
-	@Export("foundItemIndex")
-	static int foundItemIndex;
-	@ObfuscatedName("v")
+	@Export("cameraZ")
+	static int cameraZ;
+	@ObfuscatedName("nu")
+	@ObfuscatedGetter(
+		intValue = -898435727
+	)
+	static int field296;
+	@ObfuscatedName("f")
 	@Export("component")
 	Component component;
 
@@ -30,352 +36,134 @@ public final class Canvas extends java.awt.Canvas {
 	} // L: 20
 
 	public final void update(Graphics var1) {
-		this.component.update(var1); // L: 15
-	} // L: 16
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
-		garbageValue = "1145652403"
-	)
-	public static File method393(String var0, String var1, int var2) {
-		String var3 = var2 == 0 ? "" : "" + var2; // L: 40
-		class390.JagexCache_locationFile = new File(class22.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 41
-		String var4 = null; // L: 42
-		String var5 = null; // L: 43
-		boolean var6 = false; // L: 44
-		Buffer var8;
-		File var23;
-		if (class390.JagexCache_locationFile.exists()) { // L: 45
-			try {
-				AccessFile var7 = new AccessFile(class390.JagexCache_locationFile, "rw", 10000L); // L: 48
-
-				int var9;
-				for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 49
-					var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset);
-					if (var9 == -1) {
-						throw new IOException();
-					}
-				}
-
-				var8.offset = 0;
-				var9 = var8.readUnsignedByte();
-				if (var9 < 1 || var9 > 3) {
-					throw new IOException("" + var9);
-				}
-
-				int var10 = 0; // L: 58
-				if (var9 > 1) { // L: 59
-					var10 = var8.readUnsignedByte();
-				}
-
-				if (var9 <= 2) { // L: 60
-					var4 = var8.readStringCp1252NullCircumfixed(); // L: 61
-					if (var10 == 1) { // L: 62
-						var5 = var8.readStringCp1252NullCircumfixed();
-					}
-				} else {
-					var4 = var8.readCESU8(); // L: 65
-					if (var10 == 1) { // L: 66
-						var5 = var8.readCESU8();
-					}
-				}
-
-				var7.close(); // L: 68
-			} catch (IOException var21) { // L: 70
-				var21.printStackTrace(); // L: 71
-			}
-
-			if (var4 != null) { // L: 73
-				var23 = new File(var4); // L: 74
-				if (!var23.exists()) { // L: 75
-					var4 = null; // L: 76
-				}
-			}
-
-			if (var4 != null) { // L: 79
-				var23 = new File(var4, "test.dat"); // L: 80
-				if (!FaceNormal.isWriteable(var23, true)) { // L: 81
-					var4 = null; // L: 82
-				}
-			}
-		}
-
-		if (var4 == null && var2 == 0) { // L: 86
-			label141:
-			for (int var15 = 0; var15 < PlayerType.cacheSubPaths.length; ++var15) { // L: 87
-				for (int var16 = 0; var16 < InterfaceParent.cacheParentPaths.length; ++var16) { // L: 88
-					File var17 = new File(InterfaceParent.cacheParentPaths[var16] + PlayerType.cacheSubPaths[var15] + File.separatorChar + var0 + File.separatorChar); // L: 89
-					if (var17.exists() && FaceNormal.isWriteable(new File(var17, "test.dat"), true)) { // L: 90 91
-						var4 = var17.toString(); // L: 92
-						var6 = true; // L: 93
-						break label141; // L: 94
-					}
-				}
-			}
-		}
-
-		if (var4 == null) { // L: 100
-			var4 = class22.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 101
-			var6 = true; // L: 102
-		}
-
-		File var22;
-		if (var5 != null) { // L: 104
-			var22 = new File(var5); // L: 105
-			var23 = new File(var4); // L: 106
-
-			try {
-				File[] var24 = var22.listFiles(); // L: 108
-				File[] var18 = var24; // L: 110
-
-				for (int var11 = 0; var11 < var18.length; ++var11) { // L: 111
-					File var12 = var18[var11]; // L: 112
-					File var13 = new File(var23, var12.getName()); // L: 114
-					boolean var14 = var12.renameTo(var13); // L: 115
-					if (!var14) { // L: 116
-						throw new IOException();
-					}
-				}
-			} catch (Exception var20) { // L: 121
-				var20.printStackTrace(); // L: 122
-			}
-
-			var6 = true; // L: 124
-		}
-
-		if (var6) { // L: 126
-			var22 = new File(var4); // L: 127
-			var8 = null; // L: 128
-
-			try {
-				AccessFile var25 = new AccessFile(class390.JagexCache_locationFile, "rw", 10000L); // L: 132
-				Buffer var26 = new Buffer(500); // L: 133
-				var26.writeByte(3); // L: 134
-				var26.writeByte(var8 != null ? 1 : 0); // L: 135
-				var26.writeCESU8(var22.getPath()); // L: 136
-				if (var8 != null) { // L: 137
-					var26.writeCESU8("");
-				}
-
-				var25.write(var26.array, 0, var26.offset); // L: 138
-				var25.close(); // L: 139
-			} catch (IOException var19) { // L: 141
-				var19.printStackTrace(); // L: 142
-			}
-		}
-
-		return new File(var4); // L: 146
+		this.component.update(var1);
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ILjv;IIIZI)V",
-		garbageValue = "1003938789"
+		descriptor = "(B)V",
+		garbageValue = "44"
 	)
-	public static void method395(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) {
-		class232.musicPlayerStatus = 1; // L: 50
-		ModelData0.musicTrackArchive = var1; // L: 51
-		class32.musicTrackGroupId = var2; // L: 52
-		class18.musicTrackFileId = var3; // L: 53
-		class232.musicTrackVolume = var4; // L: 54
-		class232.musicTrackBoolean = var5; // L: 55
-		class232.pcmSampleLength = var0; // L: 56
-	} // L: 57
+	static void method495() {
+		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
+			if (var0.obj != null) { // L: 31
+				var0.set();
+			}
+		}
 
-	@ObfuscatedName("p")
+	} // L: 33
+
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1869214638"
+		descriptor = "(III)I",
+		garbageValue = "2014736548"
 	)
-	public static boolean method394(int var0) {
-		return (var0 >> 29 & 1) != 0; // L: 25
+	static int method498(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14
+		if (var2 == null) { // L: 15
+			return -1;
+		} else {
+			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17
+		}
 	}
 
-	@ObfuscatedName("hj")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(IIZI)V",
-		garbageValue = "-786826616"
+		descriptor = "(ILiw;ZI)V",
+		garbageValue = "865156803"
 	)
-	static final void method391(int var0, int var1, boolean var2) {
-		if (!var2 || var0 != GrandExchangeOfferOwnWorldComparator.field632 || UserComparator4.field1427 != var1) { // L: 5137
-			GrandExchangeOfferOwnWorldComparator.field632 = var0; // L: 5140
-			UserComparator4.field1427 = var1; // L: 5141
-			class12.updateGameState(25); // L: 5142
-			DirectByteArrayCopier.drawLoadingMessage("Loading - please wait.", true); // L: 5143
-			int var3 = VertexNormal.baseX; // L: 5144
-			int var4 = SoundSystem.baseY; // L: 5145
-			VertexNormal.baseX = (var0 - 6) * 8; // L: 5146
-			SoundSystem.baseY = (var1 - 6) * 8; // L: 5147
-			int var5 = VertexNormal.baseX - var3; // L: 5148
-			int var6 = SoundSystem.baseY - var4; // L: 5149
-			var3 = VertexNormal.baseX; // L: 5150
-			var4 = SoundSystem.baseY; // L: 5151
+	static void method497(int var0, Coord var1, boolean var2) {
+		WorldMapArea var3 = BZip2State.getWorldMap().getMapArea(var0); // L: 4411
+		int var4 = class262.localPlayer.plane; // L: 4412
+		int var5 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 4413
+		int var6 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 4414
+		Coord var7 = new Coord(var4, var5, var6); // L: 4415
+		BZip2State.getWorldMap().method6147(var3, var7, var1, var2); // L: 4416
+	} // L: 4417
 
-			int var7;
-			int var9;
-			int[] var10000;
-			for (var7 = 0; var7 < 32768; ++var7) { // L: 5152
-				NPC var19 = Client.npcs[var7]; // L: 5153
-				if (var19 != null) { // L: 5154
-					for (var9 = 0; var9 < 10; ++var9) { // L: 5155
-						var10000 = var19.pathX; // L: 5156
-						var10000[var9] -= var5;
-						var10000 = var19.pathY; // L: 5157
-						var10000[var9] -= var6;
-					}
-
-					var19.x -= var5 * 128; // L: 5159
-					var19.y -= var6 * 128; // L: 5160
-				}
-			}
-
-			for (var7 = 0; var7 < 2048; ++var7) { // L: 5163
-				Player var22 = Client.players[var7]; // L: 5164
-				if (var22 != null) { // L: 5165
-					for (var9 = 0; var9 < 10; ++var9) { // L: 5166
-						var10000 = var22.pathX; // L: 5167
-						var10000[var9] -= var5;
-						var10000 = var22.pathY; // L: 5168
-						var10000[var9] -= var6;
-					}
-
-					var22.x -= var5 * 128; // L: 5170
-					var22.y -= var6 * 128; // L: 5171
-				}
-			}
-
-			byte var20 = 0; // L: 5174
-			byte var8 = 104; // L: 5175
-			byte var21 = 1; // L: 5176
-			if (var5 < 0) { // L: 5177
-				var20 = 103; // L: 5178
-				var8 = -1; // L: 5179
-				var21 = -1; // L: 5180
-			}
-
-			byte var10 = 0; // L: 5182
-			byte var11 = 104; // L: 5183
-			byte var12 = 1; // L: 5184
-			if (var6 < 0) { // L: 5185
-				var10 = 103; // L: 5186
-				var11 = -1; // L: 5187
-				var12 = -1; // L: 5188
-			}
-
-			int var14;
-			for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5190
-				for (var14 = var10; var14 != var11; var14 += var12) { // L: 5191
-					int var15 = var13 + var5; // L: 5192
-					int var16 = var6 + var14; // L: 5193
-
-					for (int var17 = 0; var17 < 4; ++var17) { // L: 5194
-						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
-							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5195
-						} else {
-							Client.groundItems[var17][var13][var14] = null; // L: 5196
-						}
-					}
-				}
-			}
-
-			for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5200 5201 5205
-				var18.x -= var5; // L: 5202
-				var18.y -= var6; // L: 5203
-				if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5204
-					var18.remove();
-				}
-			}
-
-			if (Client.destinationX != 0) { // L: 5207
-				Client.destinationX -= var5; // L: 5208
-				Client.destinationY -= var6; // L: 5209
-			}
-
-			Client.soundEffectCount = 0; // L: 5211
-			Client.isCameraLocked = false; // L: 5212
-			MouseHandler.cameraX -= var5 << 7; // L: 5213
-			class105.cameraZ -= var6 << 7; // L: 5214
-			RouteStrategy.oculusOrbFocalPointX -= var5 << 7; // L: 5215
-			ModelData0.oculusOrbFocalPointY -= var6 << 7; // L: 5216
-			Client.field872 = -1; // L: 5217
-			Client.graphicsObjects.clear(); // L: 5218
-			Client.projectiles.clear(); // L: 5219
-
-			for (var14 = 0; var14 < 4; ++var14) { // L: 5220
-				Client.collisionMaps[var14].clear();
-			}
-
-		}
-	} // L: 5138 5221
-
-	@ObfuscatedName("jz")
+	@ObfuscatedName("gl")
 	@ObfuscatedSignature(
-		descriptor = "([Lio;II)V",
-		garbageValue = "1454811445"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1340862776"
 	)
-	@Export("drawModelComponents")
-	static final void drawModelComponents(Widget[] var0, int var1) {
-		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10836
-			Widget var3 = var0[var2]; // L: 10837
-			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !HitSplatDefinition.isComponentHidden(var3))) { // L: 10838 10839 10840
-				int var5;
-				if (var3.type == 0) { // L: 10841
-					if (!var3.isIf3 && HitSplatDefinition.isComponentHidden(var3) && var3 != World.mousedOverWidgetIf1) { // L: 10842
-						continue;
-					}
-
-					drawModelComponents(var0, var3.id); // L: 10843
-					if (var3.children != null) { // L: 10844
-						drawModelComponents(var3.children, var3.id);
-					}
-
-					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10845
-					if (var4 != null) { // L: 10846
-						var5 = var4.group; // L: 10847
-						if (Clock.loadInterface(var5)) { // L: 10849
-							drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); // L: 10850
-						}
-					}
-				}
-
-				if (var3.type == 6) { // L: 10854
-					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 10855
-						boolean var7 = InvDefinition.runCs1(var3); // L: 10856
-						if (var7) { // L: 10858
-							var5 = var3.sequenceId2;
-						} else {
-							var5 = var3.sequenceId; // L: 10859
-						}
-
-						if (var5 != -1) { // L: 10860
-							SequenceDefinition var6 = LoginScreenAnimation.SequenceDefinition_get(var5); // L: 10861
-
-							for (var3.modelFrameCycle += Client.field913; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapCacheName.invalidateWidget(var3)) { // L: 10862 10863 10870
-								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 10864
-								++var3.modelFrame; // L: 10865
-								if (var3.modelFrame >= var6.frameIds.length) { // L: 10866
-									var3.modelFrame -= var6.frameCount; // L: 10867
-									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 10868
-										var3.modelFrame = 0;
-									}
-								}
-							}
-						}
-					}
-
-					if (var3.field3014 != 0 && !var3.isIf3) { // L: 10874
-						int var8 = var3.field3014 >> 16; // L: 10875
-						var5 = var3.field3014 << 16 >> 16; // L: 10876
-						var8 *= Client.field913; // L: 10877
-						var5 *= Client.field913; // L: 10878
-						var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 10879
-						var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 10880
-						WorldMapCacheName.invalidateWidget(var3); // L: 10881
-					}
-				}
+	@Export("doCheat")
+	static final void doCheat(String var0) {
+		if (var0.equalsIgnoreCase("toggleroof")) { // L: 3871
+			class4.clientPreferences.roofsHidden = !class4.clientPreferences.roofsHidden; // L: 3872
+			Actor.savePreferences(); // L: 3873
+			if (class4.clientPreferences.roofsHidden) { // L: 3874
+				UserComparator10.addGameMessage(99, "", "Roofs are now all hidden");
+			} else {
+				UserComparator10.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3875
 			}
 		}
 
-	} // L: 10885
+		if (var0.equalsIgnoreCase("displayfps")) { // L: 3877
+			Client.displayFps = !Client.displayFps;
+		}
+
+		if (var0.equalsIgnoreCase("renderself")) { // L: 3878
+			Client.renderSelf = !Client.renderSelf;
+		}
+
+		if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3879
+			Client.showMouseOverText = !Client.showMouseOverText;
+		}
+
+		if (Client.staffModLevel >= 2) { // L: 3880
+			if (var0.equalsIgnoreCase("errortest")) { // L: 3881
+				throw new RuntimeException();
+			}
+
+			if (var0.equalsIgnoreCase("showcoord")) { // L: 3882
+				class80.worldMap.showCoord = !class80.worldMap.showCoord;
+			}
+
+			if (var0.equalsIgnoreCase("fpson")) { // L: 3883
+				Client.displayFps = true;
+			}
+
+			if (var0.equalsIgnoreCase("fpsoff")) { // L: 3884
+				Client.displayFps = false;
+			}
+
+			if (var0.equalsIgnoreCase("gc")) {
+				System.gc(); // L: 3885
+			}
+
+			if (var0.equalsIgnoreCase("clientdrop")) { // L: 3886
+				ApproximateRouteStrategy.method1268();
+			}
+		}
+
+		PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 3889
+		var1.packetBuffer.writeByte(var0.length() + 1); // L: 3890
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3891
+		Client.packetWriter.addNode(var1); // L: 3892
+	} // L: 3893
+
+	@ObfuscatedName("he")
+	@ObfuscatedSignature(
+		descriptor = "(Lcj;I)Z",
+		garbageValue = "-1832136832"
+	)
+	static boolean method492(Player var0) {
+		if (Client.drawPlayerNames == 0) { // L: 4864
+			return false;
+		} else {
+			boolean var1;
+			if (class262.localPlayer == var0) { // L: 4865
+				var1 = (Client.drawPlayerNames & 8) != 0; // L: 4879
+				return var1; // L: 4881
+			} else {
+				var1 = class171.method3611(); // L: 4866
+				if (!var1) { // L: 4867
+					boolean var2 = (Client.drawPlayerNames & 1) != 0; // L: 4870
+					var1 = var2 && var0.isFriend(); // L: 4872
+				}
+
+				return var1 || ClanChannel.method54() && var0.isFriendsChatMember(); // L: 4874
+			}
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index 27886cdd0f..7de6b6f4de 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -3,267 +3,87 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cs")
+@ObfuscatedName("cg")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("s")
-	@Export("Tiles_hue")
-	static int[] Tiles_hue;
-	@ObfuscatedName("ey")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -495301739
+		intValue = -863685229
 	)
-	static int field1110;
-	@ObfuscatedName("n")
+	@Export("Interpreter_intStackSize")
+	static int Interpreter_intStackSize;
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lbi;"
+		descriptor = "Ljp;"
+	)
+	@Export("Widget_fontsArchive")
+	static AbstractArchive Widget_fontsArchive;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "[Lbl;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1182640923
+		intValue = 1091694625
 	)
 	@Export("count")
 	int count;
 
 	ChatChannel() {
-		this.messages = new Message[100]; // L: 81
-	} // L: 84
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbi;",
-		garbageValue = "437343873"
-	)
-	@Export("addMessage")
-	Message addMessage(int var1, String var2, String var3, String var4) {
-		Message var5 = this.messages[99]; // L: 87
-
-		for (int var6 = this.count; var6 > 0; --var6) { // L: 88
-			if (var6 != 100) { // L: 89
-				this.messages[var6] = this.messages[var6 - 1]; // L: 90
-			}
-		}
-
-		if (var5 == null) { // L: 92
-			var5 = new Message(var1, var2, var4, var3);
-		} else {
-			var5.remove(); // L: 94
-			var5.removeDual(); // L: 95
-			var5.set(var1, var2, var4, var3); // L: 96
-		}
-
-		this.messages[0] = var5; // L: 98
-		if (this.count < 100) { // L: 99
-			++this.count;
-		}
-
-		return var5; // L: 100
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lbi;",
-		garbageValue = "-94614591"
-	)
-	@Export("getMessage")
-	Message getMessage(int var1) {
-		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 104 105
-	}
+		this.messages = new Message[100]; // L: 90
+	} // L: 93
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-36"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbl;",
+		garbageValue = "-353859977"
 	)
-	@Export("size")
-	int size() {
-		return this.count; // L: 109
+	@Export("addMessage")
+	Message addMessage(int var1, String var2, String var3, String var4) {
+		Message var5 = this.messages[99]; // L: 96
+
+		for (int var6 = this.count; var6 > 0; --var6) { // L: 97
+			if (var6 != 100) { // L: 98
+				this.messages[var6] = this.messages[var6 - 1]; // L: 99
+			}
+		}
+
+		if (var5 == null) { // L: 101
+			var5 = new Message(var1, var2, var4, var3);
+		} else {
+			var5.remove(); // L: 103
+			var5.removeDual(); // L: 104
+			var5.set(var1, var2, var4, var3); // L: 105
+		}
+
+		this.messages[0] = var5; // L: 107
+		if (this.count < 100) { // L: 108
+			++this.count;
+		}
+
+		return var5; // L: 109
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lbl;",
+		garbageValue = "2"
+	)
+	@Export("getMessage")
+	Message getMessage(int var1) {
+		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 113 114
 	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;I)V",
-		garbageValue = "-1209366980"
+		descriptor = "(I)I",
+		garbageValue = "-1021863211"
 	)
-	public static void method2012(AbstractArchive var0, AbstractArchive var1) {
-		class404.KitDefinition_archive = var0; // L: 27
-		KitDefinition.KitDefinition_modelsArchive = var1; // L: 28
-		ModelData0.KitDefinition_fileCount = class404.KitDefinition_archive.getGroupFileCount(3); // L: 29
-	} // L: 30
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[II)V",
-		garbageValue = "-652699785"
-	)
-	public static void method2013(String[] var0, int[] var1) {
-		TaskHandler.method2518(var0, var1, 0, var0.length - 1); // L: 39
-	} // L: 40
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "-84"
-	)
-	static int method2009(int var0, Script var1, boolean var2) {
-		boolean var3 = true; // L: 834
-		Widget var4;
-		if (var0 >= 2000) { // L: 836
-			var0 -= 1000; // L: 837
-			var4 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 838
-			var3 = false; // L: 839
-		} else {
-			var4 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 841
-		}
-
-		int var11;
-		if (var0 == ScriptOpcodes.CC_SETOP) { // L: 842
-			var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] - 1; // L: 843
-			if (var11 >= 0 && var11 <= 9) { // L: 844
-				var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 848
-				return 1; // L: 849
-			} else {
-				--Interpreter.Interpreter_stringStackSize; // L: 845
-				return 1; // L: 846
-			}
-		} else {
-			int var6;
-			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 851
-				class44.Interpreter_intStackSize -= 2; // L: 852
-				var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 853
-				var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 854
-				var4.parent = ModeWhere.getWidgetChild(var11, var6); // L: 855
-				return 1; // L: 856
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 858
-				var4.isScrollBar = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 859
-				return 1; // L: 860
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 862
-				var4.dragZoneSize = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 863
-				return 1; // L: 864
-			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 866
-				var4.dragThreshold = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 867
-				return 1; // L: 868
-			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 870
-				var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 871
-				return 1; // L: 872
-			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 874
-				var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 875
-				return 1; // L: 876
-			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 878
-				var4.actions = null; // L: 879
-				return 1; // L: 880
-			} else if (var0 == 1308) { // L: 882
-				var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 883
-				return 1; // L: 884
-			} else if (var0 == 1309) { // L: 886
-				--class44.Interpreter_intStackSize; // L: 887
-				return 1; // L: 888
-			} else {
-				int var7;
-				byte[] var8;
-				if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 890
-					byte var5;
-					if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 920
-						class44.Interpreter_intStackSize -= 2; // L: 921
-						var5 = 10; // L: 922
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]}; // L: 923
-						byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]}; // L: 924
-						class253.Widget_setKey(var4, var5, var8, var9); // L: 925
-						return 1; // L: 926
-					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 928
-						class44.Interpreter_intStackSize -= 3; // L: 929
-						var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] - 1; // L: 930
-						var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 931
-						var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 932
-						if (var11 >= 0 && var11 <= 9) { // L: 933
-							IsaacCipher.Widget_setKeyRate(var4, var11, var6, var7); // L: 936
-							return 1; // L: 937
-						} else {
-							throw new RuntimeException(); // L: 934
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 939
-						var5 = 10; // L: 940
-						var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 941
-						var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 942
-						IsaacCipher.Widget_setKeyRate(var4, var5, var6, var7); // L: 943
-						return 1; // L: 944
-					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 946
-						--class44.Interpreter_intStackSize; // L: 947
-						var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] - 1; // L: 948
-						if (var11 >= 0 && var11 <= 9) { // L: 949
-							class23.Widget_setKeyIgnoreHeld(var4, var11); // L: 952
-							return 1; // L: 953
-						} else {
-							throw new RuntimeException(); // L: 950
-						}
-					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 955
-						var5 = 10; // L: 956
-						class23.Widget_setKeyIgnoreHeld(var4, var5); // L: 957
-						return 1; // L: 958
-					} else {
-						return 2; // L: 960
-					}
-				} else {
-					byte[] var10 = null; // L: 891
-					var8 = null; // L: 892
-					if (var3) { // L: 893
-						class44.Interpreter_intStackSize -= 10; // L: 894
-
-						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class44.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 896 897
-						}
-
-						if (var7 > 0) { // L: 899
-							var10 = new byte[var7 / 2]; // L: 900
-							var8 = new byte[var7 / 2]; // L: 901
-
-							for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 902
-								var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class44.Interpreter_intStackSize]; // L: 903
-								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class44.Interpreter_intStackSize + 1]; // L: 904
-							}
-						}
-					} else {
-						class44.Interpreter_intStackSize -= 2; // L: 909
-						var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]}; // L: 910
-						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]}; // L: 911
-					}
-
-					var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] - 1; // L: 913
-					if (var7 >= 0 && var7 <= 9) { // L: 914
-						class253.Widget_setKey(var4, var7, var10, var8); // L: 917
-						return 1; // L: 918
-					} else {
-						throw new RuntimeException(); // L: 915
-					}
-				}
-			}
-		}
+	@Export("size")
+	int size() {
+		return this.count; // L: 118
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1145228216"
-	)
-	public static void method2015() {
-		PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 279
-	} // L: 280
-
-	@ObfuscatedName("gd")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "694193640"
-	)
-	static final void method2014(int var0, int var1) {
-		if (Client.hintArrowType == 2) { // L: 4416
-			GrandExchangeEvents.worldToScreen((Client.hintArrowX - VertexNormal.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - SoundSystem.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4417
-			if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4418
-				PacketBufferNode.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
-			}
-
-		}
-	} // L: 4419
 }
diff --git a/runescape-client/src/main/java/ClanChannel.java b/runescape-client/src/main/java/ClanChannel.java
index f11185ec23..d61000d152 100644
--- a/runescape-client/src/main/java/ClanChannel.java
+++ b/runescape-client/src/main/java/ClanChannel.java
@@ -10,62 +10,78 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("y")
 @Implements("ClanChannel")
 public class ClanChannel extends Node {
-	@ObfuscatedName("c")
+	@ObfuscatedName("pd")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
+		descriptor = "Lls;"
 	)
-	static IndexedSprite field33;
-	@ObfuscatedName("dg")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive3")
-	static Archive archive3;
-	@ObfuscatedName("ny")
+	@Export("privateChatMode")
+	static PrivateChatMode privateChatMode;
+	@ObfuscatedName("tu")
+	@Export("foundItemIds")
+	static short[] foundItemIds;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -217468963
+		intValue = -216933395
 	)
-	static int field38;
-	@ObfuscatedName("v")
-	boolean field30;
-	@ObfuscatedName("n")
-	boolean field27;
+	@Export("cacheGamebuild")
+	public static int cacheGamebuild;
+	@ObfuscatedName("dp")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive0")
+	static Archive archive0;
+	@ObfuscatedName("ex")
+	@ObfuscatedSignature(
+		descriptor = "Llb;"
+	)
+	@Export("spriteIds")
+	static GraphicsDefaults spriteIds;
+	@ObfuscatedName("ew")
+	@ObfuscatedGetter(
+		intValue = 1842635505
+	)
+	static int field30;
 	@ObfuscatedName("f")
+	boolean field31;
+	@ObfuscatedName("e")
+	boolean field21;
+	@ObfuscatedName("v")
 	@Export("members")
 	public List members;
 	@ObfuscatedName("y")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		longValue = -8222609313489775677L
-	)
-	long field29;
 	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		longValue = 1053094627222571429L
+	)
+	long field25;
+	@ObfuscatedName("o")
 	@Export("name")
 	public String name;
+	@ObfuscatedName("m")
+	public byte field27;
 	@ObfuscatedName("r")
-	public byte field32;
-	@ObfuscatedName("b")
-	public byte field26;
+	public byte field28;
 
 	static {
 		new BitSet(65536); // L: 21
 	} // L: 22
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	public ClanChannel(Buffer var1) {
-		this.field27 = true; // L: 12
+		this.field21 = true; // L: 12
 		this.name = null; // L: 16
-		this.method29(var1); // L: 25
+		this.method39(var1); // L: 25
 	} // L: 26
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)[I",
-		garbageValue = "1562690283"
+		garbageValue = "-163030259"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
@@ -77,176 +93,171 @@ public class ClanChannel extends Node {
 				var1[var2] = ((ClanChannelMember)this.members.get(var2)).name; // L: 33
 			}
 
-			ChatChannel.method2013(var1, this.sortedMembers); // L: 36
+			int[] var3 = this.sortedMembers; // L: 36
+			class215.method4434(var1, var3, 0, var1.length - 1); // L: 38
 		}
 
-		return this.sortedMembers; // L: 38
+		return this.sortedMembers; // L: 41
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ls;I)V",
-		garbageValue = "-1843980816"
+		descriptor = "(Ld;I)V",
+		garbageValue = "1986125377"
 	)
 	@Export("addMember")
 	void addMember(ClanChannelMember var1) {
-		this.members.add(var1); // L: 42
-		this.sortedMembers = null; // L: 43
-	} // L: 44
+		this.members.add(var1); // L: 45
+		this.sortedMembers = null; // L: 46
+	} // L: 47
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "85"
+		garbageValue = "-117"
 	)
 	@Export("removeMember")
 	void removeMember(int var1) {
-		this.members.remove(var1); // L: 47
-		this.sortedMembers = null; // L: 48
-	} // L: 49
+		this.members.remove(var1); // L: 50
+		this.sortedMembers = null; // L: 51
+	} // L: 52
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-27"
+		descriptor = "(I)I",
+		garbageValue = "467541909"
 	)
-	public int method27() {
-		return this.members.size(); // L: 52
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "493868170"
-	)
-	public int method30(String var1) {
-		if (!this.field27) { // L: 56
-			throw new RuntimeException("Displaynames not available");
-		} else {
-			for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 57
-				if (((ClanChannelMember)this.members.get(var2)).name.equalsIgnoreCase(var1)) {
-					return var2; // L: 58
-				}
-			}
-
-			return -1; // L: 60
-		}
+	public int method49() {
+		return this.members.size(); // L: 55
 	}
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-104022179"
+		descriptor = "(Ljava/lang/String;I)I",
+		garbageValue = "-1685723054"
 	)
-	void method29(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 64
-		if ((var2 & 1) != 0) { // L: 65
-			this.field30 = true;
-		}
-
-		if ((var2 & 2) != 0) { // L: 66
-			this.field27 = true;
-		}
-
-		int var3 = 2; // L: 67
-		if ((var2 & 4) != 0) { // L: 68
-			var3 = var1.readUnsignedByte();
-		}
-
-		super.key = var1.readLong(); // L: 69
-		this.field29 = var1.readLong(); // L: 70
-		this.name = var1.readStringCp1252NullTerminated(); // L: 71
-		var1.readBoolean(); // L: 72
-		this.field26 = var1.readByte(); // L: 73
-		this.field32 = var1.readByte(); // L: 74
-		int var4 = var1.readUnsignedShort(); // L: 75
-		if (var4 > 0) { // L: 76
-			this.members = new ArrayList(var4); // L: 77
-
-			for (int var5 = 0; var5 < var4; ++var5) { // L: 78
-				ClanChannelMember var6 = new ClanChannelMember(); // L: 79
-				if (this.field30) { // L: 80
-					var1.readLong(); // L: 81
-				}
-
-				if (this.field27) { // L: 83
-					var6.name = var1.readStringCp1252NullTerminated();
-				}
-
-				var6.rank = var1.readByte(); // L: 84
-				var6.world = var1.readUnsignedShort(); // L: 85
-				if (var3 >= 3) { // L: 86
-					var1.readBoolean(); // L: 87
-				}
-
-				this.members.add(var5, var6); // L: 90
-			}
-		}
-
-	} // L: 93
-
-	@ObfuscatedName("ae")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1446319005"
-	)
-	static int method41(int var0, Script var1, boolean var2) {
-		if (var0 != 3700 && var0 != 3701) { // L: 2409
-			if (var0 == 3702) { // L: 2414
-				++class44.Interpreter_intStackSize; // L: 2415
-				return 1; // L: 2416
-			} else {
-				return 2; // L: 2418
-			}
+	public int method38(String var1) {
+		if (!this.field21) { // L: 59
+			throw new RuntimeException("Displaynames not available");
 		} else {
-			--class44.Interpreter_intStackSize; // L: 2410
-			--Interpreter.Interpreter_stringStackSize; // L: 2411
-			return 1; // L: 2412
+			for (int var2 = 0; var2 < this.members.size(); ++var2) { // L: 60
+				if (((ClanChannelMember)this.members.get(var2)).name.equalsIgnoreCase(var1)) {
+					return var2; // L: 61
+				}
+			}
+
+			return -1;
 		}
 	}
 
-	@ObfuscatedName("ix")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)V",
-		garbageValue = "331312284"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1224796238"
 	)
-	static final void method36(int var0, int var1, int var2, int var3, int var4, int var5) {
-		int var6 = var2 - var0; // L: 9671
-		int var7 = var3 - var1; // L: 9672
-		int var8 = var6 >= 0 ? var6 : -var6; // L: 9673
-		int var9 = var7 >= 0 ? var7 : -var7; // L: 9674
-		int var10 = var8; // L: 9675
-		if (var8 < var9) { // L: 9676
-			var10 = var9;
+	void method39(Buffer var1) {
+		int var2 = var1.readUnsignedByte();
+		if ((var2 & 1) != 0) { // L: 68
+			this.field31 = true;
 		}
 
-		if (var10 != 0) { // L: 9677
-			int var11 = (var6 << 16) / var10; // L: 9678
-			int var12 = (var7 << 16) / var10; // L: 9679
-			if (var12 <= var11) { // L: 9680
-				var11 = -var11;
+		if ((var2 & 2) != 0) { // L: 69
+			this.field21 = true;
+		}
+
+		int var3 = 2; // L: 70
+		if ((var2 & 4) != 0) { // L: 71
+			var3 = var1.readUnsignedByte();
+		}
+
+		super.key = var1.readLong(); // L: 72
+		this.field25 = var1.readLong(); // L: 73
+		this.name = var1.readStringCp1252NullTerminated(); // L: 74
+		var1.readBoolean(); // L: 75
+		this.field28 = var1.readByte(); // L: 76
+		this.field27 = var1.readByte(); // L: 77
+		int var4 = var1.readUnsignedShort(); // L: 78
+		if (var4 > 0) { // L: 79
+			this.members = new ArrayList(var4); // L: 80
+
+			for (int var5 = 0; var5 < var4; ++var5) { // L: 81
+				ClanChannelMember var6 = new ClanChannelMember(); // L: 82
+				if (this.field31) { // L: 83
+					var1.readLong(); // L: 84
+				}
+
+				if (this.field21) { // L: 86
+					var6.name = var1.readStringCp1252NullTerminated();
+				}
+
+				var6.rank = var1.readByte(); // L: 87
+				var6.world = var1.readUnsignedShort(); // L: 88
+				if (var3 >= 3) { // L: 89
+					var1.readBoolean(); // L: 90
+				}
+
+				this.members.add(var5, var6); // L: 93
+			}
+		}
+
+	} // L: 96
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;J)V"
+	)
+	static void method56(Buffer var0, long var1) {
+		var1 /= 10L; // L: 63
+		if (var1 < 0L) { // L: 64
+			var1 = 0L;
+		} else if (var1 > 65535L) { // L: 65
+			var1 = 65535L;
+		}
+
+		var0.writeShort((int)var1); // L: 66
+	} // L: 67
+
+	@ObfuscatedName("hp")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-2090430707"
+	)
+	static boolean method54() {
+		return (Client.drawPlayerNames & 2) != 0; // L: 4860
+	}
+
+	@ObfuscatedName("hf")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "-1984819327"
+	)
+	@Export("worldToScreen")
+	static final void worldToScreen(int var0, int var1, int var2) {
+		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 5431
+			int var3 = ItemContainer.getTileHeight(var0, var1, SoundSystem.Client_plane) - var2; // L: 5436
+			var0 -= ObjectSound.cameraX; // L: 5437
+			var3 -= class160.cameraY; // L: 5438
+			var1 -= Canvas.cameraZ; // L: 5439
+			int var4 = Rasterizer3D.Rasterizer3D_sine[class69.cameraPitch]; // L: 5440
+			int var5 = Rasterizer3D.Rasterizer3D_cosine[class69.cameraPitch]; // L: 5441
+			int var6 = Rasterizer3D.Rasterizer3D_sine[class32.cameraYaw]; // L: 5442
+			int var7 = Rasterizer3D.Rasterizer3D_cosine[class32.cameraYaw]; // L: 5443
+			int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5444
+			var1 = var7 * var1 - var0 * var6 >> 16; // L: 5445
+			var0 = var8; // L: 5446
+			var8 = var3 * var5 - var4 * var1 >> 16; // L: 5447
+			var1 = var5 * var1 + var4 * var3 >> 16; // L: 5448
+			if (var1 >= 50) { // L: 5450
+				Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5451
+				Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5452
 			} else {
-				var12 = -var12; // L: 9681
+				Client.viewportTempX = -1; // L: 5455
+				Client.viewportTempY = -1; // L: 5456
 			}
 
-			int var13 = var5 * var12 >> 17; // L: 9682
-			int var14 = var5 * var12 + 1 >> 17; // L: 9683
-			int var15 = var5 * var11 >> 17; // L: 9684
-			int var16 = var5 * var11 + 1 >> 17; // L: 9685
-			var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9686
-			var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9687
-			int var17 = var0 + var13; // L: 9688
-			int var18 = var0 - var14; // L: 9689
-			int var19 = var0 + var6 - var14; // L: 9690
-			int var20 = var0 + var13 + var6; // L: 9691
-			int var21 = var15 + var1; // L: 9692
-			int var22 = var1 - var16; // L: 9693
-			int var23 = var7 + var1 - var16; // L: 9694
-			int var24 = var7 + var15 + var1; // L: 9695
-			Rasterizer3D.method3856(var17, var18, var19); // L: 9696
-			Rasterizer3D.method3919(var21, var22, var23, var17, var18, var19, var4); // L: 9697
-			Rasterizer3D.method3856(var17, var19, var20); // L: 9698
-			Rasterizer3D.method3919(var21, var23, var24, var17, var19, var20, var4); // L: 9699
+		} else {
+			Client.viewportTempX = -1; // L: 5432
+			Client.viewportTempY = -1; // L: 5433
 		}
-	} // L: 9700
+	} // L: 5434 5458
 }
diff --git a/runescape-client/src/main/java/ClanChannelMember.java b/runescape-client/src/main/java/ClanChannelMember.java
index 027be97297..bddfc3c908 100644
--- a/runescape-client/src/main/java/ClanChannelMember.java
+++ b/runescape-client/src/main/java/ClanChannelMember.java
@@ -3,493 +3,111 @@ 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("s")
+@ObfuscatedName("d")
 @Implements("ClanChannelMember")
 public class ClanChannelMember {
-	@ObfuscatedName("mq")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 81340013
+		intValue = 894086561
 	)
-	@Export("selectedItemSlot")
-	static int selectedItemSlot;
-	@ObfuscatedName("v")
+	static int field68;
+	@ObfuscatedName("f")
 	@Export("rank")
 	public byte rank;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 186545257
+		intValue = 532460543
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("name")
 	public String name;
 
 	ClanChannelMember() {
 	} // L: 8
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lid;I)V",
-		garbageValue = "-2073984636"
+		descriptor = "(IB)Z",
+		garbageValue = "109"
 	)
-	public static void method88(Huffman var0) {
-		class249.huffman = var0; // L: 14
-	} // L: 15
+	public static boolean method108(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.field264[var0] : false; // L: 234 235
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "-1338731866"
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "-82"
 	)
-	public static int method86(int var0, int var1, int var2) {
-		var2 &= 3; // L: 9
-		if (var2 == 0) { // L: 10
-			return var1;
-		} else if (var2 == 1) { // L: 11
-			return 7 - var0;
+	static int method106(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1115
+		if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1116
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1117
+			return 1; // L: 1118
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1120
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1121
+			return 1; // L: 1122
+		} else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1124
+			Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.text; // L: 1125
+			return 1; // L: 1126
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1128
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1129
+			return 1; // L: 1130
+		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1132
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1133
+			return 1; // L: 1134
+		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1136
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1137
+			return 1; // L: 1138
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1140
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1141
+			return 1; // L: 1142
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1144
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1145
+			return 1; // L: 1146
+		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1148
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1149
+			return 1; // L: 1150
+		} else if (var0 == ScriptOpcodes.CC_GETTRANS) { // L: 1152
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1153
+			return 1; // L: 1154
+		} else if (var0 == 1610) { // L: 1156
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1157
+			return 1; // L: 1158
+		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1160
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color; // L: 1161
+			return 1; // L: 1162
+		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1164
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color2; // L: 1165
+			return 1; // L: 1166
+		} else if (var0 == 1613) { // L: 1168
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1169
+			return 1; // L: 1170
+		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1172
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1173
+			return 1; // L: 1174
+		} else if (var0 != 1615 && var0 != 1616) { // L: 1176
+			return 2; // L: 1180
 		} else {
-			return var2 == 2 ? 7 - var1 : var0; // L: 12
+			++ChatChannel.Interpreter_intStackSize; // L: 1177
+			return 1; // L: 1178
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("in")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Lbi;",
-		garbageValue = "-22"
+		descriptor = "(III)V",
+		garbageValue = "-1449635210"
 	)
-	@Export("Messages_getByChannelAndID")
-	static Message Messages_getByChannelAndID(int var0, int var1) {
-		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35
-		return var2.getMessage(var1); // L: 36
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1385459044"
-	)
-	@Export("isKeyDown")
-	public static final boolean isKeyDown() {
-		synchronized(KeyHandler.KeyHandler_instance) { // L: 162
-			if (KeyHandler.field293 == KeyHandler.field295) { // L: 163
-				return false;
-			} else {
-				ItemComposition.field1859 = KeyHandler.field289[KeyHandler.field293]; // L: 164
-				class249.field3116 = KeyHandler.field286[KeyHandler.field293]; // L: 165
-				KeyHandler.field293 = KeyHandler.field293 + 1 & 127; // L: 166
-				return true; // L: 167
-			}
-		}
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "74"
-	)
-	@Export("Login_promptCredentials")
-	static void Login_promptCredentials(boolean var0) {
-		Login.Login_response1 = ""; // L: 762
-		Login.Login_response2 = "Enter your username/email & password."; // L: 763
-		Login.Login_response3 = ""; // L: 764
-		Login.loginIndex = 2; // L: 765
-		if (var0) { // L: 766
-			Login.Login_password = "";
-		}
-
-		if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 768
-			if (ObjectComposition.clientPreferences.rememberedUsername != null) { // L: 769
-				Login.Login_username = ObjectComposition.clientPreferences.rememberedUsername; // L: 770
-				Client.Login_isUsernameRemembered = true; // L: 771
-			} else {
-				Client.Login_isUsernameRemembered = false; // L: 773
-			}
-		}
-
-		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 776
-			Login.currentLoginField = 1; // L: 777
-		} else {
-			Login.currentLoginField = 0; // L: 780
-		}
-
-	} // L: 783
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIILgt;Lfz;B)V",
-		garbageValue = "11"
-	)
-	static final void method89(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 245 246 247
-			if (var0 < Tiles.Tiles_minPlane) { // L: 250
-				Tiles.Tiles_minPlane = var0;
-			}
-
-			ObjectComposition var8 = class23.getObjectDefinition(var3); // L: 251
-			int var9;
-			int var10;
-			if (var4 != 1 && var4 != 3) { // L: 254
-				var9 = var8.sizeX; // L: 259
-				var10 = var8.sizeY; // L: 260
-			} else {
-				var9 = var8.sizeY; // L: 255
-				var10 = var8.sizeX; // L: 256
-			}
-
-			int var11;
-			int var12;
-			if (var9 + var1 <= 104) { // L: 266
-				var11 = (var9 >> 1) + var1; // L: 267
-				var12 = (var9 + 1 >> 1) + var1; // L: 268
-			} else {
-				var11 = var1; // L: 271
-				var12 = var1 + 1; // L: 272
-			}
-
-			int var13;
-			int var14;
-			if (var10 + var2 <= 104) { // L: 274
-				var13 = (var10 >> 1) + var2; // L: 275
-				var14 = var2 + (var10 + 1 >> 1); // L: 276
-			} else {
-				var13 = var2; // L: 279
-				var14 = var2 + 1; // L: 280
-			}
-
-			int[][] var15 = Tiles.Tiles_heights[var0]; // L: 282
-			int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; // L: 283
-			int var17 = (var1 << 7) + (var9 << 6); // L: 284
-			int var18 = (var2 << 7) + (var10 << 6); // L: 285
-			long var19 = DevicePcmPlayerProvider.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 286
-			int var21 = var5 + (var4 << 6); // L: 287
-			if (var8.int3 == 1) { // L: 288
-				var21 += 256;
-			}
-
-			if (var8.hasSound()) { // L: 289
-				class268.method4851(var0, var1, var2, var8, var4);
-			}
-
-			Object var29;
-			if (var5 == 22) { // L: 290
-				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 291
-					if (var8.animationId == -1 && var8.transforms == null) { // L: 293
-						var29 = var8.getEntity(22, var4, var15, var17, var16, var18);
-					} else {
-						var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 294
-					}
-
-					var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 295
-					if (var8.interactType == 1 && var7 != null) { // L: 296
-						var7.setBlockedByFloorDec(var1, var2);
-					}
-
-				}
-			} else {
-				int var28;
-				if (var5 != 10 && var5 != 11) { // L: 299
-					int[] var10000;
-					if (var5 >= 12) { // L: 320
-						if (var8.animationId == -1 && var8.transforms == null) { // L: 322
-							var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 323
-						}
-
-						var6.method4007(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 324
-						if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 325
-							var10000 = UrlRequester.field1419[var0][var1];
-							var10000[var2] |= 2340;
-						}
-
-						if (var8.interactType != 0 && var7 != null) { // L: 326
-							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-						}
-
-					} else if (var5 == 0) { // L: 329
-						if (var8.animationId == -1 && var8.transforms == null) { // L: 331
-							var29 = var8.getEntity(0, var4, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 332
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1117[var4], 0, var19, var21); // L: 333
-						if (var4 == 0) { // L: 334
-							if (var8.clipped) { // L: 335
-								class372.field4123[var0][var1][var2] = 50; // L: 336
-								class372.field4123[var0][var1][var2 + 1] = 50; // L: 337
-							}
-
-							if (var8.modelClipped) { // L: 339
-								var10000 = UrlRequester.field1419[var0][var1];
-								var10000[var2] |= 585;
-							}
-						} else if (var4 == 1) { // L: 341
-							if (var8.clipped) { // L: 342
-								class372.field4123[var0][var1][var2 + 1] = 50; // L: 343
-								class372.field4123[var0][var1 + 1][var2 + 1] = 50; // L: 344
-							}
-
-							if (var8.modelClipped) { // L: 346
-								var10000 = UrlRequester.field1419[var0][var1];
-								var10000[1 + var2] |= 1170;
-							}
-						} else if (var4 == 2) { // L: 348
-							if (var8.clipped) { // L: 349
-								class372.field4123[var0][var1 + 1][var2] = 50; // L: 350
-								class372.field4123[var0][var1 + 1][var2 + 1] = 50; // L: 351
-							}
-
-							if (var8.modelClipped) { // L: 353
-								var10000 = UrlRequester.field1419[var0][var1 + 1];
-								var10000[var2] |= 585;
-							}
-						} else if (var4 == 3) { // L: 355
-							if (var8.clipped) { // L: 356
-								class372.field4123[var0][var1][var2] = 50; // L: 357
-								class372.field4123[var0][var1 + 1][var2] = 50; // L: 358
-							}
-
-							if (var8.modelClipped) { // L: 360
-								var10000 = UrlRequester.field1419[var0][var1];
-								var10000[var2] |= 1170;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) { // L: 362
-							var7.method3164(var1, var2, var5, var4, var8.boolean1);
-						}
-
-						if (var8.int2 != 16) { // L: 363
-							var6.method3967(var0, var1, var2, var8.int2);
-						}
-
-					} else if (var5 == 1) { // L: 366
-						if (var8.animationId == -1 && var8.transforms == null) { // L: 368
-							var29 = var8.getEntity(1, var4, var15, var17, var16, var18);
-						} else {
-							var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 369
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1125[var4], 0, var19, var21); // L: 370
-						if (var8.clipped) { // L: 371
-							if (var4 == 0) { // L: 372
-								class372.field4123[var0][var1][var2 + 1] = 50;
-							} else if (var4 == 1) { // L: 373
-								class372.field4123[var0][var1 + 1][var2 + 1] = 50;
-							} else if (var4 == 2) { // L: 374
-								class372.field4123[var0][var1 + 1][var2] = 50;
-							} else if (var4 == 3) { // L: 375
-								class372.field4123[var0][var1][var2] = 50;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) { // L: 377
-							var7.method3164(var1, var2, var5, var4, var8.boolean1);
-						}
-
-					} else {
-						int var22;
-						if (var5 == 2) { // L: 380
-							var22 = var4 + 1 & 3; // L: 381
-							Object var24;
-							Object var30;
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 384
-								var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 385
-								var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 386
-							} else {
-								var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 389
-								var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 390
-							}
-
-							var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field1117[var4], Tiles.field1117[var22], var19, var21); // L: 392
-							if (var8.modelClipped) { // L: 393
-								if (var4 == 0) { // L: 394
-									var10000 = UrlRequester.field1419[var0][var1]; // L: 395
-									var10000[var2] |= 585;
-									var10000 = UrlRequester.field1419[var0][var1]; // L: 396
-									var10000[1 + var2] |= 1170;
-								} else if (var4 == 1) { // L: 398
-									var10000 = UrlRequester.field1419[var0][var1]; // L: 399
-									var10000[var2 + 1] |= 1170;
-									var10000 = UrlRequester.field1419[var0][var1 + 1]; // L: 400
-									var10000[var2] |= 585;
-								} else if (var4 == 2) { // L: 402
-									var10000 = UrlRequester.field1419[var0][var1 + 1]; // L: 403
-									var10000[var2] |= 585;
-									var10000 = UrlRequester.field1419[var0][var1]; // L: 404
-									var10000[var2] |= 1170;
-								} else if (var4 == 3) { // L: 406
-									var10000 = UrlRequester.field1419[var0][var1]; // L: 407
-									var10000[var2] |= 1170;
-									var10000 = UrlRequester.field1419[var0][var1]; // L: 408
-									var10000[var2] |= 585;
-								}
-							}
-
-							if (var8.interactType != 0 && var7 != null) { // L: 411
-								var7.method3164(var1, var2, var5, var4, var8.boolean1);
-							}
-
-							if (var8.int2 != 16) { // L: 412
-								var6.method3967(var0, var1, var2, var8.int2);
-							}
-
-						} else if (var5 == 3) { // L: 415
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 417
-								var29 = var8.getEntity(3, var4, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 418
-							}
-
-							var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1125[var4], 0, var19, var21); // L: 419
-							if (var8.clipped) { // L: 420
-								if (var4 == 0) { // L: 421
-									class372.field4123[var0][var1][var2 + 1] = 50;
-								} else if (var4 == 1) { // L: 422
-									class372.field4123[var0][var1 + 1][var2 + 1] = 50;
-								} else if (var4 == 2) { // L: 423
-									class372.field4123[var0][var1 + 1][var2] = 50;
-								} else if (var4 == 3) { // L: 424
-									class372.field4123[var0][var1][var2] = 50;
-								}
-							}
-
-							if (var8.interactType != 0 && var7 != null) { // L: 426
-								var7.method3164(var1, var2, var5, var4, var8.boolean1);
-							}
-
-						} else if (var5 == 9) { // L: 429
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 431
-								var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 432
-							}
-
-							var6.method4007(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 433
-							if (var8.interactType != 0 && var7 != null) { // L: 434
-								var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-							}
-
-							if (var8.int2 != 16) { // L: 435
-								var6.method3967(var0, var1, var2, var8.int2);
-							}
-
-						} else if (var5 == 4) { // L: 438
-							if (var8.animationId == -1 && var8.transforms == null) { // L: 440
-								var29 = var8.getEntity(4, var4, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 441
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1117[var4], 0, 0, 0, var19, var21); // L: 442
-						} else {
-							long var23;
-							Object var25;
-							if (var5 == 5) { // L: 445
-								var22 = 16; // L: 446
-								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 447
-								if (0L != var23) { // L: 448
-									var22 = class23.getObjectDefinition(class93.Entity_unpackID(var23)).int2;
-								}
-
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 450
-									var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
-								} else {
-									var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 451
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1117[var4], 0, var22 * Tiles.field1126[var4], var22 * Tiles.field1123[var4], var19, var21); // L: 452
-							} else if (var5 == 6) { // L: 455
-								var22 = 8; // L: 456
-								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 457
-								if (var23 != 0L) { // L: 458
-									var22 = class23.getObjectDefinition(class93.Entity_unpackID(var23)).int2 / 2;
-								}
-
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 460
-									var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
-								} else {
-									var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 461
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field1128[var4], var22 * Tiles.field1129[var4], var19, var21); // L: 462
-							} else if (var5 == 7) { // L: 465
-								var28 = var4 + 2 & 3; // L: 467
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 468
-									var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18);
-								} else {
-									var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 469
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 470
-							} else if (var5 == 8) { // L: 473
-								var22 = 8; // L: 474
-								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 475
-								if (0L != var23) { // L: 476
-									var22 = class23.getObjectDefinition(class93.Entity_unpackID(var23)).int2 / 2;
-								}
-
-								int var27 = var4 + 2 & 3; // L: 479
-								Object var26;
-								if (var8.animationId == -1 && var8.transforms == null) { // L: 480
-									var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 481
-									var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 482
-								} else {
-									var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 485
-									var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 486
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field1128[var4], var22 * Tiles.field1129[var4], var19, var21); // L: 488
-							}
-						}
-					}
-				} else {
-					if (var8.animationId == -1 && var8.transforms == null) { // L: 301
-						var29 = var8.getEntity(10, var4, var15, var17, var16, var18);
-					} else {
-						var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1801, (Renderable)null); // L: 302
-					}
-
-					if (var29 != null && var6.method4007(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 303 304
-						var28 = 15; // L: 305
-						if (var29 instanceof Model) { // L: 306
-							var28 = ((Model)var29).method4180() / 4; // L: 307
-							if (var28 > 30) { // L: 308
-								var28 = 30;
-							}
-						}
-
-						for (int var31 = 0; var31 <= var9; ++var31) { // L: 310
-							for (int var32 = 0; var32 <= var10; ++var32) { // L: 311
-								if (var28 > class372.field4123[var0][var31 + var1][var32 + var2]) { // L: 312
-									class372.field4123[var0][var31 + var1][var32 + var2] = (byte)var28;
-								}
-							}
-						}
-					}
-
-					if (var8.interactType != 0 && var7 != null) { // L: 317
-						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-					}
-
-				}
-			}
-		}
-	} // L: 297 318 327 364 378 413 427 436 443 453 463 471 489 491
-
-	@ObfuscatedName("kz")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "813346347"
-	)
-	static final void method85() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11269
-			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11270
-			var1.clearIsInFriendsChat(); // L: 11271
-		}
-
-	} // L: 11273
+	@Export("resumePauseWidget")
+	static void resumePauseWidget(int var0, int var1) {
+		PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); // L: 8811
+		var2.packetBuffer.method6648(var1); // L: 8812
+		var2.packetBuffer.writeIntME(var0); // L: 8813
+		Client.packetWriter.addNode(var2); // L: 8814
+	} // L: 8815
 }
diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java
index c10a59647d..db666dc3d3 100644
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -1,30 +1,18 @@
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Random;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ll")
+@ObfuscatedName("lt")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("ea")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive15")
-	static Archive archive15;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
@@ -36,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown; // L: 7
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1300571849"
+		garbageValue = "-1463717617"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1945487843"
+		garbageValue = "459582232"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -62,28 +50,28 @@ public class ClanMate extends Buddy {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "256"
+		descriptor = "(I)V",
+		garbageValue = "1131395032"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = NetSocket.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
+		this.friend = DevicePcmPlayerProvider.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23
 	} // L: 24
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "61"
+		descriptor = "(I)V",
+		garbageValue = "530293268"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "601254132"
+		garbageValue = "-105977481"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -94,242 +82,13 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true; // L: 34
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-440591589"
+		garbageValue = "1794197265"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = NetSocket.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
+		this.ignored = DevicePcmPlayerProvider.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38
 	} // L: 39
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1024085126"
-	)
-	static void method5712() {
-		Login.Login_username = Login.Login_username.trim(); // L: 786
-		if (Login.Login_username.length() == 0) { // L: 787
-			class260.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 788
-		} else {
-			long var1;
-			try {
-				URL var3 = new URL(KitDefinition.method2705("services", false) + "m=accountappeal/login.ws"); // L: 795
-				URLConnection var4 = var3.openConnection(); // L: 796
-				var4.setRequestProperty("connection", "close"); // L: 797
-				var4.setDoInput(true); // L: 798
-				var4.setDoOutput(true); // L: 799
-				var4.setConnectTimeout(5000); // L: 800
-				OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream()); // L: 801
-				var5.write("data1=req"); // L: 802
-				var5.flush(); // L: 803
-				InputStream var6 = var4.getInputStream(); // L: 804
-				Buffer var7 = new Buffer(new byte[1000]); // L: 805
-
-				while (true) {
-					int var8 = var6.read(var7.array, var7.offset, 1000 - var7.offset); // L: 807
-					if (var8 == -1) { // L: 808
-						var7.offset = 0; // L: 815
-						long var23 = var7.readLong(); // L: 816
-						var1 = var23; // L: 817
-						break;
-					}
-
-					var7.offset += var8; // L: 809
-					if (var7.offset >= 1000) { // L: 810
-						var1 = 0L; // L: 811
-						break;
-					}
-				}
-			} catch (Exception var38) { // L: 819
-				var1 = 0L; // L: 820
-			}
-
-			byte var0;
-			if (var1 == 0L) { // L: 824
-				var0 = 5;
-			} else {
-				String var39 = Login.Login_username; // L: 827
-				Random var40 = new Random(); // L: 829
-				Buffer var27 = new Buffer(128); // L: 830
-				Buffer var9 = new Buffer(128); // L: 831
-				int[] var10 = new int[]{var40.nextInt(), var40.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 832 833 834 835 836
-				var27.writeByte(10); // L: 837
-
-				int var11;
-				for (var11 = 0; var11 < 4; ++var11) { // L: 838
-					var27.writeInt(var40.nextInt()); // L: 839
-				}
-
-				var27.writeInt(var10[0]); // L: 841
-				var27.writeInt(var10[1]); // L: 842
-				var27.writeLong(var1); // L: 843
-				var27.writeLong(0L); // L: 844
-
-				for (var11 = 0; var11 < 4; ++var11) { // L: 845
-					var27.writeInt(var40.nextInt()); // L: 846
-				}
-
-				var27.encryptRsa(class80.field1006, class80.field1007); // L: 848
-				var9.writeByte(10); // L: 849
-
-				for (var11 = 0; var11 < 3; ++var11) { // L: 850
-					var9.writeInt(var40.nextInt()); // L: 851
-				}
-
-				var9.writeLong(var40.nextLong()); // L: 853
-				var9.writeLongMedium(var40.nextLong()); // L: 854
-				if (Client.randomDatData != null) { // L: 856
-					var9.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 857
-				} else {
-					byte[] var12 = new byte[24]; // L: 862
-
-					try {
-						JagexCache.JagexCache_randomDat.seek(0L); // L: 864
-						JagexCache.JagexCache_randomDat.readFully(var12); // L: 865
-
-						int var13;
-						for (var13 = 0; var13 < 24 && var12[var13] == 0; ++var13) { // L: 866 867 868
-						}
-
-						if (var13 >= 24) { // L: 870
-							throw new IOException();
-						}
-					} catch (Exception var37) {
-						for (int var14 = 0; var14 < 24; ++var14) { // L: 873
-							var12[var14] = -1;
-						}
-					}
-
-					var9.writeBytes(var12, 0, var12.length); // L: 878
-				}
-
-				var9.writeLong(var40.nextLong()); // L: 880
-				var9.encryptRsa(class80.field1006, class80.field1007); // L: 881
-				var11 = Tiles.stringCp1252NullTerminatedByteSize(var39); // L: 882
-				if (var11 % 8 != 0) { // L: 883
-					var11 += 8 - var11 % 8;
-				}
-
-				Buffer var41 = new Buffer(var11); // L: 884
-				var41.writeStringCp1252NullTerminated(var39); // L: 885
-				var41.offset = var11; // L: 886
-				var41.xteaEncryptAll(var10); // L: 887
-				Buffer var28 = new Buffer(var41.offset + var27.offset + var9.offset + 5); // L: 888
-				var28.writeByte(2); // L: 889
-				var28.writeByte(var27.offset); // L: 890
-				var28.writeBytes(var27.array, 0, var27.offset); // L: 891
-				var28.writeByte(var9.offset); // L: 892
-				var28.writeBytes(var9.array, 0, var9.offset); // L: 893
-				var28.writeShort(var41.offset); // L: 894
-				var28.writeBytes(var41.array, 0, var41.offset); // L: 895
-				byte[] var15 = var28.array; // L: 897
-				int var17 = var15.length; // L: 900
-				StringBuilder var18 = new StringBuilder(); // L: 902
-
-				int var21;
-				for (int var19 = 0; var19 < var17 + 0; var19 += 3) { // L: 903
-					int var20 = var15[var19] & 255; // L: 904
-					var18.append(class302.field3743[var20 >>> 2]); // L: 905
-					if (var19 < var17 - 1) { // L: 906
-						var21 = var15[var19 + 1] & 255; // L: 907
-						var18.append(class302.field3743[(var20 & 3) << 4 | var21 >>> 4]); // L: 908
-						if (var19 < var17 - 2) { // L: 909
-							int var22 = var15[var19 + 2] & 255; // L: 910
-							var18.append(class302.field3743[(var21 & 15) << 2 | var22 >>> 6]).append(class302.field3743[var22 & 63]); // L: 911
-						} else {
-							var18.append(class302.field3743[(var21 & 15) << 2]).append("="); // L: 913
-						}
-					} else {
-						var18.append(class302.field3743[(var20 & 3) << 4]).append("=="); // L: 915
-					}
-				}
-
-				String var16 = var18.toString(); // L: 917
-				var16 = var16; // L: 921
-
-				byte var34;
-				try {
-					URL var31 = new URL(KitDefinition.method2705("services", false) + "m=accountappeal/login.ws"); // L: 923
-					URLConnection var42 = var31.openConnection(); // L: 924
-					var42.setDoInput(true); // L: 925
-					var42.setDoOutput(true); // L: 926
-					var42.setConnectTimeout(5000); // L: 927
-					OutputStreamWriter var32 = new OutputStreamWriter(var42.getOutputStream()); // L: 928
-					var32.write("data2=" + FloorUnderlayDefinition.method2839(var16) + "&dest=" + FloorUnderlayDefinition.method2839("passwordchoice.ws")); // L: 929
-					var32.flush(); // L: 930
-					InputStream var33 = var42.getInputStream(); // L: 931
-					var28 = new Buffer(new byte[1000]); // L: 932
-
-					while (true) {
-						var21 = var33.read(var28.array, var28.offset, 1000 - var28.offset); // L: 934
-						if (var21 == -1) { // L: 935
-							var32.close(); // L: 942
-							var33.close(); // L: 943
-							String var35 = new String(var28.array); // L: 944
-							if (var35.startsWith("OFFLINE")) { // L: 945
-								var34 = 4; // L: 946
-							} else if (var35.startsWith("WRONG")) { // L: 949
-								var34 = 7; // L: 950
-							} else if (var35.startsWith("RELOAD")) { // L: 953
-								var34 = 3; // L: 954
-							} else if (var35.startsWith("Not permitted for social network accounts.")) { // L: 957
-								var34 = 6; // L: 958
-							} else {
-								var28.xteaDecryptAll(var10); // L: 961
-
-								while (var28.offset > 0 && var28.array[var28.offset - 1] == 0) { // L: 962
-									--var28.offset; // L: 963
-								}
-
-								var35 = new String(var28.array, 0, var28.offset); // L: 965
-								if (Interpreter.method1848(var35)) { // L: 966
-									Players.openURL(var35, true, false); // L: 967
-									var34 = 2; // L: 968
-								} else {
-									var34 = 5; // L: 970
-								}
-							}
-							break;
-						}
-
-						var28.offset += var21; // L: 936
-						if (var28.offset >= 1000) { // L: 937
-							var34 = 5; // L: 938
-							break;
-						}
-					}
-				} catch (Throwable var36) { // L: 972
-					var36.printStackTrace(); // L: 973
-					var34 = 5; // L: 974
-				}
-
-				var0 = var34; // L: 977
-			}
-
-			switch(var0) { // L: 979
-			case 2:
-				class260.setLoginResponseString(Strings.field3503, Strings.field3504, Strings.field3505); // L: 996
-				Login.loginIndex = 6; // L: 997
-				break;
-			case 3:
-				class260.setLoginResponseString("", "Error connecting to server.", ""); // L: 984
-				break; // L: 985
-			case 4:
-				class260.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 993
-				break; // L: 994
-			case 5:
-				class260.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 990
-				break; // L: 991
-			case 6:
-				class260.setLoginResponseString("", "Error connecting to server.", ""); // L: 981
-				break; // L: 982
-			case 7:
-				class260.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 987
-			}
-
-		}
-	} // L: 789 1000
 }
diff --git a/runescape-client/src/main/java/ClanSettings.java b/runescape-client/src/main/java/ClanSettings.java
index 32fb4d2b83..657a885242 100644
--- a/runescape-client/src/main/java/ClanSettings.java
+++ b/runescape-client/src/main/java/ClanSettings.java
@@ -1,125 +1,129 @@
+import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("l")
+@ObfuscatedName("b")
 @Implements("ClanSettings")
 public class ClanSettings {
-	@ObfuscatedName("tn")
-	@ObfuscatedGetter(
-		intValue = -1559836599
+	@ObfuscatedName("se")
+	@ObfuscatedSignature(
+		descriptor = "Lms;"
 	)
-	@Export("foundItemIdCount")
-	static int foundItemIdCount;
-	@ObfuscatedName("n")
+	@Export("platformInfo")
+	static PlatformInfo platformInfo;
+	@ObfuscatedName("es")
+	@Export("secureRandom")
+	static SecureRandom secureRandom;
+	@ObfuscatedName("e")
 	@Export("useHashes")
 	boolean useHashes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("useNames")
 	boolean useNames;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = 2571294659414795761L
+		longValue = -4969034956878830265L
 	)
-	long field109;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1000102115
-	)
-	int field94;
+	long field82;
 	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 491316409
+	)
+	int field83;
+	@ObfuscatedName("o")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -2010490505
+		intValue = -1000479447
 	)
-	int field114;
-	@ObfuscatedName("b")
+	int field85;
+	@ObfuscatedName("r")
 	@Export("allowGuests")
 	public boolean allowGuests;
+	@ObfuscatedName("h")
+	public byte field87;
 	@ObfuscatedName("d")
-	public byte field103;
-	@ObfuscatedName("s")
-	public byte field113;
-	@ObfuscatedName("u")
-	public byte field98;
-	@ObfuscatedName("l")
-	public byte field96;
-	@ObfuscatedName("o")
+	public byte field88;
+	@ObfuscatedName("z")
+	public byte field93;
+	@ObfuscatedName("b")
+	public byte field90;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1916816431
+		intValue = 2137509015
 	)
 	@Export("memberCount")
 	public int memberCount;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("memberHashes")
 	long[] memberHashes;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("memberRanks")
 	public byte[] memberRanks;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("sortedMembers")
 	int[] sortedMembers;
-	@ObfuscatedName("a")
-	int[] field106;
-	@ObfuscatedName("k")
-	public int[] field101;
-	@ObfuscatedName("m")
-	public boolean[] field108;
 	@ObfuscatedName("x")
+	int[] field95;
+	@ObfuscatedName("u")
+	public int[] field96;
+	@ObfuscatedName("q")
+	public boolean[] field97;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1791364373
+		intValue = 159638309
 	)
 	@Export("currentOwner")
 	public int currentOwner;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1909839147
+		intValue = 1730061339
 	)
 	public int field99;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1521260055
+		intValue = 1156384829
 	)
 	@Export("bannedMemberCount")
 	public int bannedMemberCount;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("bannedMemberHashes")
 	long[] bannedMemberHashes;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("memberNames")
 	public String[] memberNames;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@Export("bannedMemberNames")
 	public String[] bannedMemberNames;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("parameters")
 	IterableNodeHashTable parameters;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	public ClanSettings(Buffer var1) {
-		this.field94 = 0; // L: 14
+		this.field83 = 0; // L: 14
 		this.name = null; // L: 15
-		this.field114 = 0; // L: 16
-		this.currentOwner = -1;
+		this.field85 = 0; // L: 16
+		this.currentOwner = -1; // L: 29
 		this.field99 = -1; // L: 30
-		this.method127(var1); // L: 43
+		this.method139(var1); // L: 43
 	} // L: 44
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1920986266"
+		descriptor = "(IB)V",
+		garbageValue = "85"
 	)
-	void method97(int var1) {
+	void method121(int var1) {
 		if (this.useHashes) { // L: 47
 			if (this.memberHashes != null) { // L: 48
 				System.arraycopy(this.memberHashes, 0, this.memberHashes = new long[var1], 0, this.memberCount);
@@ -142,32 +146,32 @@ public class ClanSettings {
 			this.memberRanks = new byte[var1]; // L: 56
 		}
 
-		if (this.field106 != null) { // L: 57
-			System.arraycopy(this.field106, 0, this.field106 = new int[var1], 0, this.memberCount);
+		if (this.field95 != null) {
+			System.arraycopy(this.field95, 0, this.field95 = new int[var1], 0, this.memberCount);
 		} else {
-			this.field106 = new int[var1]; // L: 58
+			this.field95 = new int[var1]; // L: 58
 		}
 
-		if (this.field101 != null) { // L: 59
-			System.arraycopy(this.field101, 0, this.field101 = new int[var1], 0, this.memberCount);
+		if (this.field96 != null) { // L: 59
+			System.arraycopy(this.field96, 0, this.field96 = new int[var1], 0, this.memberCount);
 		} else {
-			this.field101 = new int[var1]; // L: 60
+			this.field96 = new int[var1]; // L: 60
 		}
 
-		if (this.field108 != null) { // L: 61
-			System.arraycopy(this.field108, 0, this.field108 = new boolean[var1], 0, this.memberCount);
+		if (this.field97 != null) { // L: 61
+			System.arraycopy(this.field97, 0, this.field97 = new boolean[var1], 0, this.memberCount);
 		} else {
-			this.field108 = new boolean[var1]; // L: 62
+			this.field97 = new boolean[var1]; // L: 62
 		}
 
 	} // L: 63
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(IB)V",
-		garbageValue = "0"
+		garbageValue = "-33"
 	)
-	void method98(int var1) {
+	void method122(int var1) {
 		if (this.useHashes) { // L: 66
 			if (this.bannedMemberHashes != null) { // L: 67
 				System.arraycopy(this.bannedMemberHashes, 0, this.bannedMemberHashes = new long[var1], 0, this.bannedMemberCount);
@@ -186,12 +190,12 @@ public class ClanSettings {
 
 	} // L: 74
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "562871679"
+		garbageValue = "1805753468"
 	)
-	public int method99(String var1) {
+	public int method196(String var1) {
 		if (var1 != null && var1.length() != 0) { // L: 77
 			for (int var2 = 0; var2 < this.memberCount; ++var2) { // L: 78
 				if (this.memberNames[var2].equals(var1)) { // L: 79
@@ -208,17 +212,17 @@ public class ClanSettings {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)I",
-		garbageValue = "-1640558909"
+		garbageValue = "942586664"
 	)
-	public int method100(int var1, int var2, int var3) {
+	public int method170(int var1, int var2, int var3) {
 		int var4 = var3 == 31 ? -1 : (1 << var3 + 1) - 1; // L: 85
-		return (this.field106[var1] & var4) >>> var2; // L: 86
+		return (this.field95[var1] & var4) >>> var2; // L: 86
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Ljava/lang/Integer;",
-		garbageValue = "5"
+		descriptor = "(II)Ljava/lang/Integer;",
+		garbageValue = "1522777048"
 	)
 	@Export("getTitleGroupValue")
 	public Integer getTitleGroupValue(int var1) {
@@ -230,10 +234,10 @@ public class ClanSettings {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)[I",
-		garbageValue = "-1269043110"
+		garbageValue = "284711129"
 	)
 	@Export("getSortedMembers")
 	public int[] getSortedMembers() {
@@ -248,522 +252,523 @@ public class ClanSettings {
 				}
 			}
 
-			ChatChannel.method2013(var1, this.sortedMembers); // L: 105
+			int[] var3 = this.sortedMembers; // L: 105
+			class215.method4434(var1, var3, 0, var1.length - 1); // L: 107
 		}
 
-		return this.sortedMembers; // L: 107
+		return this.sortedMembers; // L: 110
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(JLjava/lang/String;II)V",
-		garbageValue = "965862752"
+		garbageValue = "-1360534257"
 	)
-	void method103(long var1, String var3, int var4) {
-		if (var3 != null && var3.length() == 0) { // L: 111
+	void method126(long var1, String var3, int var4) {
+		if (var3 != null && var3.length() == 0) { // L: 114
 			var3 = null;
 		}
 
-		if (var1 > 0L != this.useHashes) { // L: 112
+		if (var1 > 0L != this.useHashes) { // L: 115
 			throw new RuntimeException("");
-		} else if (this.useNames != (var3 != null)) { // L: 113
+		} else if (this.useNames != (var3 != null)) { // L: 116
 			throw new RuntimeException("");
 		} else {
-			if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 114
-				this.method97(this.memberCount + 5);
+			if (var1 > 0L && (this.memberHashes == null || this.memberCount >= this.memberHashes.length) || var3 != null && (this.memberNames == null || this.memberCount >= this.memberNames.length)) { // L: 117
+				this.method121(this.memberCount + 5);
 			}
 
-			if (this.memberHashes != null) { // L: 115
+			if (this.memberHashes != null) { // L: 118
 				this.memberHashes[this.memberCount] = var1;
 			}
 
-			if (this.memberNames != null) { // L: 116
+			if (this.memberNames != null) { // L: 119
 				this.memberNames[this.memberCount] = var3;
 			}
 
-			if (this.currentOwner == -1) { // L: 117
-				this.currentOwner = this.memberCount; // L: 118
-				this.memberRanks[this.memberCount] = 126; // L: 119
+			if (this.currentOwner == -1) { // L: 120
+				this.currentOwner = this.memberCount; // L: 121
+				this.memberRanks[this.memberCount] = 126; // L: 122
 			} else {
-				this.memberRanks[this.memberCount] = 0; // L: 122
+				this.memberRanks[this.memberCount] = 0; // L: 125
 			}
 
-			this.field106[this.memberCount] = 0; // L: 124
-			this.field101[this.memberCount] = var4; // L: 125
-			this.field108[this.memberCount] = false; // L: 126
-			++this.memberCount; // L: 127
-			this.sortedMembers = null; // L: 128
+			this.field95[this.memberCount] = 0; // L: 127
+			this.field96[this.memberCount] = var4; // L: 128
+			this.field97[this.memberCount] = false; // L: 129
+			++this.memberCount; // L: 130
+			this.sortedMembers = null; // L: 131
 		}
-	} // L: 129
+	} // L: 132
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-888167097"
+		garbageValue = "-1830221034"
 	)
-	void method121(int var1) {
-		if (var1 >= 0 && var1 < this.memberCount) { // L: 132
-			--this.memberCount; // L: 133
-			this.sortedMembers = null; // L: 134
-			if (this.memberCount == 0) { // L: 135
-				this.memberHashes = null; // L: 136
-				this.memberNames = null; // L: 137
-				this.memberRanks = null; // L: 138
-				this.field106 = null; // L: 139
-				this.field101 = null; // L: 140
-				this.field108 = null; // L: 141
-				this.currentOwner = -1; // L: 142
-				this.field99 = -1; // L: 143
+	void method127(int var1) {
+		if (var1 >= 0 && var1 < this.memberCount) { // L: 135
+			--this.memberCount; // L: 136
+			this.sortedMembers = null; // L: 137
+			if (this.memberCount == 0) { // L: 138
+				this.memberHashes = null; // L: 139
+				this.memberNames = null; // L: 140
+				this.memberRanks = null; // L: 141
+				this.field95 = null; // L: 142
+				this.field96 = null; // L: 143
+				this.field97 = null; // L: 144
+				this.currentOwner = -1; // L: 145
+				this.field99 = -1; // L: 146
 			} else {
-				System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 146
-				System.arraycopy(this.field106, var1 + 1, this.field106, var1, this.memberCount - var1); // L: 147
-				System.arraycopy(this.field101, var1 + 1, this.field101, var1, this.memberCount - var1); // L: 148
-				System.arraycopy(this.field108, var1 + 1, this.field108, var1, this.memberCount - var1); // L: 149
-				if (this.memberHashes != null) { // L: 150
+				System.arraycopy(this.memberRanks, var1 + 1, this.memberRanks, var1, this.memberCount - var1); // L: 149
+				System.arraycopy(this.field95, var1 + 1, this.field95, var1, this.memberCount - var1); // L: 150
+				System.arraycopy(this.field96, var1 + 1, this.field96, var1, this.memberCount - var1); // L: 151
+				System.arraycopy(this.field97, var1 + 1, this.field97, var1, this.memberCount - var1); // L: 152
+				if (this.memberHashes != null) { // L: 153
 					System.arraycopy(this.memberHashes, var1 + 1, this.memberHashes, var1, this.memberCount - var1);
 				}
 
-				if (this.memberNames != null) { // L: 151
+				if (this.memberNames != null) { // L: 154
 					System.arraycopy(this.memberNames, var1 + 1, this.memberNames, var1, this.memberCount - var1);
 				}
 
-				this.updateOwner(); // L: 152
+				this.updateOwner(); // L: 155
 			}
 
 		} else {
 			throw new RuntimeException("");
 		}
-	} // L: 154
+	} // L: 157
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1130726760"
+		garbageValue = "1260147822"
 	)
 	@Export("updateOwner")
 	void updateOwner() {
-		if (this.memberCount == 0) { // L: 157
-			this.currentOwner = -1; // L: 158
-			this.field99 = -1; // L: 159
+		if (this.memberCount == 0) { // L: 160
+			this.currentOwner = -1; // L: 161
+			this.field99 = -1; // L: 162
 		} else {
-			this.currentOwner = -1; // L: 162
-			this.field99 = -1; // L: 163
-			int var1 = 0; // L: 164
-			byte var2 = this.memberRanks[0]; // L: 165
+			this.currentOwner = -1; // L: 165
+			this.field99 = -1; // L: 166
+			int var1 = 0; // L: 167
+			byte var2 = this.memberRanks[0]; // L: 168
 
-			for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 166
-				if (this.memberRanks[var3] > var2) { // L: 167
-					if (var2 == 125) { // L: 168
+			for (int var3 = 1; var3 < this.memberCount; ++var3) { // L: 169
+				if (this.memberRanks[var3] > var2) { // L: 170
+					if (var2 == 125) { // L: 171
 						this.field99 = var1;
 					}
 
-					var1 = var3; // L: 169
-					var2 = this.memberRanks[var3]; // L: 170
-				} else if (this.field99 == -1 && this.memberRanks[var3] == 125) { // L: 172
-					this.field99 = var3; // L: 173
+					var1 = var3; // L: 172
+					var2 = this.memberRanks[var3]; // L: 173
+				} else if (this.field99 == -1 && this.memberRanks[var3] == 125) { // L: 175
+					this.field99 = var3; // L: 176
 				}
 			}
 
-			this.currentOwner = var1; // L: 176
-			if (this.currentOwner != -1) { // L: 177
+			this.currentOwner = var1; // L: 179
+			if (this.currentOwner != -1) { // L: 180
 				this.memberRanks[this.currentOwner] = 126;
 			}
 
 		}
-	} // L: 160 178
+	} // L: 163 181
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(JLjava/lang/String;B)V",
-		garbageValue = "16"
+		descriptor = "(JLjava/lang/String;I)V",
+		garbageValue = "1778861345"
 	)
-	void method106(long var1, String var3) {
-		if (var3 != null && var3.length() == 0) { // L: 181
+	void method129(long var1, String var3) {
+		if (var3 != null && var3.length() == 0) { // L: 184
 			var3 = null;
 		}
 
-		if (this.useHashes != var1 > 0L) { // L: 182
+		if (var1 > 0L != this.useHashes) { // L: 185
 			throw new RuntimeException("");
-		} else if (this.useNames != (var3 != null)) { // L: 183
+		} else if (this.useNames != (var3 != null)) { // L: 186
 			throw new RuntimeException("");
 		} else {
-			if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 184
-				this.method98(this.bannedMemberCount + 5);
+			if (var1 > 0L && (this.bannedMemberHashes == null || this.bannedMemberCount >= this.bannedMemberHashes.length) || var3 != null && (this.bannedMemberNames == null || this.bannedMemberCount >= this.bannedMemberNames.length)) { // L: 187
+				this.method122(this.bannedMemberCount + 5);
 			}
 
-			if (this.bannedMemberHashes != null) { // L: 185
+			if (this.bannedMemberHashes != null) { // L: 188
 				this.bannedMemberHashes[this.bannedMemberCount] = var1;
 			}
 
-			if (this.bannedMemberNames != null) { // L: 186
+			if (this.bannedMemberNames != null) { // L: 189
 				this.bannedMemberNames[this.bannedMemberCount] = var3;
 			}
 
-			++this.bannedMemberCount; // L: 187
+			++this.bannedMemberCount;
 		}
-	} // L: 188
+	} // L: 191
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "618378761"
+		garbageValue = "-1142795172"
 	)
-	void method139(int var1) {
-		--this.bannedMemberCount; // L: 191
-		if (this.bannedMemberCount == 0) { // L: 192
-			this.bannedMemberHashes = null; // L: 193
-			this.bannedMemberNames = null; // L: 194
+	void method124(int var1) {
+		--this.bannedMemberCount;
+		if (this.bannedMemberCount == 0) { // L: 195
+			this.bannedMemberHashes = null; // L: 196
+			this.bannedMemberNames = null; // L: 197
 		} else {
-			if (this.bannedMemberHashes != null) { // L: 197
+			if (this.bannedMemberHashes != null) { // L: 200
 				System.arraycopy(this.bannedMemberHashes, var1 + 1, this.bannedMemberHashes, var1, this.bannedMemberCount - var1);
 			}
 
 			if (this.bannedMemberNames != null) {
-				System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 198
+				System.arraycopy(this.bannedMemberNames, var1 + 1, this.bannedMemberNames, var1, this.bannedMemberCount - var1); // L: 201
 			}
 		}
 
-	} // L: 200
+	} // L: 203
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IBB)I",
-		garbageValue = "-45"
+		descriptor = "(IBI)I",
+		garbageValue = "-604206368"
 	)
-	int method112(int var1, byte var2) {
-		if (var2 != 126 && var2 != 127) { // L: 203
-			if (this.currentOwner == var1 && (this.field99 == -1 || this.memberRanks[this.field99] < 125)) { // L: 204
+	int method131(int var1, byte var2) {
+		if (var2 != 126 && var2 != 127) { // L: 206
+			if (this.currentOwner == var1 && (this.field99 == -1 || this.memberRanks[this.field99] < 125)) { // L: 207
+				return -1;
+			} else if (this.memberRanks[var1] == var2) { // L: 208
 				return -1;
-			} else if (this.memberRanks[var1] == var2) {
-				return -1; // L: 205
 			} else {
-				this.memberRanks[var1] = var2; // L: 206
-				this.updateOwner(); // L: 207
-				return var1; // L: 208
+				this.memberRanks[var1] = var2; // L: 209
+				this.updateOwner(); // L: 210
+				return var1; // L: 211
 			}
 		} else {
 			return -1;
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		descriptor = "(IB)Z",
-		garbageValue = "-5"
+		garbageValue = "-113"
 	)
-	boolean method109(int var1) {
-		if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 212
-			this.memberRanks[this.currentOwner] = 125; // L: 213
-			this.field99 = this.currentOwner; // L: 214
-			this.memberRanks[var1] = 126; // L: 215
-			this.currentOwner = var1; // L: 216
-			return true; // L: 217
+	boolean method132(int var1) {
+		if (this.currentOwner != var1 && this.memberRanks[var1] != 126) { // L: 215
+			this.memberRanks[this.currentOwner] = 125; // L: 216
+			this.field99 = this.currentOwner; // L: 217
+			this.memberRanks[var1] = 126; // L: 218
+			this.currentOwner = var1; // L: 219
+			return true; // L: 220
 		} else {
 			return false;
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(IZB)I",
-		garbageValue = "2"
+		descriptor = "(IZI)I",
+		garbageValue = "49052820"
 	)
-	int method110(int var1, boolean var2) {
-		if (this.field108[var1] == var2) { // L: 221
+	int method133(int var1, boolean var2) {
+		if (this.field97[var1] == var2) { // L: 224
 			return -1;
 		} else {
-			this.field108[var1] = var2; // L: 222
-			return var1; // L: 223
-		}
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)I",
-		garbageValue = "-2110063672"
-	)
-	int method126(int var1, int var2, int var3, int var4) {
-		int var5 = (1 << var3) - 1; // L: 227
-		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 228
-		int var7 = var6 ^ var5; // L: 229
-		var2 <<= var3; // L: 230
-		var2 &= var7; // L: 231
-		int var8 = this.field106[var1]; // L: 232
-		if ((var8 & var7) == var2) {
-			return -1; // L: 233
-		} else {
-			var8 &= ~var7; // L: 234
-			this.field106[var1] = var8 | var2; // L: 235
-			return var1; // L: 236
+			this.field97[var1] = var2; // L: 225
+			return var1; // L: 226
 		}
 	}
 
 	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIB)I",
+		garbageValue = "-61"
+	)
+	int method128(int var1, int var2, int var3, int var4) {
+		int var5 = (1 << var3) - 1; // L: 230
+		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 231
+		int var7 = var6 ^ var5; // L: 232
+		var2 <<= var3; // L: 233
+		var2 &= var7; // L: 234
+		int var8 = this.field95[var1]; // L: 235
+		if ((var8 & var7) == var2) {
+			return -1; // L: 236
+		} else {
+			var8 &= ~var7; // L: 237
+			this.field95[var1] = var8 | var2; // L: 238
+			return var1; // L: 239
+		}
+	}
+
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-677454143"
+		garbageValue = "65280"
 	)
-	boolean method157(int var1, int var2) {
-		if (this.parameters != null) { // L: 240
-			Node var3 = this.parameters.get((long)var1); // L: 241
-			if (var3 != null) { // L: 242
-				if (var3 instanceof IntegerNode) { // L: 243
-					IntegerNode var4 = (IntegerNode)var3; // L: 244
-					if (var2 == var4.integer) { // L: 245
+	boolean method188(int var1, int var2) {
+		if (this.parameters != null) { // L: 243
+			Node var3 = this.parameters.get((long)var1); // L: 244
+			if (var3 != null) { // L: 245
+				if (var3 instanceof IntegerNode) { // L: 246
+					IntegerNode var4 = (IntegerNode)var3; // L: 247
+					if (var2 == var4.integer) { // L: 248
 						return false;
 					}
 
-					var4.integer = var2; // L: 246
-					return true; // L: 247
+					var4.integer = var2; // L: 249
+					return true; // L: 250
 				}
 
-				var3.remove(); // L: 249
+				var3.remove(); // L: 252
 			}
 		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 252
+			this.parameters = new IterableNodeHashTable(4); // L: 255
 		}
 
-		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 253
-		return true; // L: 254
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)Z",
-		garbageValue = "-1951488302"
-	)
-	boolean method113(int var1, int var2, int var3, int var4) {
-		int var5 = (1 << var3) - 1; // L: 258
-		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 259
-		int var7 = var6 ^ var5; // L: 260
-		var2 <<= var3; // L: 261
-		var2 &= var7; // L: 262
-		if (this.parameters != null) { // L: 263
-			Node var8 = this.parameters.get((long)var1); // L: 264
-			if (var8 != null) { // L: 265
-				if (var8 instanceof IntegerNode) { // L: 266
-					IntegerNode var9 = (IntegerNode)var8; // L: 267
-					if ((var9.integer & var7) == var2) { // L: 268
-						return false;
-					}
-
-					var9.integer &= ~var7; // L: 269
-					var9.integer |= var2; // L: 270
-					return true; // L: 271
-				}
-
-				var8.remove(); // L: 273
-			}
-		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 276
-		}
-
-		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 277
-		return true; // L: 278
-	}
-
-	@ObfuscatedName("k")
-	boolean method122(int var1, long var2) {
-		if (this.parameters != null) { // L: 282
-			Node var4 = this.parameters.get((long)var1); // L: 283
-			if (var4 != null) { // L: 284
-				if (var4 instanceof class349) { // L: 285
-					class349 var5 = (class349)var4; // L: 286
-					if (var5.field3935 == var2) { // L: 287
-						return false;
-					}
-
-					var5.field3935 = var2; // L: 288
-					return true; // L: 289
-				}
-
-				var4.remove(); // L: 291
-			}
-		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 294
-		}
-
-		this.parameters.put(new class349(var2), (long)var1); // L: 295
-		return true; // L: 296
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;I)Z",
-		garbageValue = "1252307954"
-	)
-	boolean method115(int var1, String var2) {
-		if (var2 == null) { // L: 300
-			var2 = "";
-		} else if (var2.length() > 80) { // L: 301
-			var2 = var2.substring(0, 80);
-		}
-
-		if (this.parameters != null) { // L: 302
-			Node var3 = this.parameters.get((long)var1); // L: 303
-			if (var3 != null) { // L: 304
-				if (var3 instanceof ObjectNode) { // L: 305
-					ObjectNode var4 = (ObjectNode)var3; // L: 306
-					if (var4.obj instanceof String) { // L: 307
-						if (var2.equals(var4.obj)) { // L: 308
-							return false;
-						}
-
-						var4.remove(); // L: 309
-						this.parameters.put(new ObjectNode(var2), var4.key); // L: 310
-						return true; // L: 311
-					}
-				}
-
-				var3.remove(); // L: 314
-			}
-		} else {
-			this.parameters = new IterableNodeHashTable(4); // L: 317
-		}
-
-		this.parameters.put(new ObjectNode(var2), (long)var1); // L: 318
-		return true; // L: 319
+		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 256
+		return true; // L: 257
 	}
 
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "469321554"
+		descriptor = "(IIIIB)Z",
+		garbageValue = "-43"
 	)
-	void method127(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 323
-		if (var2 >= 1 && var2 <= 6) { // L: 324
-			int var3 = var1.readUnsignedByte(); // L: 325
-			if ((var3 & 1) != 0) { // L: 326
+	boolean method136(int var1, int var2, int var3, int var4) {
+		int var5 = (1 << var3) - 1; // L: 261
+		int var6 = var4 == 31 ? -1 : (1 << var4 + 1) - 1; // L: 262
+		int var7 = var6 ^ var5; // L: 263
+		var2 <<= var3; // L: 264
+		var2 &= var7; // L: 265
+		if (this.parameters != null) { // L: 266
+			Node var8 = this.parameters.get((long)var1); // L: 267
+			if (var8 != null) { // L: 268
+				if (var8 instanceof IntegerNode) { // L: 269
+					IntegerNode var9 = (IntegerNode)var8; // L: 270
+					if ((var9.integer & var7) == var2) { // L: 271
+						return false;
+					}
+
+					var9.integer &= ~var7; // L: 272
+					var9.integer |= var2; // L: 273
+					return true; // L: 274
+				}
+
+				var8.remove(); // L: 276
+			}
+		} else {
+			this.parameters = new IterableNodeHashTable(4); // L: 279
+		}
+
+		this.parameters.put(new IntegerNode(var2), (long)var1); // L: 280
+		return true; // L: 281
+	}
+
+	@ObfuscatedName("u")
+	boolean method137(int var1, long var2) {
+		if (this.parameters != null) { // L: 285
+			Node var4 = this.parameters.get((long)var1); // L: 286
+			if (var4 != null) { // L: 287
+				if (var4 instanceof class350) { // L: 288
+					class350 var5 = (class350)var4; // L: 289
+					if (var5.field3932 == var2) { // L: 290
+						return false;
+					}
+
+					var5.field3932 = var2; // L: 291
+					return true; // L: 292
+				}
+
+				var4.remove(); // L: 294
+			}
+		} else {
+			this.parameters = new IterableNodeHashTable(4); // L: 297
+		}
+
+		this.parameters.put(new class350(var2), (long)var1); // L: 298
+		return true; // L: 299
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;I)Z",
+		garbageValue = "1757759616"
+	)
+	boolean method138(int var1, String var2) {
+		if (var2 == null) { // L: 303
+			var2 = "";
+		} else if (var2.length() > 80) { // L: 304
+			var2 = var2.substring(0, 80);
+		}
+
+		if (this.parameters != null) { // L: 305
+			Node var3 = this.parameters.get((long)var1); // L: 306
+			if (var3 != null) { // L: 307
+				if (var3 instanceof ObjectNode) { // L: 308
+					ObjectNode var4 = (ObjectNode)var3; // L: 309
+					if (var4.obj instanceof String) { // L: 310
+						if (var2.equals(var4.obj)) { // L: 311
+							return false;
+						}
+
+						var4.remove(); // L: 312
+						this.parameters.put(new ObjectNode(var2), var4.key); // L: 313
+						return true; // L: 314
+					}
+				}
+
+				var3.remove(); // L: 317
+			}
+		} else {
+			this.parameters = new IterableNodeHashTable(4); // L: 320
+		}
+
+		this.parameters.put(new ObjectNode(var2), (long)var1); // L: 321
+		return true; // L: 322
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-750951939"
+	)
+	void method139(Buffer var1) {
+		int var2 = var1.readUnsignedByte(); // L: 326
+		if (var2 >= 1 && var2 <= 6) { // L: 327
+			int var3 = var1.readUnsignedByte(); // L: 328
+			if ((var3 & 1) != 0) { // L: 329
 				this.useHashes = true;
 			}
 
-			if ((var3 & 2) != 0) { // L: 327
+			if ((var3 & 2) != 0) { // L: 330
 				this.useNames = true;
 			}
 
-			if (!this.useHashes) { // L: 328
-				this.memberHashes = null; // L: 329
-				this.bannedMemberHashes = null; // L: 330
+			if (!this.useHashes) { // L: 331
+				this.memberHashes = null; // L: 332
+				this.bannedMemberHashes = null; // L: 333
 			}
 
-			if (!this.useNames) { // L: 332
-				this.memberNames = null; // L: 333
-				this.bannedMemberNames = null; // L: 334
+			if (!this.useNames) { // L: 335
+				this.memberNames = null; // L: 336
+				this.bannedMemberNames = null; // L: 337
 			}
 
-			this.field94 = var1.readInt(); // L: 336
-			this.field114 = var1.readInt(); // L: 337
-			if (var2 <= 3 && this.field114 != 0) { // L: 338
-				this.field114 += 16912800;
+			this.field83 = var1.readInt(); // L: 339
+			this.field85 = var1.readInt(); // L: 340
+			if (var2 <= 3 && this.field85 != 0) { // L: 341
+				this.field85 += 16912800;
 			}
 
-			this.memberCount = var1.readUnsignedShort(); // L: 339
-			this.bannedMemberCount = var1.readUnsignedByte(); // L: 340
-			this.name = var1.readStringCp1252NullTerminated(); // L: 341
-			if (var2 >= 4) { // L: 342
-				var1.readInt(); // L: 343
+			this.memberCount = var1.readUnsignedShort(); // L: 342
+			this.bannedMemberCount = var1.readUnsignedByte(); // L: 343
+			this.name = var1.readStringCp1252NullTerminated(); // L: 344
+			if (var2 >= 4) { // L: 345
+				var1.readInt(); // L: 346
 			}
 
-			this.allowGuests = var1.readUnsignedByte() == 1; // L: 345
-			this.field103 = var1.readByte(); // L: 346
-			this.field113 = var1.readByte(); // L: 347
-			this.field98 = var1.readByte(); // L: 348
-			this.field96 = var1.readByte(); // L: 349
+			this.allowGuests = var1.readUnsignedByte() == 1; // L: 348
+			this.field87 = var1.readByte(); // L: 349
+			this.field88 = var1.readByte(); // L: 350
+			this.field93 = var1.readByte(); // L: 351
+			this.field90 = var1.readByte(); // L: 352
 			int var4;
-			if (this.memberCount > 0) { // L: 350
-				if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 351
+			if (this.memberCount > 0) { // L: 353
+				if (this.useHashes && (this.memberHashes == null || this.memberHashes.length < this.memberCount)) { // L: 354
 					this.memberHashes = new long[this.memberCount];
 				}
 
-				if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 352
+				if (this.useNames && (this.memberNames == null || this.memberNames.length < this.memberCount)) { // L: 355
 					this.memberNames = new String[this.memberCount];
 				}
 
-				if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 353
+				if (this.memberRanks == null || this.memberRanks.length < this.memberCount) { // L: 356
 					this.memberRanks = new byte[this.memberCount];
 				}
 
-				if (this.field106 == null || this.field106.length < this.memberCount) { // L: 354
-					this.field106 = new int[this.memberCount];
+				if (this.field95 == null || this.field95.length < this.memberCount) { // L: 357
+					this.field95 = new int[this.memberCount];
 				}
 
-				if (this.field101 == null || this.field101.length < this.memberCount) { // L: 355
-					this.field101 = new int[this.memberCount];
+				if (this.field96 == null || this.field96.length < this.memberCount) { // L: 358
+					this.field96 = new int[this.memberCount];
 				}
 
-				if (this.field108 == null || this.field108.length < this.memberCount) { // L: 356
-					this.field108 = new boolean[this.memberCount];
+				if (this.field97 == null || this.field97.length < this.memberCount) { // L: 359
+					this.field97 = new boolean[this.memberCount];
 				}
 
-				for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 357
-					if (this.useHashes) { // L: 358
+				for (var4 = 0; var4 < this.memberCount; ++var4) { // L: 360
+					if (this.useHashes) { // L: 361
 						this.memberHashes[var4] = var1.readLong();
 					}
 
-					if (this.useNames) { // L: 359
+					if (this.useNames) { // L: 362
 						this.memberNames[var4] = var1.readStringCp1252NullTerminatedOrNull();
 					}
 
-					this.memberRanks[var4] = var1.readByte(); // L: 360
-					if (var2 >= 2) { // L: 361
-						this.field106[var4] = var1.readInt();
+					this.memberRanks[var4] = var1.readByte(); // L: 363
+					if (var2 >= 2) { // L: 364
+						this.field95[var4] = var1.readInt();
 					}
 
-					if (var2 >= 5) { // L: 362
-						this.field101[var4] = var1.readUnsignedShort();
+					if (var2 >= 5) { // L: 365
+						this.field96[var4] = var1.readUnsignedShort();
 					} else {
-						this.field101[var4] = 0; // L: 363
+						this.field96[var4] = 0; // L: 366
 					}
 
-					if (var2 >= 6) { // L: 364
-						this.field108[var4] = var1.readUnsignedByte() == 1;
+					if (var2 >= 6) { // L: 367
+						this.field97[var4] = var1.readUnsignedByte() == 1;
 					} else {
-						this.field108[var4] = false; // L: 365
+						this.field97[var4] = false; // L: 368
 					}
 				}
 
-				this.updateOwner(); // L: 367
+				this.updateOwner(); // L: 370
 			}
 
-			if (this.bannedMemberCount > 0) { // L: 369
-				if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 370
+			if (this.bannedMemberCount > 0) { // L: 372
+				if (this.useHashes && (this.bannedMemberHashes == null || this.bannedMemberHashes.length < this.bannedMemberCount)) { // L: 373
 					this.bannedMemberHashes = new long[this.bannedMemberCount];
 				}
 
-				if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 371
+				if (this.useNames && (this.bannedMemberNames == null || this.bannedMemberNames.length < this.bannedMemberCount)) { // L: 374
 					this.bannedMemberNames = new String[this.bannedMemberCount];
 				}
 
-				for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 372
-					if (this.useHashes) { // L: 373
+				for (var4 = 0; var4 < this.bannedMemberCount; ++var4) { // L: 375
+					if (this.useHashes) { // L: 376
 						this.bannedMemberHashes[var4] = var1.readLong();
 					}
 
-					if (this.useNames) { // L: 374
+					if (this.useNames) { // L: 377
 						this.bannedMemberNames[var4] = var1.readStringCp1252NullTerminatedOrNull();
 					}
 				}
 			}
 
-			if (var2 >= 3) { // L: 377
-				var4 = var1.readUnsignedShort(); // L: 378
-				if (var4 > 0) { // L: 379
-					this.parameters = new IterableNodeHashTable(var4 < 16 ? Player.method2128(var4) : 16); // L: 380
+			if (var2 >= 3) { // L: 380
+				var4 = var1.readUnsignedShort(); // L: 381
+				if (var4 > 0) { // L: 382
+					this.parameters = new IterableNodeHashTable(var4 < 16 ? UrlRequester.method2504(var4) : 16); // L: 383
 
-					while (var4-- > 0) { // L: 381
-						int var5 = var1.readInt(); // L: 382
-						int var6 = var5 & 1073741823; // L: 383
-						int var7 = var5 >>> 30; // L: 384
-						if (var7 == 0) { // L: 385
-							int var12 = var1.readInt(); // L: 386
-							this.parameters.put(new IntegerNode(var12), (long)var6); // L: 387
-						} else if (var7 == 1) { // L: 389
-							long var10 = var1.readLong(); // L: 390
-							this.parameters.put(new class349(var10), (long)var6); // L: 391
-						} else if (var7 == 2) { // L: 393
-							String var8 = var1.readStringCp1252NullTerminated(); // L: 394
-							this.parameters.put(new ObjectNode(var8), (long)var6); // L: 395
+					while (var4-- > 0) { // L: 384
+						int var5 = var1.readInt(); // L: 385
+						int var6 = var5 & 1073741823; // L: 386
+						int var7 = var5 >>> 30; // L: 387
+						if (var7 == 0) { // L: 388
+							int var12 = var1.readInt(); // L: 389
+							this.parameters.put(new IntegerNode(var12), (long)var6); // L: 390
+						} else if (var7 == 1) { // L: 392
+							long var10 = var1.readLong(); // L: 393
+							this.parameters.put(new class350(var10), (long)var6); // L: 394
+						} else if (var7 == 2) { // L: 396
+							String var8 = var1.readStringCp1252NullTerminated(); // L: 397
+							this.parameters.put(new ObjectNode(var8), (long)var6); // L: 398
 						}
 					}
 				}
@@ -772,135 +777,56 @@ public class ClanSettings {
 		} else {
 			throw new RuntimeException("" + var2);
 		}
-	} // L: 400
+	} // L: 403
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lex;",
-		garbageValue = "760269699"
+		descriptor = "(Ljp;Ljp;B)V",
+		garbageValue = "-16"
 	)
-	@Export("VarpDefinition_get")
-	public static VarpDefinition VarpDefinition_get(int var0) {
-		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23
-		if (var1 != null) { // L: 24
-			return var1;
-		} else {
-			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25
-			var1 = new VarpDefinition(); // L: 26
-			if (var2 != null) { // L: 27
-				var1.decode(new Buffer(var2));
-			}
+	public static void method203(AbstractArchive var0, AbstractArchive var1) {
+		HealthBarDefinition.HealthBarDefinition_archive = var0; // L: 32
+		class378.HitSplatDefinition_spritesArchive = var1; // L: 33
+	} // L: 34
 
-			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28
-			return var1; // L: 29
-		}
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1865027594"
+	)
+	public static int method200() {
+		return ++MouseHandler.MouseHandler_idleCycles - 1; // L: 57
 	}
 
-	@ObfuscatedName("fv")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1049112805"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1382851298"
 	)
-	static final void method165() {
-		int[] var0 = Players.Players_indices; // L: 3460
+	static final void method201(String var0) {
+		StringBuilder var10000 = new StringBuilder();
+		Object var10001 = null; // L: 190
+		var10000 = var10000.append("Please remove ").append(var0);
+		var10001 = null;
+		String var1 = var10000.append(" from your friend list first").toString();
+		UserComparator10.addGameMessage(30, "", var1); // L: 192
+	} // L: 194
 
-		int var1;
-		for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3461
-			Player var4 = Client.players[var0[var1]]; // L: 3462
-			if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3463
-				--var4.overheadTextCyclesRemaining; // L: 3464
-				if (var4.overheadTextCyclesRemaining == 0) { // L: 3465
-					var4.overheadText = null;
-				}
-			}
+	@ObfuscatedName("fh")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "1255616789"
+	)
+	@Export("queueSoundEffect")
+	static void queueSoundEffect(int var0, int var1, int var2) {
+		if (class4.clientPreferences.soundEffectsVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3774
+			Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3775
+			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3776
+			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3777
+			Client.soundEffects[Client.soundEffectCount] = null; // L: 3778
+			Client.soundLocations[Client.soundEffectCount] = 0; // L: 3779
+			++Client.soundEffectCount; // L: 3780
 		}
 
-		for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3468
-			int var2 = Client.npcIndices[var1]; // L: 3469
-			NPC var3 = Client.npcs[var2]; // L: 3470
-			if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3471
-				--var3.overheadTextCyclesRemaining; // L: 3472
-				if (var3.overheadTextCyclesRemaining == 0) { // L: 3473
-					var3.overheadText = null;
-				}
-			}
-		}
-
-	} // L: 3476
-
-	@ObfuscatedName("he")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "0"
-	)
-	@Export("updateItemPile")
-	static final void updateItemPile(int var0, int var1) {
-		NodeDeque var2 = Client.groundItems[class22.Client_plane][var0][var1]; // L: 7289
-		if (var2 == null) { // L: 7290
-			AbstractSocket.scene.removeGroundItemPile(class22.Client_plane, var0, var1); // L: 7291
-		} else {
-			long var3 = -99999999L; // L: 7294
-			TileItem var5 = null; // L: 7295
-
-			TileItem var6;
-			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7296 7297 7305
-				ItemComposition var7 = class260.ItemDefinition_get(var6.id); // L: 7298
-				long var11 = (long)var7.price; // L: 7299
-				if (var7.isStackable == 1) { // L: 7300
-					var11 *= (long)(var6.quantity + 1);
-				}
-
-				if (var11 > var3) { // L: 7301
-					var3 = var11; // L: 7302
-					var5 = var6; // L: 7303
-				}
-			}
-
-			if (var5 == null) { // L: 7307
-				AbstractSocket.scene.removeGroundItemPile(class22.Client_plane, var0, var1); // L: 7308
-			} else {
-				var2.addLast(var5); // L: 7311
-				TileItem var13 = null; // L: 7312
-				TileItem var8 = null; // L: 7313
-
-				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7314 7315 7320
-					if (var6.id != var5.id) { // L: 7316
-						if (var13 == null) { // L: 7317
-							var13 = var6;
-						}
-
-						if (var13.id != var6.id && var8 == null) { // L: 7318
-							var8 = var6;
-						}
-					}
-				}
-
-				long var9 = DevicePcmPlayerProvider.calculateTag(var0, var1, 3, false, 0); // L: 7322
-				AbstractSocket.scene.newGroundItemPile(class22.Client_plane, var0, var1, class105.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class22.Client_plane), var5, var9, var13, var8); // L: 7323
-			}
-		}
-	} // L: 7292 7309 7324
-
-	@ObfuscatedName("js")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I)Lio;",
-		garbageValue = "-778219160"
-	)
-	static Widget method125(Widget var0) {
-		Widget var1 = StructComposition.method2892(var0); // L: 10819
-		if (var1 == null) {
-			var1 = var0.parent; // L: 10820
-		}
-
-		return var1; // L: 10821
-	}
-
-	@ObfuscatedName("lj")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-104"
-	)
-	static void method163(int var0) {
-		Client.oculusOrbState = var0; // L: 11495
-	} // L: 11496
+	} // L: 3782
 }
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index cd8521fd19..ad576b27ed 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -1,1330 +1,1343 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+import netscape.javascript.JSObject;
 
 @Implements("Client")
 @ObfuscatedName("client")
 public final class Client extends GameEngine implements Usernamed {
-	@ObfuscatedName("qh")
+	@ObfuscatedName("qq")
 	@ObfuscatedSignature(
-		descriptor = "[Ll;"
+		descriptor = "[Lb;"
 	)
 	@Export("currentClanSettings")
 	static ClanSettings[] currentClanSettings;
 	@ObfuscatedName("ok")
 	@ObfuscatedGetter(
-		intValue = 257317803
+		intValue = 660476359
 	)
 	@Export("rootWidgetCount")
 	static int rootWidgetCount;
-	@ObfuscatedName("ol")
+	@ObfuscatedName("ob")
 	@ObfuscatedGetter(
-		intValue = -1275777925
+		intValue = 360388647
 	)
-	static int field849;
-	@ObfuscatedName("pq")
+	static int field830;
+	@ObfuscatedName("pu")
 	@ObfuscatedGetter(
-		longValue = 6326177537901632971L
+		longValue = -4989319872898383139L
 	)
-	static long field858;
+	static long field839;
 	@ObfuscatedName("ov")
-	static boolean[] field719;
-	@ObfuscatedName("pc")
-	static boolean[] field860;
-	@ObfuscatedName("or")
-	static boolean[] field780;
-	@ObfuscatedName("pb")
+	static boolean[] field831;
+	@ObfuscatedName("px")
+	static boolean[] field833;
+	@ObfuscatedName("oe")
+	static boolean[] field712;
+	@ObfuscatedName("pa")
 	@Export("isResizable")
 	static boolean isResizable;
-	@ObfuscatedName("tr")
+	@ObfuscatedName("tx")
 	@ObfuscatedGetter(
-		intValue = -106098945
+		intValue = -1878723319
 	)
-	public static int field717;
-	@ObfuscatedName("qr")
-	static boolean field881;
-	@ObfuscatedName("pv")
-	@Export("rootWidgetWidths")
-	static int[] rootWidgetWidths;
-	@ObfuscatedName("oq")
+	public static int field798;
+	@ObfuscatedName("qd")
+	static boolean field862;
+	@ObfuscatedName("oh")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("widgetFlags")
 	static NodeHashTable widgetFlags;
-	@ObfuscatedName("pz")
+	@ObfuscatedName("pr")
+	@Export("rootWidgetWidths")
+	static int[] rootWidgetWidths;
+	@ObfuscatedName("pj")
 	@Export("rootWidgetXs")
 	static int[] rootWidgetXs;
-	@ObfuscatedName("pm")
+	@ObfuscatedName("ps")
 	@ObfuscatedGetter(
-		intValue = 568772133
+		intValue = -1136245775
 	)
 	@Export("gameDrawingMode")
 	static int gameDrawingMode;
-	@ObfuscatedName("pl")
+	@ObfuscatedName("pf")
 	@Export("rootWidgetYs")
 	static int[] rootWidgetYs;
-	@ObfuscatedName("pa")
-	@Export("rootWidgetHeights")
-	static int[] rootWidgetHeights;
-	@ObfuscatedName("tu")
-	static int[] field689;
-	@ObfuscatedName("tt")
-	static int[] field851;
 	@ObfuscatedName("ty")
 	@ObfuscatedSignature(
-		descriptor = "Lbb;"
+		descriptor = "Lbd;"
 	)
-	static final ApproximateRouteStrategy field785;
-	@ObfuscatedName("ot")
+	static final ApproximateRouteStrategy field733;
+	@ObfuscatedName("po")
+	@Export("rootWidgetHeights")
+	static int[] rootWidgetHeights;
+	@ObfuscatedName("os")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("scriptEvents")
 	static NodeDeque scriptEvents;
-	@ObfuscatedName("qy")
+	@ObfuscatedName("qk")
 	@ObfuscatedGetter(
-		intValue = -1714532039
+		intValue = -1081070029
 	)
 	@Export("destinationX")
 	static int destinationX;
-	@ObfuscatedName("sv")
+	@ObfuscatedName("qp")
+	@ObfuscatedGetter(
+		intValue = 605086857
+	)
+	@Export("destinationY")
+	static int destinationY;
+	@ObfuscatedName("tk")
+	static int[] field739;
+	@ObfuscatedName("ta")
+	static int[] field631;
+	@ObfuscatedName("rg")
+	@Export("isCameraLocked")
+	static boolean isCameraLocked;
+	@ObfuscatedName("rx")
+	static boolean[] field871;
+	@ObfuscatedName("ry")
+	static int[] field872;
+	@ObfuscatedName("rc")
+	static int[] field873;
+	@ObfuscatedName("sp")
+	@ObfuscatedGetter(
+		intValue = 1152521
+	)
+	static int field890;
+	@ObfuscatedName("rt")
+	static int[] field867;
+	@ObfuscatedName("sd")
+	@ObfuscatedSignature(
+		descriptor = "Lih;"
+	)
+	@Export("playerAppearance")
+	static PlayerComposition playerAppearance;
+	@ObfuscatedName("sa")
+	static int[] field875;
+	@ObfuscatedName("su")
 	@ObfuscatedSignature(
 		descriptor = "[Lju;"
 	)
 	@Export("grandExchangeOffers")
 	static GrandExchangeOffer[] grandExchangeOffers;
-	@ObfuscatedName("qw")
-	@ObfuscatedGetter(
-		intValue = 1810222737
-	)
-	@Export("destinationY")
-	static int destinationY;
-	@ObfuscatedName("ow")
-	@ObfuscatedGetter(
-		intValue = 1005623717
-	)
-	@Export("mouseWheelRotation")
-	static int mouseWheelRotation;
-	@ObfuscatedName("rg")
-	@Export("isCameraLocked")
-	static boolean isCameraLocked;
-	@ObfuscatedName("rj")
-	@ObfuscatedGetter(
-		intValue = -1084759211
-	)
-	@Export("soundEffectCount")
-	static int soundEffectCount;
-	@ObfuscatedName("rb")
-	@Export("soundEffectIds")
-	static int[] soundEffectIds;
-	@ObfuscatedName("sd")
-	@ObfuscatedGetter(
-		intValue = 909671199
-	)
-	static int field908;
-	@ObfuscatedName("rt")
-	@Export("queuedSoundEffectLoops")
-	static int[] queuedSoundEffectLoops;
-	@ObfuscatedName("sj")
-	@ObfuscatedSignature(
-		descriptor = "Lic;"
-	)
-	@Export("playerAppearance")
-	static PlayerComposition playerAppearance;
-	@ObfuscatedName("rq")
-	@Export("queuedSoundEffectDelays")
-	static int[] queuedSoundEffectDelays;
 	@ObfuscatedName("sh")
 	@ObfuscatedGetter(
-		intValue = 15595769
+		intValue = 1731824615
 	)
-	static int field752;
-	@ObfuscatedName("rc")
-	@ObfuscatedSignature(
-		descriptor = "[Laa;"
-	)
-	@Export("soundEffects")
-	static SoundEffect[] soundEffects;
-	@ObfuscatedName("rx")
-	@Export("soundLocations")
-	static int[] soundLocations;
-	@ObfuscatedName("to")
-	@Export("archiveLoaders")
-	static ArrayList archiveLoaders;
-	@ObfuscatedName("te")
+	static int field902;
+	@ObfuscatedName("pn")
+	@Export("crossWorldMessageIds")
+	static long[] crossWorldMessageIds;
+	@ObfuscatedName("qt")
 	@ObfuscatedGetter(
-		intValue = -1953954605
-	)
-	@Export("archiveLoadersDone")
-	static int archiveLoadersDone;
-	@ObfuscatedName("qj")
-	@ObfuscatedGetter(
-		intValue = -771809921
+		intValue = 1839633675
 	)
 	@Export("minimapState")
 	static int minimapState;
-	@ObfuscatedName("qq")
+	@ObfuscatedName("rm")
 	@ObfuscatedGetter(
-		intValue = 565415243
+		intValue = -1711547959
 	)
-	static int field872;
-	@ObfuscatedName("sn")
-	@ObfuscatedSignature(
-		descriptor = "Lmh;"
-	)
-	@Export("platformInfoProvider")
-	static PlatformInfoProvider platformInfoProvider;
-	@ObfuscatedName("sg")
-	static short field894;
-	@ObfuscatedName("sp")
-	static short field895;
-	@ObfuscatedName("sa")
-	static short field900;
-	@ObfuscatedName("su")
-	static short field901;
-	@ObfuscatedName("qs")
-	@ObfuscatedGetter(
-		intValue = -1674931291
-	)
-	@Export("mapIconCount")
-	static int mapIconCount;
-	@ObfuscatedName("qe")
-	@ObfuscatedGetter(
-		intValue = 2076100495
-	)
-	@Export("currentTrackGroupId")
-	static int currentTrackGroupId;
-	@ObfuscatedName("sm")
-	static short field828;
-	@ObfuscatedName("ss")
-	@ObfuscatedGetter(
-		intValue = 755828989
-	)
-	@Export("viewportZoom")
-	static int viewportZoom;
-	@ObfuscatedName("sk")
-	static short field909;
-	@ObfuscatedName("sc")
-	@ObfuscatedGetter(
-		intValue = -592780465
-	)
-	@Export("viewportWidth")
-	static int viewportWidth;
-	@ObfuscatedName("qu")
-	@Export("mapIconXs")
-	static int[] mapIconXs;
-	@ObfuscatedName("qp")
-	@Export("mapIconYs")
-	static int[] mapIconYs;
-	@ObfuscatedName("qz")
-	@ObfuscatedSignature(
-		descriptor = "[Loh;"
-	)
-	@Export("mapIcons")
-	static SpritePixels[] mapIcons;
-	@ObfuscatedName("sy")
-	@ObfuscatedGetter(
-		intValue = 1806233111
-	)
-	@Export("viewportHeight")
-	static int viewportHeight;
-	@ObfuscatedName("st")
-	@ObfuscatedGetter(
-		intValue = -2020111655
-	)
-	@Export("viewportOffsetX")
-	static int viewportOffsetX;
-	@ObfuscatedName("sw")
-	@ObfuscatedGetter(
-		intValue = 407581195
-	)
-	@Export("viewportOffsetY")
-	static int viewportOffsetY;
+	@Export("soundEffectCount")
+	static int soundEffectCount;
+	@ObfuscatedName("rd")
+	@Export("soundEffectIds")
+	static int[] soundEffectIds;
+	@ObfuscatedName("tv")
+	@Export("archiveLoaders")
+	static ArrayList archiveLoaders;
 	@ObfuscatedName("pe")
-	@Export("crossWorldMessageIds")
-	static long[] crossWorldMessageIds;
-	@ObfuscatedName("qb")
 	@ObfuscatedGetter(
-		longValue = 1950859972192234267L
-	)
-	static long field809;
-	@ObfuscatedName("pw")
-	@ObfuscatedGetter(
-		intValue = 2087031963
-	)
-	static int field806;
-	@ObfuscatedName("pn")
-	@ObfuscatedGetter(
-		intValue = -2103302667
+		intValue = -1256134345
 	)
 	@Export("crossWorldMessageIdsIndex")
 	static int crossWorldMessageIdsIndex;
-	@ObfuscatedName("tx")
+	@ObfuscatedName("tn")
 	@ObfuscatedGetter(
-		intValue = 112640073
+		intValue = 375081575
 	)
-	static int field916;
+	@Export("archiveLoadersDone")
+	static int archiveLoadersDone;
 	@ObfuscatedName("rs")
-	static boolean[] field693;
-	@ObfuscatedName("ph")
-	static int[] field868;
-	@ObfuscatedName("rd")
-	static int[] field891;
-	@ObfuscatedName("qv")
+	@Export("queuedSoundEffectLoops")
+	static int[] queuedSoundEffectLoops;
+	@ObfuscatedName("rk")
+	@Export("queuedSoundEffectDelays")
+	static int[] queuedSoundEffectDelays;
+	@ObfuscatedName("rb")
+	@ObfuscatedGetter(
+		intValue = -85390661
+	)
+	static int field659;
+	@ObfuscatedName("rw")
+	@ObfuscatedSignature(
+		descriptor = "[Lax;"
+	)
+	@Export("soundEffects")
+	static SoundEffect[] soundEffects;
+	@ObfuscatedName("rr")
+	@Export("soundLocations")
+	static int[] soundLocations;
+	@ObfuscatedName("qe")
+	@ObfuscatedGetter(
+		longValue = -3503174245678770383L
+	)
+	static long field850;
+	@ObfuscatedName("ss")
+	@ObfuscatedSignature(
+		descriptor = "Lmz;"
+	)
+	@Export("platformInfoProvider")
+	static PlatformInfoProvider platformInfoProvider;
+	@ObfuscatedName("sy")
+	static short field876;
+	@ObfuscatedName("sv")
+	static short field877;
+	@ObfuscatedName("qb")
+	@ObfuscatedGetter(
+		intValue = -1807179709
+	)
+	@Export("currentTrackGroupId")
+	static int currentTrackGroupId;
+	@ObfuscatedName("so")
+	static short field881;
+	@ObfuscatedName("qh")
+	@ObfuscatedGetter(
+		intValue = 1305420667
+	)
+	@Export("mapIconCount")
+	static int mapIconCount;
+	@ObfuscatedName("qs")
+	@Export("mapIconXs")
+	static int[] mapIconXs;
+	@ObfuscatedName("sn")
+	static short field690;
+	@ObfuscatedName("si")
+	static short field864;
+	@ObfuscatedName("st")
+	@ObfuscatedGetter(
+		intValue = 1279050647
+	)
+	@Export("viewportZoom")
+	static int viewportZoom;
+	@ObfuscatedName("sm")
+	static short field880;
+	@ObfuscatedName("sj")
+	@ObfuscatedGetter(
+		intValue = -1918427539
+	)
+	@Export("viewportWidth")
+	static int viewportWidth;
+	@ObfuscatedName("qc")
+	@Export("mapIconYs")
+	static int[] mapIconYs;
+	@ObfuscatedName("qy")
+	@ObfuscatedSignature(
+		descriptor = "[Loa;"
+	)
+	@Export("mapIcons")
+	static SpritePixels[] mapIcons;
+	@ObfuscatedName("qz")
+	@ObfuscatedGetter(
+		intValue = 743767761
+	)
+	static int field853;
+	@ObfuscatedName("sf")
+	@ObfuscatedGetter(
+		intValue = 1112444085
+	)
+	@Export("viewportHeight")
+	static int viewportHeight;
+	@ObfuscatedName("sq")
+	@ObfuscatedGetter(
+		intValue = -853632551
+	)
+	@Export("viewportOffsetX")
+	static int viewportOffsetX;
+	@ObfuscatedName("sk")
+	@ObfuscatedGetter(
+		intValue = -1851870409
+	)
+	@Export("viewportOffsetY")
+	static int viewportOffsetY;
+	@ObfuscatedName("qi")
 	@ObfuscatedSignature(
 		descriptor = "[Ly;"
 	)
 	@Export("currentClanChannels")
 	static ClanChannel[] currentClanChannels;
-	@ObfuscatedName("pi")
-	static int[] field867;
-	@ObfuscatedName("oj")
-	@ObfuscatedSignature(
-		descriptor = "Lkx;"
-	)
-	static NodeDeque field652;
-	@ObfuscatedName("om")
-	@ObfuscatedSignature(
-		descriptor = "Lkx;"
-	)
-	static NodeDeque field846;
-	@ObfuscatedName("rv")
-	static int[] field890;
-	@ObfuscatedName("si")
+	@ObfuscatedName("sc")
 	@Export("zoomHeight")
 	static short zoomHeight;
-	@ObfuscatedName("so")
+	@ObfuscatedName("sl")
 	@Export("zoomWidth")
 	static short zoomWidth;
-	@ObfuscatedName("ps")
+	@ObfuscatedName("tp")
 	@ObfuscatedGetter(
-		intValue = -639645947
+		intValue = 392522533
 	)
-	@Export("publicChatMode")
-	static int publicChatMode;
-	@ObfuscatedName("sb")
-	static int[] field893;
-	@ObfuscatedName("rh")
-	static int[] field892;
-	@ObfuscatedName("pg")
+	static int field898;
+	@ObfuscatedName("pz")
 	@ObfuscatedGetter(
-		intValue = -1863932723
+		intValue = -426545695
+	)
+	static int field847;
+	@ObfuscatedName("ph")
+	static int[] field786;
+	@ObfuscatedName("oi")
+	@ObfuscatedSignature(
+		descriptor = "Lkq;"
+	)
+	static NodeDeque field812;
+	@ObfuscatedName("pb")
+	static int[] field848;
+	@ObfuscatedName("op")
+	@ObfuscatedSignature(
+		descriptor = "Lkq;"
+	)
+	static NodeDeque field860;
+	@ObfuscatedName("pv")
+	static int[] field725;
+	@ObfuscatedName("pi")
+	@ObfuscatedGetter(
+		intValue = -2084785053
 	)
 	@Export("tradeChatMode")
 	static int tradeChatMode;
-	@ObfuscatedName("py")
-	static int[] field877;
-	@ObfuscatedName("pp")
-	static String field863;
-	@ObfuscatedName("sz")
+	@ObfuscatedName("pk")
+	@ObfuscatedGetter(
+		intValue = -1755958915
+	)
+	@Export("publicChatMode")
+	static int publicChatMode;
+	@ObfuscatedName("pq")
+	static String field642;
+	@ObfuscatedName("sw")
 	@ObfuscatedSignature(
-		descriptor = "Lbk;"
+		descriptor = "Lbp;"
 	)
 	@Export("GrandExchangeEvents_worldComparator")
 	static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator;
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "[Lfz;"
+		descriptor = "[Lfl;"
 	)
 	@Export("collisionMaps")
 	static CollisionMap[] collisionMaps;
-	@ObfuscatedName("an")
-	static boolean field889;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("ab")
+	@ObfuscatedSignature(
+		descriptor = "Llw;"
+	)
+	static Bounds field903;
+	@ObfuscatedName("af")
+	static boolean field730;
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 1396273817
+		intValue = -479860063
 	)
 	@Export("worldId")
 	public static int worldId;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = 1088533541
+		intValue = -1336794433
 	)
 	@Export("worldProperties")
 	static int worldProperties;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 60643507
+		intValue = -1086569323
 	)
 	@Export("gameBuild")
 	static int gameBuild;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@Export("isMembersWorld")
 	public static boolean isMembersWorld;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@Export("isLowDetail")
 	static boolean isLowDetail;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -1731105959
+		intValue = -1302427087
 	)
 	@Export("clientType")
 	static int clientType;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 1523027191
+		intValue = 1019445121
 	)
-	static int field643;
-	@ObfuscatedName("bj")
+	static int field625;
+	@ObfuscatedName("bg")
 	@Export("onMobile")
 	static boolean onMobile;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -888167097
+		intValue = -2033553753
 	)
 	@Export("gameState")
 	static int gameState;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cg")
 	@Export("isLoading")
 	static boolean isLoading;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("ca")
 	@ObfuscatedGetter(
-		intValue = -1702273423
+		intValue = 1506924847
 	)
 	@Export("cycle")
 	static int cycle;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		longValue = 8707347461681450731L
+		longValue = -3330415476350692251L
 	)
 	@Export("mouseLastLastPressedTimeMillis")
 	static long mouseLastLastPressedTimeMillis;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("cy")
 	@ObfuscatedGetter(
-		intValue = -1975403091
+		intValue = 2057081131
 	)
-	static int field651;
-	@ObfuscatedName("cc")
+	static int field843;
+	@ObfuscatedName("ct")
 	@ObfuscatedGetter(
-		intValue = 424553417
+		intValue = -1549041823
 	)
-	static int field812;
-	@ObfuscatedName("cu")
+	static int field633;
+	@ObfuscatedName("ci")
 	@ObfuscatedGetter(
-		longValue = 8694062253931131003L
+		longValue = -7081451214242002295L
 	)
-	static long field653;
-	@ObfuscatedName("cz")
+	static long field760;
+	@ObfuscatedName("cs")
 	@Export("hadFocus")
 	static boolean hadFocus;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("co")
 	@Export("displayFps")
 	static boolean displayFps;
-	@ObfuscatedName("ce")
+	@ObfuscatedName("cj")
 	@ObfuscatedGetter(
-		intValue = -414435005
+		intValue = -1450898569
 	)
 	@Export("rebootTimer")
 	static int rebootTimer;
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cr")
 	@ObfuscatedGetter(
-		intValue = -1764619255
+		intValue = -884240111
 	)
 	@Export("hintArrowType")
 	static int hintArrowType;
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cl")
 	@ObfuscatedGetter(
-		intValue = 1564576307
+		intValue = 1021178359
 	)
 	@Export("hintArrowNpcIndex")
 	static int hintArrowNpcIndex;
-	@ObfuscatedName("cx")
+	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = 1851530429
+		intValue = -1821645449
 	)
 	@Export("hintArrowPlayerIndex")
 	static int hintArrowPlayerIndex;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = -659326571
+		intValue = 986591039
 	)
 	@Export("hintArrowX")
 	static int hintArrowX;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = 122660467
+		intValue = 359883245
 	)
 	@Export("hintArrowY")
 	static int hintArrowY;
-	@ObfuscatedName("cw")
+	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = 1213777129
+		intValue = 1742642487
 	)
 	@Export("hintArrowHeight")
 	static int hintArrowHeight;
-	@ObfuscatedName("db")
+	@ObfuscatedName("du")
 	@ObfuscatedGetter(
-		intValue = -213439381
+		intValue = 1066725013
 	)
 	@Export("hintArrowSubX")
 	static int hintArrowSubX;
-	@ObfuscatedName("dz")
+	@ObfuscatedName("db")
 	@ObfuscatedGetter(
-		intValue = 2031424669
+		intValue = -939266577
 	)
 	@Export("hintArrowSubY")
 	static int hintArrowSubY;
-	@ObfuscatedName("dj")
-	@Export("mouseCam")
-	static boolean mouseCam;
-	@ObfuscatedName("dr")
+	@ObfuscatedName("dh")
 	@ObfuscatedSignature(
-		descriptor = "Ldj;"
+		descriptor = "Ldh;"
 	)
 	@Export("playerAttackOption")
 	static AttackOption playerAttackOption;
 	@ObfuscatedName("di")
 	@ObfuscatedSignature(
-		descriptor = "Ldj;"
+		descriptor = "Ldh;"
 	)
 	@Export("npcAttackOption")
 	static AttackOption npcAttackOption;
-	@ObfuscatedName("dk")
+	@ObfuscatedName("df")
 	@ObfuscatedGetter(
-		intValue = -1127540073
+		intValue = 645722257
 	)
 	@Export("titleLoadingStage")
 	static int titleLoadingStage;
-	@ObfuscatedName("df")
+	@ObfuscatedName("dz")
 	@ObfuscatedGetter(
-		intValue = 534657201
+		intValue = 1743859217
 	)
 	@Export("js5ConnectState")
 	static int js5ConnectState;
-	@ObfuscatedName("dv")
+	@ObfuscatedName("dc")
 	@ObfuscatedGetter(
-		intValue = -587760519
+		intValue = -1425708355
 	)
-	static int field670;
-	@ObfuscatedName("ep")
+	static int field800;
+	@ObfuscatedName("et")
 	@ObfuscatedGetter(
-		intValue = -515874317
+		intValue = 1445831209
 	)
 	@Export("js5Errors")
 	static int js5Errors;
-	@ObfuscatedName("ew")
+	@ObfuscatedName("eb")
 	@ObfuscatedGetter(
-		intValue = -1024706269
+		intValue = 1594897445
 	)
 	@Export("loginState")
 	static int loginState;
-	@ObfuscatedName("ej")
+	@ObfuscatedName("ek")
 	@ObfuscatedGetter(
-		intValue = 1134111881
+		intValue = -86832127
 	)
-	static int field673;
-	@ObfuscatedName("el")
+	static int field811;
+	@ObfuscatedName("em")
 	@ObfuscatedGetter(
-		intValue = -2135696499
+		intValue = -775816439
 	)
-	static int field845;
-	@ObfuscatedName("et")
+	static int field654;
+	@ObfuscatedName("er")
 	@ObfuscatedGetter(
-		intValue = -1200580919
+		intValue = 1385967613
 	)
-	static int field675;
-	@ObfuscatedName("eb")
+	static int field655;
+	@ObfuscatedName("ey")
 	@ObfuscatedSignature(
-		descriptor = "Ldq;"
+		descriptor = "Ldv;"
 	)
-	static class125 field676;
-	@ObfuscatedName("ei")
+	static class126 field656;
+	@ObfuscatedName("eg")
+	@Export("worldHost")
+	static String worldHost;
+	@ObfuscatedName("ed")
 	@Export("Login_isUsernameRemembered")
 	static boolean Login_isUsernameRemembered;
-	@ObfuscatedName("ev")
+	@ObfuscatedName("eh")
 	@ObfuscatedSignature(
-		descriptor = "Lcr;"
+		descriptor = "Lcv;"
 	)
 	@Export("secureRandomFuture")
 	static SecureRandomFuture secureRandomFuture;
-	@ObfuscatedName("fz")
+	@ObfuscatedName("fm")
 	@Export("randomDatData")
 	static byte[] randomDatData;
-	@ObfuscatedName("fs")
+	@ObfuscatedName("fo")
 	@ObfuscatedSignature(
-		descriptor = "[Ldb;"
+		descriptor = "[Ldu;"
 	)
 	@Export("npcs")
 	static NPC[] npcs;
-	@ObfuscatedName("fp")
+	@ObfuscatedName("fc")
 	@ObfuscatedGetter(
-		intValue = -1300723479
+		intValue = -2000479971
 	)
 	@Export("npcCount")
 	static int npcCount;
-	@ObfuscatedName("fe")
+	@ObfuscatedName("fg")
 	@Export("npcIndices")
 	static int[] npcIndices;
-	@ObfuscatedName("fb")
+	@ObfuscatedName("fe")
 	@ObfuscatedGetter(
-		intValue = 1045404765
+		intValue = -22894005
 	)
-	static int field685;
-	@ObfuscatedName("fo")
-	static int[] field686;
-	@ObfuscatedName("fw")
+	static int field636;
+	@ObfuscatedName("fs")
+	static int[] field763;
+	@ObfuscatedName("ft")
 	@ObfuscatedSignature(
-		descriptor = "Lds;"
+		descriptor = "Ldq;"
 	)
 	@Export("packetWriter")
 	public static final PacketWriter packetWriter;
-	@ObfuscatedName("fj")
-	@ObfuscatedSignature(
-		descriptor = "Lls;"
-	)
-	static AbstractSocket field688;
-	@ObfuscatedName("fg")
+	@ObfuscatedName("fb")
 	@ObfuscatedGetter(
-		intValue = -688107431
+		intValue = 796481149
 	)
 	@Export("logoutTimer")
 	static int logoutTimer;
-	@ObfuscatedName("fi")
+	@ObfuscatedName("fp")
 	@Export("hadNetworkError")
 	static boolean hadNetworkError;
-	@ObfuscatedName("fy")
+	@ObfuscatedName("fi")
 	@Export("useBufferedSocket")
 	static boolean useBufferedSocket;
-	@ObfuscatedName("fx")
+	@ObfuscatedName("fr")
 	@ObfuscatedSignature(
-		descriptor = "Lkv;"
+		descriptor = "Lki;"
 	)
 	@Export("timer")
 	static Timer timer;
-	@ObfuscatedName("fn")
+	@ObfuscatedName("fd")
 	@Export("fontsMap")
 	static HashMap fontsMap;
-	@ObfuscatedName("gz")
+	@ObfuscatedName("ge")
 	@ObfuscatedGetter(
-		intValue = -1548218417
+		intValue = 1919520289
 	)
-	static int field694;
-	@ObfuscatedName("gb")
+	static int field618;
+	@ObfuscatedName("gg")
 	@ObfuscatedGetter(
-		intValue = 834526125
+		intValue = -1712660563
 	)
-	static int field695;
+	static int field789;
 	@ObfuscatedName("gs")
 	@ObfuscatedGetter(
-		intValue = 1282334079
+		intValue = 852398613
 	)
-	static int field696;
-	@ObfuscatedName("gv")
+	static int field742;
+	@ObfuscatedName("gu")
 	@ObfuscatedGetter(
-		intValue = 1781171757
+		intValue = -1878164651
 	)
-	static int field697;
-	@ObfuscatedName("gm")
+	static int field677;
+	@ObfuscatedName("gw")
 	@ObfuscatedGetter(
-		intValue = -189422017
+		intValue = 143152059
 	)
-	static int field698;
-	@ObfuscatedName("gl")
+	static int field678;
+	@ObfuscatedName("gp")
 	@Export("isInInstance")
 	static boolean isInInstance;
-	@ObfuscatedName("gk")
+	@ObfuscatedName("gr")
 	@Export("instanceChunkTemplates")
 	static int[][][] instanceChunkTemplates;
-	@ObfuscatedName("gd")
-	static final int[] field702;
-	@ObfuscatedName("gp")
+	@ObfuscatedName("gy")
+	static final int[] field682;
+	@ObfuscatedName("gj")
 	@ObfuscatedGetter(
-		intValue = 613265553
+		intValue = -270595563
 	)
-	static int field913;
-	@ObfuscatedName("ht")
+	static int field683;
+	@ObfuscatedName("hf")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
+	)
+	@Export("scrollBarSprites")
+	static IndexedSprite[] scrollBarSprites;
+	@ObfuscatedName("hk")
 	@ObfuscatedGetter(
-		intValue = -119839221
+		intValue = 173125819
 	)
-	static int field704;
+	static int field685;
+	@ObfuscatedName("hx")
+	@ObfuscatedGetter(
+		intValue = 527282429
+	)
+	static int field686;
+	@ObfuscatedName("hc")
+	@ObfuscatedGetter(
+		intValue = 713325161
+	)
+	static int field818;
 	@ObfuscatedName("hm")
 	@ObfuscatedGetter(
-		intValue = 1576725955
+		intValue = -742100795
 	)
-	static int field705;
+	static int field688;
 	@ObfuscatedName("hh")
-	@ObfuscatedGetter(
-		intValue = 1820360451
-	)
-	static int field706;
+	static boolean field689;
 	@ObfuscatedName("hn")
 	@ObfuscatedGetter(
-		intValue = -944863209
-	)
-	static int field707;
-	@ObfuscatedName("hc")
-	static boolean field708;
-	@ObfuscatedName("hz")
-	@ObfuscatedGetter(
-		intValue = -2035208823
+		intValue = -126848597
 	)
 	@Export("alternativeScrollbarWidth")
 	static int alternativeScrollbarWidth;
-	@ObfuscatedName("hv")
+	@ObfuscatedName("hs")
 	@ObfuscatedGetter(
-		intValue = -2031705619
+		intValue = 625342135
 	)
 	@Export("camAngleX")
 	static int camAngleX;
-	@ObfuscatedName("hu")
+	@ObfuscatedName("hl")
 	@ObfuscatedGetter(
-		intValue = -574530013
+		intValue = 1330409253
 	)
 	@Export("camAngleY")
 	static int camAngleY;
-	@ObfuscatedName("hi")
+	@ObfuscatedName("hq")
 	@ObfuscatedGetter(
-		intValue = -308632201
+		intValue = 1581889061
 	)
 	@Export("camAngleDY")
 	static int camAngleDY;
-	@ObfuscatedName("hk")
+	@ObfuscatedName("hb")
 	@ObfuscatedGetter(
-		intValue = -1928381453
+		intValue = 182124091
 	)
 	@Export("camAngleDX")
 	static int camAngleDX;
-	@ObfuscatedName("hx")
+	@ObfuscatedName("ho")
 	@ObfuscatedGetter(
-		intValue = -1017968913
+		intValue = -474499607
 	)
 	@Export("mouseCamClickedX")
 	static int mouseCamClickedX;
-	@ObfuscatedName("hp")
+	@ObfuscatedName("hu")
 	@ObfuscatedGetter(
-		intValue = 1156171963
+		intValue = -1521559245
 	)
 	@Export("mouseCamClickedY")
 	static int mouseCamClickedY;
-	@ObfuscatedName("ir")
+	@ObfuscatedName("ie")
 	@ObfuscatedGetter(
-		intValue = -400479567
+		intValue = 399806555
 	)
 	@Export("oculusOrbState")
 	static int oculusOrbState;
-	@ObfuscatedName("in")
+	@ObfuscatedName("il")
 	@ObfuscatedGetter(
-		intValue = 334319879
+		intValue = -210927579
 	)
 	@Export("camFollowHeight")
 	static int camFollowHeight;
 	@ObfuscatedName("it")
 	@Export("selectedItemName")
 	static String selectedItemName;
-	@ObfuscatedName("ik")
+	@ObfuscatedName("iy")
 	@ObfuscatedGetter(
-		intValue = -859124845
+		intValue = 44183997
 	)
-	static int field718;
-	@ObfuscatedName("ii")
+	static int field699;
+	@ObfuscatedName("iq")
 	@ObfuscatedGetter(
-		intValue = -1624140925
+		intValue = 1634750831
 	)
-	static int field732;
-	@ObfuscatedName("iu")
+	static int field676;
+	@ObfuscatedName("ir")
 	@ObfuscatedGetter(
-		intValue = 286253175
+		intValue = -2080387383
 	)
-	static int field720;
-	@ObfuscatedName("ig")
+	static int field857;
+	@ObfuscatedName("ip")
 	@ObfuscatedGetter(
-		intValue = -503425261
+		intValue = 1614384069
 	)
 	@Export("oculusOrbNormalSpeed")
 	static int oculusOrbNormalSpeed;
-	@ObfuscatedName("io")
+	@ObfuscatedName("ih")
 	@ObfuscatedGetter(
-		intValue = 918404705
+		intValue = 930603185
 	)
 	@Export("oculusOrbSlowedSpeed")
 	static int oculusOrbSlowedSpeed;
-	@ObfuscatedName("is")
+	@ObfuscatedName("in")
 	@ObfuscatedGetter(
-		intValue = -315190483
+		intValue = 1986123723
 	)
-	static int field723;
-	@ObfuscatedName("id")
-	static boolean field724;
-	@ObfuscatedName("il")
+	public static int field704;
+	@ObfuscatedName("iv")
+	static boolean field705;
+	@ObfuscatedName("ia")
 	@ObfuscatedGetter(
-		intValue = -1396591603
+		intValue = -572863563
 	)
-	static int field725;
-	@ObfuscatedName("im")
-	static boolean field726;
-	@ObfuscatedName("ip")
+	static int field706;
+	@ObfuscatedName("ii")
+	static boolean field707;
+	@ObfuscatedName("ic")
 	@ObfuscatedGetter(
-		intValue = 627480141
+		intValue = 482365293
 	)
-	static int field727;
-	@ObfuscatedName("if")
+	static int field708;
+	@ObfuscatedName("iu")
 	@ObfuscatedGetter(
-		intValue = 964514413
+		intValue = -1595418399
 	)
 	@Export("overheadTextCount")
 	static int overheadTextCount;
-	@ObfuscatedName("ia")
+	@ObfuscatedName("if")
 	@ObfuscatedGetter(
-		intValue = 1347852179
+		intValue = -2069034471
 	)
 	@Export("overheadTextLimit")
 	static int overheadTextLimit;
-	@ObfuscatedName("ij")
+	@ObfuscatedName("ik")
 	@Export("overheadTextXs")
 	static int[] overheadTextXs;
-	@ObfuscatedName("iw")
+	@ObfuscatedName("is")
 	@Export("overheadTextYs")
 	static int[] overheadTextYs;
-	@ObfuscatedName("iv")
+	@ObfuscatedName("ij")
 	@Export("overheadTextAscents")
 	static int[] overheadTextAscents;
-	@ObfuscatedName("iy")
+	@ObfuscatedName("ig")
 	@Export("overheadTextXOffsets")
 	static int[] overheadTextXOffsets;
-	@ObfuscatedName("ib")
+	@ObfuscatedName("im")
 	@Export("overheadTextColors")
 	static int[] overheadTextColors;
-	@ObfuscatedName("ji")
+	@ObfuscatedName("jc")
 	@Export("overheadTextEffects")
 	static int[] overheadTextEffects;
-	@ObfuscatedName("jw")
+	@ObfuscatedName("jj")
 	@Export("overheadTextCyclesRemaining")
 	static int[] overheadTextCyclesRemaining;
-	@ObfuscatedName("jk")
+	@ObfuscatedName("ji")
 	@Export("overheadText")
 	static String[] overheadText;
-	@ObfuscatedName("jd")
+	@ObfuscatedName("js")
 	@Export("tileLastDrawnActor")
 	static int[][] tileLastDrawnActor;
 	@ObfuscatedName("jl")
 	@ObfuscatedGetter(
-		intValue = -213028925
+		intValue = 1472746363
 	)
 	@Export("viewportDrawCount")
 	static int viewportDrawCount;
-	@ObfuscatedName("jh")
+	@ObfuscatedName("jg")
 	@ObfuscatedGetter(
-		intValue = 1057202329
+		intValue = 646714111
 	)
 	@Export("viewportTempX")
 	static int viewportTempX;
-	@ObfuscatedName("jq")
+	@ObfuscatedName("jm")
 	@ObfuscatedGetter(
-		intValue = -1775322899
+		intValue = 1866904061
 	)
 	@Export("viewportTempY")
 	static int viewportTempY;
-	@ObfuscatedName("jo")
+	@ObfuscatedName("jd")
 	@ObfuscatedGetter(
-		intValue = 2140784851
+		intValue = -1814244043
 	)
 	@Export("mouseCrossX")
 	static int mouseCrossX;
-	@ObfuscatedName("jn")
+	@ObfuscatedName("jh")
 	@ObfuscatedGetter(
-		intValue = -1518689867
+		intValue = 1740953143
 	)
 	@Export("mouseCrossY")
 	static int mouseCrossY;
-	@ObfuscatedName("ja")
+	@ObfuscatedName("jo")
 	@ObfuscatedGetter(
-		intValue = -1932536521
+		intValue = -161820321
 	)
 	@Export("mouseCrossState")
 	static int mouseCrossState;
-	@ObfuscatedName("jy")
+	@ObfuscatedName("ja")
 	@ObfuscatedGetter(
-		intValue = 993621687
+		intValue = -1567280515
 	)
 	@Export("mouseCrossColor")
 	static int mouseCrossColor;
-	@ObfuscatedName("jg")
+	@ObfuscatedName("jw")
 	@Export("showMouseCross")
 	static boolean showMouseCross;
 	@ObfuscatedName("jf")
 	@ObfuscatedGetter(
-		intValue = -1890193251
+		intValue = -756322907
 	)
-	static int field747;
-	@ObfuscatedName("jv")
+	static int field869;
+	@ObfuscatedName("jq")
 	@ObfuscatedGetter(
-		intValue = -657236193
+		intValue = 198485255
 	)
-	static int field841;
-	@ObfuscatedName("jr")
+	static int field729;
+	@ObfuscatedName("jk")
 	@ObfuscatedGetter(
-		intValue = -65004085
+		intValue = 1180846677
 	)
 	@Export("dragItemSlotSource")
 	static int dragItemSlotSource;
-	@ObfuscatedName("jc")
+	@ObfuscatedName("jr")
 	@ObfuscatedGetter(
-		intValue = 823942939
+		intValue = 2098466217
 	)
 	@Export("draggedWidgetX")
 	static int draggedWidgetX;
-	@ObfuscatedName("jt")
+	@ObfuscatedName("je")
 	@ObfuscatedGetter(
-		intValue = -732224895
+		intValue = -1854794411
 	)
 	@Export("draggedWidgetY")
 	static int draggedWidgetY;
-	@ObfuscatedName("jb")
+	@ObfuscatedName("jy")
 	@ObfuscatedGetter(
-		intValue = -1148388107
+		intValue = 1229722503
 	)
 	@Export("dragItemSlotDestination")
 	static int dragItemSlotDestination;
-	@ObfuscatedName("jj")
-	static boolean field848;
-	@ObfuscatedName("js")
+	@ObfuscatedName("jv")
+	static boolean field734;
+	@ObfuscatedName("jz")
 	@ObfuscatedGetter(
-		intValue = -599181589
+		intValue = 433289591
 	)
 	@Export("itemDragDuration")
 	static int itemDragDuration;
-	@ObfuscatedName("ju")
+	@ObfuscatedName("jt")
 	@ObfuscatedGetter(
-		intValue = -267997189
+		intValue = -1284891995
 	)
-	static int field755;
-	@ObfuscatedName("je")
+	static int field629;
+	@ObfuscatedName("jx")
 	@Export("showLoadingMessages")
 	static boolean showLoadingMessages;
-	@ObfuscatedName("kj")
+	@ObfuscatedName("kc")
 	@ObfuscatedSignature(
-		descriptor = "[Lce;"
+		descriptor = "[Lcj;"
 	)
 	@Export("players")
 	static Player[] players;
-	@ObfuscatedName("kk")
+	@ObfuscatedName("kx")
 	@ObfuscatedGetter(
-		intValue = 929092845
+		intValue = -990316241
 	)
 	@Export("localPlayerIndex")
 	static int localPlayerIndex;
-	@ObfuscatedName("kl")
+	@ObfuscatedName("kn")
 	@ObfuscatedGetter(
-		intValue = -1721569989
+		intValue = -1153104715
 	)
-	static int field759;
+	static int field740;
 	@ObfuscatedName("ka")
 	@Export("renderSelf")
 	static boolean renderSelf;
-	@ObfuscatedName("kg")
+	@ObfuscatedName("kd")
 	@ObfuscatedGetter(
-		intValue = -1493328845
+		intValue = -1689088739
 	)
 	@Export("drawPlayerNames")
 	static int drawPlayerNames;
-	@ObfuscatedName("ko")
+	@ObfuscatedName("kl")
 	@ObfuscatedGetter(
-		intValue = 1717996379
+		intValue = 506159691
 	)
-	static int field762;
-	@ObfuscatedName("kt")
-	static int[] field771;
-	@ObfuscatedName("kz")
+	static int field783;
+	@ObfuscatedName("ks")
+	static int[] field859;
+	@ObfuscatedName("kr")
 	@Export("playerMenuOpcodes")
 	static final int[] playerMenuOpcodes;
-	@ObfuscatedName("kd")
+	@ObfuscatedName("ko")
 	@Export("playerMenuActions")
 	static String[] playerMenuActions;
-	@ObfuscatedName("kp")
+	@ObfuscatedName("kw")
 	@Export("playerOptionsPriorities")
 	static boolean[] playerOptionsPriorities;
-	@ObfuscatedName("kw")
+	@ObfuscatedName("kt")
 	@Export("defaultRotations")
 	static int[] defaultRotations;
-	@ObfuscatedName("ku")
+	@ObfuscatedName("kp")
 	@ObfuscatedGetter(
-		intValue = 845336023
+		intValue = -263949421
 	)
 	@Export("combatTargetPlayerIndex")
 	static int combatTargetPlayerIndex;
 	@ObfuscatedName("kb")
 	@ObfuscatedSignature(
-		descriptor = "[[[Lkx;"
+		descriptor = "[[[Lkq;"
 	)
 	@Export("groundItems")
 	static NodeDeque[][][] groundItems;
-	@ObfuscatedName("ke")
+	@ObfuscatedName("kh")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("pendingSpawns")
 	static NodeDeque pendingSpawns;
-	@ObfuscatedName("kf")
+	@ObfuscatedName("ky")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("projectiles")
 	static NodeDeque projectiles;
-	@ObfuscatedName("kv")
+	@ObfuscatedName("kf")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("graphicsObjects")
 	static NodeDeque graphicsObjects;
-	@ObfuscatedName("kn")
+	@ObfuscatedName("ki")
 	@Export("currentLevels")
 	static int[] currentLevels;
-	@ObfuscatedName("ks")
+	@ObfuscatedName("kv")
 	@Export("levels")
 	static int[] levels;
-	@ObfuscatedName("lr")
+	@ObfuscatedName("lg")
 	@Export("experience")
 	static int[] experience;
-	@ObfuscatedName("lk")
+	@ObfuscatedName("ln")
 	@ObfuscatedGetter(
-		intValue = 161491329
+		intValue = -1921591875
 	)
 	@Export("leftClickOpensMenu")
 	static int leftClickOpensMenu;
-	@ObfuscatedName("lo")
+	@ObfuscatedName("le")
 	@Export("isMenuOpen")
 	static boolean isMenuOpen;
-	@ObfuscatedName("ll")
+	@ObfuscatedName("lh")
 	@ObfuscatedGetter(
-		intValue = 673512273
+		intValue = 125901859
 	)
 	@Export("menuOptionsCount")
 	static int menuOptionsCount;
-	@ObfuscatedName("lx")
+	@ObfuscatedName("lt")
 	@Export("menuArguments1")
 	static int[] menuArguments1;
-	@ObfuscatedName("ln")
+	@ObfuscatedName("lf")
 	@Export("menuArguments2")
 	static int[] menuArguments2;
-	@ObfuscatedName("lj")
+	@ObfuscatedName("lr")
 	@Export("menuOpcodes")
 	static int[] menuOpcodes;
-	@ObfuscatedName("la")
+	@ObfuscatedName("ld")
 	@Export("menuIdentifiers")
 	static int[] menuIdentifiers;
-	@ObfuscatedName("lv")
+	@ObfuscatedName("lq")
 	@Export("menuActions")
 	static String[] menuActions;
-	@ObfuscatedName("lu")
+	@ObfuscatedName("ly")
 	@Export("menuTargets")
 	static String[] menuTargets;
-	@ObfuscatedName("ly")
+	@ObfuscatedName("lu")
 	@Export("menuShiftClick")
 	static boolean[] menuShiftClick;
-	@ObfuscatedName("ls")
+	@ObfuscatedName("lc")
 	@Export("followerOpsLowPriority")
 	static boolean followerOpsLowPriority;
-	@ObfuscatedName("lw")
+	@ObfuscatedName("ll")
 	@Export("shiftClickDrop")
 	static boolean shiftClickDrop;
-	@ObfuscatedName("le")
+	@ObfuscatedName("lx")
 	@Export("tapToDrop")
 	static boolean tapToDrop;
-	@ObfuscatedName("lh")
+	@ObfuscatedName("lv")
 	@Export("showMouseOverText")
 	static boolean showMouseOverText;
-	@ObfuscatedName("lm")
+	@ObfuscatedName("la")
 	@ObfuscatedGetter(
-		intValue = 1449324429
+		intValue = 1932466889
 	)
 	@Export("viewportX")
 	static int viewportX;
-	@ObfuscatedName("lf")
+	@ObfuscatedName("ls")
 	@ObfuscatedGetter(
-		intValue = -406218029
+		intValue = -936888801
 	)
 	@Export("viewportY")
 	static int viewportY;
-	@ObfuscatedName("mi")
+	@ObfuscatedName("mj")
 	@ObfuscatedGetter(
-		intValue = -1946501383
+		intValue = -2134544589
 	)
-	static int field792;
-	@ObfuscatedName("ms")
+	static int field773;
+	@ObfuscatedName("mw")
 	@ObfuscatedGetter(
-		intValue = 625904081
+		intValue = 1407129087
 	)
-	static int field833;
-	@ObfuscatedName("me")
+	static int field693;
+	@ObfuscatedName("mv")
 	@ObfuscatedGetter(
-		intValue = -438265211
+		intValue = -56477685
 	)
 	@Export("isItemSelected")
 	static int isItemSelected;
-	@ObfuscatedName("ml")
+	@ObfuscatedName("ma")
 	@Export("isSpellSelected")
 	static boolean isSpellSelected;
-	@ObfuscatedName("mp")
+	@ObfuscatedName("mu")
 	@ObfuscatedGetter(
-		intValue = 1683168531
+		intValue = -1880896879
 	)
 	@Export("selectedSpellChildIndex")
 	static int selectedSpellChildIndex;
-	@ObfuscatedName("mz")
+	@ObfuscatedName("ml")
 	@ObfuscatedGetter(
-		intValue = 1424616685
+		intValue = 239487695
 	)
-	static int field788;
-	@ObfuscatedName("mk")
+	static int field634;
+	@ObfuscatedName("mm")
 	@Export("selectedSpellActionName")
 	static String selectedSpellActionName;
-	@ObfuscatedName("mn")
+	@ObfuscatedName("mh")
 	@Export("selectedSpellName")
 	static String selectedSpellName;
-	@ObfuscatedName("mx")
+	@ObfuscatedName("mi")
 	@ObfuscatedGetter(
-		intValue = 1338880923
+		intValue = -65357441
 	)
 	@Export("rootInterface")
 	static int rootInterface;
-	@ObfuscatedName("mo")
+	@ObfuscatedName("my")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("interfaceParents")
 	static NodeHashTable interfaceParents;
-	@ObfuscatedName("ma")
+	@ObfuscatedName("mz")
 	@ObfuscatedGetter(
-		intValue = -907665653
+		intValue = -397561133
 	)
-	static int field803;
-	@ObfuscatedName("mc")
+	static int field784;
+	@ObfuscatedName("mx")
 	@ObfuscatedGetter(
-		intValue = 1274187443
+		intValue = -1298961303
 	)
-	static int field805;
-	@ObfuscatedName("mu")
+	static int field694;
+	@ObfuscatedName("me")
 	@ObfuscatedGetter(
-		intValue = -234914901
+		intValue = 1894201327
 	)
 	@Export("chatEffects")
 	static int chatEffects;
-	@ObfuscatedName("mv")
+	@ObfuscatedName("mk")
 	@ObfuscatedGetter(
-		intValue = -1287342199
+		intValue = 1703378305
 	)
-	static int field912;
-	@ObfuscatedName("mj")
+	static int field891;
+	@ObfuscatedName("mb")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("meslayerContinueWidget")
 	static Widget meslayerContinueWidget;
-	@ObfuscatedName("mr")
+	@ObfuscatedName("mp")
 	@ObfuscatedGetter(
-		intValue = 1008679671
+		intValue = -932901887
 	)
 	@Export("runEnergy")
 	static int runEnergy;
-	@ObfuscatedName("md")
+	@ObfuscatedName("mo")
 	@ObfuscatedGetter(
-		intValue = -612986977
+		intValue = 2078766509
 	)
 	@Export("weight")
 	static int weight;
-	@ObfuscatedName("mg")
+	@ObfuscatedName("mn")
 	@ObfuscatedGetter(
-		intValue = -816484905
+		intValue = -91677995
 	)
 	@Export("staffModLevel")
-	static int staffModLevel;
-	@ObfuscatedName("mt")
+	public static int staffModLevel;
+	@ObfuscatedName("md")
 	@ObfuscatedGetter(
-		intValue = -1092871253
+		intValue = 1939957429
 	)
 	@Export("followerIndex")
 	static int followerIndex;
-	@ObfuscatedName("nc")
+	@ObfuscatedName("nv")
 	@Export("playerMod")
 	static boolean playerMod;
-	@ObfuscatedName("nk")
+	@ObfuscatedName("nb")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("viewportWidget")
 	static Widget viewportWidget;
-	@ObfuscatedName("nm")
+	@ObfuscatedName("nc")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("clickedWidget")
 	static Widget clickedWidget;
-	@ObfuscatedName("nf")
+	@ObfuscatedName("np")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("clickedWidgetParent")
 	static Widget clickedWidgetParent;
-	@ObfuscatedName("ni")
+	@ObfuscatedName("na")
 	@ObfuscatedGetter(
-		intValue = -653830947
+		intValue = 123822307
 	)
 	@Export("widgetClickX")
 	static int widgetClickX;
-	@ObfuscatedName("nu")
+	@ObfuscatedName("nm")
 	@ObfuscatedGetter(
-		intValue = 1055501491
+		intValue = -1215830949
 	)
 	@Export("widgetClickY")
 	static int widgetClickY;
-	@ObfuscatedName("nv")
+	@ObfuscatedName("nz")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("draggedOnWidget")
 	static Widget draggedOnWidget;
-	@ObfuscatedName("no")
-	static boolean field819;
-	@ObfuscatedName("nx")
-	@ObfuscatedGetter(
-		intValue = 1941546241
-	)
-	static int field740;
-	@ObfuscatedName("nw")
-	@ObfuscatedGetter(
-		intValue = -356014141
-	)
-	static int field821;
-	@ObfuscatedName("np")
-	static boolean field822;
 	@ObfuscatedName("nq")
+	static boolean field821;
+	@ObfuscatedName("nj")
 	@ObfuscatedGetter(
-		intValue = -227792449
+		intValue = 392956681
 	)
-	static int field854;
-	@ObfuscatedName("nl")
+	static int field801;
+	@ObfuscatedName("nn")
 	@ObfuscatedGetter(
-		intValue = 662563071
+		intValue = -207848961
+	)
+	static int field802;
+	@ObfuscatedName("nk")
+	static boolean field731;
+	@ObfuscatedName("ne")
+	@ObfuscatedGetter(
+		intValue = -1026128313
 	)
 	static int field804;
-	@ObfuscatedName("nz")
+	@ObfuscatedName("nf")
+	@ObfuscatedGetter(
+		intValue = 1520709181
+	)
+	static int field805;
+	@ObfuscatedName("nl")
 	@Export("isDraggingWidget")
 	static boolean isDraggingWidget;
-	@ObfuscatedName("nd")
+	@ObfuscatedName("ns")
 	@ObfuscatedGetter(
-		intValue = 1675804533
+		intValue = -627437657
 	)
 	@Export("cycleCntr")
 	static int cycleCntr;
-	@ObfuscatedName("nn")
+	@ObfuscatedName("no")
 	@Export("changedVarps")
 	static int[] changedVarps;
-	@ObfuscatedName("na")
+	@ObfuscatedName("ni")
 	@ObfuscatedGetter(
-		intValue = 1149971569
+		intValue = 1626383345
 	)
 	@Export("changedVarpCount")
 	static int changedVarpCount;
-	@ObfuscatedName("ns")
+	@ObfuscatedName("nr")
 	@Export("changedItemContainers")
 	static int[] changedItemContainers;
-	@ObfuscatedName("nj")
+	@ObfuscatedName("ng")
 	@ObfuscatedGetter(
-		intValue = 102304557
+		intValue = 942162965
 	)
-	static int field830;
-	@ObfuscatedName("ne")
+	static int field711;
+	@ObfuscatedName("nd")
 	@Export("changedSkills")
 	static int[] changedSkills;
-	@ObfuscatedName("oc")
+	@ObfuscatedName("on")
 	@ObfuscatedGetter(
-		intValue = 28091927
+		intValue = -887652095
 	)
 	@Export("changedSkillsCount")
 	static int changedSkillsCount;
-	@ObfuscatedName("oi")
-	static int[] field911;
-	@ObfuscatedName("oe")
+	@ObfuscatedName("oo")
+	static int[] field814;
+	@ObfuscatedName("og")
 	@ObfuscatedGetter(
-		intValue = 1843609775
+		intValue = -1384400453
 	)
-	static int field852;
-	@ObfuscatedName("on")
+	static int field759;
+	@ObfuscatedName("om")
 	@ObfuscatedGetter(
-		intValue = 1908476521
+		intValue = 811091313
 	)
 	@Export("chatCycle")
 	static int chatCycle;
-	@ObfuscatedName("op")
+	@ObfuscatedName("oj")
 	@ObfuscatedGetter(
-		intValue = 56143531
+		intValue = -892031395
 	)
-	static int field836;
-	@ObfuscatedName("oh")
-	@ObfuscatedGetter(
-		intValue = 1400025619
-	)
-	static int field844;
-	@ObfuscatedName("ox")
-	@ObfuscatedGetter(
-		intValue = -1827987357
-	)
-	static int field654;
+	static int field817;
 	@ObfuscatedName("of")
 	@ObfuscatedGetter(
-		intValue = -31959039
+		intValue = -2026013483
 	)
-	static int field839;
+	static int field882;
+	@ObfuscatedName("oa")
+	@ObfuscatedGetter(
+		intValue = 976614793
+	)
+	static int field819;
+	@ObfuscatedName("ol")
+	@ObfuscatedGetter(
+		intValue = 1591480271
+	)
+	static int field820;
 	@ObfuscatedName("oy")
 	@ObfuscatedGetter(
-		intValue = 77736245
+		intValue = 1602383115
 	)
-	static int field840;
-	@ObfuscatedName("og")
+	static int field827;
+	@ObfuscatedName("od")
 	@ObfuscatedGetter(
-		intValue = -194606347
+		intValue = 1877231855
 	)
-	static int field748;
-	@ObfuscatedName("ou")
+	static int field822;
+	@ObfuscatedName("or")
 	@ObfuscatedGetter(
-		intValue = 1047300925
+		intValue = -451521007
 	)
-	static int field659;
-	@ObfuscatedName("eo")
+	static int field823;
+	@ObfuscatedName("oc")
+	@ObfuscatedGetter(
+		intValue = 807145243
+	)
+	@Export("mouseWheelRotation")
+	static int mouseWheelRotation;
+	@ObfuscatedName("ef")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lnt;"
 	)
-	Buffer field679;
-	@ObfuscatedName("fl")
+	Buffer field660;
+	@ObfuscatedName("fq")
 	@ObfuscatedSignature(
-		descriptor = "Las;"
+		descriptor = "Laq;"
 	)
-	class35 field680;
+	class35 field661;
 
 	static {
-		field889 = true; // L: 194
+		field730 = true; // L: 194
 		worldId = 1; // L: 195
 		worldProperties = 0; // L: 196
 		gameBuild = 0; // L: 198
 		isMembersWorld = false; // L: 201
 		isLowDetail = false; // L: 202
 		clientType = -1; // L: 207
-		field643 = -1; // L: 208
+		field625 = -1; // L: 208
 		onMobile = false; // L: 209
 		gameState = 0; // L: 210
 		isLoading = true; // L: 231
 		cycle = 0; // L: 232
 		mouseLastLastPressedTimeMillis = -1L; // L: 233
-		field651 = -1; // L: 235
-		field812 = -1; // L: 236
-		field653 = -1L; // L: 237
+		field843 = -1; // L: 235
+		field633 = -1; // L: 236
+		field760 = -1L; // L: 237
 		hadFocus = true; // L: 238
 		displayFps = false; // L: 239
 		rebootTimer = 0; // L: 240
 		hintArrowType = 0; // L: 241
-		hintArrowNpcIndex = 0; // L: 242
-		hintArrowPlayerIndex = 0; // L: 243
+		hintArrowNpcIndex = 0;
+		hintArrowPlayerIndex = 0;
 		hintArrowX = 0; // L: 244
 		hintArrowY = 0; // L: 245
 		hintArrowHeight = 0; // L: 246
@@ -1334,42 +1347,42 @@ public final class Client extends GameEngine implements Usernamed {
 		npcAttackOption = AttackOption.AttackOption_hidden; // L: 251
 		titleLoadingStage = 0; // L: 253
 		js5ConnectState = 0; // L: 256
-		field670 = 0; // L: 257
+		field800 = 0; // L: 257
 		js5Errors = 0; // L: 279
 		loginState = 0; // L: 281
-		field673 = 0; // L: 282
-		field845 = 0; // L: 283
-		field675 = 0; // L: 284
-		field676 = class125.field1468; // L: 285
+		field811 = 0; // L: 282
+		field654 = 0; // L: 283
+		field655 = 0; // L: 284
+		field656 = class126.field1475; // L: 285
 		Login_isUsernameRemembered = false; // L: 294
 		secureRandomFuture = new SecureRandomFuture(); // L: 295
 		randomDatData = null; // L: 300
 		npcs = new NPC[32768]; // L: 304
 		npcCount = 0; // L: 305
 		npcIndices = new int[32768]; // L: 306
-		field685 = 0; // L: 307
-		field686 = new int[250]; // L: 308
+		field636 = 0; // L: 307
+		field763 = new int[250]; // L: 308
 		packetWriter = new PacketWriter(); // L: 311
 		logoutTimer = 0; // L: 313
 		hadNetworkError = false; // L: 314
 		useBufferedSocket = true; // L: 315
 		timer = new Timer(); // L: 316
 		fontsMap = new HashMap(); // L: 322
-		field694 = 0; // L: 329
-		field695 = 1; // L: 330
-		field696 = 0; // L: 331
-		field697 = 1; // L: 332
-		field698 = 0; // L: 333
+		field618 = 0; // L: 329
+		field789 = 1; // L: 330
+		field742 = 0; // L: 331
+		field677 = 1; // L: 332
+		field678 = 0; // L: 333
 		collisionMaps = new CollisionMap[4]; // L: 341
 		isInInstance = false; // L: 342
 		instanceChunkTemplates = new int[4][13][13]; // L: 343
-		field702 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 344
-		field913 = 0; // L: 347
-		field704 = 2301979; // L: 359
-		field705 = 5063219; // L: 360
-		field706 = 3353893; // L: 361
-		field707 = 7759444; // L: 362
-		field708 = false; // L: 363
+		field682 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 344
+		field683 = 0; // L: 347
+		field685 = 2301979; // L: 359
+		field686 = 5063219; // L: 360
+		field818 = 3353893; // L: 361
+		field688 = 7759444; // L: 362
+		field689 = false; // L: 363
 		alternativeScrollbarWidth = 0; // L: 364
 		camAngleX = 128; // L: 372
 		camAngleY = 0; // L: 373
@@ -1379,16 +1392,16 @@ public final class Client extends GameEngine implements Usernamed {
 		mouseCamClickedY = 0; // L: 377
 		oculusOrbState = 0; // L: 378
 		camFollowHeight = 50; // L: 379
-		field718 = 0; // L: 383
-		field732 = 0; // L: 384
-		field720 = 0; // L: 385
+		field699 = 0; // L: 383
+		field676 = 0; // L: 384
+		field857 = 0; // L: 385
 		oculusOrbNormalSpeed = 12; // L: 387
 		oculusOrbSlowedSpeed = 6; // L: 388
-		field723 = 0; // L: 389
-		field724 = false; // L: 390
-		field725 = 0; // L: 391
-		field726 = false; // L: 392
-		field727 = 0; // L: 393
+		field704 = 0; // L: 389
+		field705 = false; // L: 390
+		field706 = 0; // L: 391
+		field707 = false; // L: 392
+		field708 = 0; // L: 393
 		overheadTextCount = 0; // L: 394
 		overheadTextLimit = 50; // L: 395
 		overheadTextXs = new int[overheadTextLimit]; // L: 396
@@ -1408,23 +1421,23 @@ public final class Client extends GameEngine implements Usernamed {
 		mouseCrossState = 0; // L: 410
 		mouseCrossColor = 0; // L: 411
 		showMouseCross = true; // L: 412
-		field747 = 0; // L: 414
-		field841 = 0; // L: 415
+		field869 = 0; // L: 414
+		field729 = 0; // L: 415
 		dragItemSlotSource = 0; // L: 418
 		draggedWidgetX = 0; // L: 419
 		draggedWidgetY = 0; // L: 420
 		dragItemSlotDestination = 0; // L: 421
-		field848 = false; // L: 422
+		field734 = false; // L: 422
 		itemDragDuration = 0; // L: 423
-		field755 = 0; // L: 424
+		field629 = 0; // L: 424
 		showLoadingMessages = true; // L: 426
 		players = new Player[2048]; // L: 428
 		localPlayerIndex = -1; // L: 430
-		field759 = 0; // L: 431
+		field740 = 0; // L: 431
 		renderSelf = true; // L: 433
 		drawPlayerNames = 0; // L: 438
-		field762 = 0; // L: 439
-		field771 = new int[1000]; // L: 440
+		field783 = 0; // L: 439
+		field859 = new int[1000]; // L: 440
 		playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 442
 		playerMenuActions = new String[8]; // L: 443
 		playerOptionsPriorities = new boolean[8]; // L: 444
@@ -1453,21 +1466,21 @@ public final class Client extends GameEngine implements Usernamed {
 		showMouseOverText = true; // L: 473
 		viewportX = -1; // L: 474
 		viewportY = -1; // L: 475
-		field792 = 0; // L: 479
-		field833 = 50; // L: 480
+		field773 = 0; // L: 479
+		field693 = 50; // L: 480
 		isItemSelected = 0; // L: 481
 		selectedItemName = null; // L: 485
 		isSpellSelected = false; // L: 486
 		selectedSpellChildIndex = -1; // L: 488
-		field788 = -1; // L: 489
+		field634 = -1; // L: 489
 		selectedSpellActionName = null; // L: 491
 		selectedSpellName = null; // L: 492
 		rootInterface = -1; // L: 493
 		interfaceParents = new NodeHashTable(8); // L: 494
-		field803 = 0; // L: 499
-		field805 = -1; // L: 500
+		field784 = 0; // L: 499
+		field694 = -1; // L: 500
 		chatEffects = 0; // L: 501
-		field912 = 0; // L: 502
+		field891 = 0; // L: 502
 		meslayerContinueWidget = null; // L: 503
 		runEnergy = 0; // L: 504
 		weight = 0; // L: 505
@@ -1480,69 +1493,69 @@ public final class Client extends GameEngine implements Usernamed {
 		widgetClickX = 0; // L: 512
 		widgetClickY = 0; // L: 513
 		draggedOnWidget = null; // L: 514
-		field819 = false; // L: 515
-		field740 = -1; // L: 516
-		field821 = -1; // L: 517
-		field822 = false; // L: 518
-		field854 = -1; // L: 519
-		field804 = -1; // L: 520
+		field821 = false; // L: 515
+		field801 = -1; // L: 516
+		field802 = -1; // L: 517
+		field731 = false; // L: 518
+		field804 = -1; // L: 519
+		field805 = -1; // L: 520
 		isDraggingWidget = false; // L: 521
 		cycleCntr = 1; // L: 526
 		changedVarps = new int[32]; // L: 529
 		changedVarpCount = 0; // L: 530
 		changedItemContainers = new int[32]; // L: 531
-		field830 = 0; // L: 532
+		field711 = 0; // L: 532
 		changedSkills = new int[32]; // L: 533
 		changedSkillsCount = 0; // L: 534
-		field911 = new int[32]; // L: 535
-		field852 = 0; // L: 536
+		field814 = new int[32]; // L: 535
+		field759 = 0; // L: 536
 		chatCycle = 0; // L: 537
-		field836 = 0; // L: 538
-		field844 = 0; // L: 539
-		field654 = 0; // L: 540
-		field839 = 0; // L: 541
-		field840 = 0; // L: 542
-		field748 = 0; // L: 543
-		field659 = 0; // L: 544
+		field817 = 0; // L: 538
+		field882 = 0; // L: 539
+		field819 = 0; // L: 540
+		field820 = 0; // L: 541
+		field827 = 0; // L: 542
+		field822 = 0; // L: 543
+		field823 = 0; // L: 544
 		mouseWheelRotation = 0; // L: 550
 		scriptEvents = new NodeDeque(); // L: 551
-		field652 = new NodeDeque(); // L: 552
-		field846 = new NodeDeque(); // L: 553
+		field812 = new NodeDeque(); // L: 552
+		field860 = new NodeDeque(); // L: 553
 		widgetFlags = new NodeHashTable(512); // L: 554
 		rootWidgetCount = 0; // L: 556
-		field849 = -2; // L: 557
-		field719 = new boolean[100]; // L: 558
-		field780 = new boolean[100]; // L: 559
-		field860 = new boolean[100]; // L: 560
+		field830 = -2; // L: 557
+		field831 = new boolean[100]; // L: 558
+		field712 = new boolean[100]; // L: 559
+		field833 = new boolean[100]; // L: 560
 		rootWidgetXs = new int[100]; // L: 561
 		rootWidgetYs = new int[100]; // L: 562
 		rootWidgetWidths = new int[100]; // L: 563
 		rootWidgetHeights = new int[100]; // L: 564
-		gameDrawingMode = 0; // L: 565
-		field858 = 0L; // L: 566
-		isResizable = true; // L: 567
-		field877 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 574
-		publicChatMode = 0; // L: 575
-		tradeChatMode = 0; // L: 577
-		field863 = ""; // L: 578
-		crossWorldMessageIds = new long[100]; // L: 580
-		crossWorldMessageIdsIndex = 0; // L: 581
-		field806 = 0; // L: 583
-		field867 = new int[128]; // L: 584
-		field868 = new int[128]; // L: 585
-		field809 = -1L; // L: 586
-		currentClanSettings = new ClanSettings[1]; // L: 590
-		currentClanChannels = new ClanChannel[1]; // L: 592
-		field872 = -1; // L: 594
-		mapIconCount = 0; // L: 595
-		mapIconXs = new int[1000]; // L: 596
-		mapIconYs = new int[1000]; // L: 597
-		mapIcons = new SpritePixels[1000]; // L: 598
-		destinationX = 0; // L: 599
+		gameDrawingMode = 0;
+		field839 = 0L; // L: 566
+		isResizable = true;
+		field725 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
+		publicChatMode = 0;
+		tradeChatMode = 0;
+		field642 = "";
+		crossWorldMessageIds = new long[100];
+		crossWorldMessageIdsIndex = 0;
+		field847 = 0; // L: 583
+		field848 = new int[128];
+		field786 = new int[128];
+		field850 = -1L;
+		currentClanSettings = new ClanSettings[1];
+		currentClanChannels = new ClanChannel[1];
+		field853 = -1; // L: 594
+		mapIconCount = 0;
+		mapIconXs = new int[1000];
+		mapIconYs = new int[1000];
+		mapIcons = new SpritePixels[1000];
+		destinationX = 0;
 		destinationY = 0; // L: 600
-		minimapState = 0; // L: 607
-		currentTrackGroupId = -1; // L: 608
-		field881 = false; // L: 609
+		minimapState = 0;
+		currentTrackGroupId = -1;
+		field862 = false;
 		soundEffectCount = 0; // L: 615
 		soundEffectIds = new int[50]; // L: 616
 		queuedSoundEffectLoops = new int[50]; // L: 617
@@ -1550,408 +1563,751 @@ public final class Client extends GameEngine implements Usernamed {
 		soundLocations = new int[50]; // L: 619
 		soundEffects = new SoundEffect[50]; // L: 620
 		isCameraLocked = false; // L: 622
-		field693 = new boolean[5]; // L: 634
-		field890 = new int[5]; // L: 635
-		field891 = new int[5]; // L: 636
-		field892 = new int[5]; // L: 637
-		field893 = new int[5]; // L: 638
-		field894 = 256; // L: 639
-		field895 = 205; // L: 640
+		field871 = new boolean[5]; // L: 634
+		field872 = new int[5]; // L: 635
+		field873 = new int[5]; // L: 636
+		field867 = new int[5]; // L: 637
+		field875 = new int[5]; // L: 638
+		field876 = 256; // L: 639
+		field877 = 205; // L: 640
 		zoomHeight = 256; // L: 641
 		zoomWidth = 320; // L: 642
-		field909 = 1; // L: 643
-		field828 = 32767; // L: 644
-		field900 = 1; // L: 645
-		field901 = 32767; // L: 646
+		field880 = 1; // L: 643
+		field864 = 32767; // L: 644
+		field881 = 1; // L: 645
+		field690 = 32767; // L: 646
 		viewportOffsetX = 0; // L: 647
 		viewportOffsetY = 0; // L: 648
 		viewportWidth = 0; // L: 649
 		viewportHeight = 0; // L: 650
 		viewportZoom = 0; // L: 651
 		playerAppearance = new PlayerComposition(); // L: 653
-		field908 = -1; // L: 654
-		field752 = -1; // L: 655
+		field890 = -1; // L: 654
+		field902 = -1; // L: 655
 		platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 657
 		grandExchangeOffers = new GrandExchangeOffer[8]; // L: 659
 		GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 662
-		field717 = -1; // L: 669
+		field798 = -1; // L: 669
 		archiveLoaders = new ArrayList(10); // L: 670
 		archiveLoadersDone = 0; // L: 671
-		field916 = 0; // L: 672
-		field785 = new ApproximateRouteStrategy(); // L: 681
-		field689 = new int[50]; // L: 682
-		field851 = new int[50]; // L: 683
+		field898 = 0; // L: 672
+		field733 = new ApproximateRouteStrategy(); // L: 681
+		field739 = new int[50]; // L: 682
+		field631 = new int[50]; // L: 683
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "50"
+		garbageValue = "-95"
 	)
 	@Export("resizeGame")
 	protected final void resizeGame() {
-		field858 = ObjectComposition.currentTimeMillis() + 500L; // L: 3933
-		this.resizeJS(); // L: 3934
-		if (rootInterface != -1) { // L: 3935
+		field839 = ClientPacket.currentTimeMillis() + 500L; // L: 4420
+		this.resizeJS(); // L: 4421
+		if (rootInterface != -1) { // L: 4422
 			this.resizeRoot(true);
 		}
 
-	} // L: 3936
+	} // L: 4423
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-232069568"
+		garbageValue = "-1587549695"
 	)
 	@Export("setUp")
 	protected final void setUp() {
-		SecureRandomFuture.method1981(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 880
-		WorldMapLabelSize.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 881
-		GrandExchangeOfferTotalQuantityComparator.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 882
-		DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 883
-		class29.field233 = class245.field2944; // L: 884
-		class15.field137 = class245.field2940; // L: 885
-		UserComparator5.field1442 = class245.field2941; // L: 886
-		VarbitComposition.field1708 = class245.field2942; // L: 887
-		ServerPacket.urlRequester = new UrlRequester(); // L: 888
-		this.setUpKeyboard(); // L: 889
-		this.setUpMouse(); // L: 890
-		MidiPcmStream.mouseWheel = this.mouseWheel(); // L: 891
-		class43.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 892
-		AccessFile var2 = null; // L: 895
-		ClientPreferences var3 = new ClientPreferences(); // L: 896
+		int[] var1 = new int[]{20, 260, 10000}; // L: 898
+		int[] var2 = new int[]{1000, 100, 500}; // L: 899
+		if (var1 != null && var2 != null) { // L: 901
+			class372.ByteArrayPool_alternativeSizes = var1; // L: 907
+			WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; // L: 908
+			Tiles.ByteArrayPool_arrays = new byte[var1.length][][]; // L: 909
 
-		try {
-			var2 = class82.getPreferencesFile("", SoundSystem.field461.name, false); // L: 898
-			byte[] var4 = new byte[(int)var2.length()]; // L: 899
-
-			int var6;
-			for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 900 901 904
-				var6 = var2.read(var4, var5, var4.length - var5); // L: 902
-				if (var6 == -1) { // L: 903
-					throw new IOException();
-				}
+			for (int var3 = 0; var3 < class372.ByteArrayPool_alternativeSizes.length; ++var3) { // L: 910
+				Tiles.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; // L: 911
 			}
-
-			var3 = new ClientPreferences(new Buffer(var4)); // L: 906
-		} catch (Exception var8) { // L: 908
+		} else {
+			class372.ByteArrayPool_alternativeSizes = null; // L: 902
+			WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts = null; // L: 903
+			Tiles.ByteArrayPool_arrays = null; // L: 904
 		}
 
-		try {
-			if (var2 != null) { // L: 910
-				var2.close();
-			}
-		} catch (Exception var7) { // L: 912
-		}
-
-		ObjectComposition.clientPreferences = var3; // L: 915
-		this.setUpClipboard(); // L: 916
-		String var9 = PacketWriter.null_string; // L: 918
-		class44.applet = this; // L: 920
-		if (var9 != null) { // L: 921
-			class44.field318 = var9;
-		}
-
-		if (gameBuild != 0) { // L: 923
+		UserComparator7.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 914
+		MouseRecorder.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 915
+		UserComparator2.currentPort = UserComparator7.worldPort; // L: 916
+		VarcInt.field1581 = class246.field2945; // L: 917
+		class69.field568 = class246.field2944; // L: 918
+		ModelData0.field2517 = class246.field2943; // L: 919
+		Skills.field3175 = class246.field2946; // L: 920
+		ArchiveDiskActionHandler.urlRequester = new UrlRequester(); // L: 921
+		this.setUpKeyboard(); // L: 922
+		this.setUpMouse(); // L: 923
+		Projectile.mouseWheel = this.mouseWheel(); // L: 924
+		WorldMapID.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 925
+		class4.clientPreferences = VarpDefinition.method2715(); // L: 926
+		this.setUpClipboard(); // L: 927
+		UserComparator5.method2543(this, InvDefinition.null_string); // L: 928
+		if (gameBuild != 0) { // L: 929
 			displayFps = true;
 		}
 
-		CollisionMap.setWindowedMode(ObjectComposition.clientPreferences.windowMode); // L: 924
-		NetSocket.friendSystem = new FriendSystem(WorldMapSection0.loginType); // L: 925
-	} // L: 926
+		WorldMapDecorationType.setWindowedMode(class4.clientPreferences.windowMode); // L: 930
+		DevicePcmPlayerProvider.friendSystem = new FriendSystem(LoginScreenAnimation.loginType); // L: 931
+	} // L: 932
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "68"
+		descriptor = "(I)V",
+		garbageValue = "2087654500"
 	)
 	@Export("doCycle")
 	protected final void doCycle() {
-		++cycle; // L: 929
-		this.doCycleJs5(); // L: 930
-
-		while (true) {
-			ArchiveDiskAction var1;
-			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 934
-				var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 935
-			} // L: 936
-
-			if (var1 == null) { // L: 937
-				Interpreter.method1870(); // L: 941
-				HealthBarUpdate.playPcmPlayers(); // L: 942
-				synchronized(KeyHandler.KeyHandler_instance) { // L: 944
-					++KeyHandler.KeyHandler_idleCycles; // L: 945
-					KeyHandler.field293 = KeyHandler.field295; // L: 946
-					KeyHandler.field292 = 0; // L: 947
-					int var5;
-					if (KeyHandler.field288 >= 0) { // L: 948
-						while (KeyHandler.field296 != KeyHandler.field288) { // L: 953
-							var5 = KeyHandler.field287[KeyHandler.field296]; // L: 954
-							KeyHandler.field296 = KeyHandler.field296 + 1 & 127; // L: 955
-							if (var5 < 0) { // L: 956
-								KeyHandler.KeyHandler_pressedKeys[~var5] = false;
-							} else {
-								if (!KeyHandler.KeyHandler_pressedKeys[var5] && KeyHandler.field292 < KeyHandler.field274.length - 1) { // L: 958
-									KeyHandler.field274[++KeyHandler.field292 - 1] = var5; // L: 959
-								}
-
-								KeyHandler.KeyHandler_pressedKeys[var5] = true; // L: 961
-							}
+		++cycle; // L: 935
+		this.doCycleJs5(); // L: 936
+		class35.method422(); // L: 937
+		Frames.method4257(); // L: 938
+		class233.playPcmPlayers(); // L: 939
+		int var2;
+		synchronized(KeyHandler.KeyHandler_instance) { // L: 941
+			++KeyHandler.KeyHandler_idleCycles; // L: 942
+			KeyHandler.field276 = KeyHandler.field277; // L: 943
+			KeyHandler.field271 = 0; // L: 944
+			KeyHandler.field274 = 0; // L: 945
+			Arrays.fill(KeyHandler.field264, false); // L: 946
+			Arrays.fill(KeyHandler.field265, false); // L: 947
+			if (KeyHandler.field268 < 0) { // L: 948
+				Arrays.fill(KeyHandler.KeyHandler_pressedKeys, false); // L: 949
+				KeyHandler.field268 = KeyHandler.field267; // L: 950
+			} else {
+				while (KeyHandler.field267 != KeyHandler.field268) { // L: 953
+					var2 = KeyHandler.field283[KeyHandler.field267]; // L: 954
+					KeyHandler.field267 = KeyHandler.field267 + 1 & 127; // L: 955
+					if (var2 < 0) { // L: 956
+						var2 = ~var2; // L: 957
+						if (KeyHandler.KeyHandler_pressedKeys[var2]) { // L: 958
+							KeyHandler.KeyHandler_pressedKeys[var2] = false; // L: 959
+							KeyHandler.field265[var2] = true; // L: 960
+							KeyHandler.field273[KeyHandler.field274] = var2; // L: 961
+							++KeyHandler.field274; // L: 962
 						}
 					} else {
-						for (var5 = 0; var5 < 112; ++var5) { // L: 949
-							KeyHandler.KeyHandler_pressedKeys[var5] = false;
+						if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field271 < KeyHandler.field257.length - 1) { // L: 966
+							KeyHandler.field264[var2] = true; // L: 967
+							KeyHandler.field257[++KeyHandler.field271 - 1] = var2; // L: 968
 						}
 
-						KeyHandler.field288 = KeyHandler.field296; // L: 950
+						KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 970
 					}
-
-					if (KeyHandler.field292 > 0) { // L: 965
-						KeyHandler.KeyHandler_idleCycles = 0;
-					}
-
-					KeyHandler.field295 = KeyHandler.field294; // L: 966
 				}
-
-				Player.method2166(); // L: 969
-				int var6;
-				if (MidiPcmStream.mouseWheel != null) { // L: 970
-					var6 = MidiPcmStream.mouseWheel.useRotation(); // L: 971
-					mouseWheelRotation = var6; // L: 972
-				}
-
-				if (gameState == 0) { // L: 974
-					MilliClock.load(); // L: 975
-					GameEngine.clock.mark(); // L: 977
-
-					for (var6 = 0; var6 < 32; ++var6) { // L: 978
-						GameEngine.graphicsTickTimes[var6] = 0L;
-					}
-
-					for (var6 = 0; var6 < 32; ++var6) { // L: 979
-						GameEngine.clientTickTimes[var6] = 0L;
-					}
-
-					class260.gameCyclesToDo = 0; // L: 980
-				} else if (gameState == 5) { // L: 983
-					WorldMapManager.doCycleTitle(this); // L: 984
-					MilliClock.load(); // L: 985
-					GameEngine.clock.mark(); // L: 987
-
-					for (var6 = 0; var6 < 32; ++var6) { // L: 988
-						GameEngine.graphicsTickTimes[var6] = 0L;
-					}
-
-					for (var6 = 0; var6 < 32; ++var6) { // L: 989
-						GameEngine.clientTickTimes[var6] = 0L;
-					}
-
-					class260.gameCyclesToDo = 0; // L: 990
-				} else if (gameState != 10 && gameState != 11) { // L: 993
-					if (gameState == 20) { // L: 994
-						WorldMapManager.doCycleTitle(this); // L: 995
-						this.doCycleLoggedOut(); // L: 996
-					} else if (gameState == 25) { // L: 998
-						WorldMapAreaData.method3708();
-					}
-				} else {
-					WorldMapManager.doCycleTitle(this);
-				}
-
-				if (gameState == 30) { // L: 999
-					this.doCycleLoggedIn();
-				} else if (gameState == 40 || gameState == 45) { // L: 1000
-					this.doCycleLoggedOut();
-				}
-
-				return; // L: 1001
 			}
 
-			var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); // L: 938
-		}
-	}
+			if (KeyHandler.field271 > 0) { // L: 974
+				KeyHandler.KeyHandler_idleCycles = 0;
+			}
 
-	@ObfuscatedName("ad")
+			KeyHandler.field277 = KeyHandler.field255; // L: 975
+		}
+
+		class34.method406(); // L: 978
+		if (Projectile.mouseWheel != null) { // L: 979
+			int var24 = Projectile.mouseWheel.useRotation(); // L: 980
+			mouseWheelRotation = var24; // L: 981
+		}
+
+		if (gameState == 0) { // L: 983
+			class34.load(); // L: 984
+			class26.method350(); // L: 985
+		} else if (gameState == 5) { // L: 987
+			class21.doCycleTitle(this); // L: 988
+			class34.load(); // L: 989
+			class26.method350(); // L: 990
+		} else if (gameState != 10 && gameState != 11) { // L: 992
+			if (gameState == 20) { // L: 993
+				class21.doCycleTitle(this); // L: 994
+				this.doCycleLoggedOut(); // L: 995
+			} else if (gameState == 25) { // L: 997
+				DynamicObject.method2099(false); // L: 998
+				field618 = 0; // L: 999
+				boolean var35 = true; // L: 1000
+
+				for (var2 = 0; var2 < UrlRequest.regionLandArchives.length; ++var2) { // L: 1001
+					if (UrlRequester.regionMapArchiveIds[var2] != -1 && UrlRequest.regionLandArchives[var2] == null) { // L: 1002 1003
+						UrlRequest.regionLandArchives[var2] = class4.archive5.takeFile(UrlRequester.regionMapArchiveIds[var2], 0); // L: 1004
+						if (UrlRequest.regionLandArchives[var2] == null) { // L: 1005
+							var35 = false; // L: 1006
+							++field618; // L: 1007
+						}
+					}
+
+					if (class286.regionLandArchiveIds[var2] != -1 && WorldMapDecorationType.regionMapArchives[var2] == null) { // L: 1011 1012
+						WorldMapDecorationType.regionMapArchives[var2] = class4.archive5.takeFileEncrypted(class286.regionLandArchiveIds[var2], 0, class7.xteaKeys[var2]); // L: 1013
+						if (WorldMapDecorationType.regionMapArchives[var2] == null) { // L: 1014
+							var35 = false; // L: 1015
+							++field618; // L: 1016
+						}
+					}
+				}
+
+				if (!var35) { // L: 1021
+					field678 = 1; // L: 1022
+				} else {
+					field742 = 0; // L: 1025
+					var35 = true; // L: 1026
+
+					int var4;
+					int var5;
+					for (var2 = 0; var2 < UrlRequest.regionLandArchives.length; ++var2) { // L: 1027
+						byte[] var3 = WorldMapDecorationType.regionMapArchives[var2]; // L: 1028
+						if (var3 != null) { // L: 1029
+							var4 = (UserComparator4.regions[var2] >> 8) * 64 - class15.baseX; // L: 1030
+							var5 = (UserComparator4.regions[var2] & 255) * 64 - WorldMapSprite.baseY; // L: 1031
+							if (isInInstance) { // L: 1032
+								var4 = 10; // L: 1033
+								var5 = 10; // L: 1034
+							}
+
+							var35 &= class69.method1222(var3, var4, var5); // L: 1036
+						}
+					}
+
+					if (!var35) { // L: 1039
+						field678 = 2; // L: 1040
+					} else {
+						if (field678 != 0) { // L: 1043
+							class143.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
+						}
+
+						class233.playPcmPlayers(); // L: 1044
+						DevicePcmPlayerProvider.scene.clear(); // L: 1045
+
+						for (var2 = 0; var2 < 4; ++var2) { // L: 1046
+							collisionMaps[var2].clear();
+						}
+
+						int var25;
+						for (var2 = 0; var2 < 4; ++var2) { // L: 1047
+							for (var25 = 0; var25 < 104; ++var25) { // L: 1048
+								for (var4 = 0; var4 < 104; ++var4) { // L: 1049
+									Tiles.Tiles_renderFlags[var2][var25][var4] = 0; // L: 1050
+								}
+							}
+						}
+
+						class233.playPcmPlayers(); // L: 1054
+						Tiles.Tiles_minPlane = 99; // L: 1056
+						AccessFile.field4098 = new byte[4][104][104]; // L: 1057
+						Tiles.field1111 = new byte[4][104][104]; // L: 1058
+						class22.field186 = new byte[4][104][104]; // L: 1059
+						class16.field132 = new byte[4][104][104]; // L: 1060
+						Tiles.field1101 = new int[4][105][105]; // L: 1061
+						class43.field307 = new byte[4][105][105]; // L: 1062
+						NPC.field1328 = new int[105][105]; // L: 1063
+						class230.Tiles_hue = new int[104]; // L: 1064
+						Tiles.Tiles_saturation = new int[104]; // L: 1065
+						AbstractByteArrayCopier.Tiles_lightness = new int[104]; // L: 1066
+						WorldMapSectionType.Tiles_hueMultiplier = new int[104]; // L: 1067
+						Tiles.field1095 = new int[104]; // L: 1068
+						var2 = UrlRequest.regionLandArchives.length; // L: 1070
+
+						for (ObjectSound var33 = (ObjectSound)ObjectSound.objectSounds.last(); var33 != null; var33 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 1072
+							if (var33.stream1 != null) { // L: 1073
+								UserComparator7.pcmStreamMixer.removeSubStream(var33.stream1); // L: 1074
+								var33.stream1 = null; // L: 1075
+							}
+
+							if (var33.stream2 != null) { // L: 1077
+								UserComparator7.pcmStreamMixer.removeSubStream(var33.stream2); // L: 1078
+								var33.stream2 = null; // L: 1079
+							}
+						}
+
+						ObjectSound.objectSounds.clear(); // L: 1082
+						DynamicObject.method2099(true); // L: 1084
+						int var7;
+						int var8;
+						int var10;
+						int var11;
+						int var12;
+						int var13;
+						int var28;
+						if (!isInInstance) { // L: 1085
+							var25 = 0;
+
+							label579:
+							while (true) {
+								byte[] var6;
+								if (var25 >= var2) {
+									for (var25 = 0; var25 < var2; ++var25) { // L: 1114
+										var4 = (UserComparator4.regions[var25] >> 8) * 64 - class15.baseX; // L: 1115
+										var5 = (UserComparator4.regions[var25] & 255) * 64 - WorldMapSprite.baseY; // L: 1116
+										var6 = UrlRequest.regionLandArchives[var25]; // L: 1117
+										if (var6 == null && RouteStrategy.field1919 < 800) { // L: 1118
+											class233.playPcmPlayers(); // L: 1119
+											UrlRequest.method2520(var4, var5, 64, 64); // L: 1120
+										}
+									}
+
+									DynamicObject.method2099(true); // L: 1123
+									var25 = 0;
+
+									while (true) {
+										if (var25 >= var2) {
+											break label579;
+										}
+
+										byte[] var27 = WorldMapDecorationType.regionMapArchives[var25]; // L: 1125
+										if (var27 != null) { // L: 1126
+											var5 = (UserComparator4.regions[var25] >> 8) * 64 - class15.baseX; // L: 1127
+											var28 = (UserComparator4.regions[var25] & 255) * 64 - WorldMapSprite.baseY; // L: 1128
+											class233.playPcmPlayers(); // L: 1129
+											Scene var29 = DevicePcmPlayerProvider.scene; // L: 1130
+											CollisionMap[] var30 = collisionMaps; // L: 1131
+											Buffer var34 = new Buffer(var27); // L: 1133
+											var10 = -1; // L: 1134
+
+											while (true) {
+												var11 = var34.method6628(); // L: 1136
+												if (var11 == 0) { // L: 1137
+													break;
+												}
+
+												var10 += var11; // L: 1138
+												var12 = 0; // L: 1139
+
+												while (true) {
+													var13 = var34.readUShortSmart(); // L: 1141
+													if (var13 == 0) { // L: 1142
+														break;
+													}
+
+													var12 += var13 - 1; // L: 1143
+													int var14 = var12 & 63; // L: 1144
+													int var15 = var12 >> 6 & 63; // L: 1145
+													int var16 = var12 >> 12; // L: 1146
+													int var17 = var34.readUnsignedByte(); // L: 1147
+													int var18 = var17 >> 2; // L: 1148
+													int var19 = var17 & 3; // L: 1149
+													int var20 = var5 + var15; // L: 1150
+													int var21 = var14 + var28; // L: 1151
+													if (var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) { // L: 1152
+														int var22 = var16; // L: 1153
+														if ((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) { // L: 1154
+															var22 = var16 - 1;
+														}
+
+														CollisionMap var23 = null; // L: 1155
+														if (var22 >= 0) { // L: 1156
+															var23 = var30[var22];
+														}
+
+														Player.method2258(var16, var20, var21, var10, var19, var18, var29, var23); // L: 1157
+													}
+												}
+											}
+										}
+
+										++var25; // L: 1124
+									}
+								}
+
+								var4 = (UserComparator4.regions[var25] >> 8) * 64 - class15.baseX; // L: 1087
+								var5 = (UserComparator4.regions[var25] & 255) * 64 - WorldMapSprite.baseY; // L: 1088
+								var6 = UrlRequest.regionLandArchives[var25]; // L: 1089
+								if (var6 != null) { // L: 1090
+									class233.playPcmPlayers(); // L: 1091
+									var7 = class12.field111 * 8 - 48; // L: 1092
+									var8 = RouteStrategy.field1919 * 8 - 48; // L: 1093
+									CollisionMap[] var9 = collisionMaps; // L: 1094
+									var10 = 0;
+
+									label576:
+									while (true) {
+										if (var10 >= 4) {
+											Buffer var26 = new Buffer(var6); // L: 1103
+											var11 = 0;
+
+											while (true) {
+												if (var11 >= 4) {
+													break label576;
+												}
+
+												for (var12 = 0; var12 < 64; ++var12) { // L: 1105
+													for (var13 = 0; var13 < 64; ++var13) { // L: 1106
+														Huffman.loadTerrain(var26, var11, var4 + var12, var13 + var5, var7, var8, 0); // L: 1107
+													}
+												}
+
+												++var11; // L: 1104
+											}
+										}
+
+										for (var11 = 0; var11 < 64; ++var11) { // L: 1097
+											for (var12 = 0; var12 < 64; ++var12) { // L: 1098
+												if (var4 + var11 > 0 && var11 + var4 < 103 && var5 + var12 > 0 && var5 + var12 < 103) { // L: 1099
+													int[] var10000 = var9[var10].flags[var4 + var11];
+													var10000[var5 + var12] &= -16777217;
+												}
+											}
+										}
+
+										++var10; // L: 1096
+									}
+								}
+
+								++var25; // L: 1086
+							}
+						}
+
+						int var31;
+						if (isInInstance) { // L: 1165
+							var25 = 0;
+
+							label512:
+							while (true) {
+								if (var25 >= 4) {
+									for (var25 = 0; var25 < 13; ++var25) { // L: 1208
+										for (var4 = 0; var4 < 13; ++var4) { // L: 1209
+											var5 = instanceChunkTemplates[0][var25][var4]; // L: 1210
+											if (var5 == -1) { // L: 1211
+												UrlRequest.method2520(var25 * 8, var4 * 8, 8, 8); // L: 1212
+											}
+										}
+									}
+
+									DynamicObject.method2099(true); // L: 1216
+									var25 = 0;
+
+									while (true) {
+										if (var25 >= 4) {
+											break label512;
+										}
+
+										class233.playPcmPlayers(); // L: 1218
+
+										for (var4 = 0; var4 < 13; ++var4) { // L: 1219
+											for (var5 = 0; var5 < 13; ++var5) { // L: 1220
+												var28 = instanceChunkTemplates[var25][var4][var5]; // L: 1221
+												if (var28 != -1) { // L: 1222
+													var7 = var28 >> 24 & 3; // L: 1223
+													var8 = var28 >> 1 & 3; // L: 1224
+													var31 = var28 >> 14 & 1023; // L: 1225
+													var10 = var28 >> 3 & 2047; // L: 1226
+													var11 = (var31 / 8 << 8) + var10 / 8; // L: 1227
+
+													for (var12 = 0; var12 < UserComparator4.regions.length; ++var12) { // L: 1228
+														if (UserComparator4.regions[var12] == var11 && WorldMapDecorationType.regionMapArchives[var12] != null) { // L: 1229
+															class25.method337(WorldMapDecorationType.regionMapArchives[var12], var25, var4 * 8, var5 * 8, var7, (var31 & 7) * 8, (var10 & 7) * 8, var8, DevicePcmPlayerProvider.scene, collisionMaps); // L: 1230
+															break; // L: 1231
+														}
+													}
+												}
+											}
+										}
+
+										++var25; // L: 1217
+									}
+								}
+
+								class233.playPcmPlayers(); // L: 1167
+
+								for (var4 = 0; var4 < 13; ++var4) { // L: 1168
+									for (var5 = 0; var5 < 13; ++var5) { // L: 1169
+										boolean var37 = false; // L: 1170
+										var7 = instanceChunkTemplates[var25][var4][var5]; // L: 1171
+										if (var7 != -1) { // L: 1172
+											var8 = var7 >> 24 & 3; // L: 1173
+											var31 = var7 >> 1 & 3; // L: 1174
+											var10 = var7 >> 14 & 1023; // L: 1175
+											var11 = var7 >> 3 & 2047; // L: 1176
+											var12 = (var10 / 8 << 8) + var11 / 8; // L: 1177
+
+											for (var13 = 0; var13 < UserComparator4.regions.length; ++var13) { // L: 1178
+												if (UserComparator4.regions[var13] == var12 && UrlRequest.regionLandArchives[var13] != null) { // L: 1179
+													UserComparator6.method2580(UrlRequest.regionLandArchives[var13], var25, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var31, collisionMaps); // L: 1180
+													var37 = true; // L: 1181
+													break; // L: 1182
+												}
+											}
+										}
+
+										if (!var37) { // L: 1186
+											var8 = var25; // L: 1187
+											var31 = var4 * 8; // L: 1188
+											var10 = var5 * 8; // L: 1189
+
+											for (var11 = 0; var11 < 8; ++var11) { // L: 1191
+												for (var12 = 0; var12 < 8; ++var12) { // L: 1192
+													Tiles.Tiles_heights[var8][var11 + var31][var10 + var12] = 0;
+												}
+											}
+
+											if (var31 > 0) { // L: 1194
+												for (var11 = 1; var11 < 8; ++var11) { // L: 1195
+													Tiles.Tiles_heights[var8][var31][var11 + var10] = Tiles.Tiles_heights[var8][var31 - 1][var11 + var10];
+												}
+											}
+
+											if (var10 > 0) { // L: 1197
+												for (var11 = 1; var11 < 8; ++var11) { // L: 1198
+													Tiles.Tiles_heights[var8][var11 + var31][var10] = Tiles.Tiles_heights[var8][var11 + var31][var10 - 1];
+												}
+											}
+
+											if (var31 > 0 && Tiles.Tiles_heights[var8][var31 - 1][var10] != 0) { // L: 1200
+												Tiles.Tiles_heights[var8][var31][var10] = Tiles.Tiles_heights[var8][var31 - 1][var10];
+											} else if (var10 > 0 && Tiles.Tiles_heights[var8][var31][var10 - 1] != 0) { // L: 1201
+												Tiles.Tiles_heights[var8][var31][var10] = Tiles.Tiles_heights[var8][var31][var10 - 1];
+											} else if (var31 > 0 && var10 > 0 && Tiles.Tiles_heights[var8][var31 - 1][var10 - 1] != 0) { // L: 1202
+												Tiles.Tiles_heights[var8][var31][var10] = Tiles.Tiles_heights[var8][var31 - 1][var10 - 1];
+											}
+										}
+									}
+								}
+
+								++var25; // L: 1166
+							}
+						}
+
+						DynamicObject.method2099(true); // L: 1239
+						class233.playPcmPlayers(); // L: 1240
+						class69.method1225(DevicePcmPlayerProvider.scene, collisionMaps); // L: 1241
+						DynamicObject.method2099(true); // L: 1242
+						var25 = Tiles.Tiles_minPlane; // L: 1243
+						if (var25 > SoundSystem.Client_plane) { // L: 1244
+							var25 = SoundSystem.Client_plane;
+						}
+
+						if (var25 < SoundSystem.Client_plane - 1) { // L: 1245
+							var25 = SoundSystem.Client_plane - 1;
+						}
+
+						if (isLowDetail) { // L: 1246
+							DevicePcmPlayerProvider.scene.init(Tiles.Tiles_minPlane);
+						} else {
+							DevicePcmPlayerProvider.scene.init(0); // L: 1247
+						}
+
+						for (var4 = 0; var4 < 104; ++var4) { // L: 1248
+							for (var5 = 0; var5 < 104; ++var5) { // L: 1249
+								class26.updateItemPile(var4, var5); // L: 1250
+							}
+						}
+
+						class233.playPcmPlayers(); // L: 1253
+						GraphicsObject.method2014(); // L: 1254
+						ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 1255
+						PacketBufferNode var36;
+						if (class1.client.hasFrame()) { // L: 1256
+							var36 = InterfaceParent.getPacketBufferNode(ClientPacket.field2574, packetWriter.isaacCipher); // L: 1258
+							var36.packetBuffer.writeInt(1057001181); // L: 1259
+							packetWriter.addNode(var36); // L: 1260
+						}
+
+						if (!isInInstance) { // L: 1262
+							var4 = (class12.field111 - 6) / 8; // L: 1263
+							var5 = (class12.field111 + 6) / 8; // L: 1264
+							var28 = (RouteStrategy.field1919 - 6) / 8; // L: 1265
+							var7 = (RouteStrategy.field1919 + 6) / 8; // L: 1266
+
+							for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { // L: 1267
+								for (var31 = var28 - 1; var31 <= var7 + 1; ++var31) { // L: 1268
+									if (var8 < var4 || var8 > var5 || var31 < var28 || var31 > var7) { // L: 1269
+										class4.archive5.loadRegionFromName("m" + var8 + "_" + var31); // L: 1270
+										class4.archive5.loadRegionFromName("l" + var8 + "_" + var31); // L: 1271
+									}
+								}
+							}
+						}
+
+						Projectile.updateGameState(30); // L: 1275
+						class233.playPcmPlayers(); // L: 1276
+						AccessFile.field4098 = null; // L: 1278
+						Tiles.field1111 = null; // L: 1279
+						class22.field186 = null; // L: 1280
+						class16.field132 = null; // L: 1281
+						Tiles.field1101 = null; // L: 1282
+						class43.field307 = null; // L: 1283
+						NPC.field1328 = null; // L: 1284
+						class230.Tiles_hue = null; // L: 1285
+						Tiles.Tiles_saturation = null; // L: 1286
+						AbstractByteArrayCopier.Tiles_lightness = null; // L: 1287
+						WorldMapSectionType.Tiles_hueMultiplier = null; // L: 1288
+						Tiles.field1095 = null; // L: 1289
+						var36 = InterfaceParent.getPacketBufferNode(ClientPacket.field2585, packetWriter.isaacCipher); // L: 1291
+						packetWriter.addNode(var36); // L: 1292
+						class26.method350(); // L: 1293
+					}
+				}
+			}
+		} else {
+			class21.doCycleTitle(this);
+		}
+
+		if (gameState == 30) { // L: 1295
+			this.doCycleLoggedIn();
+		} else if (gameState == 40 || gameState == 45) { // L: 1296
+			this.doCycleLoggedOut();
+		}
+
+	} // L: 1297
+
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(ZS)V",
-		garbageValue = "9311"
+		descriptor = "(ZB)V",
+		garbageValue = "49"
 	)
 	@Export("draw")
 	protected final void draw(boolean var1) {
-		boolean var2;
-		label168: {
-			try {
-				if (class232.musicPlayerStatus == 2) { // L: 1007
-					if (class2.musicTrack == null) { // L: 1008
-						class2.musicTrack = MusicTrack.readTrack(ModelData0.musicTrackArchive, class32.musicTrackGroupId, class18.musicTrackFileId); // L: 1009
-						if (class2.musicTrack == null) { // L: 1010
-							var2 = false; // L: 1011
-							break label168;
-						}
-					}
-
-					if (Messages.soundCache == null) { // L: 1015
-						Messages.soundCache = new SoundCache(WorldMapElement.soundEffectsArchive, class232.musicSamplesArchive);
-					}
-
-					if (class124.midiPcmStream.loadMusicTrack(class2.musicTrack, class232.musicPatchesArchive, Messages.soundCache, 22050)) { // L: 1016
-						class124.midiPcmStream.clearAll(); // L: 1017
-						class124.midiPcmStream.setPcmStreamVolume(class232.musicTrackVolume); // L: 1018
-						class124.midiPcmStream.setMusicTrack(class2.musicTrack, class232.musicTrackBoolean); // L: 1019
-						class232.musicPlayerStatus = 0; // L: 1020
-						class2.musicTrack = null; // L: 1021
-						Messages.soundCache = null; // L: 1022
-						ModelData0.musicTrackArchive = null; // L: 1023
-						var2 = true; // L: 1024
-						break label168;
-					}
-				}
-			} catch (Exception var6) { // L: 1029
-				var6.printStackTrace(); // L: 1030
-				class124.midiPcmStream.clear(); // L: 1031
-				class232.musicPlayerStatus = 0; // L: 1032
-				class2.musicTrack = null; // L: 1033
-				Messages.soundCache = null; // L: 1034
-				ModelData0.musicTrackArchive = null; // L: 1035
-			}
-
-			var2 = false; // L: 1037
+		boolean var2 = RouteStrategy.method3252(); // L: 1300
+		if (var2 && field862 && SoundCache.pcmPlayer0 != null) { // L: 1301 1302
+			SoundCache.pcmPlayer0.tryDiscard();
 		}
 
-		if (var2 && field881 && DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1040 1041
-			DesktopPlatformInfoProvider.pcmPlayer0.tryDiscard();
+		if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field839 && ClientPacket.currentTimeMillis() > field839) { // L: 1304 1305
+			WorldMapDecorationType.setWindowedMode(class302.getWindowedMode()); // L: 1306
 		}
 
-		if ((gameState == 10 || gameState == 20 || gameState == 30) && field858 != 0L && ObjectComposition.currentTimeMillis() > field858) { // L: 1043 1044
-			CollisionMap.setWindowedMode(SpotAnimationDefinition.getWindowedMode()); // L: 1045
-		}
-
-		int var4;
-		if (var1) { // L: 1048
-			for (var4 = 0; var4 < 100; ++var4) { // L: 1049
-				field719[var4] = true;
+		int var3;
+		if (var1) { // L: 1309
+			for (var3 = 0; var3 < 100; ++var3) { // L: 1310
+				field831[var3] = true;
 			}
 		}
 
-		if (gameState == 0) { // L: 1051
+		if (gameState == 0) { // L: 1312
 			this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
-		} else if (gameState == 5) { // L: 1052
-			FriendSystem.drawTitle(Widget.fontBold12, Actor.fontPlain11, UserComparator3.fontPlain12);
-		} else if (gameState != 10 && gameState != 11) { // L: 1053
-			if (gameState == 20) { // L: 1054
-				FriendSystem.drawTitle(Widget.fontBold12, Actor.fontPlain11, UserComparator3.fontPlain12);
-			} else if (gameState == 25) { // L: 1055
-				if (field698 == 1) { // L: 1056
-					if (field694 > field695) { // L: 1057
-						field695 = field694;
+		} else if (gameState == 5) { // L: 1313
+			NetFileRequest.drawTitle(class309.fontBold12, UserComparator10.fontPlain11, AbstractSocket.fontPlain12);
+		} else if (gameState != 10 && gameState != 11) { // L: 1314
+			if (gameState == 20) { // L: 1315
+				NetFileRequest.drawTitle(class309.fontBold12, UserComparator10.fontPlain11, AbstractSocket.fontPlain12);
+			} else if (gameState == 25) { // L: 1316
+				if (field678 == 1) { // L: 1317
+					if (field618 > field789) { // L: 1318
+						field789 = field618;
 					}
 
-					var4 = (field695 * 50 - field694 * 50) / field695; // L: 1058
-					DirectByteArrayCopier.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false); // L: 1059
-				} else if (field698 == 2) { // L: 1061
-					if (field696 > field697) { // L: 1062
-						field697 = field696;
+					var3 = (field789 * 50 - field618 * 50) / field789; // L: 1319
+					class143.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var3 + "%" + ")", false); // L: 1320
+				} else if (field678 == 2) { // L: 1322
+					if (field742 > field677) { // L: 1323
+						field677 = field742;
 					}
 
-					var4 = (field697 * 50 - field696 * 50) / field697 + 50; // L: 1063
-					DirectByteArrayCopier.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false); // L: 1064
+					var3 = (field677 * 50 - field742 * 50) / field677 + 50; // L: 1324
+					class143.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var3 + "%" + ")", false); // L: 1325
 				} else {
-					DirectByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); // L: 1066
+					class143.drawLoadingMessage("Loading - please wait.", false); // L: 1327
 				}
-			} else if (gameState == 30) { // L: 1068
+			} else if (gameState == 30) { // L: 1329
 				this.drawLoggedIn();
-			} else if (gameState == 40) { // L: 1069
-				DirectByteArrayCopier.drawLoadingMessage("Connection lost" + "<br>" + "Please wait - attempting to reestablish", false);
-			} else if (gameState == 45) { // L: 1070
-				DirectByteArrayCopier.drawLoadingMessage("Please wait...", false);
+			} else if (gameState == 40) { // L: 1330
+				class143.drawLoadingMessage("Connection lost" + "<br>" + "Please wait - attempting to reestablish", false);
+			} else if (gameState == 45) { // L: 1331
+				class143.drawLoadingMessage("Please wait...", false);
 			}
 		} else {
-			FriendSystem.drawTitle(Widget.fontBold12, Actor.fontPlain11, UserComparator3.fontPlain12);
+			NetFileRequest.drawTitle(class309.fontBold12, UserComparator10.fontPlain11, AbstractSocket.fontPlain12); // L: 1321
 		}
 
-		if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1071
-			for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1072
-				if (field780[var4]) { // L: 1073
-					class26.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); // L: 1074
-					field780[var4] = false; // L: 1075
+		if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1332
+			for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1333
+				if (field712[var3]) { // L: 1334
+					AbstractWorldMapData.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1335
+					field712[var3] = false; // L: 1336
 				}
 			}
-		} else if (gameState > 0) { // L: 1079
-			class26.rasterProvider.drawFull(0, 0); // L: 1080
+		} else if (gameState > 0) { // L: 1340
+			AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 1341
 
-			for (var4 = 0; var4 < rootWidgetCount; ++var4) { // L: 1081
-				field780[var4] = false;
+			for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1342
+				field712[var3] = false;
 			}
 		}
 
-	} // L: 1083
+	} // L: 1344
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "561275520"
+		garbageValue = "1785168903"
 	)
 	@Export("kill0")
 	protected final void kill0() {
-		if (GrandExchangeOfferOwnWorldComparator.varcs.hasUnwrittenChanges()) { // L: 1086
-			GrandExchangeOfferOwnWorldComparator.varcs.write();
+		if (class20.varcs.hasUnwrittenChanges()) { // L: 1347
+			class20.varcs.write();
 		}
 
-		if (Skills.mouseRecorder != null) { // L: 1087
-			Skills.mouseRecorder.isRunning = false;
+		if (UrlRequester.mouseRecorder != null) { // L: 1348
+			UrlRequester.mouseRecorder.isRunning = false;
 		}
 
-		Skills.mouseRecorder = null; // L: 1088
-		packetWriter.close(); // L: 1089
-		if (KeyHandler.KeyHandler_instance != null) { // L: 1091
-			synchronized(KeyHandler.KeyHandler_instance) { // L: 1092
-				KeyHandler.KeyHandler_instance = null; // L: 1093
-			} // L: 1094
+		UrlRequester.mouseRecorder = null; // L: 1349
+		packetWriter.close(); // L: 1350
+		if (KeyHandler.KeyHandler_instance != null) { // L: 1352
+			synchronized(KeyHandler.KeyHandler_instance) { // L: 1353
+				KeyHandler.KeyHandler_instance = null; // L: 1354
+			} // L: 1355
 		}
 
-		if (MouseHandler.MouseHandler_instance != null) { // L: 1098
-			synchronized(MouseHandler.MouseHandler_instance) { // L: 1099
-				MouseHandler.MouseHandler_instance = null; // L: 1100
-			} // L: 1101
+		if (MouseHandler.MouseHandler_instance != null) { // L: 1359
+			synchronized(MouseHandler.MouseHandler_instance) { // L: 1360
+				MouseHandler.MouseHandler_instance = null; // L: 1361
+			} // L: 1362
 		}
 
-		MidiPcmStream.mouseWheel = null; // L: 1104
-		if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1105
-			DesktopPlatformInfoProvider.pcmPlayer0.shutdown();
+		Projectile.mouseWheel = null; // L: 1365
+		if (SoundCache.pcmPlayer0 != null) { // L: 1366
+			SoundCache.pcmPlayer0.shutdown();
 		}
 
-		if (MouseRecorder.pcmPlayer1 != null) { // L: 1106
-			MouseRecorder.pcmPlayer1.shutdown();
+		if (UrlRequester.pcmPlayer1 != null) { // L: 1367
+			UrlRequester.pcmPlayer1.shutdown();
 		}
 
-		VarcInt.method2673(); // L: 1107
-		Widget.method4759(); // L: 1108
-		if (ServerPacket.urlRequester != null) { // L: 1109
-			ServerPacket.urlRequester.close(); // L: 1110
-			ServerPacket.urlRequester = null; // L: 1111
+		if (NetCache.NetCache_socket != null) { // L: 1369
+			NetCache.NetCache_socket.close();
 		}
 
-		FriendSystem.method1746(); // L: 1113
-	} // L: 1114
+		GameObject.method4431(); // L: 1371
+		if (ArchiveDiskActionHandler.urlRequester != null) { // L: 1372
+			ArchiveDiskActionHandler.urlRequester.close(); // L: 1373
+			ArchiveDiskActionHandler.urlRequester = null; // L: 1374
+		}
 
-	@ObfuscatedName("av")
+		try {
+			JagexCache.JagexCache_dat2File.close(); // L: 1378
+
+			for (int var4 = 0; var4 < class24.idxCount; ++var4) { // L: 1379
+				class369.JagexCache_idxFiles[var4].close();
+			}
+
+			JagexCache.JagexCache_idx255File.close(); // L: 1380
+			JagexCache.JagexCache_randomDat.close(); // L: 1381
+		} catch (Exception var7) { // L: 1383
+		}
+
+	} // L: 1385
+
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-992375266"
+		garbageValue = "-1888551887"
 	)
-	protected final void vmethod1471() {
+	protected final void vmethod1278() {
 	} // L: 690
 
 	public final void init() {
 		try {
 			if (this.checkHost()) { // L: 696
-				int var4;
 				for (int var1 = 0; var1 <= 20; ++var1) { // L: 697
 					String var2 = this.getParameter(Integer.toString(var1)); // L: 698
 					if (var2 != null) { // L: 699
 						switch(var1) { // L: 700
 						case 1:
-							useBufferedSocket = Integer.parseInt(var2) != 0; // L: 755
+							useBufferedSocket = Integer.parseInt(var2) != 0; // L: 703
 						case 2:
 						case 11:
 						case 13:
@@ -1959,255 +2315,273 @@ public final class Client extends GameEngine implements Usernamed {
 						default:
 							break;
 						case 3:
-							if (var2.equalsIgnoreCase("true")) { // L: 786
+							if (var2.equalsIgnoreCase("true")) { // L: 772
 								isMembersWorld = true;
 							} else {
-								isMembersWorld = false; // L: 787
+								isMembersWorld = false; // L: 773
 							}
 							break;
 						case 4:
-							if (clientType == -1) { // L: 792
-								clientType = Integer.parseInt(var2); // L: 793
+							if (clientType == -1) { // L: 749
+								clientType = Integer.parseInt(var2); // L: 750
 							}
 							break;
 						case 5:
-							worldProperties = Integer.parseInt(var2); // L: 771
-							break; // L: 772
+							worldProperties = Integer.parseInt(var2); // L: 723
+							break; // L: 724
 						case 6:
-							class378.clientLanguage = Language.method5151(Integer.parseInt(var2)); // L: 745
-							break; // L: 746
+							AbstractArchive.clientLanguage = Language.method5269(Integer.parseInt(var2)); // L: 708
+							break; // L: 709
 						case 7:
-							var4 = Integer.parseInt(var2); // L: 704
-							GameBuild[] var5 = new GameBuild[]{GameBuild.WIP, GameBuild.LIVE, GameBuild.RC, GameBuild.BUILDLIVE}; // L: 709
-							GameBuild[] var6 = var5; // L: 711
-							int var7 = 0;
-
-							GameBuild var20;
-							while (true) {
-								if (var7 >= var6.length) {
-									var20 = null; // L: 722
-									break;
-								}
-
-								GameBuild var8 = var6[var7]; // L: 713
-								if (var4 == var8.buildId) { // L: 715
-									var20 = var8; // L: 716
-									break; // L: 717
-								}
-
-								++var7; // L: 712
-							}
-
-							FaceNormal.field2365 = var20; // L: 724
-							break; // L: 725
+							WorldMapDecoration.field2084 = ReflectionCheck.method1228(Integer.parseInt(var2)); // L: 756
+							break; // L: 757
 						case 8:
-							if (var2.equalsIgnoreCase("true")) { // L: 765
+							if (var2.equalsIgnoreCase("true")) { // L: 761
 							}
 							break;
 						case 9:
-							class363.field4079 = var2; // L: 776
-							break; // L: 777
+							Messages.field1397 = var2; // L: 718
+							break; // L: 719
 						case 10:
-							StudioGame[] var3 = new StudioGame[]{StudioGame.runescape, StudioGame.stellardawn, StudioGame.game5, StudioGame.oldscape, StudioGame.game3, StudioGame.game4}; // L: 736
-							SoundSystem.field461 = (StudioGame)Messages.findEnumerated(var3, Integer.parseInt(var2)); // L: 738
-							if (StudioGame.oldscape == SoundSystem.field461) { // L: 739
-								WorldMapSection0.loginType = LoginType.oldscape;
+							StudioGame[] var3 = new StudioGame[]{StudioGame.stellardawn, StudioGame.game3, StudioGame.game4, StudioGame.runescape, StudioGame.game5, StudioGame.oldscape}; // L: 735
+							class182.field2114 = (StudioGame)Clock.findEnumerated(var3, Integer.parseInt(var2)); // L: 737
+							if (class182.field2114 == StudioGame.oldscape) { // L: 738
+								LoginScreenAnimation.loginType = LoginType.oldscape;
 							} else {
-								WorldMapSection0.loginType = LoginType.field4091; // L: 740
+								LoginScreenAnimation.loginType = LoginType.field4089; // L: 739
 							}
 							break;
 						case 12:
-							worldId = Integer.parseInt(var2); // L: 729
-							break; // L: 730
+							worldId = Integer.parseInt(var2); // L: 744
+							break; // L: 745
 						case 14:
-							Script.field1094 = Integer.parseInt(var2); // L: 750
-							break; // L: 751
+							class82.field999 = Integer.parseInt(var2); // L: 713
+							break; // L: 714
 						case 15:
-							gameBuild = Integer.parseInt(var2); // L: 781
-							break; // L: 782
+							gameBuild = Integer.parseInt(var2); // L: 767
+							break; // L: 768
 						case 17:
-							class6.field58 = var2; // L: 760
+							class162.field1936 = var2; // L: 728
 						}
 					}
 				}
 
-				Scene.Scene_isLowDetail = false; // L: 801
-				isLowDetail = false; // L: 802
-				class80.worldHost = this.getCodeBase().getHost(); // L: 804
-				String var9 = FaceNormal.field2365.name; // L: 805
-				byte var10 = 0; // L: 806
+				Scene.Scene_isLowDetail = false; // L: 780
+				isLowDetail = false; // L: 781
+				worldHost = this.getCodeBase().getHost(); // L: 783
+				String var11 = WorldMapDecoration.field2084.name; // L: 784
+				byte var12 = 0; // L: 785
 
 				try {
-					SoundCache.idxCount = 21; // L: 809
-					UserComparator10.cacheGamebuild = var10; // L: 810
+					class24.idxCount = 21; // L: 788
+					ClanChannel.cacheGamebuild = var12; // L: 789
 
 					try {
-						class35.operatingSystemName = System.getProperty("os.name"); // L: 812
-					} catch (Exception var17) { // L: 814
-						class35.operatingSystemName = "Unknown"; // L: 815
+						class23.operatingSystemName = System.getProperty("os.name"); // L: 791
+					} catch (Exception var20) { // L: 793
+						class23.operatingSystemName = "Unknown"; // L: 794
 					}
 
-					UserComparator5.formattedOperatingSystemName = class35.operatingSystemName.toLowerCase(); // L: 817
+					GraphicsObject.formattedOperatingSystemName = class23.operatingSystemName.toLowerCase(); // L: 796
 
 					try {
-						class22.userHomeDirectory = System.getProperty("user.home"); // L: 819
-						if (class22.userHomeDirectory != null) { // L: 820
-							class22.userHomeDirectory = class22.userHomeDirectory + "/";
+						JagexCache.userHomeDirectory = System.getProperty("user.home"); // L: 798
+						if (JagexCache.userHomeDirectory != null) { // L: 799
+							JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/";
 						}
-					} catch (Exception var16) { // L: 822
+					} catch (Exception var19) { // L: 801
 					}
 
 					try {
-						if (UserComparator5.formattedOperatingSystemName.startsWith("win")) { // L: 824
-							if (class22.userHomeDirectory == null) { // L: 825
-								class22.userHomeDirectory = System.getenv("USERPROFILE");
+						if (GraphicsObject.formattedOperatingSystemName.startsWith("win")) { // L: 803
+							if (JagexCache.userHomeDirectory == null) { // L: 804
+								JagexCache.userHomeDirectory = System.getenv("USERPROFILE");
 							}
-						} else if (class22.userHomeDirectory == null) { // L: 828
-							class22.userHomeDirectory = System.getenv("HOME");
+						} else if (JagexCache.userHomeDirectory == null) { // L: 807
+							JagexCache.userHomeDirectory = System.getenv("HOME");
 						}
 
-						if (class22.userHomeDirectory != null) { // L: 830
-							class22.userHomeDirectory = class22.userHomeDirectory + "/";
+						if (JagexCache.userHomeDirectory != null) { // L: 809
+							JagexCache.userHomeDirectory = JagexCache.userHomeDirectory + "/";
 						}
-					} catch (Exception var15) { // L: 832
+					} catch (Exception var18) { // L: 811
 					}
 
-					if (class22.userHomeDirectory == null) { // L: 833
-						class22.userHomeDirectory = "~/";
+					if (JagexCache.userHomeDirectory == null) { // L: 812
+						JagexCache.userHomeDirectory = "~/";
 					}
 
-					InterfaceParent.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", class22.userHomeDirectory, "/tmp/", ""}; // L: 834
-					PlayerType.cacheSubPaths = new String[]{".jagex_cache_" + UserComparator10.cacheGamebuild, ".file_store_" + UserComparator10.cacheGamebuild}; // L: 835
+					ArchiveLoader.cacheParentPaths = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", JagexCache.userHomeDirectory, "/tmp/", ""}; // L: 813
+					JagexCache.cacheSubPaths = new String[]{".jagex_cache_" + ClanChannel.cacheGamebuild, ".file_store_" + ClanChannel.cacheGamebuild}; // L: 814
 
-					label137:
-					for (int var11 = 0; var11 < 4; ++var11) { // L: 836
-						class12.cacheDir = Canvas.method393("oldschool", var9, var11); // L: 837
-						if (!class12.cacheDir.exists()) { // L: 838
-							class12.cacheDir.mkdirs();
+					int var13;
+					label176:
+					for (var13 = 0; var13 < 4; ++var13) { // L: 815
+						WorldMapDecoration.cacheDir = Renderable.method4244("oldschool", var11, var13); // L: 816
+						if (!WorldMapDecoration.cacheDir.exists()) { // L: 817
+							WorldMapDecoration.cacheDir.mkdirs();
 						}
 
-						File[] var12 = class12.cacheDir.listFiles(); // L: 839
-						if (var12 == null) { // L: 840
+						File[] var4 = WorldMapDecoration.cacheDir.listFiles(); // L: 818
+						if (var4 == null) { // L: 819
 							break;
 						}
 
-						File[] var22 = var12; // L: 842
-						int var13 = 0;
+						File[] var5 = var4; // L: 821
+						int var6 = 0;
 
 						while (true) {
-							if (var13 >= var22.length) {
-								break label137;
+							if (var6 >= var5.length) {
+								break label176;
 							}
 
-							File var14 = var22[var13]; // L: 844
-							if (!FaceNormal.isWriteable(var14, false)) { // L: 846
+							File var7 = var5[var6]; // L: 823
+
+							boolean var8;
+							try {
+								RandomAccessFile var9 = new RandomAccessFile(var7, "rw"); // L: 828
+								int var10 = var9.read(); // L: 829
+								var9.seek(0L); // L: 830
+								var9.write(var10); // L: 831
+								var9.seek(0L); // L: 832
+								var9.close(); // L: 833
+								var8 = true; // L: 835
+							} catch (Exception var17) { // L: 837
+								var8 = false; // L: 838
+							}
+
+							if (!var8) { // L: 841
 								break;
 							}
 
-							++var13; // L: 843
+							++var6; // L: 822
 						}
 					}
 
-					File var21 = class12.cacheDir; // L: 853
-					FileSystem.FileSystem_cacheDir = var21; // L: 855
-					if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 856
-						throw new RuntimeException("");
+					class26.method344(WorldMapDecoration.cacheDir); // L: 848
+
+					try {
+						File var24 = new File(JagexCache.userHomeDirectory, "random.dat"); // L: 851
+						int var15;
+						if (var24.exists()) { // L: 852
+							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var24, "rw", 25L), 24, 0); // L: 853
+						} else {
+							label155:
+							for (int var14 = 0; var14 < JagexCache.cacheSubPaths.length; ++var14) { // L: 856
+								for (var15 = 0; var15 < ArchiveLoader.cacheParentPaths.length; ++var15) { // L: 857
+									File var16 = new File(ArchiveLoader.cacheParentPaths[var15] + JagexCache.cacheSubPaths[var14] + File.separatorChar + "random.dat"); // L: 858
+									if (var16.exists()) { // L: 859
+										JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); // L: 860
+										break label155; // L: 861
+									}
+								}
+							}
+						}
+
+						if (JagexCache.JagexCache_randomDat == null) { // L: 866
+							RandomAccessFile var25 = new RandomAccessFile(var24, "rw"); // L: 867
+							var15 = var25.read(); // L: 868
+							var25.seek(0L); // L: 869
+							var25.write(var15); // L: 870
+							var25.seek(0L); // L: 871
+							var25.close(); // L: 872
+							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var24, "rw", 25L), 24, 0); // L: 873
+						}
+					} catch (IOException var21) { // L: 876
 					}
 
-					FileSystem.FileSystem_hasPermissions = true; // L: 857
-					SoundCache.method830(); // L: 859
-					JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 860
-					JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 861
-					class93.JagexCache_idxFiles = new BufferedFile[SoundCache.idxCount]; // L: 862
+					JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(FloorUnderlayDefinition.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 878
+					JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(FloorUnderlayDefinition.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 879
+					class369.JagexCache_idxFiles = new BufferedFile[class24.idxCount]; // L: 880
 
-					for (var4 = 0; var4 < SoundCache.idxCount; ++var4) { // L: 863
-						class93.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(ScriptFrame.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); // L: 864
+					for (var13 = 0; var13 < class24.idxCount; ++var13) { // L: 881
+						class369.JagexCache_idxFiles[var13] = new BufferedFile(new AccessFile(FloorUnderlayDefinition.getFile("main_file_cache.idx" + var13), "rw", 1048576L), 6000, 0); // L: 882
 					}
-				} catch (Exception var18) { // L: 868
-					class266.RunException_sendStackTrace((String)null, var18); // L: 869
+				} catch (Exception var22) { // L: 886
+					FriendsChat.RunException_sendStackTrace((String)null, var22); // L: 887
 				}
 
-				class23.client = this; // L: 871
-				RunException.clientType = clientType; // L: 872
-				if (field643 == -1) { // L: 873
-					field643 = 0; // L: 874
+				class1.client = this; // L: 889
+				GZipDecompressor.clientType = clientType; // L: 890
+				if (field625 == -1) { // L: 891
+					field625 = 0; // L: 892
 				}
 
-				this.startThread(765, 503, 196); // L: 876
+				this.startThread(765, 503, 197); // L: 894
 			}
-		} catch (RuntimeException var19) {
-			throw WorldMapDecoration.newRunException(var19, "client.init(" + ')');
+		} catch (RuntimeException var23) {
+			throw Timer.newRunException(var23, "client.init(" + ')');
 		}
-	} // L: 877
+	} // L: 895
 
-	@ObfuscatedName("ei")
+	@ObfuscatedName("fm")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1243838219"
+		descriptor = "(B)V",
+		garbageValue = "80"
 	)
 	@Export("doCycleJs5")
 	void doCycleJs5() {
-		if (gameState != 1000) { // L: 1173
-			long var2 = ObjectComposition.currentTimeMillis(); // L: 1176
-			int var4 = (int)(var2 - class18.field159); // L: 1177
-			class18.field159 = var2; // L: 1178
-			if (var4 > 200) { // L: 1179
+		if (gameState != 1000) { // L: 1444
+			long var2 = ClientPacket.currentTimeMillis(); // L: 1447
+			int var4 = (int)(var2 - NetCache.field3604); // L: 1448
+			NetCache.field3604 = var2; // L: 1449
+			if (var4 > 200) { // L: 1450
 				var4 = 200;
 			}
 
-			NetCache.NetCache_loadTime += var4; // L: 1180
+			NetCache.NetCache_loadTime += var4; // L: 1451
 			boolean var1;
-			if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1181
-				var1 = true; // L: 1182
-			} else if (NetCache.NetCache_socket == null) { // L: 1185
-				var1 = false; // L: 1186
+			if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 1452
+				var1 = true; // L: 1453
+			} else if (NetCache.NetCache_socket == null) { // L: 1456
+				var1 = false; // L: 1457
 			} else {
 				try {
-					label238: {
-						if (NetCache.NetCache_loadTime > 30000) { // L: 1190
+					label241: {
+						if (NetCache.NetCache_loadTime > 30000) { // L: 1461
 							throw new IOException();
 						}
 
 						NetFileRequest var5;
 						Buffer var6;
-						while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1191
-							var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1192
-							var6 = new Buffer(4); // L: 1193
-							var6.writeByte(1); // L: 1194
-							var6.writeMedium((int)var5.key); // L: 1195
-							NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1196
-							NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1197
-							--NetCache.NetCache_pendingPriorityWritesCount; // L: 1198
-							++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1199
+						while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 1462
+							var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 1463
+							var6 = new Buffer(4); // L: 1464
+							var6.writeByte(1); // L: 1465
+							var6.writeMedium((int)var5.key); // L: 1466
+							NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1467
+							NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); // L: 1468
+							--NetCache.NetCache_pendingPriorityWritesCount; // L: 1469
+							++NetCache.NetCache_pendingPriorityResponsesCount; // L: 1470
 						}
 
-						while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1201
-							var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1202
-							var6 = new Buffer(4); // L: 1203
-							var6.writeByte(0); // L: 1204
-							var6.writeMedium((int)var5.key); // L: 1205
-							NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1206
-							var5.removeDual(); // L: 1207
-							NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1208
-							--NetCache.NetCache_pendingWritesCount; // L: 1209
-							++NetCache.NetCache_pendingResponsesCount; // L: 1210
+						while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 1472
+							var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 1473
+							var6 = new Buffer(4); // L: 1474
+							var6.writeByte(0); // L: 1475
+							var6.writeMedium((int)var5.key); // L: 1476
+							NetCache.NetCache_socket.write(var6.array, 0, 4); // L: 1477
+							var5.removeDual(); // L: 1478
+							NetCache.NetCache_pendingResponses.put(var5, var5.key); // L: 1479
+							--NetCache.NetCache_pendingWritesCount; // L: 1480
+							++NetCache.NetCache_pendingResponsesCount; // L: 1481
 						}
 
-						for (int var17 = 0; var17 < 100; ++var17) { // L: 1212
-							int var18 = NetCache.NetCache_socket.available(); // L: 1213
-							if (var18 < 0) { // L: 1214
+						for (int var17 = 0; var17 < 100; ++var17) { // L: 1483
+							int var18 = NetCache.NetCache_socket.available(); // L: 1484
+							if (var18 < 0) { // L: 1485
 								throw new IOException();
 							}
 
-							if (var18 == 0) { // L: 1215
+							if (var18 == 0) { // L: 1486
 								break;
 							}
 
-							NetCache.NetCache_loadTime = 0; // L: 1216
-							byte var7 = 0; // L: 1217
-							if (BuddyRankComparator.NetCache_currentResponse == null) { // L: 1218
+							NetCache.NetCache_loadTime = 0; // L: 1487
+							byte var7 = 0; // L: 1488
+							if (class34.NetCache_currentResponse == null) { // L: 1489
 								var7 = 8;
-							} else if (NetCache.field3612 == 0) { // L: 1219
+							} else if (NetCache.field3615 == 0) { // L: 1490
 								var7 = 1;
 							}
 
@@ -2218,1037 +2592,846 @@ public final class Client extends GameEngine implements Usernamed {
 							byte[] var10000;
 							int var10001;
 							Buffer var25;
-							if (var7 > 0) { // L: 1220
-								var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1221
-								if (var8 > var18) { // L: 1222
+							if (var7 > 0) { // L: 1491
+								var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 1492
+								if (var8 > var18) { // L: 1493
 									var8 = var18;
 								}
 
-								NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1223
-								if (NetCache.field3607 != 0) { // L: 1224
-									for (var9 = 0; var9 < var8; ++var9) { // L: 1225
+								NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); // L: 1494
+								if (NetCache.field3618 != 0) { // L: 1495
+									for (var9 = 0; var9 < var8; ++var9) { // L: 1496
 										var10000 = NetCache.NetCache_responseHeaderBuffer.array;
 										var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset;
-										var10000[var10001] ^= NetCache.field3607;
+										var10000[var10001] ^= NetCache.field3618;
 									}
 								}
 
-								var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1227
+								var25 = NetCache.NetCache_responseHeaderBuffer; // L: 1498
 								var25.offset += var8;
-								if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1228
+								if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { // L: 1499
 									break;
 								}
 
-								if (BuddyRankComparator.NetCache_currentResponse == null) { // L: 1229
-									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1230
-									var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1231
-									var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1232
-									int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1233
-									var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1234
-									long var13 = (long)(var10 + (var9 << 16)); // L: 1235
-									NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1236
-									class8.field75 = true; // L: 1237
-									if (var15 == null) { // L: 1238
-										var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1239
-										class8.field75 = false; // L: 1240
+								if (class34.NetCache_currentResponse == null) { // L: 1500
+									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1501
+									var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1502
+									var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 1503
+									int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 1504
+									var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 1505
+									long var13 = (long)(var10 + (var9 << 16)); // L: 1506
+									NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); // L: 1507
+									class266.field3222 = true; // L: 1508
+									if (var15 == null) { // L: 1509
+										var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); // L: 1510
+										class266.field3222 = false; // L: 1511
 									}
 
-									if (var15 == null) { // L: 1242
-										throw new IOException(); // L: 1243
+									if (var15 == null) { // L: 1513
+										throw new IOException(); // L: 1514
 									}
 
-									int var16 = var11 == 0 ? 5 : 9; // L: 1245
-									BuddyRankComparator.NetCache_currentResponse = var15; // L: 1246
-									SoundSystem.NetCache_responseArchiveBuffer = new Buffer(var16 + var12 + BuddyRankComparator.NetCache_currentResponse.padding); // L: 1247
-									SoundSystem.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1248
-									SoundSystem.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1249
-									NetCache.field3612 = 8; // L: 1250
-									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1251
-								} else if (NetCache.field3612 == 0) { // L: 1254
-									if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1255
-										NetCache.field3612 = 1; // L: 1256
-										NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1257
+									int var16 = var11 == 0 ? 5 : 9; // L: 1516
+									class34.NetCache_currentResponse = var15; // L: 1517
+									class254.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + class34.NetCache_currentResponse.padding); // L: 1518
+									class254.NetCache_responseArchiveBuffer.writeByte(var11); // L: 1519
+									class254.NetCache_responseArchiveBuffer.writeInt(var12); // L: 1520
+									NetCache.field3615 = 8; // L: 1521
+									NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1522
+								} else if (NetCache.field3615 == 0) { // L: 1525
+									if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 1526
+										NetCache.field3615 = 1; // L: 1527
+										NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1528
 									} else {
-										BuddyRankComparator.NetCache_currentResponse = null; // L: 1261
+										class34.NetCache_currentResponse = null; // L: 1532
 									}
 								}
 							} else {
-								var8 = SoundSystem.NetCache_responseArchiveBuffer.array.length - BuddyRankComparator.NetCache_currentResponse.padding; // L: 1267
-								var9 = 512 - NetCache.field3612; // L: 1268
-								if (var9 > var8 - SoundSystem.NetCache_responseArchiveBuffer.offset) { // L: 1269
-									var9 = var8 - SoundSystem.NetCache_responseArchiveBuffer.offset;
+								var8 = class254.NetCache_responseArchiveBuffer.array.length - class34.NetCache_currentResponse.padding; // L: 1538
+								var9 = 512 - NetCache.field3615; // L: 1539
+								if (var9 > var8 - class254.NetCache_responseArchiveBuffer.offset) { // L: 1540
+									var9 = var8 - class254.NetCache_responseArchiveBuffer.offset;
 								}
 
-								if (var9 > var18) { // L: 1270
+								if (var9 > var18) { // L: 1541
 									var9 = var18;
 								}
 
-								NetCache.NetCache_socket.read(SoundSystem.NetCache_responseArchiveBuffer.array, SoundSystem.NetCache_responseArchiveBuffer.offset, var9); // L: 1271
-								if (NetCache.field3607 != 0) { // L: 1272
-									for (var10 = 0; var10 < var9; ++var10) { // L: 1273
-										var10000 = SoundSystem.NetCache_responseArchiveBuffer.array;
-										var10001 = var10 + SoundSystem.NetCache_responseArchiveBuffer.offset;
-										var10000[var10001] ^= NetCache.field3607;
+								NetCache.NetCache_socket.read(class254.NetCache_responseArchiveBuffer.array, class254.NetCache_responseArchiveBuffer.offset, var9); // L: 1542
+								if (NetCache.field3618 != 0) { // L: 1543
+									for (var10 = 0; var10 < var9; ++var10) { // L: 1544
+										var10000 = class254.NetCache_responseArchiveBuffer.array;
+										var10001 = var10 + class254.NetCache_responseArchiveBuffer.offset;
+										var10000[var10001] ^= NetCache.field3618;
 									}
 								}
 
-								var25 = SoundSystem.NetCache_responseArchiveBuffer; // L: 1275
+								var25 = class254.NetCache_responseArchiveBuffer; // L: 1546
 								var25.offset += var9;
-								NetCache.field3612 += var9; // L: 1276
-								if (var8 == SoundSystem.NetCache_responseArchiveBuffer.offset) { // L: 1277
-									if (BuddyRankComparator.NetCache_currentResponse.key == 16711935L) { // L: 1278
-										class125.NetCache_reference = SoundSystem.NetCache_responseArchiveBuffer; // L: 1279
+								NetCache.field3615 += var9; // L: 1547
+								if (var8 == class254.NetCache_responseArchiveBuffer.offset) { // L: 1548
+									if (16711935L == class34.NetCache_currentResponse.key) { // L: 1549
+										UserComparator6.NetCache_reference = class254.NetCache_responseArchiveBuffer; // L: 1550
 
-										for (var10 = 0; var10 < 256; ++var10) { // L: 1280
-											Archive var19 = NetCache.NetCache_archives[var10]; // L: 1281
-											if (var19 != null) { // L: 1282
-												class125.NetCache_reference.offset = var10 * 8 + 5; // L: 1283
-												var12 = class125.NetCache_reference.readInt(); // L: 1284
-												int var20 = class125.NetCache_reference.readInt(); // L: 1285
-												var19.loadIndex(var12, var20); // L: 1286
+										for (var10 = 0; var10 < 256; ++var10) { // L: 1551
+											Archive var19 = NetCache.NetCache_archives[var10]; // L: 1552
+											if (var19 != null) { // L: 1553
+												UserComparator6.NetCache_reference.offset = var10 * 8 + 5; // L: 1554
+												var12 = UserComparator6.NetCache_reference.readInt(); // L: 1555
+												int var20 = UserComparator6.NetCache_reference.readInt(); // L: 1556
+												var19.loadIndex(var12, var20); // L: 1557
 											}
 										}
 									} else {
-										NetCache.NetCache_crc.reset(); // L: 1291
-										NetCache.NetCache_crc.update(SoundSystem.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1292
-										var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1293
-										if (var10 != BuddyRankComparator.NetCache_currentResponse.crc) { // L: 1294
+										NetCache.NetCache_crc.reset(); // L: 1562
+										NetCache.NetCache_crc.update(class254.NetCache_responseArchiveBuffer.array, 0, var8); // L: 1563
+										var10 = (int)NetCache.NetCache_crc.getValue(); // L: 1564
+										if (var10 != class34.NetCache_currentResponse.crc) { // L: 1565
 											try {
-												NetCache.NetCache_socket.close(); // L: 1296
-											} catch (Exception var23) { // L: 1298
+												NetCache.NetCache_socket.close(); // L: 1567
+											} catch (Exception var23) { // L: 1569
 											}
 
-											++NetCache.NetCache_crcMismatches; // L: 1299
-											NetCache.NetCache_socket = null; // L: 1300
-											NetCache.field3607 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1301
-											var1 = false; // L: 1302
-											break label238;
+											++NetCache.NetCache_crcMismatches; // L: 1570
+											NetCache.NetCache_socket = null; // L: 1571
+											NetCache.field3618 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 1572
+											var1 = false; // L: 1573
+											break label241;
 										}
 
-										NetCache.NetCache_crcMismatches = 0; // L: 1305
-										NetCache.NetCache_ioExceptions = 0; // L: 1306
-										BuddyRankComparator.NetCache_currentResponse.archive.write((int)(BuddyRankComparator.NetCache_currentResponse.key & 65535L), SoundSystem.NetCache_responseArchiveBuffer.array, (BuddyRankComparator.NetCache_currentResponse.key & 16711680L) == 16711680L, class8.field75); // L: 1307
+										NetCache.NetCache_crcMismatches = 0; // L: 1576
+										NetCache.NetCache_ioExceptions = 0; // L: 1577
+										class34.NetCache_currentResponse.archive.write((int)(class34.NetCache_currentResponse.key & 65535L), class254.NetCache_responseArchiveBuffer.array, (class34.NetCache_currentResponse.key & 16711680L) == 16711680L, class266.field3222); // L: 1578
 									}
 
-									BuddyRankComparator.NetCache_currentResponse.remove(); // L: 1309
-									if (class8.field75) { // L: 1310
+									class34.NetCache_currentResponse.remove(); // L: 1580
+									if (class266.field3222) { // L: 1581
 										--NetCache.NetCache_pendingPriorityResponsesCount;
 									} else {
-										--NetCache.NetCache_pendingResponsesCount; // L: 1311
+										--NetCache.NetCache_pendingResponsesCount; // L: 1582
 									}
 
-									NetCache.field3612 = 0; // L: 1312
-									BuddyRankComparator.NetCache_currentResponse = null; // L: 1313
-									SoundSystem.NetCache_responseArchiveBuffer = null; // L: 1314
+									NetCache.field3615 = 0; // L: 1583
+									class34.NetCache_currentResponse = null; // L: 1584
+									class254.NetCache_responseArchiveBuffer = null; // L: 1585
 								} else {
-									if (NetCache.field3612 != 512) { // L: 1316
+									if (NetCache.field3615 != 512) { // L: 1587
 										break;
 									}
 
-									NetCache.field3612 = 0;
+									NetCache.field3615 = 0;
 								}
 							}
 						}
 
-						var1 = true; // L: 1320
+						var1 = true; // L: 1591
 					}
 				} catch (IOException var24) {
 					try {
-						NetCache.NetCache_socket.close(); // L: 1324
-					} catch (Exception var22) { // L: 1326
+						NetCache.NetCache_socket.close(); // L: 1595
+					} catch (Exception var22) { // L: 1597
 					}
 
-					++NetCache.NetCache_ioExceptions; // L: 1327
-					NetCache.NetCache_socket = null; // L: 1328
-					var1 = false; // L: 1329
+					++NetCache.NetCache_ioExceptions; // L: 1598
+					NetCache.NetCache_socket = null; // L: 1599
+					var1 = false; // L: 1600
 				}
 			}
 
-			if (!var1) { // L: 1333
+			if (!var1) { // L: 1604
 				this.doCycleJs5Connect();
 			}
 
 		}
-	} // L: 1334
+	} // L: 1605
 
-	@ObfuscatedName("ev")
+	@ObfuscatedName("fl")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1090327888"
+		garbageValue = "1568310172"
 	)
 	@Export("doCycleJs5Connect")
 	void doCycleJs5Connect() {
-		if (NetCache.NetCache_crcMismatches >= 4) { // L: 1337
-			this.error("js5crc"); // L: 1338
-			gameState = 1000; // L: 1339
+		if (NetCache.NetCache_crcMismatches >= 4) { // L: 1608
+			this.error("js5crc"); // L: 1609
+			gameState = 1000; // L: 1610
 		} else {
-			if (NetCache.NetCache_ioExceptions >= 4) { // L: 1342
-				if (gameState <= 5) { // L: 1343
-					this.error("js5io"); // L: 1344
-					gameState = 1000; // L: 1345
-					return; // L: 1346
+			if (NetCache.NetCache_ioExceptions >= 4) { // L: 1613
+				if (gameState <= 5) { // L: 1614
+					this.error("js5io"); // L: 1615
+					gameState = 1000; // L: 1616
+					return; // L: 1617
 				}
 
-				field670 = 3000; // L: 1349
-				NetCache.NetCache_ioExceptions = 3; // L: 1350
+				field800 = 3000; // L: 1620
+				NetCache.NetCache_ioExceptions = 3; // L: 1621
 			}
 
-			if (--field670 + 1 <= 0) { // L: 1353
+			if (--field800 + 1 <= 0) { // L: 1624
 				try {
-					if (js5ConnectState == 0) { // L: 1355
-						class159.js5SocketTask = GameEngine.taskHandler.newSocketTask(class80.worldHost, DesktopPlatformInfoProvider.currentPort); // L: 1356
-						++js5ConnectState; // L: 1357
+					if (js5ConnectState == 0) { // L: 1626
+						Buddy.js5SocketTask = GameEngine.taskHandler.newSocketTask(worldHost, UserComparator2.currentPort); // L: 1627
+						++js5ConnectState; // L: 1628
 					}
 
-					if (js5ConnectState == 1) { // L: 1359
-						if (class159.js5SocketTask.status == 2) { // L: 1360
-							this.js5Error(-1); // L: 1361
-							return; // L: 1362
+					if (js5ConnectState == 1) { // L: 1630
+						if (Buddy.js5SocketTask.status == 2) { // L: 1631
+							this.js5Error(-1); // L: 1632
+							return; // L: 1633
 						}
 
-						if (class159.js5SocketTask.status == 1) { // L: 1364
+						if (Buddy.js5SocketTask.status == 1) { // L: 1635
 							++js5ConnectState;
 						}
 					}
 
-					if (js5ConnectState == 2) { // L: 1366
-						if (useBufferedSocket) { // L: 1367
-							Socket var2 = (Socket)class159.js5SocketTask.result; // L: 1369
-							BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); // L: 1371
-							WorldMapID.js5Socket = var1; // L: 1373
+					if (js5ConnectState == 2) { // L: 1637
+						if (useBufferedSocket) { // L: 1638
+							BoundaryObject.js5Socket = PcmPlayer.method897((Socket)Buddy.js5SocketTask.result, 40000, 5000); // L: 1639
 						} else {
-							WorldMapID.js5Socket = new NetSocket((Socket)class159.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1376
+							BoundaryObject.js5Socket = new NetSocket((Socket)Buddy.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1642
 						}
 
-						Buffer var11 = new Buffer(5); // L: 1378
-						var11.writeByte(15); // L: 1379
-						var11.writeInt(196); // L: 1380
-						WorldMapID.js5Socket.write(var11.array, 0, 5); // L: 1381
-						++js5ConnectState; // L: 1382
-						ArchiveDiskAction.field3556 = ObjectComposition.currentTimeMillis(); // L: 1383
+						Buffer var1 = new Buffer(5); // L: 1644
+						var1.writeByte(15); // L: 1645
+						var1.writeInt(197); // L: 1646
+						BoundaryObject.js5Socket.write(var1.array, 0, 5); // L: 1647
+						++js5ConnectState; // L: 1648
+						VarcInt.field1586 = ClientPacket.currentTimeMillis(); // L: 1649
 					}
 
-					if (js5ConnectState == 3) { // L: 1385
-						if (WorldMapID.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1386
-							int var5 = WorldMapID.js5Socket.readUnsignedByte(); // L: 1387
-							if (var5 != 0) { // L: 1388
-								this.js5Error(var5); // L: 1389
-								return; // L: 1390
+					if (js5ConnectState == 3) { // L: 1651
+						if (BoundaryObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1652
+							int var2 = BoundaryObject.js5Socket.readUnsignedByte(); // L: 1653
+							if (var2 != 0) { // L: 1654
+								this.js5Error(var2); // L: 1655
+								return; // L: 1656
 							}
 
-							++js5ConnectState; // L: 1392
-						} else if (ObjectComposition.currentTimeMillis() - ArchiveDiskAction.field3556 > 30000L) { // L: 1395
-							this.js5Error(-2); // L: 1396
-							return; // L: 1397
+							++js5ConnectState; // L: 1658
+						} else if (ClientPacket.currentTimeMillis() - VarcInt.field1586 > 30000L) { // L: 1661
+							this.js5Error(-2); // L: 1662
+							return; // L: 1663
 						}
 					}
 
-					if (js5ConnectState == 4) { // L: 1401
-						AbstractSocket var12 = WorldMapID.js5Socket; // L: 1402
-						boolean var6 = gameState > 20; // L: 1403
-						if (NetCache.NetCache_socket != null) { // L: 1405
-							try {
-								NetCache.NetCache_socket.close(); // L: 1407
-							} catch (Exception var9) { // L: 1409
-							}
-
-							NetCache.NetCache_socket = null; // L: 1410
-						}
-
-						NetCache.NetCache_socket = var12; // L: 1412
-						StudioGame.method4847(var6); // L: 1413
-						NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 1414
-						BuddyRankComparator.NetCache_currentResponse = null; // L: 1415
-						SoundSystem.NetCache_responseArchiveBuffer = null; // L: 1416
-						NetCache.field3612 = 0; // L: 1417
-
-						while (true) {
-							NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 1419
-							if (var3 == null) { // L: 1420
-								while (true) {
-									var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 1426
-									if (var3 == null) { // L: 1427
-										if (NetCache.field3607 != 0) { // L: 1433
-											try {
-												Buffer var13 = new Buffer(4); // L: 1435
-												var13.writeByte(4); // L: 1436
-												var13.writeByte(NetCache.field3607); // L: 1437
-												var13.writeShort(0); // L: 1438
-												NetCache.NetCache_socket.write(var13.array, 0, 4); // L: 1439
-											} catch (IOException var8) {
-												try {
-													NetCache.NetCache_socket.close(); // L: 1443
-												} catch (Exception var7) { // L: 1445
-												}
-
-												++NetCache.NetCache_ioExceptions; // L: 1446
-												NetCache.NetCache_socket = null; // L: 1447
-											}
-										}
-
-										NetCache.NetCache_loadTime = 0; // L: 1450
-										class18.field159 = ObjectComposition.currentTimeMillis(); // L: 1451
-										class159.js5SocketTask = null; // L: 1453
-										WorldMapID.js5Socket = null; // L: 1454
-										js5ConnectState = 0; // L: 1455
-										js5Errors = 0; // L: 1456
-										return; // L: 1462
-									}
-
-									NetCache.NetCache_pendingWritesQueue.addLast(var3); // L: 1428
-									NetCache.NetCache_pendingWrites.put(var3, var3.key); // L: 1429
-									++NetCache.NetCache_pendingWritesCount; // L: 1430
-									--NetCache.NetCache_pendingResponsesCount; // L: 1431
-								}
-							}
-
-							NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); // L: 1421
-							++NetCache.NetCache_pendingPriorityWritesCount; // L: 1422
-							--NetCache.NetCache_pendingPriorityResponsesCount; // L: 1423
-						}
+					if (js5ConnectState == 4) { // L: 1667
+						VarbitComposition.method2928(BoundaryObject.js5Socket, gameState > 20); // L: 1668
+						Buddy.js5SocketTask = null; // L: 1669
+						BoundaryObject.js5Socket = null; // L: 1670
+						js5ConnectState = 0; // L: 1671
+						js5Errors = 0; // L: 1672
 					}
-				} catch (IOException var10) { // L: 1459
-					this.js5Error(-3); // L: 1460
+				} catch (IOException var3) { // L: 1675
+					this.js5Error(-3); // L: 1676
 				}
 
 			}
 		}
-	} // L: 1340
+	} // L: 1611 1678
 
-	@ObfuscatedName("eq")
+	@ObfuscatedName("fv")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1995142761"
+		garbageValue = "435825776"
 	)
 	@Export("js5Error")
 	void js5Error(int var1) {
-		class159.js5SocketTask = null; // L: 1465
-		WorldMapID.js5Socket = null; // L: 1466
-		js5ConnectState = 0; // L: 1467
-		if (WorldMapLabelSize.worldPort == DesktopPlatformInfoProvider.currentPort) { // L: 1468
-			DesktopPlatformInfoProvider.currentPort = GrandExchangeOfferTotalQuantityComparator.js5Port;
+		Buddy.js5SocketTask = null; // L: 1681
+		BoundaryObject.js5Socket = null; // L: 1682
+		js5ConnectState = 0; // L: 1683
+		if (UserComparator2.currentPort == UserComparator7.worldPort) { // L: 1684
+			UserComparator2.currentPort = MouseRecorder.js5Port;
 		} else {
-			DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 1469
+			UserComparator2.currentPort = UserComparator7.worldPort; // L: 1685
 		}
 
-		++js5Errors; // L: 1470
-		if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1471
-			if (gameState <= 5) { // L: 1472
-				this.error("js5connect_full"); // L: 1473
-				gameState = 1000; // L: 1474
+		++js5Errors; // L: 1686
+		if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1687
+			if (gameState <= 5) { // L: 1688
+				this.error("js5connect_full"); // L: 1689
+				gameState = 1000; // L: 1690
 			} else {
-				field670 = 3000; // L: 1476
+				field800 = 3000; // L: 1692
 			}
-		} else if (js5Errors >= 2 && var1 == 6) { // L: 1478
-			this.error("js5connect_outofdate"); // L: 1479
-			gameState = 1000; // L: 1480
-		} else if (js5Errors >= 4) { // L: 1482
-			if (gameState <= 5) { // L: 1483
-				this.error("js5connect"); // L: 1484
-				gameState = 1000; // L: 1485
+		} else if (js5Errors >= 2 && var1 == 6) { // L: 1694
+			this.error("js5connect_outofdate"); // L: 1695
+			gameState = 1000; // L: 1696
+		} else if (js5Errors >= 4) { // L: 1698
+			if (gameState <= 5) { // L: 1699
+				this.error("js5connect"); // L: 1700
+				gameState = 1000; // L: 1701
 			} else {
-				field670 = 3000; // L: 1487
+				field800 = 3000; // L: 1703
 			}
 		}
 
-	} // L: 1489
+	} // L: 1705
 
-	@ObfuscatedName("fe")
+	@ObfuscatedName("fa")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-607645058"
+		descriptor = "(S)V",
+		garbageValue = "26284"
 	)
 	@Export("doCycleLoggedOut")
 	final void doCycleLoggedOut() {
-		Object var1 = packetWriter.getSocket(); // L: 1923
-		PacketBuffer var2 = packetWriter.packetBuffer; // L: 1924
+		Object var1 = packetWriter.getSocket(); // L: 2425
+		PacketBuffer var2 = packetWriter.packetBuffer; // L: 2426
 
 		try {
-			if (loginState == 0) { // L: 1926
-				if (ClientPreferences.secureRandom == null && (secureRandomFuture.isDone() || field673 > 250)) { // L: 1927
-					ClientPreferences.secureRandom = secureRandomFuture.get(); // L: 1928
-					secureRandomFuture.shutdown(); // L: 1929
-					secureRandomFuture = null; // L: 1930
+			if (loginState == 0) { // L: 2428
+				if (ClanSettings.secureRandom == null && (secureRandomFuture.isDone() || field811 > 250)) { // L: 2429
+					ClanSettings.secureRandom = secureRandomFuture.get(); // L: 2430
+					secureRandomFuture.shutdown(); // L: 2431
+					secureRandomFuture = null; // L: 2432
 				}
 
-				if (ClientPreferences.secureRandom != null) { // L: 1932
-					if (var1 != null) { // L: 1933
-						((AbstractSocket)var1).close(); // L: 1934
-						var1 = null; // L: 1935
+				if (ClanSettings.secureRandom != null) { // L: 2434
+					if (var1 != null) { // L: 2435
+						((AbstractSocket)var1).close(); // L: 2436
+						var1 = null; // L: 2437
 					}
 
-					UserComparator9.socketTask = null; // L: 1937
-					hadNetworkError = false; // L: 1938
-					field673 = 0; // L: 1939
-					loginState = 1; // L: 1940
+					AbstractArchive.socketTask = null; // L: 2439
+					hadNetworkError = false; // L: 2440
+					field811 = 0; // L: 2441
+					loginState = 1; // L: 2442
 				}
 			}
 
-			if (loginState == 1) { // L: 1943
-				if (UserComparator9.socketTask == null) { // L: 1944
-					UserComparator9.socketTask = GameEngine.taskHandler.newSocketTask(class80.worldHost, DesktopPlatformInfoProvider.currentPort); // L: 1945
+			if (loginState == 1) { // L: 2445
+				if (AbstractArchive.socketTask == null) { // L: 2446
+					AbstractArchive.socketTask = GameEngine.taskHandler.newSocketTask(worldHost, UserComparator2.currentPort); // L: 2447
 				}
 
-				if (UserComparator9.socketTask.status == 2) { // L: 1947
+				if (AbstractArchive.socketTask.status == 2) { // L: 2449
 					throw new IOException();
 				}
 
-				if (UserComparator9.socketTask.status == 1) { // L: 1948
-					if (useBufferedSocket) { // L: 1949
-						Socket var4 = (Socket)UserComparator9.socketTask.result; // L: 1951
-						BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); // L: 1953
-						var1 = var3; // L: 1955
+				if (AbstractArchive.socketTask.status == 1) { // L: 2450
+					if (useBufferedSocket) { // L: 2451
+						var1 = PcmPlayer.method897((Socket)AbstractArchive.socketTask.result, 40000, 5000); // L: 2452
 					} else {
-						var1 = new NetSocket((Socket)UserComparator9.socketTask.result, GameEngine.taskHandler, 5000); // L: 1958
+						var1 = new NetSocket((Socket)AbstractArchive.socketTask.result, GameEngine.taskHandler, 5000); // L: 2455
 					}
 
-					packetWriter.setSocket((AbstractSocket)var1); // L: 1960
-					UserComparator9.socketTask = null; // L: 1961
-					loginState = 2; // L: 1962
+					packetWriter.setSocket((AbstractSocket)var1); // L: 2457
+					AbstractArchive.socketTask = null; // L: 2458
+					loginState = 2; // L: 2459
 				}
 			}
 
-			PacketBufferNode var26;
-			if (loginState == 2) { // L: 1965
-				packetWriter.clearBuffer(); // L: 1966
-				var26 = class22.method247(); // L: 1967
-				var26.packetBuffer.writeByte(LoginPacket.field2806.id); // L: 1968
-				packetWriter.addNode(var26); // L: 1969
-				packetWriter.flush(); // L: 1970
-				var2.offset = 0; // L: 1971
-				loginState = 3; // L: 1972
+			if (loginState == 2) { // L: 2462
+				packetWriter.clearBuffer(); // L: 2463
+				PacketBufferNode var4 = WorldMapData_1.method3583(); // L: 2466
+				var4.clientPacket = null; // L: 2467
+				var4.clientPacketLength = 0; // L: 2468
+				var4.packetBuffer = new PacketBuffer(5000); // L: 2469
+				var4.packetBuffer.writeByte(LoginPacket.field2806.id); // L: 2473
+				packetWriter.addNode(var4); // L: 2474
+				packetWriter.flush(); // L: 2475
+				var2.offset = 0; // L: 2476
+				loginState = 3; // L: 2477
 			}
 
 			boolean var13;
 			int var14;
-			if (loginState == 3) { // L: 1974
-				if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1975
-					DesktopPlatformInfoProvider.pcmPlayer0.method733();
+			if (loginState == 3) { // L: 2479
+				if (SoundCache.pcmPlayer0 != null) { // L: 2480
+					SoundCache.pcmPlayer0.method844();
 				}
 
-				if (MouseRecorder.pcmPlayer1 != null) { // L: 1976
-					MouseRecorder.pcmPlayer1.method733();
+				if (UrlRequester.pcmPlayer1 != null) { // L: 2481
+					UrlRequester.pcmPlayer1.method844();
 				}
 
-				var13 = true; // L: 1977
-				if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1978 1979
+				var13 = true; // L: 2482
+				if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 2483 2484
 					var13 = false;
 				}
 
-				if (var13) { // L: 1981
-					var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1982
-					if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 1983
-						DesktopPlatformInfoProvider.pcmPlayer0.method733();
+				if (var13) { // L: 2486
+					var14 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2487
+					if (SoundCache.pcmPlayer0 != null) { // L: 2488
+						SoundCache.pcmPlayer0.method844();
 					}
 
-					if (MouseRecorder.pcmPlayer1 != null) { // L: 1984
-						MouseRecorder.pcmPlayer1.method733();
+					if (UrlRequester.pcmPlayer1 != null) { // L: 2489
+						UrlRequester.pcmPlayer1.method844();
 					}
 
-					if (var14 != 0) { // L: 1985
-						MouseHandler.getLoginError(var14); // L: 1986
-						return; // L: 1987
+					if (var14 != 0) { // L: 2490
+						WorldMapDecorationType.getLoginError(var14); // L: 2491
+						return; // L: 2492
 					}
 
-					var2.offset = 0; // L: 1989
-					loginState = 4; // L: 1990
+					var2.offset = 0; // L: 2494
+					loginState = 4; // L: 2495
 				}
 			}
 
-			int var41;
-			if (loginState == 4) { // L: 1993
-				if (var2.offset < 8) { // L: 1994
-					var41 = ((AbstractSocket)var1).available(); // L: 1995
-					if (var41 > 8 - var2.offset) { // L: 1996
-						var41 = 8 - var2.offset;
+			int var32;
+			if (loginState == 4) { // L: 2498
+				if (var2.offset < 8) { // L: 2499
+					var32 = ((AbstractSocket)var1).available(); // L: 2500
+					if (var32 > 8 - var2.offset) { // L: 2501
+						var32 = 8 - var2.offset;
 					}
 
-					if (var41 > 0) { // L: 1997
-						((AbstractSocket)var1).read(var2.array, var2.offset, var41); // L: 1998
-						var2.offset += var41; // L: 1999
+					if (var32 > 0) { // L: 2502
+						((AbstractSocket)var1).read(var2.array, var2.offset, var32); // L: 2503
+						var2.offset += var32; // L: 2504
 					}
 				}
 
-				if (var2.offset == 8) { // L: 2002
-					var2.offset = 0; // L: 2003
-					GrandExchangeOfferAgeComparator.field3634 = var2.readLong(); // L: 2004
-					loginState = 5; // L: 2005
+				if (var2.offset == 8) { // L: 2507
+					var2.offset = 0; // L: 2508
+					class160.field1929 = var2.readLong(); // L: 2509
+					loginState = 5; // L: 2510
 				}
 			}
 
-			int var7;
-			int var9;
-			int var15;
-			if (loginState == 5) { // L: 2008
-				packetWriter.packetBuffer.offset = 0; // L: 2009
-				packetWriter.clearBuffer(); // L: 2010
-				PacketBuffer var27 = new PacketBuffer(500); // L: 2011
-				int[] var29 = new int[]{ClientPreferences.secureRandom.nextInt(), ClientPreferences.secureRandom.nextInt(), ClientPreferences.secureRandom.nextInt(), ClientPreferences.secureRandom.nextInt()}; // L: 2012 2013 2014 2015 2016
-				var27.offset = 0; // L: 2017
-				var27.writeByte(1); // L: 2018
-				var27.writeInt(var29[0]); // L: 2019
-				var27.writeInt(var29[1]); // L: 2020
-				var27.writeInt(var29[2]); // L: 2021
-				var27.writeInt(var29[3]); // L: 2022
-				var27.writeLong(GrandExchangeOfferAgeComparator.field3634); // L: 2023
-				int var11;
-				if (gameState == 40) { // L: 2024
-					var27.writeInt(HealthBarDefinition.field1603[0]); // L: 2025
-					var27.writeInt(HealthBarDefinition.field1603[1]); // L: 2026
-					var27.writeInt(HealthBarDefinition.field1603[2]); // L: 2027
-					var27.writeInt(HealthBarDefinition.field1603[3]); // L: 2028
+			if (loginState == 5) { // L: 2513
+				packetWriter.packetBuffer.offset = 0; // L: 2514
+				packetWriter.clearBuffer(); // L: 2515
+				PacketBuffer var3 = new PacketBuffer(500); // L: 2516
+				int[] var24 = new int[]{ClanSettings.secureRandom.nextInt(), ClanSettings.secureRandom.nextInt(), ClanSettings.secureRandom.nextInt(), ClanSettings.secureRandom.nextInt()}; // L: 2517 2518 2519 2520 2521
+				var3.offset = 0; // L: 2522
+				var3.writeByte(1); // L: 2523
+				var3.writeInt(var24[0]); // L: 2524
+				var3.writeInt(var24[1]); // L: 2525
+				var3.writeInt(var24[2]); // L: 2526
+				var3.writeInt(var24[3]); // L: 2527
+				var3.writeLong(class160.field1929); // L: 2528
+				if (gameState == 40) { // L: 2529
+					var3.writeInt(SoundCache.field438[0]); // L: 2530
+					var3.writeInt(SoundCache.field438[1]); // L: 2531
+					var3.writeInt(SoundCache.field438[2]); // L: 2532
+					var3.writeInt(SoundCache.field438[3]); // L: 2533
 				} else {
-					var27.writeByte(field676.rsOrdinal()); // L: 2031
-					switch(field676.field1472) { // L: 2032
+					var3.writeByte(field656.rsOrdinal()); // L: 2536
+					switch(field656.field1476) { // L: 2537
 					case 0:
-						var27.offset += 4; // L: 2057
-						break;
+						var3.offset += 4; // L: 2540
+						break; // L: 2541
 					case 1:
-					case 3:
-						var27.writeMedium(class5.field53); // L: 2051
-						++var27.offset; // L: 2052
-						break; // L: 2053
 					case 2:
-						LinkedHashMap var6 = ObjectComposition.clientPreferences.parameters; // L: 2036
-						String var8 = Login.Login_username; // L: 2038
-						var9 = var8.length(); // L: 2040
-						int var10 = 0; // L: 2041
-
-						for (var11 = 0; var11 < var9; ++var11) { // L: 2042
-							var10 = (var10 << 5) - var10 + var8.charAt(var11);
-						}
-
-						var27.writeInt((Integer)var6.get(var10)); // L: 2045
+						var3.writeMedium(class0.field2); // L: 2551
+						++var3.offset; // L: 2552
+						break;
+					case 3:
+						var3.writeInt((Integer)class4.clientPreferences.parameters.get(class125.method2586(Login.Login_username))); // L: 2545
 					}
 
-					var27.writeByte(class386.field4210.rsOrdinal()); // L: 2061
-					var27.writeStringCp1252NullTerminated(Login.Login_password); // L: 2062
+					var3.writeByte(class387.field4211.rsOrdinal()); // L: 2556
+					var3.writeStringCp1252NullTerminated(Login.Login_password); // L: 2557
 				}
 
-				var27.encryptRsa(class82.field1018, class82.field1017); // L: 2064
-				HealthBarDefinition.field1603 = var29; // L: 2065
-				PacketBufferNode var5 = class22.method247(); // L: 2066
-				var5.packetBuffer.offset = 0; // L: 2067
-				if (gameState == 40) { // L: 2068
-					var5.packetBuffer.writeByte(LoginPacket.field2799.id); // L: 2069
+				var3.encryptRsa(class82.field1000, class82.field996); // L: 2559
+				SoundCache.field438 = var24; // L: 2560
+				PacketBufferNode var6 = WorldMapData_1.method3583(); // L: 2563
+				var6.clientPacket = null; // L: 2564
+				var6.clientPacketLength = 0; // L: 2565
+				var6.packetBuffer = new PacketBuffer(5000); // L: 2566
+				var6.packetBuffer.offset = 0; // L: 2570
+				if (gameState == 40) { // L: 2571
+					var6.packetBuffer.writeByte(LoginPacket.field2803.id); // L: 2572
 				} else {
-					var5.packetBuffer.writeByte(LoginPacket.field2802.id); // L: 2072
+					var6.packetBuffer.writeByte(LoginPacket.field2802.id); // L: 2575
 				}
 
-				var5.packetBuffer.writeShort(0); // L: 2074
-				var15 = var5.packetBuffer.offset; // L: 2075
-				var5.packetBuffer.writeInt(196); // L: 2076
-				var5.packetBuffer.writeInt(1); // L: 2077
-				var5.packetBuffer.writeByte(clientType); // L: 2078
-				var5.packetBuffer.writeByte(field643); // L: 2079
-				var5.packetBuffer.writeBytes(var27.array, 0, var27.offset); // L: 2080
-				var7 = var5.packetBuffer.offset; // L: 2081
-				var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2082
-				var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2083
-				var5.packetBuffer.writeShort(class32.canvasWidth); // L: 2084
-				var5.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 2085
-				PacketBuffer var39 = var5.packetBuffer; // L: 2086
-				if (randomDatData != null) { // L: 2088
-					var39.writeBytes(randomDatData, 0, randomDatData.length); // L: 2089
+				var6.packetBuffer.writeShort(0); // L: 2577
+				int var7 = var6.packetBuffer.offset; // L: 2578
+				var6.packetBuffer.writeInt(197); // L: 2579
+				var6.packetBuffer.writeInt(1); // L: 2580
+				var6.packetBuffer.writeByte(clientType); // L: 2581
+				var6.packetBuffer.writeByte(field625); // L: 2582
+				var6.packetBuffer.writeBytes(var3.array, 0, var3.offset); // L: 2583
+				int var8 = var6.packetBuffer.offset; // L: 2584
+				var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2585
+				var6.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2586
+				var6.packetBuffer.writeShort(AttackOption.canvasWidth); // L: 2587
+				var6.packetBuffer.writeShort(class0.canvasHeight); // L: 2588
+				PacketBuffer var9 = var6.packetBuffer; // L: 2589
+				if (randomDatData != null) { // L: 2591
+					var9.writeBytes(randomDatData, 0, randomDatData.length); // L: 2592
 				} else {
-					byte[] var16 = new byte[24]; // L: 2094
-
-					try {
-						JagexCache.JagexCache_randomDat.seek(0L); // L: 2096
-						JagexCache.JagexCache_randomDat.readFully(var16); // L: 2097
-
-						for (var11 = 0; var11 < 24 && var16[var11] == 0; ++var11) { // L: 2098 2099 2100
-						}
-
-						if (var11 >= 24) { // L: 2102
-							throw new IOException();
-						}
-					} catch (Exception var24) {
-						for (int var12 = 0; var12 < 24; ++var12) { // L: 2105
-							var16[var12] = -1;
-						}
-					}
-
-					var39.writeBytes(var16, 0, var16.length); // L: 2110
+					byte[] var10 = PlatformInfo.method6115(); // L: 2595
+					var9.writeBytes(var10, 0, var10.length); // L: 2596
 				}
 
-				var5.packetBuffer.writeStringCp1252NullTerminated(class363.field4079); // L: 2112
-				var5.packetBuffer.writeInt(Script.field1094); // L: 2113
-				Buffer var18 = new Buffer(class10.platformInfo.size()); // L: 2114
-				class10.platformInfo.write(var18); // L: 2115
-				var5.packetBuffer.writeBytes(var18.array, 0, var18.array.length); // L: 2116
-				var5.packetBuffer.writeByte(clientType); // L: 2117
-				var5.packetBuffer.writeInt(0); // L: 2118
-				var5.packetBuffer.writeInt(UrlRequest.archive6.hash); // L: 2119
-				var5.packetBuffer.method6612(0); // L: 2120
-				var5.packetBuffer.method6612(class8.archive17.hash); // L: 2121
-				var5.packetBuffer.writeIntME(class27.archive1.hash); // L: 2122
-				var5.packetBuffer.method6612(ClanChannel.archive3.hash); // L: 2123
-				var5.packetBuffer.writeIntME(class5.archive20.hash); // L: 2124
-				var5.packetBuffer.writeInt(class179.archive19.hash); // L: 2125
-				var5.packetBuffer.method6611(NetCache.archive0.hash); // L: 2126
-				var5.packetBuffer.writeInt(ClanMate.archive15.hash); // L: 2127
-				var5.packetBuffer.writeInt(SoundCache.archive10.hash); // L: 2128
-				var5.packetBuffer.writeInt(class8.archive2.hash); // L: 2129
-				var5.packetBuffer.method6611(WorldMapManager.archive11.hash); // L: 2130
-				var5.packetBuffer.writeIntME(class32.archive4.hash); // L: 2131
-				var5.packetBuffer.writeInt(Decimator.archive13.hash); // L: 2132
-				var5.packetBuffer.writeIntME(class125.archive14.hash); // L: 2133
-				var5.packetBuffer.method6612(CollisionMap.archive9.hash); // L: 2134
-				var5.packetBuffer.method6611(UserComparator5.archive12.hash); // L: 2135
-				var5.packetBuffer.writeIntME(FontName.archive18.hash); // L: 2136
-				var5.packetBuffer.method6611(class247.archive5.hash); // L: 2137
-				var5.packetBuffer.writeInt(Decimator.archive7.hash); // L: 2138
-				var5.packetBuffer.writeInt(GrandExchangeOfferAgeComparator.archive8.hash); // L: 2139
-				var5.packetBuffer.xteaEncrypt(var29, var7, var5.packetBuffer.offset); // L: 2140
-				var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var15); // L: 2141
-				packetWriter.addNode(var5); // L: 2142
-				packetWriter.flush(); // L: 2143
-				packetWriter.isaacCipher = new IsaacCipher(var29); // L: 2144
-				int[] var43 = new int[4]; // L: 2145
+				var6.packetBuffer.writeStringCp1252NullTerminated(Messages.field1397); // L: 2598
+				var6.packetBuffer.writeInt(class82.field999); // L: 2599
+				Buffer var31 = new Buffer(ClanSettings.platformInfo.size()); // L: 2600
+				ClanSettings.platformInfo.write(var31); // L: 2601
+				var6.packetBuffer.writeBytes(var31.array, 0, var31.array.length); // L: 2602
+				var6.packetBuffer.writeByte(clientType); // L: 2603
+				var6.packetBuffer.writeInt(0); // L: 2604
+				var6.packetBuffer.method6659(KitDefinition.archive1.hash); // L: 2605
+				var6.packetBuffer.method6658(Varcs.archive12.hash); // L: 2606
+				var6.packetBuffer.writeInt(class4.archive5.hash); // L: 2607
+				var6.packetBuffer.method6658(0); // L: 2608
+				var6.packetBuffer.writeIntME(class26.archive4.hash); // L: 2609
+				var6.packetBuffer.method6658(PcmPlayer.archive7.hash); // L: 2610
+				var6.packetBuffer.method6658(class160.archive11.hash); // L: 2611
+				var6.packetBuffer.writeIntME(class18.archive3.hash); // L: 2612
+				var6.packetBuffer.method6659(JagexCache.archive10.hash); // L: 2613
+				var6.packetBuffer.writeInt(ClanChannel.archive0.hash); // L: 2614
+				var6.packetBuffer.method6658(PacketWriter.archive14.hash); // L: 2615
+				var6.packetBuffer.method6659(DynamicObject.archive6.hash); // L: 2616
+				var6.packetBuffer.writeInt(SecureRandomFuture.archive2.hash); // L: 2617
+				var6.packetBuffer.writeInt(WorldMapEvent.archive19.hash); // L: 2618
+				var6.packetBuffer.writeInt(class6.archive18.hash); // L: 2619
+				var6.packetBuffer.method6659(class10.archive17.hash); // L: 2620
+				var6.packetBuffer.writeIntME(GrandExchangeOfferOwnWorldComparator.archive13.hash); // L: 2621
+				var6.packetBuffer.method6658(class16.archive9.hash); // L: 2622
+				var6.packetBuffer.writeIntME(class306.archive15.hash); // L: 2623
+				var6.packetBuffer.writeInt(ModeWhere.archive8.hash); // L: 2624
+				var6.packetBuffer.method6659(WorldMapLabel.archive20.hash); // L: 2625
+				var6.packetBuffer.xteaEncrypt(var24, var8, var6.packetBuffer.offset); // L: 2626
+				var6.packetBuffer.writeLengthShort(var6.packetBuffer.offset - var7); // L: 2627
+				packetWriter.addNode(var6); // L: 2628
+				packetWriter.flush(); // L: 2629
+				packetWriter.isaacCipher = new IsaacCipher(var24); // L: 2630
+				int[] var11 = new int[4]; // L: 2631
 
-				for (var11 = 0; var11 < 4; ++var11) { // L: 2146
-					var43[var11] = var29[var11] + 50;
+				for (int var12 = 0; var12 < 4; ++var12) { // L: 2632
+					var11[var12] = var24[var12] + 50;
 				}
 
-				var2.newIsaacCipher(var43); // L: 2147
-				loginState = 6; // L: 2148
+				var2.newIsaacCipher(var11); // L: 2633
+				loginState = 6; // L: 2634
 			}
 
-			if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2150 2151
-				var41 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2152
-				if (var41 == 21 && gameState == 20) { // L: 2153
-					loginState = 12; // L: 2154
-				} else if (var41 == 2) { // L: 2156
-					loginState = 14; // L: 2157
-				} else if (var41 == 15 && gameState == 40) { // L: 2159
-					packetWriter.serverPacketLength = -1; // L: 2160
-					loginState = 19; // L: 2161
-				} else if (var41 == 64) { // L: 2163
-					loginState = 10; // L: 2164
-				} else if (var41 == 23 && field845 < 1) { // L: 2166
-					++field845; // L: 2167
-					loginState = 0; // L: 2168
-				} else if (var41 == 29) { // L: 2170
-					loginState = 17; // L: 2171
+			if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2636 2637
+				var32 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2638
+				if (var32 == 21 && gameState == 20) { // L: 2639
+					loginState = 12; // L: 2640
+				} else if (var32 == 2) { // L: 2642
+					loginState = 14; // L: 2643
+				} else if (var32 == 15 && gameState == 40) { // L: 2645
+					packetWriter.serverPacketLength = -1; // L: 2646
+					loginState = 19; // L: 2647
+				} else if (var32 == 64) { // L: 2649
+					loginState = 10; // L: 2650
+				} else if (var32 == 23 && field654 < 1) { // L: 2652
+					++field654; // L: 2653
+					loginState = 0; // L: 2654
+				} else if (var32 == 29) { // L: 2656
+					loginState = 17; // L: 2657
 				} else {
-					if (var41 != 69) { // L: 2173
-						MouseHandler.getLoginError(var41); // L: 2177
-						return; // L: 2178
+					if (var32 != 69) { // L: 2659
+						WorldMapDecorationType.getLoginError(var32); // L: 2663
+						return; // L: 2664
 					}
 
-					loginState = 7; // L: 2174
+					loginState = 7; // L: 2660
 				}
 			}
 
-			if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2182 2183
-				((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2184
-				var2.offset = 0; // L: 2185
-				class27.field231 = var2.readUnsignedShort(); // L: 2186
-				loginState = 8; // L: 2187
+			if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2668 2669
+				((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2670
+				var2.offset = 0; // L: 2671
+				ClanChannel.field30 = var2.readUnsignedShort(); // L: 2672
+				loginState = 8; // L: 2673
 			}
 
-			if (loginState == 8 && ((AbstractSocket)var1).available() >= class27.field231) { // L: 2190 2191
-				var2.offset = 0; // L: 2192
-				((AbstractSocket)var1).read(var2.array, var2.offset, class27.field231); // L: 2193
-				class34[] var28 = new class34[]{class34.field256}; // L: 2196
-				class34 var30 = var28[var2.readUnsignedByte()]; // L: 2198
+			if (loginState == 8 && ((AbstractSocket)var1).available() >= ClanChannel.field30) { // L: 2676 2677
+				var2.offset = 0; // L: 2678
+				((AbstractSocket)var1).read(var2.array, var2.offset, ClanChannel.field30); // L: 2679
+				class34[] var21 = new class34[]{class34.field232}; // L: 2682
+				class34 var25 = var21[var2.readUnsignedByte()]; // L: 2684
 
 				try {
-					class31 var33 = class374.method6477(var30); // L: 2200
-					this.field680 = new class35(var2, var33); // L: 2201
-					loginState = 9; // L: 2202
-				} catch (Exception var23) { // L: 2204
-					MouseHandler.getLoginError(22); // L: 2205
-					return; // L: 2206
+					switch(var25.field233) { // L: 2688
+					case 0:
+						class28 var5 = new class28(); // L: 2691
+						this.field661 = new class35(var2, var5); // L: 2701
+						loginState = 9; // L: 2702
+						break;
+					default:
+						throw new IllegalArgumentException(); // L: 2696
+					}
+				} catch (Exception var19) { // L: 2704
+					WorldMapDecorationType.getLoginError(22); // L: 2705
+					return; // L: 2706
 				}
 			}
 
-			if (loginState == 9 && this.field680.method342()) { // L: 2210 2211
-				this.field679 = this.field680.method331(); // L: 2212
-				this.field680.method332(); // L: 2213
-				this.field680 = null; // L: 2214
-				if (this.field679 == null) { // L: 2215
-					MouseHandler.getLoginError(22); // L: 2216
-					return; // L: 2217
+			if (loginState == 9 && this.field661.method420()) { // L: 2710 2711
+				this.field660 = this.field661.method416(); // L: 2712
+				this.field661.method410(); // L: 2713
+				this.field661 = null; // L: 2714
+				if (this.field660 == null) { // L: 2715
+					WorldMapDecorationType.getLoginError(22); // L: 2716
+					return; // L: 2717
 				}
 
-				packetWriter.clearBuffer(); // L: 2219
-				var26 = class22.method247(); // L: 2220
-				var26.packetBuffer.writeByte(LoginPacket.field2803.id); // L: 2221
-				var26.packetBuffer.writeShort(this.field679.offset); // L: 2222
-				var26.packetBuffer.method6768(this.field679); // L: 2223
-				packetWriter.addNode(var26); // L: 2224
-				packetWriter.flush(); // L: 2225
-				this.field679 = null; // L: 2226
-				loginState = 6; // L: 2227
+				packetWriter.clearBuffer(); // L: 2719
+				PacketBufferNode var22 = ArchiveLoader.method2162(); // L: 2720
+				var22.packetBuffer.writeByte(LoginPacket.field2804.id); // L: 2721
+				var22.packetBuffer.writeShort(this.field660.offset); // L: 2722
+				var22.packetBuffer.method6607(this.field660); // L: 2723
+				packetWriter.addNode(var22); // L: 2724
+				packetWriter.flush(); // L: 2725
+				this.field660 = null; // L: 2726
+				loginState = 6; // L: 2727
 			}
 
-			if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2230 2231
-				ChatChannel.field1110 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2232
-				loginState = 11; // L: 2233
+			if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2730 2731
+				WorldMapEvent.field2152 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2732
+				loginState = 11; // L: 2733
 			}
 
-			if (loginState == 11 && ((AbstractSocket)var1).available() >= ChatChannel.field1110) { // L: 2236 2237
-				((AbstractSocket)var1).read(var2.array, 0, ChatChannel.field1110); // L: 2238
-				var2.offset = 0; // L: 2239
-				loginState = 6; // L: 2240
+			if (loginState == 11 && ((AbstractSocket)var1).available() >= WorldMapEvent.field2152) { // L: 2736 2737
+				((AbstractSocket)var1).read(var2.array, 0, WorldMapEvent.field2152); // L: 2738
+				var2.offset = 0; // L: 2739
+				loginState = 6; // L: 2740
 			}
 
-			if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2243 2244
-				field675 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2245
-				loginState = 13; // L: 2246
+			if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2743 2744
+				field655 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2745
+				loginState = 13; // L: 2746
 			}
 
-			if (loginState == 13) { // L: 2249
-				field673 = 0; // L: 2250
-				class260.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field675 / 60 + " seconds."); // L: 2251
-				if (--field675 <= 0) { // L: 2252
+			if (loginState == 13) { // L: 2749
+				field811 = 0; // L: 2750
+				CollisionMap.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field655 / 60 + " seconds."); // L: 2751
+				if (--field655 <= 0) { // L: 2752
 					loginState = 0;
 				}
 
 			} else {
-				if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2255 2256
-					class20.field184 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2257
-					loginState = 15; // L: 2258
+				if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2755 2756
+					WorldMapSection0.field2038 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2757
+					loginState = 15; // L: 2758
 				}
 
-				boolean var42;
-				if (loginState == 15 && ((AbstractSocket)var1).available() >= class20.field184) { // L: 2261 2262
-					var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2263
-					((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2264
-					var2.offset = 0; // L: 2265
-					var42 = false; // L: 2266
-					if (var13) { // L: 2267
-						var14 = var2.readByteIsaac() << 24; // L: 2268
-						var14 |= var2.readByteIsaac() << 16; // L: 2269
-						var14 |= var2.readByteIsaac() << 8; // L: 2270
-						var14 |= var2.readByteIsaac(); // L: 2271
-						String var38 = Login.Login_username; // L: 2273
-						var7 = var38.length(); // L: 2275
-						int var19 = 0; // L: 2276
-						var9 = 0; // L: 2277
-
-						while (true) {
-							if (var9 >= var7) {
-								if (ObjectComposition.clientPreferences.parameters.size() >= 10 && !ObjectComposition.clientPreferences.parameters.containsKey(var19)) { // L: 2281 2282
-									Iterator var40 = ObjectComposition.clientPreferences.parameters.entrySet().iterator(); // L: 2283
-									var40.next(); // L: 2284
-									var40.remove(); // L: 2285
-								}
-
-								ObjectComposition.clientPreferences.parameters.put(var19, var14); // L: 2288
-								break;
-							}
-
-							var19 = (var19 << 5) - var19 + var38.charAt(var9);
-							++var9;
+				if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapSection0.field2038) { // L: 2761 2762
+					var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2763
+					((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2764
+					var2.offset = 0; // L: 2765
+					boolean var33 = false; // L: 2766
+					if (var13) { // L: 2767
+						var14 = var2.readByteIsaac() << 24; // L: 2768
+						var14 |= var2.readByteIsaac() << 16; // L: 2769
+						var14 |= var2.readByteIsaac() << 8; // L: 2770
+						var14 |= var2.readByteIsaac(); // L: 2771
+						int var15 = class125.method2586(Login.Login_username); // L: 2772
+						if (class4.clientPreferences.parameters.size() >= 10 && !class4.clientPreferences.parameters.containsKey(var15)) { // L: 2773 2774
+							Iterator var30 = class4.clientPreferences.parameters.entrySet().iterator(); // L: 2775
+							var30.next(); // L: 2776
+							var30.remove(); // L: 2777
 						}
+
+						class4.clientPreferences.parameters.put(var15, var14); // L: 2780
 					}
 
-					if (Login_isUsernameRemembered) { // L: 2290
-						ObjectComposition.clientPreferences.rememberedUsername = Login.Login_username; // L: 2291
+					if (Login_isUsernameRemembered) { // L: 2782
+						class4.clientPreferences.rememberedUsername = Login.Login_username; // L: 2783
 					} else {
-						ObjectComposition.clientPreferences.rememberedUsername = null; // L: 2294
+						class4.clientPreferences.rememberedUsername = null; // L: 2786
 					}
 
-					TileItem.savePreferences(); // L: 2296
-					staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2297
-					playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2298
-					localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2299
-					localPlayerIndex <<= 8; // L: 2300
-					localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2301
-					field759 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2302
-					((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2303
-					var2.offset = 0; // L: 2304
-					ServerPacket[] var35 = class24.ServerPacket_values(); // L: 2305
-					var15 = var2.readSmartByteShortIsaac(); // L: 2306
-					if (var15 < 0 || var15 >= var35.length) { // L: 2307
-						throw new IOException(var15 + " " + var2.offset);
+					Actor.savePreferences(); // L: 2788
+					staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2789
+					playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2790
+					localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2791
+					localPlayerIndex <<= 8; // L: 2792
+					localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2793
+					field740 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2794
+					((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2795
+					var2.offset = 0; // L: 2796
+					ServerPacket[] var27 = WorldMapIcon_0.ServerPacket_values(); // L: 2797
+					int var16 = var2.readSmartByteShortIsaac(); // L: 2798
+					if (var16 < 0 || var16 >= var27.length) { // L: 2799
+						throw new IOException(var16 + " " + var2.offset);
 					}
 
-					packetWriter.serverPacket = var35[var15]; // L: 2308
-					packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2309
-					((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2310
-					var2.offset = 0; // L: 2311
-					packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2312
+					packetWriter.serverPacket = var27[var16]; // L: 2800
+					packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2801
+					((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2802
+					var2.offset = 0; // L: 2803
+					packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2804
 
 					try {
-						class42.method421(class23.client, "zap"); // L: 2314
-					} catch (Throwable var22) { // L: 2316
+						class42.method521(class1.client, "zap"); // L: 2806
+					} catch (Throwable var18) { // L: 2808
 					}
 
-					loginState = 16; // L: 2317
+					loginState = 16; // L: 2809
 				}
 
-				if (loginState != 16) { // L: 2320
-					if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2440 2441
-						var2.offset = 0; // L: 2442
-						((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2443
-						var2.offset = 0; // L: 2444
-						WorldMapData_1.field2008 = var2.readUnsignedShort(); // L: 2445
-						loginState = 18; // L: 2446
+				if (loginState == 16) { // L: 2812
+					if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2813
+						var2.offset = 0; // L: 2814
+						((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2815
+						timer.method5676(); // L: 2816
+						PcmPlayer.method895(); // L: 2817
+						class7.updatePlayer(var2); // L: 2818
+						class12.field111 = -1; // L: 2819
+						KeyHandler.loadRegions(false, var2); // L: 2820
+						packetWriter.serverPacket = null; // L: 2821
 					}
 
-					if (loginState == 18 && ((AbstractSocket)var1).available() >= WorldMapData_1.field2008) { // L: 2449 2450
-						var2.offset = 0; // L: 2451
-						((AbstractSocket)var1).read(var2.array, 0, WorldMapData_1.field2008); // L: 2452
-						var2.offset = 0; // L: 2453
-						String var36 = var2.readStringCp1252NullTerminated(); // L: 2454
-						String var34 = var2.readStringCp1252NullTerminated(); // L: 2455
-						String var37 = var2.readStringCp1252NullTerminated(); // L: 2456
-						class260.setLoginResponseString(var36, var34, var37); // L: 2457
-						class12.updateGameState(10); // L: 2458
+				} else {
+					if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2825 2826
+						var2.offset = 0; // L: 2827
+						((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2828
+						var2.offset = 0; // L: 2829
+						class4.field38 = var2.readUnsignedShort(); // L: 2830
+						loginState = 18; // L: 2831
 					}
 
-					if (loginState == 19) { // L: 2461
-						if (packetWriter.serverPacketLength == -1) { // L: 2462
-							if (((AbstractSocket)var1).available() < 2) { // L: 2463
+					if (loginState == 18 && ((AbstractSocket)var1).available() >= class4.field38) { // L: 2834 2835
+						var2.offset = 0; // L: 2836
+						((AbstractSocket)var1).read(var2.array, 0, class4.field38); // L: 2837
+						var2.offset = 0; // L: 2838
+						String var23 = var2.readStringCp1252NullTerminated(); // L: 2839
+						String var26 = var2.readStringCp1252NullTerminated(); // L: 2840
+						String var28 = var2.readStringCp1252NullTerminated(); // L: 2841
+						CollisionMap.setLoginResponseString(var23, var26, var28); // L: 2842
+						Projectile.updateGameState(10); // L: 2843
+					}
+
+					if (loginState != 19) { // L: 2846
+						++field811; // L: 2893
+						if (field811 > 2000) { // L: 2894
+							if (field654 < 1) { // L: 2895
+								if (UserComparator2.currentPort == UserComparator7.worldPort) { // L: 2896
+									UserComparator2.currentPort = MouseRecorder.js5Port;
+								} else {
+									UserComparator2.currentPort = UserComparator7.worldPort; // L: 2897
+								}
+
+								++field654; // L: 2898
+								loginState = 0; // L: 2899
+							} else {
+								WorldMapDecorationType.getLoginError(-3); // L: 2902
+							}
+						}
+					} else {
+						if (packetWriter.serverPacketLength == -1) { // L: 2847
+							if (((AbstractSocket)var1).available() < 2) { // L: 2848
 								return;
 							}
 
-							((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2464
-							var2.offset = 0; // L: 2465
-							packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2466
+							((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2849
+							var2.offset = 0; // L: 2850
+							packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2851
 						}
 
-						if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2468
-							((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2469
-							var2.offset = 0; // L: 2470
-							var41 = packetWriter.serverPacketLength; // L: 2471
-							timer.method5594(); // L: 2472
-							WorldMapSectionType.method3594(); // L: 2473
-							Coord.updatePlayer(var2); // L: 2474
-							if (var41 != var2.offset) { // L: 2475
-								throw new RuntimeException(); // L: 2476
+						if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2853
+							((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2854
+							var2.offset = 0; // L: 2855
+							var32 = packetWriter.serverPacketLength; // L: 2856
+							timer.method5678(); // L: 2857
+							packetWriter.clearBuffer(); // L: 2859
+							packetWriter.packetBuffer.offset = 0; // L: 2860
+							packetWriter.serverPacket = null; // L: 2861
+							packetWriter.field1410 = null; // L: 2862
+							packetWriter.field1411 = null; // L: 2863
+							packetWriter.field1399 = null; // L: 2864
+							packetWriter.serverPacketLength = 0; // L: 2865
+							packetWriter.field1408 = 0; // L: 2866
+							rebootTimer = 0; // L: 2867
+							class34.method407(); // L: 2868
+							minimapState = 0; // L: 2869
+							destinationX = 0; // L: 2870
+
+							for (var14 = 0; var14 < 2048; ++var14) { // L: 2871
+								players[var14] = null;
 							}
-						}
-					} else {
-						++field673; // L: 2480
-						if (field673 > 2000) { // L: 2481
-							if (field845 < 1) { // L: 2482
-								if (DesktopPlatformInfoProvider.currentPort == WorldMapLabelSize.worldPort) { // L: 2483
-									DesktopPlatformInfoProvider.currentPort = GrandExchangeOfferTotalQuantityComparator.js5Port;
-								} else {
-									DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 2484
-								}
 
-								++field845; // L: 2485
-								loginState = 0; // L: 2486
-							} else {
-								MouseHandler.getLoginError(-3); // L: 2489
+							class262.localPlayer = null; // L: 2872
+
+							for (var14 = 0; var14 < npcs.length; ++var14) { // L: 2873
+								NPC var29 = npcs[var14]; // L: 2874
+								if (var29 != null) { // L: 2875
+									var29.targetIndex = -1; // L: 2876
+									var29.false0 = false; // L: 2877
+								}
+							}
+
+							ItemContainer.itemContainers = new NodeHashTable(32); // L: 2881
+							Projectile.updateGameState(30); // L: 2883
+
+							for (var14 = 0; var14 < 100; ++var14) { // L: 2884
+								field831[var14] = true;
+							}
+
+							BufferedSink.method5992(); // L: 2885
+							class7.updatePlayer(var2); // L: 2887
+							if (var32 != var2.offset) { // L: 2888
+								throw new RuntimeException(); // L: 2889
 							}
 						}
 					}
-				} else {
-					if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2321
-						var2.offset = 0; // L: 2322
-						((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2323
-						timer.method5592(); // L: 2324
-						mouseLastLastPressedTimeMillis = -1L; // L: 2327
-						Skills.mouseRecorder.index = 0; // L: 2328
-						WorldMapSection1.hasFocus = true; // L: 2329
-						hadFocus = true; // L: 2330
-						field809 = -1L; // L: 2331
-						SoundCache.method811(); // L: 2332
-						packetWriter.clearBuffer(); // L: 2333
-						packetWriter.packetBuffer.offset = 0; // L: 2334
-						packetWriter.serverPacket = null; // L: 2335
-						packetWriter.field1411 = null; // L: 2336
-						packetWriter.field1412 = null; // L: 2337
-						packetWriter.field1400 = null; // L: 2338
-						packetWriter.serverPacketLength = 0; // L: 2339
-						packetWriter.field1409 = 0; // L: 2340
-						rebootTimer = 0; // L: 2341
-						logoutTimer = 0; // L: 2342
-						hintArrowType = 0; // L: 2343
-						class1.method11(); // L: 2344
-						ArchiveDiskActionHandler.method4867(0); // L: 2345
-						class43.method437(); // L: 2346
-						isItemSelected = 0; // L: 2347
-						isSpellSelected = false; // L: 2348
-						soundEffectCount = 0; // L: 2349
-						camAngleY = 0; // L: 2350
-						oculusOrbState = 0; // L: 2351
-						UserComparator3.field1444 = null; // L: 2352
-						minimapState = 0; // L: 2353
-						field872 = -1; // L: 2354
-						destinationX = 0; // L: 2355
-						destinationY = 0; // L: 2356
-						playerAttackOption = AttackOption.AttackOption_hidden; // L: 2357
-						npcAttackOption = AttackOption.AttackOption_hidden; // L: 2358
-						npcCount = 0; // L: 2359
-						Player.method2110(); // L: 2360
-
-						for (var41 = 0; var41 < 2048; ++var41) { // L: 2361
-							players[var41] = null;
-						}
-
-						for (var41 = 0; var41 < 32768; ++var41) { // L: 2362
-							npcs[var41] = null;
-						}
-
-						combatTargetPlayerIndex = -1; // L: 2363
-						projectiles.clear(); // L: 2364
-						graphicsObjects.clear(); // L: 2365
-
-						int var20;
-						for (var41 = 0; var41 < 4; ++var41) { // L: 2366
-							for (var14 = 0; var14 < 104; ++var14) { // L: 2367
-								for (var20 = 0; var20 < 104; ++var20) { // L: 2368
-									groundItems[var41][var14][var20] = null; // L: 2369
-								}
-							}
-						}
-
-						pendingSpawns = new NodeDeque(); // L: 2373
-						NetSocket.friendSystem.clear(); // L: 2374
-
-						for (var41 = 0; var41 < VarpDefinition.VarpDefinition_fileCount; ++var41) { // L: 2375
-							VarpDefinition var32 = ClanSettings.VarpDefinition_get(var41); // L: 2376
-							if (var32 != null) { // L: 2377
-								Varps.Varps_temp[var41] = 0; // L: 2378
-								Varps.Varps_main[var41] = 0; // L: 2379
-							}
-						}
-
-						GrandExchangeOfferOwnWorldComparator.varcs.clearTransient(); // L: 2382
-						followerIndex = -1; // L: 2383
-						if (rootInterface != -1) { // L: 2384
-							var41 = rootInterface; // L: 2385
-							if (var41 != -1 && Widget.Widget_loadedInterfaces[var41]) { // L: 2387 2388
-								HealthBarUpdate.Widget_archive.clearFilesGroup(var41); // L: 2389
-								if (Widget.Widget_interfaceComponents[var41] != null) { // L: 2390
-									var42 = true; // L: 2391
-
-									for (var20 = 0; var20 < Widget.Widget_interfaceComponents[var41].length; ++var20) { // L: 2392
-										if (Widget.Widget_interfaceComponents[var41][var20] != null) { // L: 2393
-											if (Widget.Widget_interfaceComponents[var41][var20].type != 2) { // L: 2394
-												Widget.Widget_interfaceComponents[var41][var20] = null;
-											} else {
-												var42 = false; // L: 2395
-											}
-										}
-									}
-
-									if (var42) { // L: 2398
-										Widget.Widget_interfaceComponents[var41] = null;
-									}
-
-									Widget.Widget_loadedInterfaces[var41] = false; // L: 2399
-								}
-							}
-						}
-
-						for (InterfaceParent var31 = (InterfaceParent)interfaceParents.first(); var31 != null; var31 = (InterfaceParent)interfaceParents.next()) { // L: 2402
-							class43.closeInterface(var31, true); // L: 2403
-						}
-
-						rootInterface = -1; // L: 2405
-						interfaceParents = new NodeHashTable(8); // L: 2406
-						meslayerContinueWidget = null; // L: 2407
-						class1.method11(); // L: 2408
-						playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2409
-
-						for (var41 = 0; var41 < 8; ++var41) { // L: 2410
-							playerMenuActions[var41] = null; // L: 2411
-							playerOptionsPriorities[var41] = false; // L: 2412
-						}
-
-						Skeleton.method3921(); // L: 2414
-						isLoading = true; // L: 2415
-
-						for (var41 = 0; var41 < 100; ++var41) { // L: 2416
-							field719[var41] = true;
-						}
-
-						var26 = class21.getPacketBufferNode(ClientPacket.field2662, packetWriter.isaacCipher); // L: 2419
-						var26.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); // L: 2420
-						var26.packetBuffer.writeShort(class32.canvasWidth); // L: 2421
-						var26.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 2422
-						packetWriter.addNode(var26); // L: 2423
-						WorldMapRegion.friendsChat = null; // L: 2425
-						NPCComposition.guestClanSettings = null; // L: 2426
-						Arrays.fill(currentClanSettings, (Object)null); // L: 2427
-						ApproximateRouteStrategy.guestClanChannel = null; // L: 2428
-						Arrays.fill(currentClanChannels, (Object)null); // L: 2429
-
-						for (var41 = 0; var41 < 8; ++var41) { // L: 2430
-							grandExchangeOffers[var41] = new GrandExchangeOffer();
-						}
-
-						BuddyRankComparator.grandExchangeEvents = null; // L: 2431
-						Coord.updatePlayer(var2); // L: 2433
-						GrandExchangeOfferOwnWorldComparator.field632 = -1; // L: 2434
-						class339.loadRegions(false, var2); // L: 2435
-						packetWriter.serverPacket = null; // L: 2436
-					}
-
 				}
 			}
-		} catch (IOException var25) { // L: 2493
-			if (field845 < 1) { // L: 2494
-				if (DesktopPlatformInfoProvider.currentPort == WorldMapLabelSize.worldPort) { // L: 2495
-					DesktopPlatformInfoProvider.currentPort = GrandExchangeOfferTotalQuantityComparator.js5Port;
+		} catch (IOException var20) { // L: 2906
+			if (field654 < 1) { // L: 2907
+				if (UserComparator7.worldPort == UserComparator2.currentPort) { // L: 2908
+					UserComparator2.currentPort = MouseRecorder.js5Port;
 				} else {
-					DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 2496
+					UserComparator2.currentPort = UserComparator7.worldPort; // L: 2909
 				}
 
-				++field845; // L: 2497
-				loginState = 0; // L: 2498
+				++field654; // L: 2910
+				loginState = 0; // L: 2911
 			} else {
-				MouseHandler.getLoginError(-2); // L: 2501
+				WorldMapDecorationType.getLoginError(-2); // L: 2914
 			}
 		}
-	} // L: 2253 2438 2478 2487 2490 2499 2502 2504
+	} // L: 2753 2823 2891 2900 2903 2912 2915 2917
 
-	@ObfuscatedName("fg")
+	@ObfuscatedName("fr")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1496762169"
+		garbageValue = "1684472042"
 	)
 	@Export("doCycleLoggedIn")
 	final void doCycleLoggedIn() {
-		if (rebootTimer > 1) { // L: 2716
+		if (rebootTimer > 1) { // L: 3190
 			--rebootTimer;
 		}
 
-		if (logoutTimer > 0) { // L: 2717
+		if (logoutTimer > 0) { // L: 3191
 			--logoutTimer;
 		}
 
-		if (hadNetworkError) { // L: 2718
-			hadNetworkError = false; // L: 2719
-			NetFileRequest.method4912(); // L: 2720
+		if (hadNetworkError) { // L: 3192
+			hadNetworkError = false; // L: 3193
+			ApproximateRouteStrategy.method1268(); // L: 3194
 		} else {
-			if (!isMenuOpen) { // L: 2723
-				NetSocket.addCancelMenuEntry();
+			if (!isMenuOpen) { // L: 3197
+				Script.addCancelMenuEntry();
 			}
 
 			int var1;
-			for (var1 = 0; var1 < 100 && this.method1192(packetWriter); ++var1) { // L: 2724 2725
+			for (var1 = 0; var1 < 100 && this.method1655(packetWriter); ++var1) { // L: 3198 3199
 			}
 
-			if (gameState == 30) { // L: 2727
+			if (gameState == 30) { // L: 3201
 				int var2;
 				PacketBufferNode var14;
-				while (class20.method231()) { // L: 2728
-					var14 = class21.getPacketBufferNode(ClientPacket.field2584, packetWriter.isaacCipher); // L: 2729
-					var14.packetBuffer.writeByte(0); // L: 2730
-					var2 = var14.packetBuffer.offset; // L: 2731
-					UserComparator3.performReflectionCheck(var14.packetBuffer); // L: 2732
-					var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 2733
-					packetWriter.addNode(var14); // L: 2734
+				while (DynamicObject.method2103()) { // L: 3202
+					var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2601, packetWriter.isaacCipher); // L: 3203
+					var14.packetBuffer.writeByte(0); // L: 3204
+					var2 = var14.packetBuffer.offset; // L: 3205
+					MouseHandler.performReflectionCheck(var14.packetBuffer); // L: 3206
+					var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 3207
+					packetWriter.addNode(var14); // L: 3208
 				}
 
-				if (timer.field3769) { // L: 2736
-					var14 = class21.getPacketBufferNode(ClientPacket.field2645, packetWriter.isaacCipher); // L: 2738
-					var14.packetBuffer.writeByte(0); // L: 2739
-					var2 = var14.packetBuffer.offset; // L: 2740
-					timer.write(var14.packetBuffer); // L: 2741
-					var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 2742
-					packetWriter.addNode(var14); // L: 2743
-					timer.method5593(); // L: 2744
+				if (timer.field3772) { // L: 3210
+					var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2661, packetWriter.isaacCipher); // L: 3212
+					var14.packetBuffer.writeByte(0); // L: 3213
+					var2 = var14.packetBuffer.offset; // L: 3214
+					timer.write(var14.packetBuffer); // L: 3215
+					var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); // L: 3216
+					packetWriter.addNode(var14); // L: 3217
+					timer.method5677(); // L: 3218
 				}
 
 				int var3;
@@ -3260,2747 +3443,2745 @@ public final class Client extends GameEngine implements Usernamed {
 				int var9;
 				int var10;
 				int var11;
-				int var12;
 				PacketBuffer var10000;
-				synchronized(Skills.mouseRecorder.lock) { // L: 2747
-					if (!field889) { // L: 2748
-						Skills.mouseRecorder.index = 0; // L: 2834
-					} else if (MouseHandler.MouseHandler_lastButton != 0 || Skills.mouseRecorder.index >= 40) { // L: 2749
-						PacketBufferNode var15 = null; // L: 2751
-						var3 = 0; // L: 2752
-						var4 = 0; // L: 2753
-						var5 = 0; // L: 2754
-						var6 = 0; // L: 2755
+				synchronized(UrlRequester.mouseRecorder.lock) { // L: 3221
+					if (!field730) { // L: 3222
+						UrlRequester.mouseRecorder.index = 0; // L: 3308
+					} else if (MouseHandler.MouseHandler_lastButton != 0 || UrlRequester.mouseRecorder.index >= 40) { // L: 3223
+						PacketBufferNode var15 = null; // L: 3225
+						var3 = 0; // L: 3226
+						var4 = 0; // L: 3227
+						var5 = 0; // L: 3228
+						var6 = 0; // L: 3229
 
-						for (var7 = 0; var7 < Skills.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 2756 2757
-							var4 = var7; // L: 2758
-							var8 = Skills.mouseRecorder.ys[var7]; // L: 2759
-							if (var8 < -1) { // L: 2760
+						for (var7 = 0; var7 < UrlRequester.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { // L: 3230 3231
+							var4 = var7; // L: 3232
+							var8 = UrlRequester.mouseRecorder.ys[var7]; // L: 3233
+							if (var8 < -1) { // L: 3234
 								var8 = -1;
-							} else if (var8 > 65534) { // L: 2761
+							} else if (var8 > 65534) { // L: 3235
 								var8 = 65534;
 							}
 
-							var9 = Skills.mouseRecorder.xs[var7]; // L: 2762
-							if (var9 < -1) { // L: 2763
+							var9 = UrlRequester.mouseRecorder.xs[var7]; // L: 3236
+							if (var9 < -1) { // L: 3237
 								var9 = -1;
-							} else if (var9 > 65534) { // L: 2764
+							} else if (var9 > 65534) { // L: 3238
 								var9 = 65534;
 							}
 
-							if (var9 != field651 || var8 != field812) { // L: 2765
-								if (var15 == null) { // L: 2768
-									var15 = class21.getPacketBufferNode(ClientPacket.field2628, packetWriter.isaacCipher); // L: 2769
-									var15.packetBuffer.writeByte(0); // L: 2770
-									var3 = var15.packetBuffer.offset; // L: 2771
-									var10000 = var15.packetBuffer; // L: 2772
+							if (var9 != field843 || var8 != field633) { // L: 3239
+								if (var15 == null) { // L: 3242
+									var15 = InterfaceParent.getPacketBufferNode(ClientPacket.field2655, packetWriter.isaacCipher); // L: 3243
+									var15.packetBuffer.writeByte(0); // L: 3244
+									var3 = var15.packetBuffer.offset; // L: 3245
+									var10000 = var15.packetBuffer; // L: 3246
 									var10000.offset += 2;
-									var5 = 0; // L: 2773
-									var6 = 0; // L: 2774
+									var5 = 0; // L: 3247
+									var6 = 0; // L: 3248
 								}
 
-								if (-1L != field653) { // L: 2779
-									var10 = var9 - field651; // L: 2780
-									var11 = var8 - field812; // L: 2781
-									var12 = (int)((Skills.mouseRecorder.millis[var7] - field653) / 20L); // L: 2782
-									var5 = (int)((long)var5 + (Skills.mouseRecorder.millis[var7] - field653) % 20L); // L: 2783
+								int var12;
+								if (-1L != field760) { // L: 3253
+									var10 = var9 - field843; // L: 3254
+									var11 = var8 - field633; // L: 3255
+									var12 = (int)((UrlRequester.mouseRecorder.millis[var7] - field760) / 20L); // L: 3256
+									var5 = (int)((long)var5 + (UrlRequester.mouseRecorder.millis[var7] - field760) % 20L); // L: 3257
 								} else {
-									var10 = var9; // L: 2786
-									var11 = var8; // L: 2787
-									var12 = Integer.MAX_VALUE; // L: 2788
+									var10 = var9; // L: 3260
+									var11 = var8; // L: 3261
+									var12 = Integer.MAX_VALUE; // L: 3262
 								}
 
-								field651 = var9; // L: 2790
-								field812 = var8; // L: 2791
-								if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2792
-									var10 += 32; // L: 2793
-									var11 += 32; // L: 2794
-									var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2795
-								} else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2797
-									var10 += 128; // L: 2798
-									var11 += 128; // L: 2799
-									var15.packetBuffer.writeByte(var12 + 128); // L: 2800
-									var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2801
-								} else if (var12 < 32) { // L: 2803
-									var15.packetBuffer.writeByte(var12 + 192); // L: 2804
-									if (var9 != -1 && var8 != -1) { // L: 2805
-										var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2806
+								field843 = var9; // L: 3264
+								field633 = var8; // L: 3265
+								if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 3266
+									var10 += 32; // L: 3267
+									var11 += 32; // L: 3268
+									var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 3269
+								} else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 3271
+									var10 += 128; // L: 3272
+									var11 += 128; // L: 3273
+									var15.packetBuffer.writeByte(var12 + 128); // L: 3274
+									var15.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 3275
+								} else if (var12 < 32) { // L: 3277
+									var15.packetBuffer.writeByte(var12 + 192); // L: 3278
+									if (var9 != -1 && var8 != -1) { // L: 3279
+										var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3280
 									} else {
 										var15.packetBuffer.writeInt(Integer.MIN_VALUE);
 									}
 								} else {
-									var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2809
-									if (var9 != -1 && var8 != -1) { // L: 2810
-										var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 2811
+									var15.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 3283
+									if (var9 != -1 && var8 != -1) { // L: 3284
+										var15.packetBuffer.writeInt(var9 | var8 << 16); // L: 3285
 									} else {
 										var15.packetBuffer.writeInt(Integer.MIN_VALUE);
 									}
 								}
 
-								++var6; // L: 2813
-								field653 = Skills.mouseRecorder.millis[var7]; // L: 2814
+								++var6; // L: 3287
+								field760 = UrlRequester.mouseRecorder.millis[var7]; // L: 3288
 							}
 						}
 
-						if (var15 != null) { // L: 2816
-							var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); // L: 2817
-							var7 = var15.packetBuffer.offset; // L: 2818
-							var15.packetBuffer.offset = var3; // L: 2819
-							var15.packetBuffer.writeByte(var5 / var6); // L: 2820
-							var15.packetBuffer.writeByte(var5 % var6); // L: 2821
-							var15.packetBuffer.offset = var7; // L: 2822
-							packetWriter.addNode(var15); // L: 2823
+						if (var15 != null) { // L: 3290
+							var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); // L: 3291
+							var7 = var15.packetBuffer.offset; // L: 3292
+							var15.packetBuffer.offset = var3; // L: 3293
+							var15.packetBuffer.writeByte(var5 / var6); // L: 3294
+							var15.packetBuffer.writeByte(var5 % var6); // L: 3295
+							var15.packetBuffer.offset = var7; // L: 3296
+							packetWriter.addNode(var15); // L: 3297
 						}
 
-						if (var4 >= Skills.mouseRecorder.index) { // L: 2825
-							Skills.mouseRecorder.index = 0;
+						if (var4 >= UrlRequester.mouseRecorder.index) { // L: 3299
+							UrlRequester.mouseRecorder.index = 0;
 						} else {
-							MouseRecorder var48 = Skills.mouseRecorder; // L: 2827
-							var48.index -= var4;
-							System.arraycopy(Skills.mouseRecorder.xs, var4, Skills.mouseRecorder.xs, 0, Skills.mouseRecorder.index); // L: 2828
-							System.arraycopy(Skills.mouseRecorder.ys, var4, Skills.mouseRecorder.ys, 0, Skills.mouseRecorder.index); // L: 2829
-							System.arraycopy(Skills.mouseRecorder.millis, var4, Skills.mouseRecorder.millis, 0, Skills.mouseRecorder.index); // L: 2830
+							MouseRecorder var46 = UrlRequester.mouseRecorder; // L: 3301
+							var46.index -= var4;
+							System.arraycopy(UrlRequester.mouseRecorder.xs, var4, UrlRequester.mouseRecorder.xs, 0, UrlRequester.mouseRecorder.index); // L: 3302
+							System.arraycopy(UrlRequester.mouseRecorder.ys, var4, UrlRequester.mouseRecorder.ys, 0, UrlRequester.mouseRecorder.index); // L: 3303
+							System.arraycopy(UrlRequester.mouseRecorder.millis, var4, UrlRequester.mouseRecorder.millis, 0, UrlRequester.mouseRecorder.index); // L: 3304
 						}
 					}
 				}
 
 				PacketBufferNode var18;
-				if (MouseHandler.MouseHandler_lastButton == 1 || !mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2836
-					long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2837
-					if (var16 > 32767L) { // L: 2838
+				if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 3310
+					long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 3311
+					if (var16 > 32767L) { // L: 3312
 						var16 = 32767L;
 					}
 
-					mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2839
-					var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2840
-					if (var3 < 0) { // L: 2841
+					mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 3313
+					var3 = MouseHandler.MouseHandler_lastPressedY; // L: 3314
+					if (var3 < 0) { // L: 3315
 						var3 = 0;
-					} else if (var3 > ReflectionCheck.canvasHeight) { // L: 2842
-						var3 = ReflectionCheck.canvasHeight;
+					} else if (var3 > class0.canvasHeight) { // L: 3316
+						var3 = class0.canvasHeight;
 					}
 
-					var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2843
-					if (var4 < 0) { // L: 2844
+					var4 = MouseHandler.MouseHandler_lastPressedX; // L: 3317
+					if (var4 < 0) { // L: 3318
 						var4 = 0;
-					} else if (var4 > class32.canvasWidth) { // L: 2845
-						var4 = class32.canvasWidth;
+					} else if (var4 > AttackOption.canvasWidth) { // L: 3319
+						var4 = AttackOption.canvasWidth;
 					}
 
-					var5 = (int)var16; // L: 2846
-					var18 = class21.getPacketBufferNode(ClientPacket.field2663, packetWriter.isaacCipher); // L: 2847
-					var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2848
-					var18.packetBuffer.writeShort(var4); // L: 2849
-					var18.packetBuffer.writeShort(var3); // L: 2850
-					packetWriter.addNode(var18); // L: 2851
+					var5 = (int)var16; // L: 3320
+					var18 = InterfaceParent.getPacketBufferNode(ClientPacket.field2586, packetWriter.isaacCipher); // L: 3321
+					var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); // L: 3322
+					var18.packetBuffer.writeShort(var4); // L: 3323
+					var18.packetBuffer.writeShort(var3); // L: 3324
+					packetWriter.addNode(var18); // L: 3325
 				}
 
-				if (KeyHandler.field292 > 0) { // L: 2853
-					var14 = class21.getPacketBufferNode(ClientPacket.field2573, packetWriter.isaacCipher); // L: 2854
-					var14.packetBuffer.writeShort(0); // L: 2855
-					var2 = var14.packetBuffer.offset; // L: 2856
-					long var19 = ObjectComposition.currentTimeMillis(); // L: 2857
+				if (KeyHandler.field271 > 0) { // L: 3327
+					var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2594, packetWriter.isaacCipher); // L: 3328
+					var14.packetBuffer.writeShort(0); // L: 3329
+					var2 = var14.packetBuffer.offset; // L: 3330
+					long var19 = ClientPacket.currentTimeMillis(); // L: 3331
 
-					for (var5 = 0; var5 < KeyHandler.field292; ++var5) { // L: 2858
-						long var21 = var19 - field809; // L: 2859
-						if (var21 > 16777215L) { // L: 2860
+					for (var5 = 0; var5 < KeyHandler.field271; ++var5) { // L: 3332
+						long var21 = var19 - field850; // L: 3333
+						if (var21 > 16777215L) { // L: 3334
 							var21 = 16777215L;
 						}
 
-						field809 = var19; // L: 2861
-						var14.packetBuffer.method6594(KeyHandler.field274[var5]); // L: 2862
-						var14.packetBuffer.method6758((int)var21); // L: 2863
+						field850 = var19; // L: 3335
+						var14.packetBuffer.method6660((int)var21); // L: 3336
+						var14.packetBuffer.method6639(KeyHandler.field257[var5]); // L: 3337
 					}
 
-					var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 2865
-					packetWriter.addNode(var14); // L: 2866
+					var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); // L: 3339
+					packetWriter.addNode(var14); // L: 3340
 				}
 
-				if (field725 > 0) { // L: 2868
-					--field725;
+				if (field706 > 0) { // L: 3342
+					--field706;
 				}
 
-				if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2869
-					field726 = true;
+				if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3343
+					field707 = true;
 				}
 
-				if (field726 && field725 <= 0) { // L: 2870
-					field725 = 20; // L: 2871
-					field726 = false; // L: 2872
-					var14 = class21.getPacketBufferNode(ClientPacket.field2630, packetWriter.isaacCipher); // L: 2874
-					var14.packetBuffer.method6619(camAngleX); // L: 2875
-					var14.packetBuffer.writeShort(camAngleY); // L: 2876
-					packetWriter.addNode(var14); // L: 2877
+				if (field707 && field706 <= 0) { // L: 3344
+					field706 = 20; // L: 3345
+					field707 = false; // L: 3346
+					var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2609, packetWriter.isaacCipher); // L: 3348
+					var14.packetBuffer.writeShort(camAngleY); // L: 3349
+					var14.packetBuffer.method6705(camAngleX); // L: 3350
+					packetWriter.addNode(var14); // L: 3351
 				}
 
-				if (WorldMapSection1.hasFocus && !hadFocus) { // L: 2879
-					hadFocus = true; // L: 2880
-					var14 = class21.getPacketBufferNode(ClientPacket.field2580, packetWriter.isaacCipher); // L: 2882
-					var14.packetBuffer.writeByte(1); // L: 2883
-					packetWriter.addNode(var14); // L: 2884
+				if (class397.hasFocus && !hadFocus) { // L: 3353
+					hadFocus = true; // L: 3354
+					var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2581, packetWriter.isaacCipher); // L: 3356
+					var14.packetBuffer.writeByte(1); // L: 3357
+					packetWriter.addNode(var14); // L: 3358
 				}
 
-				if (!WorldMapSection1.hasFocus && hadFocus) { // L: 2886
-					hadFocus = false; // L: 2887
-					var14 = class21.getPacketBufferNode(ClientPacket.field2580, packetWriter.isaacCipher); // L: 2889
-					var14.packetBuffer.writeByte(0); // L: 2890
-					packetWriter.addNode(var14); // L: 2891
+				if (!class397.hasFocus && hadFocus) { // L: 3360
+					hadFocus = false; // L: 3361
+					var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2581, packetWriter.isaacCipher); // L: 3363
+					var14.packetBuffer.writeByte(0); // L: 3364
+					packetWriter.addNode(var14); // L: 3365
 				}
 
-				if (class243.worldMap != null) { // L: 2894
-					class243.worldMap.method6100();
+				if (class80.worldMap != null) { // L: 3368
+					class80.worldMap.method6239();
 				}
 
-				if (MusicPatch.ClanChat_inClanChat) { // L: 2896
-					if (WorldMapRegion.friendsChat != null) { // L: 2897
-						WorldMapRegion.friendsChat.sort(); // L: 2898
+				BuddyRankComparator.method2579(); // L: 3369
+				if (class170.field2016) { // L: 3371
+					CollisionMap.method3244(); // L: 3372
+					class170.field2016 = false; // L: 3373
+				}
+
+				if (field853 != SoundSystem.Client_plane) { // L: 3377
+					field853 = SoundSystem.Client_plane; // L: 3378
+					var1 = SoundSystem.Client_plane; // L: 3379
+					int[] var36 = class69.sceneMinimapSprite.pixels; // L: 3381
+					var3 = var36.length; // L: 3382
+
+					for (var4 = 0; var4 < var3; ++var4) { // L: 3383
+						var36[var4] = 0;
 					}
 
-					ClanChannelMember.method85(); // L: 2900
-					MusicPatch.ClanChat_inClanChat = false; // L: 2901
-				}
+					for (var4 = 1; var4 < 103; ++var4) { // L: 3384
+						var5 = (103 - var4) * 2048 + 24628; // L: 3385
 
-				VarbitComposition.method2846(); // L: 2904
-				if (class22.Client_plane != field872) { // L: 2906
-					field872 = class22.Client_plane; // L: 2907
-					GraphicsObject.createMinimapSprite(class22.Client_plane); // L: 2908
-				}
+						for (var6 = 1; var6 < 103; ++var6) { // L: 3386
+							if ((Tiles.Tiles_renderFlags[var1][var6][var4] & 24) == 0) { // L: 3387
+								DevicePcmPlayerProvider.scene.drawTileMinimap(var36, var5, 512, var1, var6, var4);
+							}
 
-				if (gameState == 30) { // L: 2911
-					for (PendingSpawn var32 = (PendingSpawn)pendingSpawns.last(); var32 != null; var32 = (PendingSpawn)pendingSpawns.previous()) { // L: 2913 2914 2957
-						if (var32.hitpoints > 0) { // L: 2915
-							--var32.hitpoints;
+							if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var6][var4] & 8) != 0) { // L: 3388
+								DevicePcmPlayerProvider.scene.drawTileMinimap(var36, var5, 512, var1 + 1, var6, var4);
+							}
+
+							var5 += 4; // L: 3389
 						}
+					}
 
-						ObjectComposition var23;
-						boolean var30;
-						if (var32.hitpoints == 0) { // L: 2916
-							if (var32.objectId >= 0) { // L: 2918
-								var3 = var32.objectId; // L: 2920
-								var4 = var32.field1229; // L: 2921
-								var23 = class23.getObjectDefinition(var3); // L: 2923
-								if (var4 == 11) { // L: 2924
-									var4 = 10;
-								}
+					var4 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3392
+					var5 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3393
+					class69.sceneMinimapSprite.setRaster(); // L: 3394
 
-								if (var4 >= 5 && var4 <= 8) { // L: 2925
-									var4 = 4;
-								}
-
-								var30 = var23.method2956(var4); // L: 2926
-								if (!var30) { // L: 2928
-									continue;
-								}
+					for (var6 = 1; var6 < 103; ++var6) { // L: 3395
+						for (var7 = 1; var7 < 103; ++var7) { // L: 3396
+							if ((Tiles.Tiles_renderFlags[var1][var7][var6] & 24) == 0) { // L: 3397
+								WorldMapIcon_0.drawObject(var1, var7, var6, var4, var5);
 							}
 
-							class247.addPendingSpawnToScene(var32.plane, var32.type, var32.x, var32.y, var32.objectId, var32.field1225, var32.field1229); // L: 2930
-							var32.remove(); // L: 2931
-						} else {
-							if (var32.delay > 0) { // L: 2935
-								--var32.delay;
+							if (var1 < 3 && (Tiles.Tiles_renderFlags[var1 + 1][var7][var6] & 8) != 0) { // L: 3398
+								WorldMapIcon_0.drawObject(var1 + 1, var7, var6, var4, var5);
 							}
+						}
+					}
 
-							if (var32.delay == 0 && var32.x >= 1 && var32.y >= 1 && var32.x <= 102 && var32.y <= 102) { // L: 2936
-								if (var32.id >= 0) { // L: 2938
-									var3 = var32.id; // L: 2940
-									var4 = var32.field1232; // L: 2941
-									var23 = class23.getObjectDefinition(var3); // L: 2943
-									if (var4 == 11) { // L: 2944
-										var4 = 10;
-									}
+					mapIconCount = 0; // L: 3401
 
-									if (var4 >= 5 && var4 <= 8) { // L: 2945
-										var4 = 4;
-									}
-
-									var30 = var23.method2956(var4); // L: 2946
-									if (!var30) { // L: 2948
-										continue;
-									}
-								}
-
-								class247.addPendingSpawnToScene(var32.plane, var32.type, var32.x, var32.y, var32.id, var32.orientation, var32.field1232); // L: 2950
-								var32.delay = -1; // L: 2951
-								if (var32.objectId == var32.id && var32.objectId == -1) { // L: 2952
-									var32.remove();
-								} else if (var32.id == var32.objectId && var32.orientation == var32.field1225 && var32.field1229 == var32.field1232) { // L: 2953
-									var32.remove();
+					for (var6 = 0; var6 < 104; ++var6) { // L: 3402
+						for (var7 = 0; var7 < 104; ++var7) { // L: 3403
+							long var23 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(SoundSystem.Client_plane, var6, var7); // L: 3404
+							if (0L != var23) { // L: 3405
+								var10 = Message.Entity_unpackID(var23); // L: 3406
+								var11 = Tiles.getObjectDefinition(var10).mapIconId; // L: 3407
+								if (var11 >= 0 && Archive.WorldMapElement_get(var11).field1567) { // L: 3408 3409
+									mapIcons[mapIconCount] = Archive.WorldMapElement_get(var11).getSpriteBool(false); // L: 3412
+									mapIconXs[mapIconCount] = var6; // L: 3413
+									mapIconYs[mapIconCount] = var7; // L: 3414
+									++mapIconCount; // L: 3415
 								}
 							}
 						}
 					}
 
+					AbstractWorldMapData.rasterProvider.apply(); // L: 3420
+				}
+
+				if (gameState == 30) { // L: 3424
+					class17.method261(); // L: 3425
+
 					int var10002;
-					for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2961
-						var10002 = queuedSoundEffectDelays[var1]--; // L: 2962
-						if (queuedSoundEffectDelays[var1] >= -10) { // L: 2963
-							SoundEffect var34 = soundEffects[var1]; // L: 2975
-							if (var34 == null) { // L: 2976
-								var10000 = null; // L: 2977
-								var34 = SoundEffect.readSoundEffect(class32.archive4, soundEffectIds[var1], 0);
-								if (var34 == null) { // L: 2978
+					for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 3427
+						var10002 = queuedSoundEffectDelays[var1]--; // L: 3428
+						if (queuedSoundEffectDelays[var1] >= -10) { // L: 3429
+							SoundEffect var37 = soundEffects[var1]; // L: 3441
+							if (var37 == null) { // L: 3442
+								var10000 = null; // L: 3443
+								var37 = SoundEffect.readSoundEffect(class26.archive4, soundEffectIds[var1], 0);
+								if (var37 == null) { // L: 3444
 									continue;
 								}
 
-								int[] var49 = queuedSoundEffectDelays; // L: 2979
-								var49[var1] += var34.calculateDelay();
-								soundEffects[var1] = var34; // L: 2980
+								int[] var47 = queuedSoundEffectDelays; // L: 3445
+								var47[var1] += var37.calculateDelay();
+								soundEffects[var1] = var37; // L: 3446
 							}
 
-							if (queuedSoundEffectDelays[var1] < 0) { // L: 2986
-								if (soundLocations[var1] != 0) { // L: 2988
-									var4 = (soundLocations[var1] & 255) * 128; // L: 2989
-									var5 = soundLocations[var1] >> 16 & 255; // L: 2990
-									var6 = var5 * 128 + 64 - class93.localPlayer.x; // L: 2991
-									if (var6 < 0) { // L: 2992
+							if (queuedSoundEffectDelays[var1] < 0) { // L: 3452
+								if (soundLocations[var1] != 0) { // L: 3454
+									var4 = (soundLocations[var1] & 255) * 128; // L: 3455
+									var5 = soundLocations[var1] >> 16 & 255; // L: 3456
+									var6 = var5 * 128 + 64 - class262.localPlayer.x; // L: 3457
+									if (var6 < 0) { // L: 3458
 										var6 = -var6;
 									}
 
-									var7 = soundLocations[var1] >> 8 & 255; // L: 2993
-									var8 = var7 * 128 + 64 - class93.localPlayer.y; // L: 2994
-									if (var8 < 0) { // L: 2995
+									var7 = soundLocations[var1] >> 8 & 255; // L: 3459
+									var8 = var7 * 128 + 64 - class262.localPlayer.y; // L: 3460
+									if (var8 < 0) { // L: 3461
 										var8 = -var8;
 									}
 
-									var9 = var6 + var8 - 128; // L: 2996
-									if (var9 > var4) { // L: 2997
-										queuedSoundEffectDelays[var1] = -100; // L: 2998
-										continue; // L: 2999
+									var9 = var8 + var6 - 128; // L: 3462
+									if (var9 > var4) { // L: 3463
+										queuedSoundEffectDelays[var1] = -100; // L: 3464
+										continue; // L: 3465
 									}
 
-									if (var9 < 0) { // L: 3001
+									if (var9 < 0) { // L: 3467
 										var9 = 0;
 									}
 
-									var3 = (var4 - var9) * ObjectComposition.clientPreferences.areaSoundEffectsVolume / var4; // L: 3002
+									var3 = (var4 - var9) * class4.clientPreferences.areaSoundEffectsVolume / var4; // L: 3468
 								} else {
-									var3 = ObjectComposition.clientPreferences.soundEffectsVolume; // L: 3004
+									var3 = class4.clientPreferences.soundEffectsVolume; // L: 3470
 								}
 
-								if (var3 > 0) { // L: 3005
-									RawSound var24 = var34.toRawSound().resample(TileItem.decimator); // L: 3006
-									RawPcmStream var38 = RawPcmStream.createRawPcmStream(var24, 100, var3); // L: 3007
-									var38.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3008
-									class308.pcmStreamMixer.addSubStream(var38); // L: 3009
+								if (var3 > 0) { // L: 3471
+									RawSound var25 = var37.toRawSound().resample(WorldMapAreaData.decimator); // L: 3472
+									RawPcmStream var26 = RawPcmStream.createRawPcmStream(var25, 100, var3); // L: 3473
+									var26.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 3474
+									UserComparator7.pcmStreamMixer.addSubStream(var26); // L: 3475
 								}
 
-								queuedSoundEffectDelays[var1] = -100; // L: 3011
+								queuedSoundEffectDelays[var1] = -100; // L: 3477
 							}
 						} else {
-							--soundEffectCount; // L: 2964
+							--soundEffectCount; // L: 3430
 
-							for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 2965
-								soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 2966
-								soundEffects[var2] = soundEffects[var2 + 1]; // L: 2967
-								queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 2968
-								queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 2969
-								soundLocations[var2] = soundLocations[var2 + 1]; // L: 2970
+							for (var2 = var1; var2 < soundEffectCount; ++var2) { // L: 3431
+								soundEffectIds[var2] = soundEffectIds[var2 + 1]; // L: 3432
+								soundEffects[var2] = soundEffects[var2 + 1]; // L: 3433
+								queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; // L: 3434
+								queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; // L: 3435
+								soundLocations[var2] = soundLocations[var2 + 1]; // L: 3436
 							}
 
-							--var1; // L: 2972
+							--var1; // L: 3438
 						}
 					}
 
-					if (field881) { // L: 3014
-						boolean var29;
-						if (class232.musicPlayerStatus != 0) { // L: 3017
-							var29 = true; // L: 3018
-						} else {
-							var29 = class124.midiPcmStream.isReady(); // L: 3021
+					if (field862 && !ApproximateRouteStrategy.method1269()) { // L: 3480
+						if (class4.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3481
+							class105.method2357(DynamicObject.archive6, currentTrackGroupId, 0, class4.clientPreferences.musicVolume, false);
 						}
 
-						if (!var29) { // L: 3023
-							if (ObjectComposition.clientPreferences.musicVolume != 0 && currentTrackGroupId != -1) { // L: 3024
-								LoginScreenAnimation.method2219(UrlRequest.archive6, currentTrackGroupId, 0, ObjectComposition.clientPreferences.musicVolume, false);
-							}
-
-							field881 = false; // L: 3025
-						}
+						field862 = false; // L: 3482
 					}
 
-					++packetWriter.field1409; // L: 3029
-					if (packetWriter.field1409 > 750) { // L: 3030
-						NetFileRequest.method4912(); // L: 3031
+					++packetWriter.field1408; // L: 3485
+					if (packetWriter.field1408 > 750) { // L: 3486
+						ApproximateRouteStrategy.method1268(); // L: 3487
 					} else {
-						var1 = Players.Players_count; // L: 3035
-						int[] var35 = Players.Players_indices; // L: 3036
+						WorldMapLabelSize.method3274(); // L: 3490
 
-						for (var3 = 0; var3 < var1; ++var3) { // L: 3037
-							Player var40 = players[var35[var3]]; // L: 3038
-							if (var40 != null) { // L: 3039
-								class7.updateActorSequence(var40, 1); // L: 3040
+						for (var1 = 0; var1 < npcCount; ++var1) { // L: 3492
+							var2 = npcIndices[var1]; // L: 3493
+							NPC var27 = npcs[var2]; // L: 3494
+							if (var27 != null) { // L: 3495
+								World.updateActorSequence(var27, var27.definition.size); // L: 3496
 							}
 						}
 
-						for (var1 = 0; var1 < npcCount; ++var1) { // L: 3045
-							var2 = npcIndices[var1]; // L: 3046
-							NPC var25 = npcs[var2]; // L: 3047
-							if (var25 != null) { // L: 3048
-								class7.updateActorSequence(var25, var25.definition.size); // L: 3049
-							}
-						}
-
-						ClanSettings.method165(); // L: 3053
-						++field913; // L: 3054
-						if (mouseCrossColor != 0) { // L: 3055
-							mouseCrossState += 20; // L: 3056
-							if (mouseCrossState >= 400) { // L: 3057
+						WorldMapManager.method3557(); // L: 3500
+						++field683; // L: 3501
+						if (mouseCrossColor != 0) { // L: 3502
+							mouseCrossState += 20; // L: 3503
+							if (mouseCrossState >= 400) { // L: 3504
 								mouseCrossColor = 0;
 							}
 						}
 
-						if (GrandExchangeEvents.field3626 != null) { // L: 3059
-							++field747; // L: 3060
-							if (field747 >= 15) { // L: 3061
-								WorldMapCacheName.invalidateWidget(GrandExchangeEvents.field3626); // L: 3062
-								GrandExchangeEvents.field3626 = null; // L: 3063
+						if (Login.field1034 != null) { // L: 3506
+							++field869; // L: 3507
+							if (field869 >= 15) { // L: 3508
+								Script.invalidateWidget(Login.field1034); // L: 3509
+								Login.field1034 = null; // L: 3510
 							}
 						}
 
-						Widget var33 = World.mousedOverWidgetIf1; // L: 3066
-						Widget var36 = ReflectionCheck.field609; // L: 3067
-						World.mousedOverWidgetIf1 = null; // L: 3068
-						ReflectionCheck.field609 = null; // L: 3069
-						draggedOnWidget = null; // L: 3070
-						field822 = false; // L: 3071
-						field819 = false; // L: 3072
-						field806 = 0; // L: 3073
+						Widget var35 = MusicPatchNode.mousedOverWidgetIf1; // L: 3513
+						Widget var38 = class5.field42; // L: 3514
+						MusicPatchNode.mousedOverWidgetIf1 = null; // L: 3515
+						class5.field42 = null; // L: 3516
+						draggedOnWidget = null; // L: 3517
+						field731 = false; // L: 3518
+						field821 = false; // L: 3519
+						field847 = 0; // L: 3520
 
-						while (ClanChannelMember.isKeyDown() && field806 < 128) { // L: 3074
-							if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ItemComposition.field1859 == 66) { // L: 3075
-								String var42 = ""; // L: 3078
+						while (SecureRandomCallable.isKeyDown() && field847 < 128) { // L: 3521
+							if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && SoundCache.field446 == 66) { // L: 3522
+								String var41 = ""; // L: 3525
 
-								Message var37;
-								for (Iterator var39 = Messages.Messages_hashTable.iterator(); var39.hasNext(); var42 = var42 + var37.sender + ':' + var37.text + '\n') { // L: 3079 3082
-									var37 = (Message)var39.next(); // L: 3080
+								Message var39;
+								for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var41 = var41 + var39.sender + ':' + var39.text + '\n') { // L: 3526 3529
+									var39 = (Message)var43.next(); // L: 3527
 								}
 
-								class23.client.clipboardSetString(var42); // L: 3088
-							} else if (oculusOrbState != 1 || class249.field3116 <= 0) { // L: 3091
-								field868[field806] = ItemComposition.field1859; // L: 3094
-								field867[field806] = class249.field3116; // L: 3095
-								++field806; // L: 3096
+								class1.client.clipboardSetString(var41); // L: 3535
+							} else if (oculusOrbState != 1 || Timer.field3780 <= 0) { // L: 3538
+								field786[field847] = SoundCache.field446; // L: 3541
+								field848[field847] = Timer.field3780; // L: 3542
+								++field847; // L: 3543
 							}
 						}
 
-						if (FontName.method6297() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3098
-							var3 = class93.localPlayer.plane - mouseWheelRotation; // L: 3099
-							if (var3 < 0) { // L: 3100
-								var3 = 0;
-							} else if (var3 > 3) { // L: 3101
-								var3 = 3;
+						boolean var32 = staffModLevel >= 2; // L: 3547
+						PacketBufferNode var28;
+						if (var32 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 3549
+							var4 = class262.localPlayer.plane - mouseWheelRotation; // L: 3550
+							if (var4 < 0) { // L: 3551
+								var4 = 0;
+							} else if (var4 > 3) { // L: 3552
+								var4 = 3;
 							}
 
-							if (var3 != class93.localPlayer.plane) { // L: 3102
-								class4.method50(class93.localPlayer.pathX[0] + VertexNormal.baseX, class93.localPlayer.pathY[0] + SoundSystem.baseY, var3, false); // L: 3103
+							if (var4 != class262.localPlayer.plane) { // L: 3553
+								var5 = class262.localPlayer.pathX[0] + class15.baseX; // L: 3554
+								var6 = class262.localPlayer.pathY[0] + WorldMapSprite.baseY; // L: 3555
+								var28 = InterfaceParent.getPacketBufferNode(ClientPacket.field2596, packetWriter.isaacCipher); // L: 3558
+								var28.packetBuffer.writeShort(var5); // L: 3559
+								var28.packetBuffer.method6659(0); // L: 3560
+								var28.packetBuffer.method6640(var4); // L: 3561
+								var28.packetBuffer.method6648(var6); // L: 3562
+								packetWriter.addNode(var28); // L: 3563
 							}
 
-							mouseWheelRotation = 0; // L: 3105
+							mouseWheelRotation = 0; // L: 3566
 						}
 
-						if (rootInterface != -1) { // L: 3107
-							class32.updateRootInterface(rootInterface, 0, 0, class32.canvasWidth, ReflectionCheck.canvasHeight, 0, 0);
+						if (rootInterface != -1) { // L: 3568
+							PacketWriter.updateRootInterface(rootInterface, 0, 0, AttackOption.canvasWidth, class0.canvasHeight, 0, 0);
 						}
 
-						++cycleCntr; // L: 3108
+						++cycleCntr; // L: 3569
 
 						while (true) {
-							Widget var41;
-							ScriptEvent var43;
+							Widget var40;
+							ScriptEvent var42;
 							Widget var44;
 							do {
-								var43 = (ScriptEvent)field652.removeLast(); // L: 3110
-								if (var43 == null) { // L: 3111
+								var42 = (ScriptEvent)field812.removeLast(); // L: 3571
+								if (var42 == null) { // L: 3572
 									while (true) {
 										do {
-											var43 = (ScriptEvent)field846.removeLast(); // L: 3122
-											if (var43 == null) { // L: 3123
+											var42 = (ScriptEvent)field860.removeLast(); // L: 3583
+											if (var42 == null) { // L: 3584
 												while (true) {
 													do {
-														var43 = (ScriptEvent)scriptEvents.removeLast(); // L: 3134
-														if (var43 == null) { // L: 3135
-															this.menu(); // L: 3145
-															if (class243.worldMap != null) { // L: 3147
-																class243.worldMap.method6110(class22.Client_plane, (class93.localPlayer.x >> 7) + VertexNormal.baseX, (class93.localPlayer.y >> 7) + SoundSystem.baseY, false); // L: 3148
-																class243.worldMap.loadCache(); // L: 3149
+														var42 = (ScriptEvent)scriptEvents.removeLast(); // L: 3595
+														if (var42 == null) { // L: 3596
+															this.menu(); // L: 3606
+															class19.method282(); // L: 3607
+															if (clickedWidget != null) { // L: 3608
+																this.method1298();
 															}
 
-															if (clickedWidget != null) { // L: 3152
-																this.method1198();
-															}
-
-															PacketBufferNode var46;
-															if (Script.dragInventoryWidget != null) { // L: 3153
-																WorldMapCacheName.invalidateWidget(Script.dragInventoryWidget); // L: 3154
-																++itemDragDuration; // L: 3155
-																if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3156
-																	if (field848) { // L: 3157
-																		if (Script.dragInventoryWidget == class18.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3158
-																			Widget var47 = Script.dragInventoryWidget; // L: 3159
-																			byte var31 = 0; // L: 3160
-																			if (field912 == 1 && var47.contentType == 206) { // L: 3161
-																				var31 = 1;
+															if (VerticalAlignment.dragInventoryWidget != null) { // L: 3609
+																Script.invalidateWidget(VerticalAlignment.dragInventoryWidget); // L: 3610
+																++itemDragDuration; // L: 3611
+																if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3612
+																	if (field734) { // L: 3613
+																		if (VerticalAlignment.dragInventoryWidget == UserComparator2.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3614
+																			Widget var45 = VerticalAlignment.dragInventoryWidget; // L: 3615
+																			byte var33 = 0; // L: 3616
+																			if (field891 == 1 && var45.contentType == 206) { // L: 3617
+																				var33 = 1;
 																			}
 
-																			if (var47.itemIds[dragItemSlotDestination] <= 0) { // L: 3162
-																				var31 = 0;
+																			if (var45.itemIds[dragItemSlotDestination] <= 0) { // L: 3618
+																				var33 = 0;
 																			}
 
-																			if (Canvas.method394(class21.getWidgetFlags(var47))) { // L: 3163
-																				var5 = dragItemSlotSource; // L: 3164
-																				var6 = dragItemSlotDestination; // L: 3165
-																				var47.itemIds[var6] = var47.itemIds[var5]; // L: 3166
-																				var47.itemQuantities[var6] = var47.itemQuantities[var5]; // L: 3167
-																				var47.itemIds[var5] = -1; // L: 3168
-																				var47.itemQuantities[var5] = 0; // L: 3169
-																			} else if (var31 == 1) { // L: 3171
-																				var5 = dragItemSlotSource; // L: 3172
-																				var6 = dragItemSlotDestination; // L: 3173
+																			var7 = class22.getWidgetFlags(var45); // L: 3620
+																			boolean var34 = (var7 >> 29 & 1) != 0; // L: 3622
+																			if (var34) { // L: 3624
+																				var8 = dragItemSlotSource; // L: 3625
+																				var9 = dragItemSlotDestination; // L: 3626
+																				var45.itemIds[var9] = var45.itemIds[var8]; // L: 3627
+																				var45.itemQuantities[var9] = var45.itemQuantities[var8]; // L: 3628
+																				var45.itemIds[var8] = -1; // L: 3629
+																				var45.itemQuantities[var8] = 0; // L: 3630
+																			} else if (var33 == 1) { // L: 3632
+																				var8 = dragItemSlotSource; // L: 3633
+																				var9 = dragItemSlotDestination; // L: 3634
 
-																				while (var5 != var6) { // L: 3174
-																					if (var5 > var6) { // L: 3175
-																						var47.swapItems(var5 - 1, var5); // L: 3176
-																						--var5; // L: 3177
-																					} else if (var5 < var6) { // L: 3179
-																						var47.swapItems(var5 + 1, var5); // L: 3180
-																						++var5; // L: 3181
+																				while (var8 != var9) { // L: 3635
+																					if (var8 > var9) { // L: 3636
+																						var45.swapItems(var8 - 1, var8); // L: 3637
+																						--var8; // L: 3638
+																					} else if (var8 < var9) { // L: 3640
+																						var45.swapItems(var8 + 1, var8); // L: 3641
+																						++var8; // L: 3642
 																					}
 																				}
 																			} else {
-																				var47.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3186
+																				var45.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3647
 																			}
 
-																			var46 = class21.getPacketBufferNode(ClientPacket.field2658, packetWriter.isaacCipher); // L: 3189
-																			var46.packetBuffer.method6612(Script.dragInventoryWidget.id); // L: 3190
-																			var46.packetBuffer.method6594(var31); // L: 3191
-																			var46.packetBuffer.method6602(dragItemSlotSource); // L: 3192
-																			var46.packetBuffer.writeShort(dragItemSlotDestination); // L: 3193
-																			packetWriter.addNode(var46); // L: 3194
+																			PacketBufferNode var29 = InterfaceParent.getPacketBufferNode(ClientPacket.field2635, packetWriter.isaacCipher); // L: 3650
+																			var29.packetBuffer.writeIntME(VerticalAlignment.dragInventoryWidget.id); // L: 3651
+																			var29.packetBuffer.writeShort(dragItemSlotDestination); // L: 3652
+																			var29.packetBuffer.writeShort(dragItemSlotSource); // L: 3653
+																			var29.packetBuffer.method6639(var33); // L: 3654
+																			packetWriter.addNode(var29); // L: 3655
 																		}
-																	} else if (this.shouldLeftClickOpenMenu()) { // L: 3198
-																		this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3199
-																	} else if (menuOptionsCount > 0) { // L: 3201
-																		var3 = draggedWidgetX; // L: 3202
-																		var4 = draggedWidgetY; // L: 3203
-																		MenuAction var45 = ReflectionCheck.tempMenuAction; // L: 3205
-																		Script.menuAction(var45.param0, var45.param1, var45.opcode, var45.identifier, var45.action, var45.action, var3, var4); // L: 3207
-																		ReflectionCheck.tempMenuAction = null; // L: 3209
+																	} else if (this.shouldLeftClickOpenMenu()) { // L: 3659
+																		this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3660
+																	} else if (menuOptionsCount > 0) { // L: 3662
+																		var4 = draggedWidgetX; // L: 3663
+																		var5 = draggedWidgetY; // L: 3664
+																		TaskHandler.method2625(class29.tempMenuAction, var4, var5); // L: 3666
+																		class29.tempMenuAction = null; // L: 3667
 																	}
 
-																	field747 = 10; // L: 3213
-																	MouseHandler.MouseHandler_lastButton = 0; // L: 3214
-																	Script.dragInventoryWidget = null; // L: 3215
-																} else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3218 3219
-																	field848 = true; // L: 3220
+																	field869 = 10; // L: 3671
+																	MouseHandler.MouseHandler_lastButton = 0; // L: 3672
+																	VerticalAlignment.dragInventoryWidget = null; // L: 3673
+																} else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3676 3677
+																	field734 = true; // L: 3678
 																}
 															}
 
-															if (Scene.shouldSendWalk()) { // L: 3225
-																var3 = Scene.Scene_selectedX; // L: 3226
-																var4 = Scene.Scene_selectedY; // L: 3227
-																var46 = class21.getPacketBufferNode(ClientPacket.field2642, packetWriter.isaacCipher); // L: 3229
-																var46.packetBuffer.writeByte(5); // L: 3230
-																var46.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3231
-																var46.packetBuffer.writeShort(var4 + SoundSystem.baseY); // L: 3232
-																var46.packetBuffer.writeShort(var3 + VertexNormal.baseX); // L: 3233
-																packetWriter.addNode(var46); // L: 3234
-																Scene.method4047(); // L: 3235
-																mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3236
-																mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3237
-																mouseCrossColor = 1; // L: 3238
-																mouseCrossState = 0; // L: 3239
-																destinationX = var3; // L: 3240
-																destinationY = var4; // L: 3241
+															if (Scene.shouldSendWalk()) { // L: 3683
+																var4 = Scene.Scene_selectedX; // L: 3684
+																var5 = Scene.Scene_selectedY; // L: 3685
+																var18 = InterfaceParent.getPacketBufferNode(ClientPacket.field2670, packetWriter.isaacCipher); // L: 3687
+																var18.packetBuffer.writeByte(5); // L: 3688
+																var18.packetBuffer.writeShort(var5 + WorldMapSprite.baseY); // L: 3689
+																var18.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3690
+																var18.packetBuffer.method6649(var4 + class15.baseX); // L: 3691
+																packetWriter.addNode(var18); // L: 3692
+																Scene.method4069(); // L: 3693
+																mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3694
+																mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3695
+																mouseCrossColor = 1; // L: 3696
+																mouseCrossState = 0; // L: 3697
+																destinationX = var4; // L: 3698
+																destinationY = var5; // L: 3699
 															}
 
-															if (var33 != World.mousedOverWidgetIf1) { // L: 3243
-																if (var33 != null) { // L: 3244
-																	WorldMapCacheName.invalidateWidget(var33);
+															if (var35 != MusicPatchNode.mousedOverWidgetIf1) { // L: 3701
+																if (var35 != null) { // L: 3702
+																	Script.invalidateWidget(var35);
 																}
 
-																if (World.mousedOverWidgetIf1 != null) { // L: 3245
-																	WorldMapCacheName.invalidateWidget(World.mousedOverWidgetIf1);
+																if (MusicPatchNode.mousedOverWidgetIf1 != null) { // L: 3703
+																	Script.invalidateWidget(MusicPatchNode.mousedOverWidgetIf1);
 																}
 															}
 
-															if (var36 != ReflectionCheck.field609 && field833 == field792) { // L: 3247
-																if (var36 != null) { // L: 3248
-																	WorldMapCacheName.invalidateWidget(var36);
+															if (var38 != class5.field42 && field693 == field773) { // L: 3705
+																if (var38 != null) { // L: 3706
+																	Script.invalidateWidget(var38);
 																}
 
-																if (ReflectionCheck.field609 != null) { // L: 3249
-																	WorldMapCacheName.invalidateWidget(ReflectionCheck.field609);
+																if (class5.field42 != null) { // L: 3707
+																	Script.invalidateWidget(class5.field42);
 																}
 															}
 
-															if (ReflectionCheck.field609 != null) { // L: 3251
-																if (field792 < field833) { // L: 3252
-																	++field792; // L: 3253
-																	if (field833 == field792) { // L: 3254
-																		WorldMapCacheName.invalidateWidget(ReflectionCheck.field609);
+															if (class5.field42 != null) { // L: 3709
+																if (field773 < field693) { // L: 3710
+																	++field773; // L: 3711
+																	if (field773 == field693) { // L: 3712
+																		Script.invalidateWidget(class5.field42);
 																	}
 																}
-															} else if (field792 > 0) { // L: 3257
-																--field792;
+															} else if (field773 > 0) { // L: 3715
+																--field773;
 															}
 
-															FloorOverlayDefinition.method3104(); // L: 3258
-															if (isCameraLocked) { // L: 3259
-																var3 = VarpDefinition.field1544 * 128 + 64; // L: 3260
-																var4 = Ignored.field3847 * 128 + 64; // L: 3261
-																var5 = class105.getTileHeight(var3, var4, class22.Client_plane) - AbstractByteArrayCopier.field3119; // L: 3262
-																if (MouseHandler.cameraX < var3) { // L: 3263
-																	MouseHandler.cameraX = (var3 - MouseHandler.cameraX) * class18.field156 / 1000 + MouseHandler.cameraX + class35.field264; // L: 3264
-																	if (MouseHandler.cameraX > var3) { // L: 3265
-																		MouseHandler.cameraX = var3;
-																	}
-																}
-
-																if (MouseHandler.cameraX > var3) { // L: 3267
-																	MouseHandler.cameraX -= class18.field156 * (MouseHandler.cameraX - var3) / 1000 + class35.field264; // L: 3268
-																	if (MouseHandler.cameraX < var3) { // L: 3269
-																		MouseHandler.cameraX = var3;
-																	}
-																}
-
-																if (SecureRandomCallable.cameraY < var5) { // L: 3271
-																	SecureRandomCallable.cameraY = (var5 - SecureRandomCallable.cameraY) * class18.field156 / 1000 + SecureRandomCallable.cameraY + class35.field264; // L: 3272
-																	if (SecureRandomCallable.cameraY > var5) { // L: 3273
-																		SecureRandomCallable.cameraY = var5;
-																	}
-																}
-
-																if (SecureRandomCallable.cameraY > var5) { // L: 3275
-																	SecureRandomCallable.cameraY -= class18.field156 * (SecureRandomCallable.cameraY - var5) / 1000 + class35.field264; // L: 3276
-																	if (SecureRandomCallable.cameraY < var5) { // L: 3277
-																		SecureRandomCallable.cameraY = var5;
-																	}
-																}
-
-																if (class105.cameraZ < var4) { // L: 3279
-																	class105.cameraZ = (var4 - class105.cameraZ) * class18.field156 / 1000 + class105.cameraZ + class35.field264; // L: 3280
-																	if (class105.cameraZ > var4) { // L: 3281
-																		class105.cameraZ = var4;
-																	}
-																}
-
-																if (class105.cameraZ > var4) { // L: 3283
-																	class105.cameraZ -= class18.field156 * (class105.cameraZ - var4) / 1000 + class35.field264; // L: 3284
-																	if (class105.cameraZ < var4) { // L: 3285
-																		class105.cameraZ = var4;
-																	}
-																}
-
-																var3 = ArchiveDisk.field3886 * 128 + 64; // L: 3287
-																var4 = class4.field47 * 128 + 64; // L: 3288
-																var5 = class105.getTileHeight(var3, var4, class22.Client_plane) - class18.field153; // L: 3289
-																var6 = var3 - MouseHandler.cameraX; // L: 3290
-																var7 = var5 - SecureRandomCallable.cameraY; // L: 3291
-																var8 = var4 - class105.cameraZ; // L: 3292
-																var9 = (int)Math.sqrt((double)(var6 * var6 + var8 * var8)); // L: 3293
-																var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; // L: 3294
-																var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; // L: 3295
-																if (var10 < 128) { // L: 3296
-																	var10 = 128;
-																}
-
-																if (var10 > 383) { // L: 3297
-																	var10 = 383;
-																}
-
-																if (SpotAnimationDefinition.cameraPitch < var10) { // L: 3298
-																	SpotAnimationDefinition.cameraPitch = (var10 - SpotAnimationDefinition.cameraPitch) * SoundCache.field468 / 1000 + SpotAnimationDefinition.cameraPitch + FriendsList.field3812; // L: 3299
-																	if (SpotAnimationDefinition.cameraPitch > var10) { // L: 3300
-																		SpotAnimationDefinition.cameraPitch = var10;
-																	}
-																}
-
-																if (SpotAnimationDefinition.cameraPitch > var10) { // L: 3302
-																	SpotAnimationDefinition.cameraPitch -= SoundCache.field468 * (SpotAnimationDefinition.cameraPitch - var10) / 1000 + FriendsList.field3812; // L: 3303
-																	if (SpotAnimationDefinition.cameraPitch < var10) { // L: 3304
-																		SpotAnimationDefinition.cameraPitch = var10;
-																	}
-																}
-
-																var12 = var11 - class376.cameraYaw; // L: 3306
-																if (var12 > 1024) { // L: 3307
-																	var12 -= 2048;
-																}
-
-																if (var12 < -1024) { // L: 3308
-																	var12 += 2048;
-																}
-
-																if (var12 > 0) { // L: 3309
-																	class376.cameraYaw = var12 * SoundCache.field468 / 1000 + class376.cameraYaw + FriendsList.field3812; // L: 3310
-																	class376.cameraYaw &= 2047; // L: 3311
-																}
-
-																if (var12 < 0) { // L: 3313
-																	class376.cameraYaw -= -var12 * SoundCache.field468 / 1000 + FriendsList.field3812; // L: 3314
-																	class376.cameraYaw &= 2047; // L: 3315
-																}
-
-																int var26 = var11 - class376.cameraYaw; // L: 3317
-																if (var26 > 1024) { // L: 3318
-																	var26 -= 2048;
-																}
-
-																if (var26 < -1024) { // L: 3319
-																	var26 += 2048;
-																}
-
-																if (var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) { // L: 3320
-																	class376.cameraYaw = var11;
-																}
+															Varps.method4783(); // L: 3716
+															if (isCameraLocked) { // L: 3717
+																Coord.method4790();
 															}
 
-															for (var3 = 0; var3 < 5; ++var3) { // L: 3322
-																var10002 = field893[var3]++;
+															for (var4 = 0; var4 < 5; ++var4) { // L: 3718
+																var10002 = field875[var4]++;
 															}
 
-															GrandExchangeOfferOwnWorldComparator.varcs.tryWrite(); // L: 3323
-															var3 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3326
-															var5 = WorldMapLabelSize.method3206(); // L: 3329
-															if (var3 > 15000 && var5 > 15000) { // L: 3330
-																logoutTimer = 250; // L: 3331
-																ArchiveDiskActionHandler.method4867(14500); // L: 3332
-																var18 = class21.getPacketBufferNode(ClientPacket.field2644, packetWriter.isaacCipher); // L: 3334
-																packetWriter.addNode(var18); // L: 3335
+															class20.varcs.tryWrite(); // L: 3719
+															var4 = ClanSettings.method200(); // L: 3720
+															var5 = KeyHandler.KeyHandler_idleCycles; // L: 3723
+															if (var4 > 15000 && var5 > 15000) { // L: 3726
+																logoutTimer = 250; // L: 3727
+																MouseHandler.MouseHandler_idleCycles = 14500; // L: 3729
+																var28 = InterfaceParent.getPacketBufferNode(ClientPacket.field2644, packetWriter.isaacCipher); // L: 3732
+																packetWriter.addNode(var28); // L: 3733
 															}
 
-															NetSocket.friendSystem.processFriendUpdates(); // L: 3337
-															++packetWriter.pendingWrites; // L: 3338
-															if (packetWriter.pendingWrites > 50) { // L: 3339
-																var18 = class21.getPacketBufferNode(ClientPacket.field2590, packetWriter.isaacCipher); // L: 3341
-																packetWriter.addNode(var18); // L: 3342
+															DevicePcmPlayerProvider.friendSystem.processFriendUpdates(); // L: 3735
+															++packetWriter.pendingWrites; // L: 3736
+															if (packetWriter.pendingWrites > 50) { // L: 3737
+																var28 = InterfaceParent.getPacketBufferNode(ClientPacket.field2647, packetWriter.isaacCipher); // L: 3739
+																packetWriter.addNode(var28); // L: 3740
 															}
 
 															try {
-																packetWriter.flush(); // L: 3345
-															} catch (IOException var27) { // L: 3347
-																NetFileRequest.method4912(); // L: 3348
+																packetWriter.flush(); // L: 3743
+															} catch (IOException var30) { // L: 3745
+																ApproximateRouteStrategy.method1268(); // L: 3746
 															}
 
-															return; // L: 3350
+															return; // L: 3748
 														}
 
-														var44 = var43.widget; // L: 3136
-														if (var44.childIndex < 0) { // L: 3137
+														var44 = var42.widget; // L: 3597
+														if (var44.childIndex < 0) { // L: 3598
 															break;
 														}
 
-														var41 = Frames.getWidget(var44.parentId); // L: 3138
-													} while(var41 == null || var41.children == null || var44.childIndex >= var41.children.length || var44 != var41.children[var44.childIndex]); // L: 3139
+														var40 = WorldMapData_1.getWidget(var44.parentId); // L: 3599
+													} while(var40 == null || var40.children == null || var44.childIndex >= var40.children.length || var44 != var40.children[var44.childIndex]); // L: 3600
 
-													PacketWriter.runScriptEvent(var43); // L: 3143
+													WorldMapSection1.runScriptEvent(var42); // L: 3604
 												}
 											}
 
-											var44 = var43.widget; // L: 3124
-											if (var44.childIndex < 0) { // L: 3125
+											var44 = var42.widget; // L: 3585
+											if (var44.childIndex < 0) { // L: 3586
 												break;
 											}
 
-											var41 = Frames.getWidget(var44.parentId); // L: 3126
-										} while(var41 == null || var41.children == null || var44.childIndex >= var41.children.length || var44 != var41.children[var44.childIndex]); // L: 3127
+											var40 = WorldMapData_1.getWidget(var44.parentId); // L: 3587
+										} while(var40 == null || var40.children == null || var44.childIndex >= var40.children.length || var44 != var40.children[var44.childIndex]); // L: 3588
 
-										PacketWriter.runScriptEvent(var43); // L: 3131
+										WorldMapSection1.runScriptEvent(var42); // L: 3592
 									}
 								}
 
-								var44 = var43.widget; // L: 3112
-								if (var44.childIndex < 0) { // L: 3113
+								var44 = var42.widget; // L: 3573
+								if (var44.childIndex < 0) { // L: 3574
 									break;
 								}
 
-								var41 = Frames.getWidget(var44.parentId); // L: 3114
-							} while(var41 == null || var41.children == null || var44.childIndex >= var41.children.length || var44 != var41.children[var44.childIndex]); // L: 3115
+								var40 = WorldMapData_1.getWidget(var44.parentId); // L: 3575
+							} while(var40 == null || var40.children == null || var44.childIndex >= var40.children.length || var44 != var40.children[var44.childIndex]); // L: 3576
 
-							PacketWriter.runScriptEvent(var43); // L: 3119
+							WorldMapSection1.runScriptEvent(var42); // L: 3580
 						}
 					}
 				}
 			}
 		}
-	} // L: 2721 3032
+	} // L: 3195 3488
 
-	@ObfuscatedName("gv")
+	@ObfuscatedName("gn")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "65280"
+		garbageValue = "1382818150"
 	)
 	@Export("resizeJS")
 	void resizeJS() {
-		int var1 = class32.canvasWidth; // L: 3939
-		int var2 = ReflectionCheck.canvasHeight; // L: 3940
-		if (super.contentWidth < var1) { // L: 3941
+		int var1 = AttackOption.canvasWidth; // L: 4426
+		int var2 = class0.canvasHeight; // L: 4427
+		if (super.contentWidth < var1) { // L: 4428
 			var1 = super.contentWidth;
 		}
 
-		if (super.contentHeight < var2) {
-			var2 = super.contentHeight; // L: 3942
+		if (super.contentHeight < var2) { // L: 4429
+			var2 = super.contentHeight;
 		}
 
-		if (ObjectComposition.clientPreferences != null) { // L: 3943
+		if (class4.clientPreferences != null) { // L: 4430
 			try {
-				class42.method422(class23.client, "resize", new Object[]{SpotAnimationDefinition.getWindowedMode()}); // L: 3945
-			} catch (Throwable var4) { // L: 3947
+				Client var3 = class1.client; // L: 4432
+				Object[] var4 = new Object[]{class302.getWindowedMode()}; // L: 4433
+				JSObject.getWindow(var3).call("resize", var4); // L: 4436
+			} catch (Throwable var5) { // L: 4439
 			}
 		}
 
-	} // L: 3949
+	} // L: 4441
 
-	@ObfuscatedName("gm")
+	@ObfuscatedName("gb")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1520673658"
+		descriptor = "(B)V",
+		garbageValue = "110"
 	)
 	@Export("drawLoggedIn")
 	final void drawLoggedIn() {
+		if (rootInterface != -1) { // L: 4444
+			class25.method330(rootInterface);
+		}
+
 		int var1;
-		if (rootInterface != -1) { // L: 3952
-			var1 = rootInterface; // L: 3953
-			if (Clock.loadInterface(var1)) { // L: 3955
-				Canvas.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); // L: 3956
+		for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4445
+			if (field831[var1]) { // L: 4446
+				field712[var1] = true;
+			}
+
+			field833[var1] = field831[var1]; // L: 4447
+			field831[var1] = false; // L: 4448
+		}
+
+		field830 = cycle; // L: 4450
+		viewportX = -1; // L: 4451
+		viewportY = -1; // L: 4452
+		UserComparator2.hoveredItemContainer = null; // L: 4453
+		if (rootInterface != -1) { // L: 4454
+			rootWidgetCount = 0; // L: 4455
+			SoundSystem.drawWidgets(rootInterface, 0, 0, AttackOption.canvasWidth, class0.canvasHeight, 0, 0, -1); // L: 4456
+		}
+
+		Rasterizer2D.Rasterizer2D_resetClip(); // L: 4458
+		if (showMouseCross) { // L: 4459
+			if (mouseCrossColor == 1) { // L: 4460
+				NPCComposition.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4461
+			}
+
+			if (mouseCrossColor == 2) { // L: 4463
+				NPCComposition.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 4464
 			}
 		}
 
-		for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3959
-			if (field719[var1]) { // L: 3960
-				field780[var1] = true;
-			}
-
-			field860[var1] = field719[var1]; // L: 3961
-			field719[var1] = false; // L: 3962
-		}
-
-		field849 = cycle; // L: 3964
-		viewportX = -1; // L: 3965
-		viewportY = -1; // L: 3966
-		class18.hoveredItemContainer = null; // L: 3967
-		if (rootInterface != -1) { // L: 3968
-			rootWidgetCount = 0; // L: 3969
-			class225.drawWidgets(rootInterface, 0, 0, class32.canvasWidth, ReflectionCheck.canvasHeight, 0, 0, -1); // L: 3970
-		}
-
-		Rasterizer2D.Rasterizer2D_resetClip(); // L: 3972
-		if (showMouseCross) { // L: 3973
-			if (mouseCrossColor == 1) { // L: 3974
-				ArchiveLoader.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3975
-			}
-
-			if (mouseCrossColor == 2) { // L: 3977
-				ArchiveLoader.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3978
-			}
-		}
-
-		if (!isMenuOpen) { // L: 3981
-			if (viewportX != -1) { // L: 3982
-				FileSystem.method2547(viewportX, viewportY);
+		if (!isMenuOpen) { // L: 4467
+			if (viewportX != -1) { // L: 4468
+				class15.method241(viewportX, viewportY);
 			}
 		} else {
-			var1 = class14.menuX; // L: 3985
-			int var2 = class243.menuY; // L: 3986
-			int var3 = class29.menuWidth; // L: 3987
-			int var4 = class24.menuHeight; // L: 3988
-			int var5 = 6116423; // L: 3989
-			Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 3990
-			Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 3991
-			Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 3992
-			Widget.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 3993
-			int var6 = MouseHandler.MouseHandler_x; // L: 3994
-			int var7 = MouseHandler.MouseHandler_y; // L: 3995
+			var1 = StructComposition.menuX; // L: 4471
+			int var2 = class143.menuY; // L: 4472
+			int var3 = UserComparator3.menuWidth; // L: 4473
+			int var4 = PendingSpawn.menuHeight; // L: 4474
+			int var5 = 6116423; // L: 4475
+			Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5); // L: 4476
+			Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); // L: 4477
+			Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0); // L: 4478
+			class309.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1); // L: 4479
+			int var6 = MouseHandler.MouseHandler_x; // L: 4480
+			int var7 = MouseHandler.MouseHandler_y; // L: 4481
 
-			for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 3996
-				int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 3997
-				int var10 = 16777215; // L: 3998
-				if (var6 > var1 && var6 < var1 + var3 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 3999
+			for (int var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 4482
+				int var9 = (menuOptionsCount - 1 - var8) * 15 + var2 + 31; // L: 4483
+				int var10 = 16777215; // L: 4484
+				if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { // L: 4485
 					var10 = 16776960;
 				}
 
-				Widget.fontBold12.draw(MouseRecorder.method2098(var8), var1 + 3, var9, var10, 0); // L: 4000
+				class309.fontBold12.draw(class0.method1(var8), var1 + 3, var9, var10, 0); // L: 4486
 			}
 
-			PcmPlayer.method786(class14.menuX, class243.menuY, class29.menuWidth, class24.menuHeight); // L: 4002
+			ReflectionCheck.method1229(StructComposition.menuX, class143.menuY, UserComparator3.menuWidth, PendingSpawn.menuHeight); // L: 4488
 		}
 
-		if (gameDrawingMode == 3) { // L: 4004
-			for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4005
-				if (field860[var1]) { // L: 4006
-					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4007
-				} else if (field780[var1]) { // L: 4009
-					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4010
+		if (gameDrawingMode == 3) { // L: 4490
+			for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 4491
+				if (field833[var1]) { // L: 4492
+					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 4493
+				} else if (field712[var1]) { // L: 4495
+					Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 4496
 				}
 			}
 		}
 
-		class169.method3549(class22.Client_plane, class93.localPlayer.x, class93.localPlayer.y, field913); // L: 4014
-		field913 = 0; // L: 4015
-	} // L: 4016
+		UrlRequest.method2519(SoundSystem.Client_plane, class262.localPlayer.x, class262.localPlayer.y, field683); // L: 4500
+		field683 = 0; // L: 4501
+	} // L: 4502
 
-	@ObfuscatedName("hh")
+	@ObfuscatedName("hn")
 	@ObfuscatedSignature(
-		descriptor = "(Lds;I)Z",
-		garbageValue = "-2018950508"
+		descriptor = "(Ldq;I)Z",
+		garbageValue = "-372201617"
 	)
-	final boolean method1192(PacketWriter var1) {
-		AbstractSocket var2 = var1.getSocket(); // L: 5767
-		PacketBuffer var3 = var1.packetBuffer; // L: 5768
-		if (var2 == null) { // L: 5769
+	final boolean method1655(PacketWriter var1) {
+		AbstractSocket var2 = var1.getSocket(); // L: 5859
+		PacketBuffer var3 = var1.packetBuffer; // L: 5860
+		if (var2 == null) { // L: 5861
 			return false;
 		} else {
 			int var6;
-			String var18;
+			String var26;
 			try {
 				int var5;
-				if (var1.serverPacket == null) { // L: 5771
-					if (var1.field1408) { // L: 5772
-						if (!var2.isAvailable(1)) { // L: 5773
+				if (var1.serverPacket == null) { // L: 5863
+					if (var1.field1412) { // L: 5864
+						if (!var2.isAvailable(1)) { // L: 5865
 							return false;
 						}
 
-						var2.read(var1.packetBuffer.array, 0, 1); // L: 5774
-						var1.field1409 = 0; // L: 5775
-						var1.field1408 = false; // L: 5776
+						var2.read(var1.packetBuffer.array, 0, 1); // L: 5866
+						var1.field1408 = 0; // L: 5867
+						var1.field1412 = false; // L: 5868
 					}
 
-					var3.offset = 0; // L: 5778
-					if (var3.method6529()) { // L: 5779
-						if (!var2.isAvailable(1)) { // L: 5780
+					var3.offset = 0; // L: 5870
+					if (var3.method6569()) { // L: 5871
+						if (!var2.isAvailable(1)) { // L: 5872
 							return false;
 						}
 
-						var2.read(var1.packetBuffer.array, 1, 1); // L: 5781
-						var1.field1409 = 0; // L: 5782
+						var2.read(var1.packetBuffer.array, 1, 1); // L: 5873
+						var1.field1408 = 0; // L: 5874
 					}
 
-					var1.field1408 = true; // L: 5784
-					ServerPacket[] var4 = class24.ServerPacket_values(); // L: 5785
-					var5 = var3.readSmartByteShortIsaac(); // L: 5786
-					if (var5 < 0 || var5 >= var4.length) { // L: 5787
+					var1.field1412 = true; // L: 5876
+					ServerPacket[] var4 = WorldMapIcon_0.ServerPacket_values(); // L: 5877
+					var5 = var3.readSmartByteShortIsaac(); // L: 5878
+					if (var5 < 0 || var5 >= var4.length) { // L: 5879
 						throw new IOException(var5 + " " + var3.offset);
 					}
 
-					var1.serverPacket = var4[var5]; // L: 5788
-					var1.serverPacketLength = var1.serverPacket.length; // L: 5789
+					var1.serverPacket = var4[var5]; // L: 5880
+					var1.serverPacketLength = var1.serverPacket.length; // L: 5881
 				}
 
-				if (var1.serverPacketLength == -1) { // L: 5791
-					if (!var2.isAvailable(1)) { // L: 5792
+				if (var1.serverPacketLength == -1) { // L: 5883
+					if (!var2.isAvailable(1)) { // L: 5884
 						return false;
 					}
 
-					var1.getSocket().read(var3.array, 0, 1); // L: 5793
-					var1.serverPacketLength = var3.array[0] & 255; // L: 5794
+					var1.getSocket().read(var3.array, 0, 1); // L: 5885
+					var1.serverPacketLength = var3.array[0] & 255; // L: 5886
 				}
 
-				if (var1.serverPacketLength == -2) { // L: 5796
-					if (!var2.isAvailable(2)) { // L: 5797
+				if (var1.serverPacketLength == -2) { // L: 5888
+					if (!var2.isAvailable(2)) { // L: 5889
 						return false;
 					}
 
-					var1.getSocket().read(var3.array, 0, 2); // L: 5798
-					var3.offset = 0; // L: 5799
-					var1.serverPacketLength = var3.readUnsignedShort(); // L: 5800
+					var1.getSocket().read(var3.array, 0, 2); // L: 5890
+					var3.offset = 0; // L: 5891
+					var1.serverPacketLength = var3.readUnsignedShort(); // L: 5892
 				}
 
-				if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5802
+				if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5894
 					return false;
 				}
 
-				var3.offset = 0; // L: 5803
-				var2.read(var3.array, 0, var1.serverPacketLength); // L: 5804
-				var1.field1409 = 0; // L: 5805
-				timer.method5602(); // L: 5806
-				var1.field1400 = var1.field1412; // L: 5807
-				var1.field1412 = var1.field1411; // L: 5808
-				var1.field1411 = var1.serverPacket; // L: 5809
-				int var7;
-				int var8;
-				int var9;
-				int var60;
-				if (ServerPacket.field2732 == var1.serverPacket) { // L: 5810
-					var60 = var3.readUnsignedShort(); // L: 5811
-					var5 = var3.readInt(); // L: 5812
-					var6 = var60 >> 10 & 31; // L: 5813
-					var7 = var60 >> 5 & 31; // L: 5814
-					var8 = var60 & 31; // L: 5815
-					var9 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 5816
-					Widget var55 = Frames.getWidget(var5); // L: 5817
-					if (var9 != var55.color) { // L: 5818
-						var55.color = var9; // L: 5819
-						WorldMapCacheName.invalidateWidget(var55); // L: 5820
+				var3.offset = 0; // L: 5895
+				var2.read(var3.array, 0, var1.serverPacketLength); // L: 5896
+				var1.field1408 = 0; // L: 5897
+				timer.method5690(); // L: 5898
+				var1.field1399 = var1.field1411; // L: 5899
+				var1.field1411 = var1.field1410; // L: 5900
+				var1.field1410 = var1.serverPacket; // L: 5901
+				if (ServerPacket.field2776 == var1.serverPacket) { // L: 5902
+					DevicePcmPlayerProvider.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5903
+					field817 = cycleCntr; // L: 5904
+					var1.serverPacket = null; // L: 5905
+					return true; // L: 5906
+				}
+
+				if (ServerPacket.field2704 == var1.serverPacket) { // L: 5908
+					if (rootInterface != -1) { // L: 5909
+						class8.runIntfCloseListeners(rootInterface, 0);
 					}
 
-					var1.serverPacket = null; // L: 5822
-					return true; // L: 5823
-				}
-
-				boolean var78;
-				if (ServerPacket.field2734 == var1.serverPacket) { // L: 5825
-					var78 = var3.readBoolean(); // L: 5826
-					if (var78) { // L: 5827
-						if (UserComparator3.field1444 == null) { // L: 5828
-							UserComparator3.field1444 = new class285();
-						}
-					} else {
-						UserComparator3.field1444 = null; // L: 5830
-					}
-
-					var1.serverPacket = null; // L: 5831
-					return true; // L: 5832
-				}
-
-				if (ServerPacket.field2757 == var1.serverPacket) { // L: 5834
-					class69.field596 = var3.readUnsignedByte(); // L: 5835
-					Occluder.field2387 = var3.readUnsignedByte(); // L: 5836
-
-					while (var3.offset < var1.serverPacketLength) { // L: 5837
-						var60 = var3.readUnsignedByte(); // L: 5838
-						class225 var71 = PlayerComposition.method4705()[var60]; // L: 5839
-						Tile.method3843(var71); // L: 5840
-					}
-
-					var1.serverPacket = null; // L: 5842
-					return true; // L: 5843
-				}
-
-				if (ServerPacket.field2750 == var1.serverPacket) { // L: 5845
-					Tile.method3843(class225.field2687); // L: 5846
-					var1.serverPacket = null; // L: 5847
-					return true; // L: 5848
-				}
-
-				String var46;
-				if (ServerPacket.field2781 == var1.serverPacket) { // L: 5850
-					var46 = var3.readStringCp1252NullTerminated(); // L: 5851
-					Object[] var70 = new Object[var46.length() + 1]; // L: 5852
-
-					for (var6 = var46.length() - 1; var6 >= 0; --var6) { // L: 5853
-						if (var46.charAt(var6) == 's') { // L: 5854
-							var70[var6 + 1] = var3.readStringCp1252NullTerminated();
-						} else {
-							var70[var6 + 1] = new Integer(var3.readInt()); // L: 5855
-						}
-					}
-
-					var70[0] = new Integer(var3.readInt()); // L: 5857
-					ScriptEvent var77 = new ScriptEvent(); // L: 5858
-					var77.args = var70; // L: 5859
-					PacketWriter.runScriptEvent(var77); // L: 5860
-					var1.serverPacket = null; // L: 5861
-					return true; // L: 5862
-				}
-
-				if (ServerPacket.field2759 == var1.serverPacket) { // L: 5864
-					hintArrowType = var3.readUnsignedByte(); // L: 5865
-					if (hintArrowType == 1) { // L: 5866
-						hintArrowNpcIndex = var3.readUnsignedShort();
-					}
-
-					if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 5867
-						if (hintArrowType == 2) { // L: 5868
-							hintArrowSubX = 64; // L: 5869
-							hintArrowSubY = 64; // L: 5870
-						}
-
-						if (hintArrowType == 3) { // L: 5872
-							hintArrowSubX = 0; // L: 5873
-							hintArrowSubY = 64; // L: 5874
-						}
-
-						if (hintArrowType == 4) { // L: 5876
-							hintArrowSubX = 128; // L: 5877
-							hintArrowSubY = 64; // L: 5878
-						}
-
-						if (hintArrowType == 5) { // L: 5880
-							hintArrowSubX = 64; // L: 5881
-							hintArrowSubY = 0; // L: 5882
-						}
-
-						if (hintArrowType == 6) { // L: 5884
-							hintArrowSubX = 64; // L: 5885
-							hintArrowSubY = 128; // L: 5886
-						}
-
-						hintArrowType = 2; // L: 5888
-						hintArrowX = var3.readUnsignedShort(); // L: 5889
-						hintArrowY = var3.readUnsignedShort(); // L: 5890
-						hintArrowHeight = var3.readUnsignedByte(); // L: 5891
-					}
-
-					if (hintArrowType == 10) { // L: 5893
-						hintArrowPlayerIndex = var3.readUnsignedShort();
-					}
-
-					var1.serverPacket = null; // L: 5894
-					return true; // L: 5895
-				}
-
-				if (ServerPacket.field2711 == var1.serverPacket) { // L: 5897
-					Tile.method3843(class225.field2683); // L: 5898
-					var1.serverPacket = null; // L: 5899
-					return true; // L: 5900
-				}
-
-				if (ServerPacket.field2730 == var1.serverPacket) { // L: 5902
-					class34.field254 = new class339(ViewportMouse.HitSplatDefinition_cachedSprites); // L: 5903
-					var1.serverPacket = null; // L: 5904
-					return true; // L: 5905
-				}
-
-				if (ServerPacket.field2777 == var1.serverPacket) { // L: 5907
-					var60 = var3.readUnsignedByte(); // L: 5908
-					class15.forceDisconnect(var60); // L: 5909
 					var1.serverPacket = null; // L: 5910
-					return false; // L: 5911
+					return true; // L: 5911
 				}
 
-				if (ServerPacket.field2752 == var1.serverPacket) { // L: 5913
-					var60 = var3.readUnsignedByte(); // L: 5914
-					if (var3.readUnsignedByte() == 0) { // L: 5915
-						grandExchangeOffers[var60] = new GrandExchangeOffer(); // L: 5916
-						var3.offset += 18; // L: 5917
-					} else {
-						--var3.offset; // L: 5920
-						grandExchangeOffers[var60] = new GrandExchangeOffer(var3, false); // L: 5921
-					}
+				int var7;
+				int var17;
+				if (ServerPacket.field2774 == var1.serverPacket) { // L: 5913
+					WorldMapID.method3717(); // L: 5914
+					var17 = var3.method6725(); // L: 5915
+					var5 = var3.readUnsignedByte(); // L: 5916
+					var6 = var3.method6642(); // L: 5917
+					experience[var6] = var17; // L: 5918
+					currentLevels[var6] = var5; // L: 5919
+					levels[var6] = 1; // L: 5920
 
-					field840 = cycleCntr; // L: 5923
-					var1.serverPacket = null; // L: 5924
-					return true; // L: 5925
-				}
-
-				if (ServerPacket.field2741 == var1.serverPacket) { // L: 5927
-					ScriptEvent.privateChatMode = class124.method2498(var3.readUnsignedByte()); // L: 5928
-					var1.serverPacket = null; // L: 5929
-					return true; // L: 5930
-				}
-
-				if (ServerPacket.field2746 == var1.serverPacket) { // L: 5932
-					Tile.method3843(class225.field2681); // L: 5933
-					var1.serverPacket = null; // L: 5934
-					return true; // L: 5935
-				}
-
-				if (ServerPacket.field2704 == var1.serverPacket) { // L: 5937
-					var60 = var3.readUnsignedShort(); // L: 5938
-					var5 = var3.readUnsignedByte(); // L: 5939
-					var6 = var3.readUnsignedShort(); // L: 5940
-					BufferedSource.queueSoundEffect(var60, var5, var6); // L: 5941
-					var1.serverPacket = null; // L: 5942
-					return true; // L: 5943
-				}
-
-				Widget var67;
-				if (ServerPacket.field2717 == var1.serverPacket) { // L: 5945
-					var60 = var3.readInt(); // L: 5946
-					var5 = var3.readUnsignedShort(); // L: 5947
-					var67 = Frames.getWidget(var60); // L: 5948
-					if (var67.modelType != 2 || var5 != var67.modelId) { // L: 5949
-						var67.modelType = 2; // L: 5950
-						var67.modelId = var5; // L: 5951
-						WorldMapCacheName.invalidateWidget(var67); // L: 5952
-					}
-
-					var1.serverPacket = null; // L: 5954
-					return true; // L: 5955
-				}
-
-				int var20;
-				if (ServerPacket.field2788 == var1.serverPacket) { // L: 5957
-					isCameraLocked = true; // L: 5958
-					ArchiveDisk.field3886 = var3.readUnsignedByte(); // L: 5959
-					class4.field47 = var3.readUnsignedByte(); // L: 5960
-					class18.field153 = var3.readUnsignedShort(); // L: 5961
-					FriendsList.field3812 = var3.readUnsignedByte(); // L: 5962
-					SoundCache.field468 = var3.readUnsignedByte(); // L: 5963
-					if (SoundCache.field468 >= 100) { // L: 5964
-						var60 = ArchiveDisk.field3886 * 128 + 64; // L: 5965
-						var5 = class4.field47 * 128 + 64; // L: 5966
-						var6 = class105.getTileHeight(var60, var5, class22.Client_plane) - class18.field153; // L: 5967
-						var7 = var60 - MouseHandler.cameraX; // L: 5968
-						var8 = var6 - SecureRandomCallable.cameraY; // L: 5969
-						var9 = var5 - class105.cameraZ; // L: 5970
-						var20 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); // L: 5971
-						SpotAnimationDefinition.cameraPitch = (int)(Math.atan2((double)var8, (double)var20) * 325.949D) & 2047; // L: 5972
-						class376.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; // L: 5973
-						if (SpotAnimationDefinition.cameraPitch < 128) { // L: 5974
-							SpotAnimationDefinition.cameraPitch = 128;
-						}
-
-						if (SpotAnimationDefinition.cameraPitch > 383) { // L: 5975
-							SpotAnimationDefinition.cameraPitch = 383;
+					for (var7 = 0; var7 < 98; ++var7) { // L: 5921
+						if (var17 >= Skills.Skills_experienceTable[var7]) {
+							levels[var6] = var7 + 2;
 						}
 					}
 
-					var1.serverPacket = null; // L: 5977
-					return true; // L: 5978
+					changedSkills[++changedSkillsCount - 1 & 31] = var6; // L: 5922
+					var1.serverPacket = null; // L: 5923
+					return true; // L: 5924
 				}
 
-				if (ServerPacket.field2776 == var1.serverPacket) { // L: 5980
-					var60 = var3.method6613(); // L: 5981
-					var5 = var3.method6726(); // L: 5982
-					var67 = Frames.getWidget(var60); // L: 5983
-					if (var5 != var67.sequenceId || var5 == -1) { // L: 5984
-						var67.sequenceId = var5; // L: 5985
-						var67.modelFrame = 0; // L: 5986
-						var67.modelFrameCycle = 0; // L: 5987
-						WorldMapCacheName.invalidateWidget(var67); // L: 5988
-					}
+				long var18;
+				long var20;
+				String var22;
+				String var48;
+				int var54;
+				if (ServerPacket.field2732 == var1.serverPacket) { // L: 5926
+					var48 = var3.readStringCp1252NullTerminated(); // L: 5927
+					var18 = (long)var3.readUnsignedShort(); // L: 5928
+					var20 = (long)var3.readMedium(); // L: 5929
+					PlayerType var9 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var3.readUnsignedByte()); // L: 5930
+					long var10 = (var18 << 32) + var20; // L: 5931
+					boolean var12 = false; // L: 5932
 
-					var1.serverPacket = null; // L: 5990
-					return true; // L: 5991
-				}
-
-				if (ServerPacket.field2721 == var1.serverPacket) { // L: 5993
-					Tile.method3843(class225.field2689); // L: 5994
-					var1.serverPacket = null; // L: 5995
-					return true; // L: 5996
-				}
-
-				if (ServerPacket.field2709 == var1.serverPacket) { // L: 5998
-					Tile.method3843(class225.field2686); // L: 5999
-					var1.serverPacket = null; // L: 6000
-					return true; // L: 6001
-				}
-
-				if (ServerPacket.field2714 == var1.serverPacket) { // L: 6003
-					var60 = var3.readUnsignedByte(); // L: 6004
-					ClanSettings.method163(var60); // L: 6005
-					var1.serverPacket = null; // L: 6006
-					return true; // L: 6007
-				}
-
-				if (ServerPacket.field2738 == var1.serverPacket) { // L: 6009
-					if (class34.field254 == null) { // L: 6010
-						class34.field254 = new class339(ViewportMouse.HitSplatDefinition_cachedSprites);
-					}
-
-					class390 var51 = ViewportMouse.HitSplatDefinition_cachedSprites.method6021(var3); // L: 6011
-					class34.field254.field3921.vmethod6364(var51.field4219, var51.field4218); // L: 6012
-					field911[++field852 - 1 & 31] = var51.field4219; // L: 6013
-					var1.serverPacket = null; // L: 6014
-					return true; // L: 6015
-				}
-
-				if (ServerPacket.field2735 == var1.serverPacket) { // L: 6017
-					NetSocket.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 6018
-					field836 = cycleCntr; // L: 6019
-					var1.serverPacket = null; // L: 6020
-					return true; // L: 6021
-				}
-
-				if (ServerPacket.field2701 == var1.serverPacket) { // L: 6023
-					isCameraLocked = true; // L: 6024
-					VarpDefinition.field1544 = var3.readUnsignedByte(); // L: 6025
-					Ignored.field3847 = var3.readUnsignedByte(); // L: 6026
-					AbstractByteArrayCopier.field3119 = var3.readUnsignedShort(); // L: 6027
-					class35.field264 = var3.readUnsignedByte(); // L: 6028
-					class18.field156 = var3.readUnsignedByte(); // L: 6029
-					if (class18.field156 >= 100) { // L: 6030
-						MouseHandler.cameraX = VarpDefinition.field1544 * 128 + 64; // L: 6031
-						class105.cameraZ = Ignored.field3847 * 128 + 64; // L: 6032
-						SecureRandomCallable.cameraY = class105.getTileHeight(MouseHandler.cameraX, class105.cameraZ, class22.Client_plane) - AbstractByteArrayCopier.field3119; // L: 6033
-					}
-
-					var1.serverPacket = null; // L: 6035
-					return true; // L: 6036
-				}
-
-				if (ServerPacket.field2767 == var1.serverPacket) { // L: 6038
-					SoundSystem.updateNpcs(true, var3); // L: 6039
-					var1.serverPacket = null; // L: 6040
-					return true; // L: 6041
-				}
-
-				if (ServerPacket.field2772 == var1.serverPacket) { // L: 6043
-					destinationX = var3.readUnsignedByte(); // L: 6044
-					if (destinationX == 255) { // L: 6045
-						destinationX = 0;
-					}
-
-					destinationY = var3.readUnsignedByte(); // L: 6046
-					if (destinationY == 255) { // L: 6047
-						destinationY = 0;
-					}
-
-					var1.serverPacket = null; // L: 6048
-					return true; // L: 6049
-				}
-
-				InterfaceParent var21;
-				Widget var74;
-				if (ServerPacket.field2743 == var1.serverPacket) { // L: 6051
-					var60 = var3.method6614(); // L: 6052
-					var5 = var3.method6614(); // L: 6053
-					InterfaceParent var76 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6054
-					var21 = (InterfaceParent)interfaceParents.get((long)var60); // L: 6055
-					if (var21 != null) { // L: 6056
-						class43.closeInterface(var21, var76 == null || var21.group != var76.group);
-					}
-
-					if (var76 != null) { // L: 6057
-						var76.remove(); // L: 6058
-						interfaceParents.put(var76, (long)var60); // L: 6059
-					}
-
-					var74 = Frames.getWidget(var5); // L: 6061
-					if (var74 != null) { // L: 6062
-						WorldMapCacheName.invalidateWidget(var74);
-					}
-
-					var74 = Frames.getWidget(var60); // L: 6063
-					if (var74 != null) { // L: 6064
-						WorldMapCacheName.invalidateWidget(var74); // L: 6065
-						class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var74.id >>> 16], var74, true); // L: 6066
-					}
-
-					if (rootInterface != -1) { // L: 6068
-						Login.runIntfCloseListeners(rootInterface, 1);
-					}
-
-					var1.serverPacket = null; // L: 6069
-					return true; // L: 6070
-				}
-
-				if (ServerPacket.field2729 == var1.serverPacket) { // L: 6072
-					FriendLoginUpdate.method5690(var3.readStringCp1252NullTerminated()); // L: 6073
-					var1.serverPacket = null; // L: 6074
-					return true; // L: 6075
-				}
-
-				if (ServerPacket.field2736 == var1.serverPacket) { // L: 6077
-					var60 = var3.readInt(); // L: 6078
-					InterfaceParent var68 = (InterfaceParent)interfaceParents.get((long)var60); // L: 6079
-					if (var68 != null) { // L: 6080
-						class43.closeInterface(var68, true);
-					}
-
-					if (meslayerContinueWidget != null) { // L: 6081
-						WorldMapCacheName.invalidateWidget(meslayerContinueWidget); // L: 6082
-						meslayerContinueWidget = null; // L: 6083
-					}
-
-					var1.serverPacket = null; // L: 6085
-					return true; // L: 6086
-				}
-
-				if (ServerPacket.field2722 == var1.serverPacket) { // L: 6088
-					if (rootInterface != -1) { // L: 6089
-						Login.runIntfCloseListeners(rootInterface, 0);
-					}
-
-					var1.serverPacket = null; // L: 6090
-					return true; // L: 6091
-				}
-
-				long var12;
-				if (ServerPacket.field2775 == var1.serverPacket) { // L: 6093
-					var60 = var3.offset + var1.serverPacketLength; // L: 6094
-					var5 = var3.readUnsignedShort(); // L: 6095
-					var6 = var3.readUnsignedShort(); // L: 6096
-					if (var5 != rootInterface) { // L: 6097
-						rootInterface = var5; // L: 6098
-						this.resizeRoot(false); // L: 6099
-						class21.Widget_resetModelFrames(rootInterface); // L: 6100
-						FloorDecoration.runWidgetOnLoadListener(rootInterface); // L: 6101
-
-						for (var7 = 0; var7 < 100; ++var7) { // L: 6102
-							field719[var7] = true;
+					for (var54 = 0; var54 < 100; ++var54) { // L: 5933
+						if (var10 == crossWorldMessageIds[var54]) { // L: 5934
+							var12 = true; // L: 5935
+							break; // L: 5936
 						}
 					}
 
-					InterfaceParent var53;
-					for (; var6-- > 0; var53.field1165 = true) { // L: 6104 6114
-						var7 = var3.readInt(); // L: 6105
-						var8 = var3.readUnsignedShort(); // L: 6106
-						var9 = var3.readUnsignedByte(); // L: 6107
-						var53 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6108
-						if (var53 != null && var8 != var53.group) { // L: 6109
-							class43.closeInterface(var53, true); // L: 6110
-							var53 = null; // L: 6111
-						}
-
-						if (var53 == null) { // L: 6113
-							var53 = class17.method208(var7, var8, var9);
-						}
+					if (DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var48, LoginScreenAnimation.loginType))) { // L: 5939
+						var12 = true;
 					}
 
-					for (var21 = (InterfaceParent)interfaceParents.first(); var21 != null; var21 = (InterfaceParent)interfaceParents.next()) { // L: 6116
-						if (var21.field1165) { // L: 6117
-							var21.field1165 = false;
+					if (!var12 && field629 == 0) { // L: 5940
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var10; // L: 5941
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 5942
+						var22 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(var3))); // L: 5943
+						byte var56;
+						if (var9.isPrivileged) { // L: 5945
+							var56 = 7;
 						} else {
-							class43.closeInterface(var21, true); // L: 6119
+							var56 = 3; // L: 5946
+						}
+
+						if (var9.modIcon != -1) { // L: 5947
+							UserComparator10.addGameMessage(var56, MusicPatchPcmStream.method4743(var9.modIcon) + var48, var22);
+						} else {
+							UserComparator10.addGameMessage(var56, var48, var22); // L: 5948
 						}
 					}
 
-					widgetFlags = new NodeHashTable(512); // L: 6122
+					var1.serverPacket = null; // L: 5950
+					return true; // L: 5951
+				}
 
-					while (var3.offset < var60) { // L: 6123
-						var7 = var3.readInt(); // L: 6124
-						var8 = var3.readUnsignedShort(); // L: 6125
-						var9 = var3.readUnsignedShort(); // L: 6126
-						var20 = var3.readInt(); // L: 6127
+				if (ServerPacket.field2718 == var1.serverPacket) { // L: 5953
+					UrlRequest.method2511(class226.field2686); // L: 5954
+					var1.serverPacket = null; // L: 5955
+					return true; // L: 5956
+				}
 
-						for (int var56 = var8; var56 <= var9; ++var56) { // L: 6128
-							var12 = ((long)var7 << 32) + (long)var56; // L: 6129
-							widgetFlags.put(new IntegerNode(var20), var12); // L: 6130
+				if (ServerPacket.field2758 == var1.serverPacket) { // L: 5958
+					class10.field74 = new class340(class26.HitSplatDefinition_cachedSprites); // L: 5959
+					var1.serverPacket = null; // L: 5960
+					return true; // L: 5961
+				}
+
+				int var8;
+				long var23;
+				if (ServerPacket.field2736 == var1.serverPacket) { // L: 5963
+					var17 = var3.readUnsignedShort(); // L: 5964
+					if (var17 == 65535) { // L: 5965
+						var17 = -1;
+					}
+
+					var5 = var3.readInt(); // L: 5966
+					var6 = var3.method6725(); // L: 5967
+					var7 = var3.method6653(); // L: 5968
+					if (var7 == 65535) { // L: 5969
+						var7 = -1;
+					}
+
+					for (var8 = var17; var8 <= var7; ++var8) { // L: 5970
+						var23 = ((long)var5 << 32) + (long)var8; // L: 5971
+						Node var53 = widgetFlags.get(var23); // L: 5972
+						if (var53 != null) { // L: 5973
+							var53.remove();
 						}
+
+						widgetFlags.put(new IntegerNode(var6), var23); // L: 5974
+					}
+
+					var1.serverPacket = null; // L: 5976
+					return true; // L: 5977
+				}
+
+				if (ServerPacket.field2766 == var1.serverPacket) { // L: 5979
+					var3.offset += 28; // L: 5980
+					if (var3.checkCrc()) { // L: 5981
+						WorldMapRectangle.method3709(var3, var3.offset - 28);
+					}
+
+					var1.serverPacket = null; // L: 5982
+					return true; // L: 5983
+				}
+
+				if (ServerPacket.field2724 == var1.serverPacket) { // L: 5985
+					var17 = var3.readInt(); // L: 5986
+					var5 = var3.readInt(); // L: 5987
+					var6 = class29.getGcDuration(); // L: 5988
+					PacketBufferNode var61 = InterfaceParent.getPacketBufferNode(ClientPacket.field2576, packetWriter.isaacCipher); // L: 5990
+					var61.packetBuffer.method6641(GameEngine.fps); // L: 5991
+					var61.packetBuffer.method6659(var17); // L: 5992
+					var61.packetBuffer.method6658(var5); // L: 5993
+					var61.packetBuffer.writeByte(var6); // L: 5994
+					packetWriter.addNode(var61); // L: 5995
+					var1.serverPacket = null; // L: 5996
+					return true; // L: 5997
+				}
+
+				if (ServerPacket.field2705 == var1.serverPacket) { // L: 5999
+					isCameraLocked = false; // L: 6000
+
+					for (var17 = 0; var17 < 5; ++var17) { // L: 6001
+						field871[var17] = false;
+					}
+
+					var1.serverPacket = null; // L: 6002
+					return true; // L: 6003
+				}
+
+				Widget var68;
+				if (ServerPacket.field2708 == var1.serverPacket) { // L: 6005
+					var17 = var3.method6662(); // L: 6006
+					var68 = WorldMapData_1.getWidget(var17); // L: 6007
+					var68.modelType = 3; // L: 6008
+					var68.modelId = class262.localPlayer.appearance.getChatHeadId(); // L: 6009
+					Script.invalidateWidget(var68); // L: 6010
+					var1.serverPacket = null; // L: 6011
+					return true; // L: 6012
+				}
+
+				if (ServerPacket.field2771 == var1.serverPacket) { // L: 6014
+					var17 = var3.readUnsignedByte(); // L: 6015
+					var5 = var3.readUnsignedByte(); // L: 6016
+					var6 = var3.readUnsignedByte(); // L: 6017
+					var7 = var3.readUnsignedByte(); // L: 6018
+					field871[var17] = true; // L: 6019
+					field872[var17] = var5; // L: 6020
+					field873[var17] = var6; // L: 6021
+					field867[var17] = var7; // L: 6022
+					field875[var17] = 0; // L: 6023
+					var1.serverPacket = null; // L: 6024
+					return true; // L: 6025
+				}
+
+				if (ServerPacket.field2765 == var1.serverPacket) { // L: 6027
+					var48 = var3.readStringCp1252NullTerminated(); // L: 6028
+					Object[] var72 = new Object[var48.length() + 1]; // L: 6029
+
+					for (var6 = var48.length() - 1; var6 >= 0; --var6) { // L: 6030
+						if (var48.charAt(var6) == 's') { // L: 6031
+							var72[var6 + 1] = var3.readStringCp1252NullTerminated();
+						} else {
+							var72[var6 + 1] = new Integer(var3.readInt()); // L: 6032
+						}
+					}
+
+					var72[0] = new Integer(var3.readInt()); // L: 6034
+					ScriptEvent var79 = new ScriptEvent(); // L: 6035
+					var79.args = var72; // L: 6036
+					WorldMapSection1.runScriptEvent(var79); // L: 6037
+					var1.serverPacket = null; // L: 6038
+					return true; // L: 6039
+				}
+
+				if (ServerPacket.field2779 == var1.serverPacket) { // L: 6041
+					var48 = var3.readStringCp1252NullTerminated(); // L: 6042
+					var26 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(var3))); // L: 6043
+					UserComparator10.addGameMessage(6, var48, var26); // L: 6044
+					var1.serverPacket = null; // L: 6045
+					return true; // L: 6046
+				}
+
+				byte var58;
+				if (ServerPacket.field2795 == var1.serverPacket) { // L: 6048
+					SecureRandomFuture.method2085(); // L: 6049
+					var58 = var3.readByte(); // L: 6050
+					if (var1.serverPacketLength == 1) { // L: 6051
+						if (var58 >= 0) { // L: 6052
+							currentClanSettings[var58] = null;
+						} else {
+							WorldMapManager.guestClanSettings = null; // L: 6053
+						}
+
+						var1.serverPacket = null; // L: 6054
+						return true; // L: 6055
+					}
+
+					if (var58 >= 0) { // L: 6057
+						currentClanSettings[var58] = new ClanSettings(var3); // L: 6058
+					} else {
+						WorldMapManager.guestClanSettings = new ClanSettings(var3); // L: 6061
+					}
+
+					var1.serverPacket = null; // L: 6063
+					return true; // L: 6064
+				}
+
+				if (ServerPacket.field2753 == var1.serverPacket) { // L: 6066
+					var17 = var3.readUnsignedByte(); // L: 6067
+					if (var3.readUnsignedByte() == 0) { // L: 6068
+						grandExchangeOffers[var17] = new GrandExchangeOffer(); // L: 6069
+						var3.offset += 18; // L: 6070
+					} else {
+						--var3.offset; // L: 6073
+						grandExchangeOffers[var17] = new GrandExchangeOffer(var3, false); // L: 6074
+					}
+
+					field827 = cycleCntr; // L: 6076
+					var1.serverPacket = null; // L: 6077
+					return true; // L: 6078
+				}
+
+				if (ServerPacket.field2709 == var1.serverPacket) { // L: 6080
+					WorldMapID.method3717(); // L: 6081
+					weight = var3.readShort(); // L: 6082
+					field823 = cycleCntr; // L: 6083
+					var1.serverPacket = null; // L: 6084
+					return true; // L: 6085
+				}
+
+				if (ServerPacket.field2762 == var1.serverPacket) { // L: 6087
+					UrlRequest.method2511(class226.field2687); // L: 6088
+					var1.serverPacket = null; // L: 6089
+					return true; // L: 6090
+				}
+
+				if (ServerPacket.field2722 == var1.serverPacket) { // L: 6092
+					class16.updateNpcs(true, var3); // L: 6093
+					var1.serverPacket = null; // L: 6094
+					return true; // L: 6095
+				}
+
+				Widget var59;
+				if (ServerPacket.field2799 == var1.serverPacket) { // L: 6097
+					var17 = var3.method6653(); // L: 6098
+					if (var17 == 65535) { // L: 6099
+						var17 = -1;
+					}
+
+					var5 = var3.method6662(); // L: 6100
+					var6 = var3.method6725(); // L: 6101
+					var59 = WorldMapData_1.getWidget(var5); // L: 6102
+					ItemComposition var71;
+					if (!var59.isIf3) { // L: 6103
+						if (var17 == -1) { // L: 6104
+							var59.modelType = 0; // L: 6105
+							var1.serverPacket = null; // L: 6106
+							return true; // L: 6107
+						}
+
+						var71 = class250.ItemDefinition_get(var17); // L: 6109
+						var59.modelType = 4; // L: 6110
+						var59.modelId = var17; // L: 6111
+						var59.modelAngleX = var71.xan2d; // L: 6112
+						var59.modelAngleY = var71.yan2d; // L: 6113
+						var59.modelZoom = var71.zoom2d * 100 / var6; // L: 6114
+						Script.invalidateWidget(var59); // L: 6115
+					} else {
+						var59.itemId = var17; // L: 6118
+						var59.itemQuantity = var6; // L: 6119
+						var71 = class250.ItemDefinition_get(var17); // L: 6120
+						var59.modelAngleX = var71.xan2d; // L: 6121
+						var59.modelAngleY = var71.yan2d; // L: 6122
+						var59.modelAngleZ = var71.zan2d; // L: 6123
+						var59.modelOffsetX = var71.offsetX2d; // L: 6124
+						var59.modelOffsetY = var71.offsetY2d; // L: 6125
+						var59.modelZoom = var71.zoom2d; // L: 6126
+						if (var71.isStackable == 1) { // L: 6127
+							var59.itemQuantityMode = 1;
+						} else {
+							var59.itemQuantityMode = 2; // L: 6128
+						}
+
+						if (var59.field3011 > 0) { // L: 6129
+							var59.modelZoom = var59.modelZoom * 32 / var59.field3011;
+						} else if (var59.rawWidth > 0) { // L: 6130
+							var59.modelZoom = var59.modelZoom * 32 / var59.rawWidth;
+						}
+
+						Script.invalidateWidget(var59); // L: 6131
 					}
 
 					var1.serverPacket = null; // L: 6133
 					return true; // L: 6134
 				}
 
-				if (ServerPacket.field2705 == var1.serverPacket) { // L: 6136
-					var78 = var3.method6549() == 1; // L: 6137
-					var5 = var3.method6598(); // L: 6138
-					var67 = Frames.getWidget(var5); // L: 6139
-					if (var78 != var67.isHidden) { // L: 6140
-						var67.isHidden = var78; // L: 6141
-						WorldMapCacheName.invalidateWidget(var67); // L: 6142
+				if (ServerPacket.field2750 == var1.serverPacket) { // L: 6136
+					SecureRandomFuture.method2085(); // L: 6137
+					var58 = var3.readByte(); // L: 6138
+					class2 var70 = new class2(var3); // L: 6139
+					ClanSettings var78;
+					if (var58 >= 0) { // L: 6141
+						var78 = currentClanSettings[var58];
+					} else {
+						var78 = WorldMapManager.guestClanSettings; // L: 6142
 					}
 
+					var70.method24(var78); // L: 6143
 					var1.serverPacket = null; // L: 6144
 					return true; // L: 6145
 				}
 
-				if (ServerPacket.field2751 == var1.serverPacket) { // L: 6147
-					class34.field254 = null; // L: 6148
-					var1.serverPacket = null; // L: 6149
-					return true; // L: 6150
-				}
-
-				int var15;
-				long var23;
-				long var25;
-				long var27;
-				String var30;
-				if (ServerPacket.field2785 == var1.serverPacket) { // L: 6152
-					var46 = var3.readStringCp1252NullTerminated(); // L: 6153
-					var23 = var3.readLong(); // L: 6154
-					var25 = (long)var3.readUnsignedShort(); // L: 6155
-					var27 = (long)var3.readMedium(); // L: 6156
-					PlayerType var79 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var3.readUnsignedByte()); // L: 6157
-					var12 = var27 + (var25 << 32); // L: 6158
-					boolean var59 = false; // L: 6159
-
-					for (var15 = 0; var15 < 100; ++var15) { // L: 6160
-						if (var12 == crossWorldMessageIds[var15]) { // L: 6161
-							var59 = true; // L: 6162
-							break; // L: 6163
-						}
-					}
-
-					if (var79.isUser && NetSocket.friendSystem.isIgnored(new Username(var46, WorldMapSection0.loginType))) { // L: 6166 6167
-						var59 = true;
-					}
-
-					if (!var59 && field755 == 0) { // L: 6169
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var12; // L: 6170
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6171
-						var30 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(var3))); // L: 6172
-						if (var79.modIcon != -1) { // L: 6173
-							class5.addChatMessage(9, SecureRandomFuture.method1982(var79.modIcon) + var46, var30, class258.base37DecodeLong(var23));
-						} else {
-							class5.addChatMessage(9, var46, var30, class258.base37DecodeLong(var23)); // L: 6174
-						}
-					}
-
-					var1.serverPacket = null; // L: 6176
-					return true; // L: 6177
-				}
-
-				if (ServerPacket.field2770 == var1.serverPacket) { // L: 6179
-					Tile.method3843(class225.field2685); // L: 6180
-					var1.serverPacket = null; // L: 6181
-					return true; // L: 6182
-				}
-
-				if (ServerPacket.field2779 == var1.serverPacket) { // L: 6184
-					var46 = var3.readStringCp1252NullTerminated(); // L: 6185
-					var5 = var3.method6614(); // L: 6186
-					var67 = Frames.getWidget(var5); // L: 6187
-					if (!var46.equals(var67.text)) { // L: 6188
-						var67.text = var46; // L: 6189
-						WorldMapCacheName.invalidateWidget(var67); // L: 6190
-					}
-
-					var1.serverPacket = null; // L: 6192
-					return true; // L: 6193
-				}
-
-				if (ServerPacket.field2787 == var1.serverPacket) { // L: 6195
-					var60 = var3.method6603(); // L: 6196
-					var5 = var3.method6598(); // L: 6197
-					var67 = Frames.getWidget(var5); // L: 6198
-					if (var67.modelType != 1 || var60 != var67.modelId) { // L: 6199
-						var67.modelType = 1; // L: 6200
-						var67.modelId = var60; // L: 6201
-						WorldMapCacheName.invalidateWidget(var67); // L: 6202
-					}
-
-					var1.serverPacket = null; // L: 6204
-					return true; // L: 6205
-				}
-
-				if (ServerPacket.field2706 == var1.serverPacket) { // L: 6207
-					var60 = var3.readInt(); // L: 6208
-					if (var60 != field723) { // L: 6209
-						field723 = var60; // L: 6210
-						Script.method1999(); // L: 6211
-					}
-
-					var1.serverPacket = null; // L: 6213
-					return true; // L: 6214
-				}
-
-				if (ServerPacket.field2778 == var1.serverPacket) { // L: 6216
-					class7.logOut(); // L: 6217
-					var1.serverPacket = null; // L: 6218
-					return false; // L: 6219
-				}
-
-				if (ServerPacket.field2737 == var1.serverPacket) { // L: 6221
-					World var50 = new World(); // L: 6222
-					var50.host = var3.readStringCp1252NullTerminated(); // L: 6223
-					var50.id = var3.readUnsignedShort(); // L: 6224
-					var5 = var3.readInt(); // L: 6225
-					var50.properties = var5; // L: 6226
-					class12.updateGameState(45); // L: 6227
-					var2.close(); // L: 6228
-					var2 = null; // L: 6229
-					class0.changeWorld(var50); // L: 6230
-					var1.serverPacket = null; // L: 6231
-					return false; // L: 6232
-				}
-
-				if (ServerPacket.field2728 == var1.serverPacket) { // L: 6234
-					rebootTimer = var3.readUnsignedShort() * 30; // L: 6235
-					field659 = cycleCntr; // L: 6236
-					var1.serverPacket = null; // L: 6237
-					return true; // L: 6238
-				}
-
-				String var72;
-				if (ServerPacket.field2765 == var1.serverPacket) { // L: 6240
-					byte[] var48 = new byte[var1.serverPacketLength]; // L: 6241
-					var3.method6521(var48, 0, var48.length); // L: 6242
-					Buffer var66 = new Buffer(var48); // L: 6243
-					var72 = var66.readStringCp1252NullTerminated(); // L: 6244
-					Players.openURL(var72, true, false); // L: 6245
-					var1.serverPacket = null; // L: 6246
-					return true; // L: 6247
-				}
-
-				byte var17;
-				if (ServerPacket.field2739 == var1.serverPacket) { // L: 6249
-					class124.method2496(); // L: 6250
-					var17 = var3.readByte(); // L: 6251
-					if (var1.serverPacketLength == 1) { // L: 6252
-						if (var17 >= 0) { // L: 6253
-							currentClanSettings[var17] = null;
-						} else {
-							NPCComposition.guestClanSettings = null; // L: 6254
-						}
-
-						var1.serverPacket = null; // L: 6255
-						return true; // L: 6256
-					}
-
-					if (var17 >= 0) { // L: 6258
-						currentClanSettings[var17] = new ClanSettings(var3); // L: 6259
+				boolean var63;
+				if (ServerPacket.field2707 == var1.serverPacket) { // L: 6147
+					var63 = var3.readUnsignedByte() == 1; // L: 6148
+					if (var63) { // L: 6149
+						WorldMapEvent.field2150 = ClientPacket.currentTimeMillis() - var3.readLong(); // L: 6150
+						class267.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6151
 					} else {
-						NPCComposition.guestClanSettings = new ClanSettings(var3); // L: 6262
+						class267.grandExchangeEvents = null; // L: 6153
 					}
 
-					var1.serverPacket = null; // L: 6264
-					return true; // L: 6265
+					field822 = cycleCntr; // L: 6154
+					var1.serverPacket = null; // L: 6155
+					return true; // L: 6156
 				}
 
-				if (ServerPacket.field2724 == var1.serverPacket) { // L: 6267
-					var60 = var3.method6598(); // L: 6268
-					var5 = var3.method6603(); // L: 6269
-					var67 = Frames.getWidget(var60); // L: 6270
-					if (var67 != null && var67.type == 0) { // L: 6271
-						if (var5 > var67.scrollHeight - var67.height) { // L: 6272
-							var5 = var67.scrollHeight - var67.height;
-						}
+				if (ServerPacket.field2759 == var1.serverPacket) { // L: 6158
+					isCameraLocked = true; // L: 6159
+					SoundCache.field448 = var3.readUnsignedByte(); // L: 6160
+					AttackOption.field1351 = var3.readUnsignedByte(); // L: 6161
+					field659 = var3.readUnsignedShort(); // L: 6162
+					Message.field602 = var3.readUnsignedByte(); // L: 6163
+					FloorUnderlayDefinition.field1707 = var3.readUnsignedByte(); // L: 6164
+					if (FloorUnderlayDefinition.field1707 >= 100) { // L: 6165
+						ObjectSound.cameraX = SoundCache.field448 * 128 + 64; // L: 6166
+						Canvas.cameraZ = AttackOption.field1351 * 128 + 64; // L: 6167
+						class160.cameraY = ItemContainer.getTileHeight(ObjectSound.cameraX, Canvas.cameraZ, SoundSystem.Client_plane) - field659; // L: 6168
+					}
 
-						if (var5 < 0) { // L: 6273
-							var5 = 0;
-						}
+					var1.serverPacket = null; // L: 6170
+					return true; // L: 6171
+				}
 
-						if (var5 != var67.scrollY) { // L: 6274
-							var67.scrollY = var5; // L: 6275
-							WorldMapCacheName.invalidateWidget(var67); // L: 6276
+				if (ServerPacket.field2706 == var1.serverPacket) { // L: 6173
+					UrlRequest.method2511(class226.field2693); // L: 6174
+					var1.serverPacket = null; // L: 6175
+					return true; // L: 6176
+				}
+
+				if (ServerPacket.field2746 == var1.serverPacket) { // L: 6178
+					UrlRequest.method2511(class226.field2689); // L: 6179
+					var1.serverPacket = null; // L: 6180
+					return true; // L: 6181
+				}
+
+				if (ServerPacket.field2740 == var1.serverPacket) { // L: 6183
+					World var50 = new World(); // L: 6184
+					var50.host = var3.readStringCp1252NullTerminated(); // L: 6185
+					var50.id = var3.readUnsignedShort(); // L: 6186
+					var5 = var3.readInt(); // L: 6187
+					var50.properties = var5; // L: 6188
+					Projectile.updateGameState(45); // L: 6189
+					var2.close(); // L: 6190
+					var2 = null; // L: 6191
+					GrandExchangeOfferAgeComparator.changeWorld(var50); // L: 6192
+					var1.serverPacket = null; // L: 6193
+					return false; // L: 6194
+				}
+
+				if (ServerPacket.field2792 == var1.serverPacket) { // L: 6196
+					var17 = var3.readInt(); // L: 6197
+					var5 = var3.method6757(); // L: 6198
+					var6 = var3.method6654(); // L: 6199
+					var59 = WorldMapData_1.getWidget(var17); // L: 6200
+					if (var5 != var59.rawX || var6 != var59.rawY || var59.xAlignment != 0 || var59.yAlignment != 0) { // L: 6201
+						var59.rawX = var5; // L: 6202
+						var59.rawY = var6; // L: 6203
+						var59.xAlignment = 0; // L: 6204
+						var59.yAlignment = 0; // L: 6205
+						Script.invalidateWidget(var59); // L: 6206
+						this.alignWidget(var59); // L: 6207
+						if (var59.type == 0) { // L: 6208
+							WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var17 >> 16], var59, false);
 						}
 					}
 
+					var1.serverPacket = null; // L: 6210
+					return true; // L: 6211
+				}
+
+				if (ServerPacket.field2777 == var1.serverPacket) { // L: 6213
+					UrlRequest.method2511(class226.field2690); // L: 6214
+					var1.serverPacket = null; // L: 6215
+					return true; // L: 6216
+				}
+
+				int var29;
+				int var30;
+				if (ServerPacket.field2743 == var1.serverPacket) { // L: 6218
+					isCameraLocked = true; // L: 6219
+					WorldMapIcon_0.field2029 = var3.readUnsignedByte(); // L: 6220
+					class44.field315 = var3.readUnsignedByte(); // L: 6221
+					FriendsChat.field3815 = var3.readUnsignedShort(); // L: 6222
+					GrandExchangeOfferOwnWorldComparator.field607 = var3.readUnsignedByte(); // L: 6223
+					class20.field166 = var3.readUnsignedByte(); // L: 6224
+					if (class20.field166 >= 100) { // L: 6225
+						var17 = WorldMapIcon_0.field2029 * 128 + 64; // L: 6226
+						var5 = class44.field315 * 128 + 64; // L: 6227
+						var6 = ItemContainer.getTileHeight(var17, var5, SoundSystem.Client_plane) - FriendsChat.field3815; // L: 6228
+						var7 = var17 - ObjectSound.cameraX; // L: 6229
+						var8 = var6 - class160.cameraY; // L: 6230
+						var29 = var5 - Canvas.cameraZ; // L: 6231
+						var30 = (int)Math.sqrt((double)(var7 * var7 + var29 * var29)); // L: 6232
+						class69.cameraPitch = (int)(Math.atan2((double)var8, (double)var30) * 325.949D) & 2047; // L: 6233
+						class32.cameraYaw = (int)(Math.atan2((double)var7, (double)var29) * -325.949D) & 2047; // L: 6234
+						if (class69.cameraPitch < 128) { // L: 6235
+							class69.cameraPitch = 128;
+						}
+
+						if (class69.cameraPitch > 383) { // L: 6236
+							class69.cameraPitch = 383;
+						}
+					}
+
+					var1.serverPacket = null; // L: 6238
+					return true; // L: 6239
+				}
+
+				if (ServerPacket.field2726 == var1.serverPacket) { // L: 6241
+					class126.readReflectionCheck(var3, var1.serverPacketLength); // L: 6242
+					var1.serverPacket = null; // L: 6243
+					return true; // L: 6244
+				}
+
+				if (ServerPacket.field2786 == var1.serverPacket) { // L: 6246
+					PcmPlayer.logOut(); // L: 6247
+					var1.serverPacket = null; // L: 6248
+					return false; // L: 6249
+				}
+
+				if (ServerPacket.field2721 == var1.serverPacket) { // L: 6251
+					DevicePcmPlayerProvider.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6252
+					World.FriendSystem_invalidateIgnoreds(); // L: 6253
+					field817 = cycleCntr; // L: 6254
+					var1.serverPacket = null; // L: 6255
+					return true; // L: 6256
+				}
+
+				if (ServerPacket.field2703 == var1.serverPacket) { // L: 6258
+					var17 = var3.method6651(); // L: 6259
+					byte var57 = var3.method6682(); // L: 6260
+					Varps.Varps_temp[var17] = var57; // L: 6261
+					if (Varps.Varps_main[var17] != var57) { // L: 6262
+						Varps.Varps_main[var17] = var57; // L: 6263
+					}
+
+					class6.changeGameOptions(var17); // L: 6265
+					changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6266
+					var1.serverPacket = null; // L: 6267
+					return true; // L: 6268
+				}
+
+				if (ServerPacket.field2723 == var1.serverPacket) { // L: 6270
+					var17 = var3.method6653(); // L: 6271
+					var5 = var3.method6675(); // L: 6272
+					Varps.Varps_temp[var17] = var5; // L: 6273
+					if (Varps.Varps_main[var17] != var5) { // L: 6274
+						Varps.Varps_main[var17] = var5; // L: 6275
+					}
+
+					class6.changeGameOptions(var17); // L: 6277
+					changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6278
 					var1.serverPacket = null; // L: 6279
 					return true; // L: 6280
 				}
 
-				if (ServerPacket.field2790 == var1.serverPacket) { // L: 6282
-					for (var60 = 0; var60 < Varps.Varps_main.length; ++var60) { // L: 6283
-						if (Varps.Varps_main[var60] != Varps.Varps_temp[var60]) { // L: 6284
-							Varps.Varps_main[var60] = Varps.Varps_temp[var60]; // L: 6285
-							ApproximateRouteStrategy.changeGameOptions(var60); // L: 6286
-							changedVarps[++changedVarpCount - 1 & 31] = var60; // L: 6287
-						}
+				InterfaceParent var25;
+				if (ServerPacket.field2751 == var1.serverPacket) { // L: 6282
+					var17 = var3.method6644(); // L: 6283
+					var5 = var3.method6725(); // L: 6284
+					var6 = var3.method6651(); // L: 6285
+					var25 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6286
+					if (var25 != null) { // L: 6287
+						InvDefinition.closeInterface(var25, var6 != var25.group);
 					}
 
-					var1.serverPacket = null; // L: 6290
-					return true; // L: 6291
+					FriendSystem.method1867(var5, var6, var17); // L: 6288
+					var1.serverPacket = null; // L: 6289
+					return true; // L: 6290
 				}
 
-				if (ServerPacket.field2710 == var1.serverPacket) { // L: 6293
-					PlayerComposition.readReflectionCheck(var3, var1.serverPacketLength); // L: 6294
+				if (ServerPacket.field2768 == var1.serverPacket) { // L: 6292
+					var17 = var3.readUnsignedByte(); // L: 6293
+					ViewportMouse.method4410(var17); // L: 6294
 					var1.serverPacket = null; // L: 6295
 					return true; // L: 6296
 				}
 
-				if (ServerPacket.field2792 == var1.serverPacket) { // L: 6298
-					var60 = var3.readInt(); // L: 6299
-					var5 = var3.readUnsignedShort(); // L: 6300
-					if (var60 < -70000) { // L: 6301
-						var5 += 32768;
+				if (ServerPacket.field2757 == var1.serverPacket) { // L: 6298
+					KeyHandler.loadRegions(false, var1.packetBuffer); // L: 6299
+					var1.serverPacket = null; // L: 6300
+					return true; // L: 6301
+				}
+
+				if (ServerPacket.field2791 == var1.serverPacket) { // L: 6303
+					var17 = var3.method6662(); // L: 6304
+					var68 = WorldMapData_1.getWidget(var17); // L: 6305
+
+					for (var6 = 0; var6 < var68.itemIds.length; ++var6) { // L: 6306
+						var68.itemIds[var6] = -1; // L: 6307
+						var68.itemIds[var6] = 0; // L: 6308
 					}
 
-					if (var60 >= 0) { // L: 6303
-						var67 = Frames.getWidget(var60);
-					} else {
-						var67 = null; // L: 6304
+					Script.invalidateWidget(var68); // L: 6310
+					var1.serverPacket = null; // L: 6311
+					return true; // L: 6312
+				}
+
+				Widget var27;
+				if (ServerPacket.field2775 == var1.serverPacket) { // L: 6314
+					var17 = var3.method6654(); // L: 6315
+					var5 = var3.method6675(); // L: 6316
+					var27 = WorldMapData_1.getWidget(var5); // L: 6317
+					if (var17 != var27.sequenceId || var17 == -1) { // L: 6318
+						var27.sequenceId = var17; // L: 6319
+						var27.modelFrame = 0; // L: 6320
+						var27.modelFrameCycle = 0; // L: 6321
+						Script.invalidateWidget(var27); // L: 6322
 					}
 
-					for (; var3.offset < var1.serverPacketLength; class4.itemContainerSetItem(var5, var7, var8 - 1, var9)) { // L: 6305 6319
-						var7 = var3.readUShortSmart(); // L: 6306
-						var8 = var3.readUnsignedShort(); // L: 6307
-						var9 = 0; // L: 6308
-						if (var8 != 0) { // L: 6309
-							var9 = var3.readUnsignedByte(); // L: 6310
-							if (var9 == 255) { // L: 6311
-								var9 = var3.readInt();
-							}
-						}
-
-						if (var67 != null && var7 >= 0 && var7 < var67.itemIds.length) { // L: 6313 6314
-							var67.itemIds[var7] = var8; // L: 6315
-							var67.itemQuantities[var7] = var9; // L: 6316
-						}
-					}
-
-					if (var67 != null) { // L: 6321
-						WorldMapCacheName.invalidateWidget(var67);
-					}
-
-					class170.method3554(); // L: 6322
-					changedItemContainers[++field830 - 1 & 31] = var5 & 32767; // L: 6323
 					var1.serverPacket = null; // L: 6324
 					return true; // L: 6325
 				}
 
-				if (ServerPacket.field2780 == var1.serverPacket) { // L: 6327
-					class339.loadRegions(false, var1.packetBuffer); // L: 6328
+				if (ServerPacket.field2778 == var1.serverPacket) { // L: 6327
+					class10.field74 = null; // L: 6328
 					var1.serverPacket = null; // L: 6329
 					return true; // L: 6330
 				}
 
-				if (ServerPacket.field2726 == var1.serverPacket) { // L: 6332
-					FriendSystem.updatePlayers(var3, var1.serverPacketLength); // L: 6333
-					ObjectSound.method1761(); // L: 6334
-					var1.serverPacket = null; // L: 6335
-					return true; // L: 6336
+				if (ServerPacket.field2748 == var1.serverPacket) { // L: 6332
+					var17 = var3.readUnsignedShort(); // L: 6333
+					var5 = var3.readUnsignedByte(); // L: 6334
+					var6 = var3.readUnsignedShort(); // L: 6335
+					ClanSettings.queueSoundEffect(var17, var5, var6); // L: 6336
+					var1.serverPacket = null; // L: 6337
+					return true; // L: 6338
 				}
 
-				if (ServerPacket.field2769 == var1.serverPacket) { // L: 6338
-					Tile.method3843(class225.field2680); // L: 6339
-					var1.serverPacket = null; // L: 6340
-					return true; // L: 6341
+				if (ServerPacket.field2783 == var1.serverPacket) { // L: 6340
+					class15.field128 = var3.method6643(); // L: 6341
+					WorldMapSection0.field2047 = var3.method6642(); // L: 6342
+					var1.serverPacket = null; // L: 6343
+					return true; // L: 6344
 				}
 
-				if (ServerPacket.field2760 == var1.serverPacket) { // L: 6343
-					class170.method3554(); // L: 6344
-					runEnergy = var3.readUnsignedByte(); // L: 6345
-					field659 = cycleCntr; // L: 6346
-					var1.serverPacket = null; // L: 6347
-					return true; // L: 6348
-				}
-
-				if (ServerPacket.field2718 == var1.serverPacket) { // L: 6350
-					var60 = var3.readUnsignedShort(); // L: 6351
-					if (var60 == 65535) { // L: 6352
-						var60 = -1;
-					}
-
-					var5 = var3.method6613(); // L: 6353
-					var6 = var3.method6605(); // L: 6354
-					if (var6 == 65535) { // L: 6355
-						var6 = -1;
-					}
-
-					var7 = var3.method6598(); // L: 6356
-
-					for (var8 = var60; var8 <= var6; ++var8) { // L: 6357
-						var27 = ((long)var7 << 32) + (long)var8; // L: 6358
-						Node var29 = widgetFlags.get(var27); // L: 6359
-						if (var29 != null) { // L: 6360
-							var29.remove();
+				String var74;
+				if (ServerPacket.field2710 == var1.serverPacket) { // L: 6346
+					var17 = var3.method6643(); // L: 6347
+					var5 = var3.readUnsignedByte(); // L: 6348
+					var74 = var3.readStringCp1252NullTerminated(); // L: 6349
+					if (var5 >= 1 && var5 <= 8) { // L: 6350
+						if (var74.equalsIgnoreCase("null")) { // L: 6351
+							var74 = null;
 						}
 
-						widgetFlags.put(new IntegerNode(var5), var27); // L: 6361
+						playerMenuActions[var5 - 1] = var74; // L: 6352
+						playerOptionsPriorities[var5 - 1] = var17 == 0; // L: 6353
 					}
 
-					var1.serverPacket = null; // L: 6363
-					return true; // L: 6364
+					var1.serverPacket = null; // L: 6355
+					return true; // L: 6356
 				}
 
-				if (ServerPacket.field2764 == var1.serverPacket) { // L: 6366
-					var60 = var3.readInt(); // L: 6367
-					var5 = var3.readInt(); // L: 6368
-					var6 = class43.getGcDuration(); // L: 6369
-					PacketBufferNode var73 = class21.getPacketBufferNode(ClientPacket.field2634, packetWriter.isaacCipher); // L: 6371
-					var73.packetBuffer.method6611(var60); // L: 6372
-					var73.packetBuffer.writeInt(var5); // L: 6373
-					var73.packetBuffer.method6581(GameEngine.fps); // L: 6374
-					var73.packetBuffer.method6584(var6); // L: 6375
-					packetWriter.addNode(var73); // L: 6376
-					var1.serverPacket = null; // L: 6377
-					return true; // L: 6378
-				}
-
-				if (ServerPacket.field2786 == var1.serverPacket) { // L: 6380
-					class339.loadRegions(true, var1.packetBuffer); // L: 6381
-					var1.serverPacket = null; // L: 6382
-					return true; // L: 6383
-				}
-
-				if (ServerPacket.field2712 == var1.serverPacket) { // L: 6385
-					Tile.method3843(class225.field2682); // L: 6386
-					var1.serverPacket = null; // L: 6387
-					return true; // L: 6388
-				}
-
-				if (ServerPacket.field2727 == var1.serverPacket) { // L: 6390
-					var78 = var3.readUnsignedByte() == 1; // L: 6391
-					if (var78) { // L: 6392
-						Widget.field3099 = ObjectComposition.currentTimeMillis() - var3.readLong(); // L: 6393
-						BuddyRankComparator.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 6394
-					} else {
-						BuddyRankComparator.grandExchangeEvents = null; // L: 6396
+				if (ServerPacket.field2725 == var1.serverPacket) { // L: 6358
+					hintArrowType = var3.readUnsignedByte(); // L: 6359
+					if (hintArrowType == 1) { // L: 6360
+						hintArrowNpcIndex = var3.readUnsignedShort();
 					}
 
-					field748 = cycleCntr; // L: 6397
-					var1.serverPacket = null; // L: 6398
-					return true; // L: 6399
-				}
-
-				if (ServerPacket.field2789 == var1.serverPacket) { // L: 6401
-					isCameraLocked = false; // L: 6402
-
-					for (var60 = 0; var60 < 5; ++var60) { // L: 6403
-						field693[var60] = false;
-					}
-
-					var1.serverPacket = null; // L: 6404
-					return true; // L: 6405
-				}
-
-				Widget var69;
-				if (ServerPacket.field2753 == var1.serverPacket) { // L: 6407
-					var60 = var3.method6598(); // L: 6408
-					var5 = var3.method6614(); // L: 6409
-					var6 = var3.method6604(); // L: 6410
-					if (var6 == 65535) { // L: 6411
-						var6 = -1;
-					}
-
-					var69 = Frames.getWidget(var5); // L: 6412
-					ItemComposition var75;
-					if (!var69.isIf3) { // L: 6413
-						if (var6 == -1) { // L: 6414
-							var69.modelType = 0; // L: 6415
-							var1.serverPacket = null; // L: 6416
-							return true; // L: 6417
+					if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6361
+						if (hintArrowType == 2) { // L: 6362
+							hintArrowSubX = 64; // L: 6363
+							hintArrowSubY = 64; // L: 6364
 						}
 
-						var75 = class260.ItemDefinition_get(var6); // L: 6419
-						var69.modelType = 4; // L: 6420
-						var69.modelId = var6; // L: 6421
-						var69.modelAngleX = var75.xan2d; // L: 6422
-						var69.modelAngleY = var75.yan2d; // L: 6423
-						var69.modelZoom = var75.zoom2d * 100 / var60; // L: 6424
-						WorldMapCacheName.invalidateWidget(var69); // L: 6425
-					} else {
-						var69.itemId = var6; // L: 6428
-						var69.itemQuantity = var60; // L: 6429
-						var75 = class260.ItemDefinition_get(var6); // L: 6430
-						var69.modelAngleX = var75.xan2d; // L: 6431
-						var69.modelAngleY = var75.yan2d; // L: 6432
-						var69.modelAngleZ = var75.zan2d; // L: 6433
-						var69.modelOffsetX = var75.offsetX2d; // L: 6434
-						var69.modelOffsetY = var75.offsetY2d; // L: 6435
-						var69.modelZoom = var75.zoom2d; // L: 6436
-						if (var75.isStackable == 1) { // L: 6437
-							var69.itemQuantityMode = 1;
-						} else {
-							var69.itemQuantityMode = 2; // L: 6438
+						if (hintArrowType == 3) { // L: 6366
+							hintArrowSubX = 0; // L: 6367
+							hintArrowSubY = 64; // L: 6368
 						}
 
-						if (var69.field3013 > 0) { // L: 6439
-							var69.modelZoom = var69.modelZoom * 32 / var69.field3013;
-						} else if (var69.rawWidth > 0) { // L: 6440
-							var69.modelZoom = var69.modelZoom * 32 / var69.rawWidth;
+						if (hintArrowType == 4) { // L: 6370
+							hintArrowSubX = 128; // L: 6371
+							hintArrowSubY = 64; // L: 6372
 						}
 
-						WorldMapCacheName.invalidateWidget(var69); // L: 6441
+						if (hintArrowType == 5) { // L: 6374
+							hintArrowSubX = 64; // L: 6375
+							hintArrowSubY = 0; // L: 6376
+						}
+
+						if (hintArrowType == 6) { // L: 6378
+							hintArrowSubX = 64; // L: 6379
+							hintArrowSubY = 128; // L: 6380
+						}
+
+						hintArrowType = 2; // L: 6382
+						hintArrowX = var3.readUnsignedShort(); // L: 6383
+						hintArrowY = var3.readUnsignedShort(); // L: 6384
+						hintArrowHeight = var3.readUnsignedByte(); // L: 6385
 					}
 
-					var1.serverPacket = null; // L: 6443
-					return true; // L: 6444
+					if (hintArrowType == 10) { // L: 6387
+						hintArrowPlayerIndex = var3.readUnsignedShort();
+					}
+
+					var1.serverPacket = null; // L: 6388
+					return true; // L: 6389
 				}
 
-				if (ServerPacket.field2794 == var1.serverPacket) { // L: 6446
-					minimapState = var3.readUnsignedByte(); // L: 6447
-					var1.serverPacket = null; // L: 6448
-					return true; // L: 6449
-				}
-
-				if (ServerPacket.field2745 == var1.serverPacket) { // L: 6451
-					var46 = var3.readStringCp1252NullTerminated(); // L: 6452
-					var18 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(var3))); // L: 6453
-					World.addGameMessage(6, var46, var18); // L: 6454
-					var1.serverPacket = null; // L: 6455
-					return true; // L: 6456
-				}
-
-				String var32;
-				int var57;
-				if (ServerPacket.field2719 == var1.serverPacket) { // L: 6458
-					var17 = var3.readByte(); // L: 6459
-					var23 = (long)var3.readUnsignedShort(); // L: 6460
-					var25 = (long)var3.readMedium(); // L: 6461
-					var27 = var25 + (var23 << 32); // L: 6462
-					boolean var11 = false; // L: 6463
-					ClanChannel var31 = var17 >= 0 ? currentClanChannels[var17] : ApproximateRouteStrategy.guestClanChannel; // L: 6464
-					if (var31 == null) { // L: 6465
-						var11 = true;
-					} else {
-						for (var57 = 0; var57 < 100; ++var57) { // L: 6467
-							if (var27 == crossWorldMessageIds[var57]) { // L: 6468
-								var11 = true; // L: 6469
-								break; // L: 6470
-							}
+				if (ServerPacket.field2782 == var1.serverPacket) { // L: 6391
+					for (var17 = 0; var17 < Varps.Varps_main.length; ++var17) { // L: 6392
+						if (Varps.Varps_temp[var17] != Varps.Varps_main[var17]) { // L: 6393
+							Varps.Varps_main[var17] = Varps.Varps_temp[var17]; // L: 6394
+							class6.changeGameOptions(var17); // L: 6395
+							changedVarps[++changedVarpCount - 1 & 31] = var17; // L: 6396
 						}
 					}
 
-					if (!var11) { // L: 6474
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var27; // L: 6475
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6476
-						var32 = MusicPatch.method4592(var3); // L: 6477
-						int var58 = var17 >= 0 ? 43 : 46; // L: 6478
-						class5.addChatMessage(var58, "", var32, var31.name); // L: 6479
+					var1.serverPacket = null; // L: 6399
+					return true; // L: 6400
+				}
+
+				Widget var28;
+				if (ServerPacket.field2755 == var1.serverPacket) { // L: 6402
+					var17 = var3.method6653(); // L: 6403
+					var5 = var3.method6675(); // L: 6404
+					var6 = var3.method6652(); // L: 6405
+					var7 = var3.method6652(); // L: 6406
+					var28 = WorldMapData_1.getWidget(var5); // L: 6407
+					if (var17 != var28.modelAngleX || var6 != var28.modelAngleY || var7 != var28.modelZoom) { // L: 6408
+						var28.modelAngleX = var17; // L: 6409
+						var28.modelAngleY = var6; // L: 6410
+						var28.modelZoom = var7; // L: 6411
+						Script.invalidateWidget(var28); // L: 6412
 					}
 
-					var1.serverPacket = null; // L: 6481
-					return true; // L: 6482
+					var1.serverPacket = null; // L: 6414
+					return true; // L: 6415
 				}
 
-				if (ServerPacket.field2708 == var1.serverPacket) { // L: 6484
-					Occluder.field2387 = var3.method6595(); // L: 6485
-					class69.field596 = var3.method6549(); // L: 6486
-					var1.serverPacket = null; // L: 6487
-					return true; // L: 6488
-				}
-
-				if (ServerPacket.field2762 == var1.serverPacket) { // L: 6490
-					var60 = var3.method6603(); // L: 6491
-					var5 = var3.method6605(); // L: 6492
-					var6 = var3.method6604(); // L: 6493
-					var7 = var3.method6598(); // L: 6494
-					var74 = Frames.getWidget(var7); // L: 6495
-					if (var60 != var74.modelAngleX || var5 != var74.modelAngleY || var6 != var74.modelZoom) { // L: 6496
-						var74.modelAngleX = var60; // L: 6497
-						var74.modelAngleY = var5; // L: 6498
-						var74.modelZoom = var6; // L: 6499
-						WorldMapCacheName.invalidateWidget(var74); // L: 6500
-					}
-
-					var1.serverPacket = null; // L: 6502
-					return true; // L: 6503
-				}
-
-				Widget var64;
-				if (ServerPacket.field2761 == var1.serverPacket) { // L: 6505
-					var60 = var3.method6614(); // L: 6506
-					var64 = Frames.getWidget(var60); // L: 6507
-					var64.modelType = 3; // L: 6508
-					var64.modelId = class93.localPlayer.appearance.getChatHeadId(); // L: 6509
-					WorldMapCacheName.invalidateWidget(var64); // L: 6510
-					var1.serverPacket = null; // L: 6511
-					return true; // L: 6512
-				}
-
-				if (ServerPacket.field2763 == var1.serverPacket) { // L: 6514
-					var60 = var3.readUShortSmart(); // L: 6515
-					boolean var54 = var3.readUnsignedByte() == 1; // L: 6516
-					var72 = ""; // L: 6517
-					boolean var52 = false; // L: 6518
-					if (var54) { // L: 6519
-						var72 = var3.readStringCp1252NullTerminated(); // L: 6520
-						if (NetSocket.friendSystem.isIgnored(new Username(var72, WorldMapSection0.loginType))) { // L: 6521
+				boolean var51;
+				if (ServerPacket.field2737 == var1.serverPacket) { // L: 6417
+					var17 = var3.readUShortSmart(); // L: 6418
+					var51 = var3.readUnsignedByte() == 1; // L: 6419
+					var74 = ""; // L: 6420
+					boolean var52 = false; // L: 6421
+					if (var51) { // L: 6422
+						var74 = var3.readStringCp1252NullTerminated(); // L: 6423
+						if (DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var74, LoginScreenAnimation.loginType))) { // L: 6424
 							var52 = true;
 						}
 					}
 
-					String var22 = var3.readStringCp1252NullTerminated(); // L: 6523
-					if (!var52) { // L: 6524
-						World.addGameMessage(var60, var72, var22);
+					String var66 = var3.readStringCp1252NullTerminated(); // L: 6426
+					if (!var52) { // L: 6427
+						UserComparator10.addGameMessage(var17, var74, var66);
 					}
 
-					var1.serverPacket = null; // L: 6525
-					return true; // L: 6526
+					var1.serverPacket = null; // L: 6428
+					return true; // L: 6429
 				}
 
-				if (ServerPacket.field2793 == var1.serverPacket) { // L: 6528
-					class170.method3554(); // L: 6529
-					weight = var3.readShort(); // L: 6530
-					field659 = cycleCntr; // L: 6531
-					var1.serverPacket = null; // L: 6532
-					return true; // L: 6533
-				}
-
-				if (ServerPacket.field2791 == var1.serverPacket) { // L: 6535
-					publicChatMode = var3.readUnsignedByte(); // L: 6536
-					tradeChatMode = var3.method6549(); // L: 6537
-					var1.serverPacket = null; // L: 6538
-					return true; // L: 6539
-				}
-
-				if (ServerPacket.field2784 == var1.serverPacket) { // L: 6541
-					var3.offset += 28; // L: 6542
-					if (var3.checkCrc()) { // L: 6543
-						class245.method4714(var3, var3.offset - 28);
-					}
-
-					var1.serverPacket = null; // L: 6544
-					return true; // L: 6545
-				}
-
-				if (ServerPacket.field2740 == var1.serverPacket) { // L: 6547
-					var60 = var3.readUnsignedShort(); // L: 6548
-					if (var60 == 65535) { // L: 6549
-						var60 = -1;
-					}
-
-					class27.playSong(var60); // L: 6550
-					var1.serverPacket = null; // L: 6551
-					return true; // L: 6552
-				}
-
-				if (ServerPacket.field2725 == var1.serverPacket) { // L: 6554
-					var60 = var3.method6604(); // L: 6555
-					if (var60 == 65535) { // L: 6556
-						var60 = -1;
-					}
-
-					var5 = var3.method6610(); // L: 6557
-					GrandExchangeOfferNameComparator.method5059(var60, var5); // L: 6558
-					var1.serverPacket = null; // L: 6559
-					return true; // L: 6560
-				}
-
-				if (ServerPacket.field2754 == var1.serverPacket) { // L: 6562
-					var46 = var3.readStringCp1252NullTerminated(); // L: 6563
-					var5 = var3.method6549(); // L: 6564
-					var6 = var3.method6671(); // L: 6565
-					if (var5 >= 1 && var5 <= 8) { // L: 6566
-						if (var46.equalsIgnoreCase("null")) { // L: 6567
-							var46 = null;
+				if (ServerPacket.field2752 == var1.serverPacket) { // L: 6431
+					field820 = cycleCntr; // L: 6432
+					var58 = var3.readByte(); // L: 6433
+					if (var1.serverPacketLength == 1) { // L: 6434
+						if (var58 >= 0) { // L: 6435
+							currentClanChannels[var58] = null;
+						} else {
+							AttackOption.guestClanChannel = null; // L: 6436
 						}
 
-						playerMenuActions[var5 - 1] = var46; // L: 6568
-						playerOptionsPriorities[var5 - 1] = var6 == 0; // L: 6569
+						var1.serverPacket = null; // L: 6437
+						return true; // L: 6438
 					}
 
-					var1.serverPacket = null; // L: 6571
-					return true; // L: 6572
+					if (var58 >= 0) { // L: 6440
+						currentClanChannels[var58] = new ClanChannel(var3); // L: 6441
+					} else {
+						AttackOption.guestClanChannel = new ClanChannel(var3); // L: 6444
+					}
+
+					var1.serverPacket = null; // L: 6446
+					return true; // L: 6447
 				}
 
-				if (ServerPacket.field2748 == var1.serverPacket) { // L: 6574
-					var60 = var3.readUnsignedByte(); // L: 6575
-					var5 = var3.readUnsignedByte(); // L: 6576
-					var6 = var3.readUnsignedByte(); // L: 6577
-					var7 = var3.readUnsignedByte(); // L: 6578
-					field693[var60] = true; // L: 6579
-					field890[var60] = var5; // L: 6580
-					field891[var60] = var6; // L: 6581
-					field892[var60] = var7; // L: 6582
-					field893[var60] = 0; // L: 6583
-					var1.serverPacket = null; // L: 6584
-					return true; // L: 6585
+				if (ServerPacket.field2796 == var1.serverPacket) { // L: 6449
+					var17 = var3.method6652(); // L: 6450
+					var5 = var3.method6725(); // L: 6451
+					var6 = var3.method6651(); // L: 6452
+					var59 = WorldMapData_1.getWidget(var5); // L: 6453
+					var59.field2981 = var17 + (var6 << 16); // L: 6454
+					var1.serverPacket = null; // L: 6455
+					return true; // L: 6456
 				}
 
-				if (ServerPacket.field2783 == var1.serverPacket) { // L: 6587
-					class69.field596 = var3.readUnsignedByte(); // L: 6588
-					Occluder.field2387 = var3.readUnsignedByte(); // L: 6589
+				if (ServerPacket.field2738 == var1.serverPacket) { // L: 6458
+					var17 = var3.method6675(); // L: 6459
+					var5 = var3.method6653(); // L: 6460
+					var27 = WorldMapData_1.getWidget(var17); // L: 6461
+					if (var27.modelType != 1 || var5 != var27.modelId) { // L: 6462
+						var27.modelType = 1; // L: 6463
+						var27.modelId = var5; // L: 6464
+						Script.invalidateWidget(var27); // L: 6465
+					}
 
-					for (var60 = Occluder.field2387; var60 < Occluder.field2387 + 8; ++var60) { // L: 6590
-						for (var5 = class69.field596; var5 < class69.field596 + 8; ++var5) { // L: 6591
-							if (groundItems[class22.Client_plane][var60][var5] != null) { // L: 6592
-								groundItems[class22.Client_plane][var60][var5] = null; // L: 6593
-								ClanSettings.updateItemPile(var60, var5); // L: 6594
+					var1.serverPacket = null; // L: 6467
+					return true; // L: 6468
+				}
+
+				if (ServerPacket.field2773 == var1.serverPacket) { // L: 6470
+					WorldMapID.method3717(); // L: 6471
+					runEnergy = var3.readUnsignedByte(); // L: 6472
+					field823 = cycleCntr; // L: 6473
+					var1.serverPacket = null; // L: 6474
+					return true; // L: 6475
+				}
+
+				if (ServerPacket.field2767 == var1.serverPacket) { // L: 6477
+					class16.updateNpcs(false, var3); // L: 6478
+					var1.serverPacket = null; // L: 6479
+					return true; // L: 6480
+				}
+
+				if (ServerPacket.field2789 == var1.serverPacket) { // L: 6482
+					var63 = var3.readBoolean(); // L: 6483
+					if (var63) { // L: 6484
+						if (LoginPacket.field2800 == null) { // L: 6485
+							LoginPacket.field2800 = new class286();
+						}
+					} else {
+						LoginPacket.field2800 = null; // L: 6487
+					}
+
+					var1.serverPacket = null; // L: 6488
+					return true; // L: 6489
+				}
+
+				if (ServerPacket.field2770 == var1.serverPacket) { // L: 6491
+					var17 = var3.readInt(); // L: 6492
+					var5 = var3.readUnsignedShort(); // L: 6493
+					if (var17 < -70000) { // L: 6494
+						var5 += 32768;
+					}
+
+					if (var17 >= 0) { // L: 6496
+						var27 = WorldMapData_1.getWidget(var17);
+					} else {
+						var27 = null; // L: 6497
+					}
+
+					for (; var3.offset < var1.serverPacketLength; ByteArrayPool.itemContainerSetItem(var5, var7, var8 - 1, var29)) { // L: 6498 6512
+						var7 = var3.readUShortSmart(); // L: 6499
+						var8 = var3.readUnsignedShort(); // L: 6500
+						var29 = 0; // L: 6501
+						if (var8 != 0) { // L: 6502
+							var29 = var3.readUnsignedByte(); // L: 6503
+							if (var29 == 255) { // L: 6504
+								var29 = var3.readInt();
 							}
 						}
-					}
 
-					for (PendingSpawn var47 = (PendingSpawn)pendingSpawns.last(); var47 != null; var47 = (PendingSpawn)pendingSpawns.previous()) { // L: 6598 6599 6601
-						if (var47.x >= Occluder.field2387 && var47.x < Occluder.field2387 + 8 && var47.y >= class69.field596 && var47.y < class69.field596 + 8 && var47.plane == class22.Client_plane) { // L: 6600
-							var47.hitpoints = 0;
+						if (var27 != null && var7 >= 0 && var7 < var27.itemIds.length) { // L: 6506 6507
+							var27.itemIds[var7] = var8; // L: 6508
+							var27.itemQuantities[var7] = var29; // L: 6509
 						}
 					}
 
-					var1.serverPacket = null; // L: 6603
-					return true; // L: 6604
+					if (var27 != null) { // L: 6514
+						Script.invalidateWidget(var27);
+					}
+
+					WorldMapID.method3717(); // L: 6515
+					changedItemContainers[++field711 - 1 & 31] = var5 & 32767; // L: 6516
+					var1.serverPacket = null; // L: 6517
+					return true; // L: 6518
 				}
 
-				if (ServerPacket.field2723 == var1.serverPacket) { // L: 6606
-					for (var60 = 0; var60 < players.length; ++var60) { // L: 6607
-						if (players[var60] != null) { // L: 6608
-							players[var60].sequence = -1;
+				if (ServerPacket.field2794 == var1.serverPacket) { // L: 6520
+					UrlRequest.method2511(class226.field2691); // L: 6521
+					var1.serverPacket = null; // L: 6522
+					return true; // L: 6523
+				}
+
+				if (ServerPacket.field2745 == var1.serverPacket) { // L: 6525
+					var17 = var3.method6662(); // L: 6526
+					var5 = var3.method6652(); // L: 6527
+					var27 = WorldMapData_1.getWidget(var17); // L: 6528
+					if (var27 != null && var27.type == 0) { // L: 6529
+						if (var5 > var27.scrollHeight - var27.height) { // L: 6530
+							var5 = var27.scrollHeight - var27.height;
+						}
+
+						if (var5 < 0) { // L: 6531
+							var5 = 0;
+						}
+
+						if (var5 != var27.scrollY) { // L: 6532
+							var27.scrollY = var5; // L: 6533
+							Script.invalidateWidget(var27); // L: 6534
 						}
 					}
 
-					for (var60 = 0; var60 < npcs.length; ++var60) { // L: 6610
-						if (npcs[var60] != null) { // L: 6611
-							npcs[var60].sequence = -1;
-						}
+					var1.serverPacket = null; // L: 6537
+					return true; // L: 6538
+				}
+
+				if (ServerPacket.field2760 == var1.serverPacket) { // L: 6540
+					DevicePcmPlayerProvider.friendSystem.method1817(); // L: 6541
+					field817 = cycleCntr; // L: 6542
+					var1.serverPacket = null; // L: 6543
+					return true; // L: 6544
+				}
+
+				if (ServerPacket.field2797 == var1.serverPacket) { // L: 6546
+					ClanChannel.privateChatMode = class244.method4812(var3.readUnsignedByte()); // L: 6547
+					var1.serverPacket = null; // L: 6548
+					return true; // L: 6549
+				}
+
+				if (ServerPacket.field2763 == var1.serverPacket) { // L: 6551
+					var17 = var3.method6652(); // L: 6552
+					MouseHandler.method750(var17); // L: 6553
+					changedItemContainers[++field711 - 1 & 31] = var17 & 32767; // L: 6554
+					var1.serverPacket = null; // L: 6555
+					return true; // L: 6556
+				}
+
+				if (ServerPacket.field2728 == var1.serverPacket) { // L: 6558
+					destinationX = var3.readUnsignedByte(); // L: 6559
+					if (destinationX == 255) { // L: 6560
+						destinationX = 0;
+					}
+
+					destinationY = var3.readUnsignedByte(); // L: 6561
+					if (destinationY == 255) { // L: 6562
+						destinationY = 0;
+					}
+
+					var1.serverPacket = null; // L: 6563
+					return true; // L: 6564
+				}
+
+				if (ServerPacket.field2784 == var1.serverPacket) { // L: 6566
+					var17 = var3.readInt(); // L: 6567
+					InterfaceParent var67 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6568
+					if (var67 != null) { // L: 6569
+						InvDefinition.closeInterface(var67, true);
+					}
+
+					if (meslayerContinueWidget != null) { // L: 6570
+						Script.invalidateWidget(meslayerContinueWidget); // L: 6571
+						meslayerContinueWidget = null; // L: 6572
+					}
+
+					var1.serverPacket = null; // L: 6574
+					return true; // L: 6575
+				}
+
+				if (ServerPacket.field2719 == var1.serverPacket) { // L: 6577
+					var17 = var3.method6651(); // L: 6578
+					var5 = var3.method6662(); // L: 6579
+					var6 = var17 >> 10 & 31; // L: 6580
+					var7 = var17 >> 5 & 31; // L: 6581
+					var8 = var17 & 31; // L: 6582
+					var29 = (var7 << 11) + (var6 << 19) + (var8 << 3); // L: 6583
+					Widget var77 = WorldMapData_1.getWidget(var5); // L: 6584
+					if (var29 != var77.color) { // L: 6585
+						var77.color = var29; // L: 6586
+						Script.invalidateWidget(var77); // L: 6587
+					}
+
+					var1.serverPacket = null; // L: 6589
+					return true; // L: 6590
+				}
+
+				if (ServerPacket.field2747 == var1.serverPacket) { // L: 6592
+					UrlRequest.method2511(class226.field2684); // L: 6593
+					var1.serverPacket = null; // L: 6594
+					return true; // L: 6595
+				}
+
+				if (ServerPacket.field2731 == var1.serverPacket) { // L: 6597
+					if (class289.friendsChat != null) { // L: 6598
+						class289.friendsChat.method5751(var3); // L: 6599
+					}
+
+					class248.method4916(); // L: 6601
+					var1.serverPacket = null; // L: 6602
+					return true; // L: 6603
+				}
+
+				if (ServerPacket.field2711 == var1.serverPacket) { // L: 6605
+					class15.field128 = var3.method6644(); // L: 6606
+					WorldMapSection0.field2047 = var3.method6643(); // L: 6607
+
+					while (var3.offset < var1.serverPacketLength) { // L: 6608
+						var17 = var3.readUnsignedByte(); // L: 6609
+						class226 var65 = WorldMapData_1.method3582()[var17]; // L: 6610
+						UrlRequest.method2511(var65); // L: 6611
 					}
 
 					var1.serverPacket = null; // L: 6613
 					return true; // L: 6614
 				}
 
-				if (ServerPacket.field2715 == var1.serverPacket) { // L: 6616
-					var60 = var3.method6613(); // L: 6617
-					var64 = Frames.getWidget(var60); // L: 6618
-
-					for (var6 = 0; var6 < var64.itemIds.length; ++var6) { // L: 6619
-						var64.itemIds[var6] = -1; // L: 6620
-						var64.itemIds[var6] = 0; // L: 6621
-					}
-
-					WorldMapCacheName.invalidateWidget(var64); // L: 6623
-					var1.serverPacket = null; // L: 6624
-					return true; // L: 6625
-				}
-
-				if (ServerPacket.field2774 == var1.serverPacket) { // L: 6627
-					class170.method3554(); // L: 6628
-					var60 = var3.method6595(); // L: 6629
-					var5 = var3.method6549(); // L: 6630
-					var6 = var3.method6614(); // L: 6631
-					experience[var5] = var6; // L: 6632
-					currentLevels[var5] = var60; // L: 6633
-					levels[var5] = 1; // L: 6634
-
-					for (var7 = 0; var7 < 98; ++var7) { // L: 6635
-						if (var6 >= Skills.Skills_experienceTable[var7]) {
-							levels[var5] = var7 + 2;
-						}
-					}
-
-					changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6636
-					var1.serverPacket = null; // L: 6637
-					return true; // L: 6638
-				}
-
-				if (ServerPacket.field2782 == var1.serverPacket) { // L: 6640
-					NetSocket.friendSystem.method1698(); // L: 6641
-					field836 = cycleCntr; // L: 6642
-					var1.serverPacket = null; // L: 6643
-					return true; // L: 6644
-				}
-
-				if (ServerPacket.field2747 == var1.serverPacket) { // L: 6646
-					var60 = var3.method6614(); // L: 6647
-					var5 = var3.method6605(); // L: 6648
-					var6 = var3.method6605(); // L: 6649
-					var69 = Frames.getWidget(var60); // L: 6650
-					var69.field3014 = var6 + (var5 << 16); // L: 6651
-					var1.serverPacket = null; // L: 6652
-					return true; // L: 6653
-				}
-
-				if (ServerPacket.field2731 == var1.serverPacket) { // L: 6655
-					var60 = var3.method6614(); // L: 6656
-					var5 = var3.readUnsignedShort(); // L: 6657
-					Varps.Varps_temp[var5] = var60; // L: 6658
-					if (Varps.Varps_main[var5] != var60) { // L: 6659
-						Varps.Varps_main[var5] = var60; // L: 6660
-					}
-
-					ApproximateRouteStrategy.changeGameOptions(var5); // L: 6662
-					changedVarps[++changedVarpCount - 1 & 31] = var5; // L: 6663
-					var1.serverPacket = null; // L: 6664
-					return true; // L: 6665
-				}
-
-				if (ServerPacket.field2771 == var1.serverPacket) { // L: 6667
-					var60 = var3.readInt(); // L: 6668
-					var5 = var3.readUnsignedShort(); // L: 6669
-					if (var60 < -70000) { // L: 6670
-						var5 += 32768;
-					}
-
-					if (var60 >= 0) { // L: 6672
-						var67 = Frames.getWidget(var60);
+				if (ServerPacket.field2790 == var1.serverPacket) { // L: 6616
+					var58 = var3.readByte(); // L: 6617
+					var18 = (long)var3.readUnsignedShort(); // L: 6618
+					var20 = (long)var3.readMedium(); // L: 6619
+					var23 = var20 + (var18 << 32); // L: 6620
+					boolean var75 = false; // L: 6621
+					ClanChannel var33 = var58 >= 0 ? currentClanChannels[var58] : AttackOption.guestClanChannel; // L: 6622
+					if (var33 == null) { // L: 6623
+						var75 = true;
 					} else {
-						var67 = null; // L: 6673
-					}
-
-					if (var67 != null) { // L: 6674
-						for (var7 = 0; var7 < var67.itemIds.length; ++var7) { // L: 6675
-							var67.itemIds[var7] = 0; // L: 6676
-							var67.itemQuantities[var7] = 0; // L: 6677
+						for (var54 = 0; var54 < 100; ++var54) { // L: 6625
+							if (var23 == crossWorldMessageIds[var54]) { // L: 6626
+								var75 = true; // L: 6627
+								break; // L: 6628
+							}
 						}
 					}
 
-					GrandExchangeOfferOwnWorldComparator.clearItemContainer(var5); // L: 6680
-					var7 = var3.readUnsignedShort(); // L: 6681
-
-					for (var8 = 0; var8 < var7; ++var8) { // L: 6682
-						var9 = var3.method6604(); // L: 6683
-						var20 = var3.method6595(); // L: 6684
-						if (var20 == 255) { // L: 6685
-							var20 = var3.method6613();
-						}
-
-						if (var67 != null && var8 < var67.itemIds.length) { // L: 6686 6687
-							var67.itemIds[var8] = var9; // L: 6688
-							var67.itemQuantities[var8] = var20; // L: 6689
-						}
-
-						class4.itemContainerSetItem(var5, var8, var9 - 1, var20); // L: 6692
+					if (!var75) { // L: 6632
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var23; // L: 6633
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6634
+						var22 = WorldMapIcon_1.method3304(var3); // L: 6635
+						int var55 = var58 >= 0 ? 43 : 46; // L: 6636
+						SecureRandomCallable.addChatMessage(var55, "", var22, var33.name); // L: 6637
 					}
 
-					if (var67 != null) { // L: 6694
-						WorldMapCacheName.invalidateWidget(var67);
-					}
-
-					class170.method3554(); // L: 6695
-					changedItemContainers[++field830 - 1 & 31] = var5 & 32767; // L: 6696
-					var1.serverPacket = null; // L: 6697
-					return true; // L: 6698
+					var1.serverPacket = null; // L: 6639
+					return true; // L: 6640
 				}
 
-				if (ServerPacket.field2756 == var1.serverPacket) { // L: 6700
-					var60 = var3.method6604(); // L: 6701
-					Login.method1941(var60); // L: 6702
-					changedItemContainers[++field830 - 1 & 31] = var60 & 32767; // L: 6703
-					var1.serverPacket = null; // L: 6704
-					return true; // L: 6705
+				if (ServerPacket.field2749 == var1.serverPacket) { // L: 6642
+					byte[] var49 = new byte[var1.serverPacketLength]; // L: 6643
+					var3.method6561(var49, 0, var49.length); // L: 6644
+					Buffer var64 = new Buffer(var49); // L: 6645
+					var74 = var64.readStringCp1252NullTerminated(); // L: 6646
+					AttackOption.openURL(var74, true, false); // L: 6647
+					var1.serverPacket = null; // L: 6648
+					return true; // L: 6649
 				}
 
-				if (ServerPacket.field2720 == var1.serverPacket) { // L: 6707
-					if (WorldMapRegion.friendsChat != null) { // L: 6708
-						WorldMapRegion.friendsChat.method5659(var3); // L: 6709
-					}
-
-					CollisionMap.method3155(); // L: 6711
-					var1.serverPacket = null; // L: 6712
-					return true; // L: 6713
+				if (ServerPacket.field2727 == var1.serverPacket) { // L: 6651
+					TaskHandler.method2615(var3.readStringCp1252NullTerminated()); // L: 6652
+					var1.serverPacket = null; // L: 6653
+					return true; // L: 6654
 				}
 
-				if (ServerPacket.field2755 == var1.serverPacket) { // L: 6715
-					for (var60 = 0; var60 < VarpDefinition.VarpDefinition_fileCount; ++var60) { // L: 6716
-						VarpDefinition var63 = ClanSettings.VarpDefinition_get(var60); // L: 6717
-						if (var63 != null) { // L: 6718
-							Varps.Varps_temp[var60] = 0; // L: 6719
-							Varps.Varps_main[var60] = 0; // L: 6720
+				if (ServerPacket.field2772 == var1.serverPacket) { // L: 6656
+					UrlRequest.method2511(class226.field2683); // L: 6657
+					var1.serverPacket = null; // L: 6658
+					return true; // L: 6659
+				}
+
+				int var15;
+				long var34;
+				String var36;
+				if (ServerPacket.field2793 == var1.serverPacket) { // L: 6661
+					var48 = var3.readStringCp1252NullTerminated(); // L: 6662
+					var18 = var3.readLong(); // L: 6663
+					var20 = (long)var3.readUnsignedShort(); // L: 6664
+					var23 = (long)var3.readMedium(); // L: 6665
+					PlayerType var11 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var3.readUnsignedByte()); // L: 6666
+					var34 = var23 + (var20 << 32); // L: 6667
+					boolean var14 = false; // L: 6668
+
+					for (var15 = 0; var15 < 100; ++var15) { // L: 6669
+						if (crossWorldMessageIds[var15] == var34) { // L: 6670
+							var14 = true; // L: 6671
+							break; // L: 6672
 						}
 					}
 
-					class170.method3554(); // L: 6723
-					changedVarpCount += 32; // L: 6724
-					var1.serverPacket = null; // L: 6725
-					return true; // L: 6726
-				}
-
-				if (ServerPacket.field2707 == var1.serverPacket) { // L: 6728
-					SoundSystem.updateNpcs(false, var3); // L: 6729
-					var1.serverPacket = null; // L: 6730
-					return true; // L: 6731
-				}
-
-				if (ServerPacket.field2702 == var1.serverPacket) { // L: 6733
-					var60 = var3.readUnsignedShort(); // L: 6734
-					byte var49 = var3.readByte(); // L: 6735
-					Varps.Varps_temp[var60] = var49; // L: 6736
-					if (Varps.Varps_main[var60] != var49) { // L: 6737
-						Varps.Varps_main[var60] = var49; // L: 6738
+					if (var11.isUser && DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var48, LoginScreenAnimation.loginType))) { // L: 6675 6676
+						var14 = true;
 					}
 
-					ApproximateRouteStrategy.changeGameOptions(var60); // L: 6740
-					changedVarps[++changedVarpCount - 1 & 31] = var60; // L: 6741
-					var1.serverPacket = null; // L: 6742
-					return true; // L: 6743
-				}
-
-				if (ServerPacket.field2768 == var1.serverPacket) { // L: 6745
-					NetSocket.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 6746
-					MouseRecorder.FriendSystem_invalidateIgnoreds(); // L: 6747
-					field836 = cycleCntr; // L: 6748
-					var1.serverPacket = null; // L: 6749
-					return true; // L: 6750
-				}
-
-				if (ServerPacket.field2744 == var1.serverPacket) { // L: 6752
-					Tile.method3843(class225.field2684); // L: 6753
-					var1.serverPacket = null; // L: 6754
-					return true; // L: 6755
-				}
-
-				if (ServerPacket.field2713 == var1.serverPacket) { // L: 6757
-					var46 = var3.readStringCp1252NullTerminated(); // L: 6758
-					var23 = (long)var3.readUnsignedShort(); // L: 6759
-					var25 = (long)var3.readMedium(); // L: 6760
-					PlayerType var33 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var3.readUnsignedByte()); // L: 6761
-					long var34 = var25 + (var23 << 32); // L: 6762
-					boolean var36 = false; // L: 6763
-
-					for (var57 = 0; var57 < 100; ++var57) { // L: 6764
-						if (crossWorldMessageIds[var57] == var34) { // L: 6765
-							var36 = true; // L: 6766
-							break; // L: 6767
-						}
-					}
-
-					if (NetSocket.friendSystem.isIgnored(new Username(var46, WorldMapSection0.loginType))) { // L: 6770
-						var36 = true;
-					}
-
-					if (!var36 && field755 == 0) { // L: 6771
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; // L: 6772
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6773
-						var32 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(var3))); // L: 6774
-						byte var14;
-						if (var33.isPrivileged) { // L: 6776
-							var14 = 7;
+					if (!var14 && field629 == 0) { // L: 6678
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var34; // L: 6679
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6680
+						var36 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(var3))); // L: 6681
+						if (var11.modIcon != -1) { // L: 6682
+							SecureRandomCallable.addChatMessage(9, MusicPatchPcmStream.method4743(var11.modIcon) + var48, var36, class80.base37DecodeLong(var18));
 						} else {
-							var14 = 3; // L: 6777
-						}
-
-						if (var33.modIcon != -1) { // L: 6778
-							World.addGameMessage(var14, SecureRandomFuture.method1982(var33.modIcon) + var46, var32);
-						} else {
-							World.addGameMessage(var14, var46, var32); // L: 6779
+							SecureRandomCallable.addChatMessage(9, var48, var36, class80.base37DecodeLong(var18)); // L: 6683
 						}
 					}
 
-					var1.serverPacket = null; // L: 6781
-					return true; // L: 6782
+					var1.serverPacket = null; // L: 6685
+					return true; // L: 6686
 				}
 
-				if (ServerPacket.field2742 == var1.serverPacket) { // L: 6784
-					var17 = var3.readByte(); // L: 6785
-					var18 = var3.readStringCp1252NullTerminated(); // L: 6786
-					long var37 = (long)var3.readUnsignedShort(); // L: 6787
-					long var39 = (long)var3.readMedium(); // L: 6788
-					PlayerType var10 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var3.readUnsignedByte()); // L: 6789
-					long var41 = (var37 << 32) + var39; // L: 6790
-					boolean var13 = false; // L: 6791
-					ClanChannel var43 = null; // L: 6792
-					var43 = var17 >= 0 ? currentClanChannels[var17] : ApproximateRouteStrategy.guestClanChannel; // L: 6794
-					if (var43 == null) { // L: 6795
-						var13 = true; // L: 6796
+				if (ServerPacket.field2712 == var1.serverPacket) { // L: 6688
+					minimapState = var3.readUnsignedByte(); // L: 6689
+					var1.serverPacket = null; // L: 6690
+					return true; // L: 6691
+				}
+
+				if (ServerPacket.field2735 == var1.serverPacket) { // L: 6693
+					if (class10.field74 == null) { // L: 6694
+						class10.field74 = new class340(class26.HitSplatDefinition_cachedSprites);
+					}
+
+					class391 var47 = class26.HitSplatDefinition_cachedSprites.method6052(var3); // L: 6695
+					class10.field74.field3919.vmethod6398(var47.field4226, var47.field4227); // L: 6696
+					field814[++field759 - 1 & 31] = var47.field4226; // L: 6697
+					var1.serverPacket = null; // L: 6698
+					return true; // L: 6699
+				}
+
+				if (ServerPacket.field2739 == var1.serverPacket) { // L: 6701
+					var58 = var3.readByte(); // L: 6702
+					var26 = var3.readStringCp1252NullTerminated(); // L: 6703
+					long var37 = (long)var3.readUnsignedShort(); // L: 6704
+					long var39 = (long)var3.readMedium(); // L: 6705
+					PlayerType var76 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var3.readUnsignedByte()); // L: 6706
+					long var41 = (var37 << 32) + var39; // L: 6707
+					boolean var13 = false; // L: 6708
+					ClanChannel var43 = null; // L: 6709
+					var43 = var58 >= 0 ? currentClanChannels[var58] : AttackOption.guestClanChannel; // L: 6711
+					if (var43 == null) { // L: 6712
+						var13 = true; // L: 6713
 					} else {
 						var15 = 0;
 
 						while (true) {
 							if (var15 >= 100) {
-								if (var10.isUser && NetSocket.friendSystem.isIgnored(new Username(var18, WorldMapSection0.loginType))) { // L: 6805 6806
+								if (var76.isUser && DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var26, LoginScreenAnimation.loginType))) { // L: 6722 6723
 									var13 = true;
 								}
 								break;
 							}
 
-							if (crossWorldMessageIds[var15] == var41) { // L: 6800
-								var13 = true; // L: 6801
-								break; // L: 6802
+							if (crossWorldMessageIds[var15] == var41) { // L: 6717
+								var13 = true; // L: 6718
+								break; // L: 6719
 							}
 
-							++var15; // L: 6799
+							++var15; // L: 6716
 						}
 					}
 
-					if (!var13) { // L: 6809
-						crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 6810
-						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6811
-						var30 = AbstractFont.escapeBrackets(MusicPatch.method4592(var3)); // L: 6812
-						int var16 = var17 >= 0 ? 41 : 44; // L: 6813
-						if (var10.modIcon != -1) { // L: 6814
-							class5.addChatMessage(var16, SecureRandomFuture.method1982(var10.modIcon) + var18, var30, var43.name);
+					if (!var13) { // L: 6726
+						crossWorldMessageIds[crossWorldMessageIdsIndex] = var41; // L: 6727
+						crossWorldMessageIdsIndex = (crossWorldMessageIdsIndex + 1) % 100; // L: 6728
+						var36 = AbstractFont.escapeBrackets(WorldMapIcon_1.method3304(var3)); // L: 6729
+						int var16 = var58 >= 0 ? 41 : 44; // L: 6730
+						if (var76.modIcon != -1) { // L: 6731
+							SecureRandomCallable.addChatMessage(var16, MusicPatchPcmStream.method4743(var76.modIcon) + var26, var36, var43.name);
 						} else {
-							class5.addChatMessage(var16, var18, var30, var43.name); // L: 6815
+							SecureRandomCallable.addChatMessage(var16, var26, var36, var43.name); // L: 6732
 						}
 					}
 
-					var1.serverPacket = null; // L: 6817
-					return true; // L: 6818
+					var1.serverPacket = null; // L: 6734
+					return true; // L: 6735
 				}
 
-				if (ServerPacket.field2716 == var1.serverPacket) { // L: 6820
-					field839 = cycleCntr; // L: 6821
-					var17 = var3.readByte(); // L: 6822
-					class19 var62 = new class19(var3); // L: 6823
-					ClanChannel var65;
-					if (var17 >= 0) { // L: 6825
-						var65 = currentClanChannels[var17];
-					} else {
-						var65 = ApproximateRouteStrategy.guestClanChannel; // L: 6826
+				if (ServerPacket.field2717 == var1.serverPacket) { // L: 6737
+					var17 = var3.readInt(); // L: 6738
+					var5 = var3.readInt(); // L: 6739
+					InterfaceParent var73 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6740
+					var25 = (InterfaceParent)interfaceParents.get((long)var17); // L: 6741
+					if (var25 != null) { // L: 6742
+						InvDefinition.closeInterface(var25, var73 == null || var25.group != var73.group);
 					}
 
-					var62.method218(var65); // L: 6827
-					var1.serverPacket = null; // L: 6828
-					return true; // L: 6829
-				}
-
-				if (ServerPacket.field2798 == var1.serverPacket) { // L: 6831
-					class124.method2496(); // L: 6832
-					var17 = var3.readByte(); // L: 6833
-					class2 var61 = new class2(var3); // L: 6834
-					ClanSettings var19;
-					if (var17 >= 0) { // L: 6836
-						var19 = currentClanSettings[var17];
-					} else {
-						var19 = NPCComposition.guestClanSettings; // L: 6837
+					if (var73 != null) { // L: 6743
+						var73.remove(); // L: 6744
+						interfaceParents.put(var73, (long)var17); // L: 6745
 					}
 
-					var61.method16(var19); // L: 6838
-					var1.serverPacket = null; // L: 6839
-					return true; // L: 6840
+					var28 = WorldMapData_1.getWidget(var5); // L: 6747
+					if (var28 != null) { // L: 6748
+						Script.invalidateWidget(var28);
+					}
+
+					var28 = WorldMapData_1.getWidget(var17); // L: 6749
+					if (var28 != null) { // L: 6750
+						Script.invalidateWidget(var28); // L: 6751
+						WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var28.id >>> 16], var28, true); // L: 6752
+					}
+
+					if (rootInterface != -1) { // L: 6754
+						class8.runIntfCloseListeners(rootInterface, 1);
+					}
+
+					var1.serverPacket = null; // L: 6755
+					return true; // L: 6756
 				}
 
-				if (ServerPacket.field2703 == var1.serverPacket) { // L: 6842
-					var60 = var3.method6661(); // L: 6843
-					var5 = var3.method6598(); // L: 6844
-					var6 = var3.method6621(); // L: 6845
-					var69 = Frames.getWidget(var5); // L: 6846
-					if (var6 != var69.rawX || var60 != var69.rawY || var69.xAlignment != 0 || var69.yAlignment != 0) { // L: 6847
-						var69.rawX = var6; // L: 6848
-						var69.rawY = var60; // L: 6849
-						var69.xAlignment = 0; // L: 6850
-						var69.yAlignment = 0; // L: 6851
-						WorldMapCacheName.invalidateWidget(var69); // L: 6852
-						this.alignWidget(var69); // L: 6853
-						if (var69.type == 0) { // L: 6854
-							class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var5 >> 16], var69, false);
+				if (ServerPacket.field2761 == var1.serverPacket) { // L: 6758
+					var17 = var3.readUnsignedByte(); // L: 6759
+					class2.forceDisconnect(var17); // L: 6760
+					var1.serverPacket = null; // L: 6761
+					return false; // L: 6762
+				}
+
+				if (ServerPacket.field2781 == var1.serverPacket) { // L: 6764
+					UrlRequest.method2511(class226.field2692); // L: 6765
+					var1.serverPacket = null; // L: 6766
+					return true; // L: 6767
+				}
+
+				if (ServerPacket.field2720 == var1.serverPacket) { // L: 6769
+					for (var17 = 0; var17 < players.length; ++var17) { // L: 6770
+						if (players[var17] != null) { // L: 6771
+							players[var17].sequence = -1;
 						}
 					}
 
-					var1.serverPacket = null; // L: 6856
-					return true; // L: 6857
-				}
-
-				if (ServerPacket.field2773 == var1.serverPacket) { // L: 6859
-					var60 = var3.readUnsignedByte(); // L: 6860
-					var5 = var3.method6605(); // L: 6861
-					var6 = var3.method6613(); // L: 6862
-					var21 = (InterfaceParent)interfaceParents.get((long)var6); // L: 6863
-					if (var21 != null) {
-						class43.closeInterface(var21, var5 != var21.group); // L: 6864
+					for (var17 = 0; var17 < npcs.length; ++var17) { // L: 6773
+						if (npcs[var17] != null) { // L: 6774
+							npcs[var17].sequence = -1;
+						}
 					}
 
-					class17.method208(var6, var5, var60); // L: 6865
-					var1.serverPacket = null; // L: 6866
-					return true; // L: 6867
+					var1.serverPacket = null; // L: 6776
+					return true; // L: 6777
 				}
 
-				if (ServerPacket.field2700 == var1.serverPacket) { // L: 6869
-					var60 = var3.method6603(); // L: 6870
-					rootInterface = var60; // L: 6871
-					this.resizeRoot(false); // L: 6872
-					class21.Widget_resetModelFrames(var60); // L: 6873
-					FloorDecoration.runWidgetOnLoadListener(rootInterface); // L: 6874
-
-					for (var5 = 0; var5 < 100; ++var5) { // L: 6875
-						field719[var5] = true;
-					}
-
-					var1.serverPacket = null; // L: 6876
-					return true; // L: 6877
-				}
-
-				if (ServerPacket.field2749 == var1.serverPacket) { // L: 6879
-					if (var1.serverPacketLength == 0) { // L: 6880
-						WorldMapRegion.friendsChat = null; // L: 6881
+				if (ServerPacket.field2733 == var1.serverPacket) { // L: 6779
+					field820 = cycleCntr; // L: 6780
+					var58 = var3.readByte(); // L: 6781
+					class19 var62 = new class19(var3); // L: 6782
+					ClanChannel var69;
+					if (var58 >= 0) { // L: 6784
+						var69 = currentClanChannels[var58];
 					} else {
-						if (WorldMapRegion.friendsChat == null) { // L: 6884
-							WorldMapRegion.friendsChat = new FriendsChat(WorldMapSection0.loginType, class23.client); // L: 6885
+						var69 = AttackOption.guestClanChannel; // L: 6785
+					}
+
+					var62.method278(var69); // L: 6786
+					var1.serverPacket = null; // L: 6787
+					return true; // L: 6788
+				}
+
+				if (ServerPacket.field2714 == var1.serverPacket) { // L: 6790
+					WorldMapSection0.field2047 = var3.method6643(); // L: 6791
+					class15.field128 = var3.method6642(); // L: 6792
+
+					for (var17 = WorldMapSection0.field2047; var17 < WorldMapSection0.field2047 + 8; ++var17) { // L: 6793
+						for (var5 = class15.field128; var5 < class15.field128 + 8; ++var5) { // L: 6794
+							if (groundItems[SoundSystem.Client_plane][var17][var5] != null) { // L: 6795
+								groundItems[SoundSystem.Client_plane][var17][var5] = null; // L: 6796
+								class26.updateItemPile(var17, var5); // L: 6797
+							}
+						}
+					}
+
+					for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) { // L: 6801 6802 6804
+						if (var46.x >= WorldMapSection0.field2047 && var46.x < WorldMapSection0.field2047 + 8 && var46.y >= class15.field128 && var46.y < class15.field128 + 8 && var46.plane == SoundSystem.Client_plane) { // L: 6803
+							var46.hitpoints = 0;
+						}
+					}
+
+					var1.serverPacket = null; // L: 6806
+					return true; // L: 6807
+				}
+
+				if (ServerPacket.field2715 == var1.serverPacket) { // L: 6809
+					UrlRequest.method2511(class226.field2688); // L: 6810
+					var1.serverPacket = null; // L: 6811
+					return true; // L: 6812
+				}
+
+				if (ServerPacket.field2713 == var1.serverPacket) { // L: 6814
+					if (var1.serverPacketLength == 0) { // L: 6815
+						class289.friendsChat = null; // L: 6816
+					} else {
+						if (class289.friendsChat == null) { // L: 6819
+							class289.friendsChat = new FriendsChat(LoginScreenAnimation.loginType, class1.client); // L: 6820
 						}
 
-						WorldMapRegion.friendsChat.readUpdate(var3); // L: 6887
+						class289.friendsChat.readUpdate(var3); // L: 6822
 					}
 
-					CollisionMap.method3155(); // L: 6889
-					var1.serverPacket = null; // L: 6890
-					return true; // L: 6891
+					class248.method4916(); // L: 6824
+					var1.serverPacket = null; // L: 6825
+					return true; // L: 6826
 				}
 
-				if (ServerPacket.field2795 == var1.serverPacket) { // L: 6893
-					Tile.method3843(class225.field2688); // L: 6894
-					var1.serverPacket = null; // L: 6895
-					return true; // L: 6896
-				}
+				if (ServerPacket.field2744 == var1.serverPacket) { // L: 6828
+					var17 = var3.offset + var1.serverPacketLength; // L: 6829
+					var5 = var3.readUnsignedShort(); // L: 6830
+					var6 = var3.readUnsignedShort(); // L: 6831
+					if (var5 != rootInterface) { // L: 6832
+						rootInterface = var5; // L: 6833
+						this.resizeRoot(false); // L: 6834
+						TextureProvider.Widget_resetModelFrames(rootInterface); // L: 6835
+						ScriptFrame.runWidgetOnLoadListener(rootInterface); // L: 6836
 
-				if (ServerPacket.field2766 == var1.serverPacket) { // L: 6898
-					field839 = cycleCntr; // L: 6899
-					var17 = var3.readByte(); // L: 6900
-					if (var1.serverPacketLength == 1) { // L: 6901
-						if (var17 >= 0) { // L: 6902
-							currentClanChannels[var17] = null;
+						for (var7 = 0; var7 < 100; ++var7) { // L: 6837
+							field831[var7] = true;
+						}
+					}
+
+					InterfaceParent var31;
+					for (; var6-- > 0; var31.field1148 = true) { // L: 6839 6849
+						var7 = var3.readInt(); // L: 6840
+						var8 = var3.readUnsignedShort(); // L: 6841
+						var29 = var3.readUnsignedByte(); // L: 6842
+						var31 = (InterfaceParent)interfaceParents.get((long)var7); // L: 6843
+						if (var31 != null && var8 != var31.group) { // L: 6844
+							InvDefinition.closeInterface(var31, true); // L: 6845
+							var31 = null; // L: 6846
+						}
+
+						if (var31 == null) { // L: 6848
+							var31 = FriendSystem.method1867(var7, var8, var29);
+						}
+					}
+
+					for (var25 = (InterfaceParent)interfaceParents.first(); var25 != null; var25 = (InterfaceParent)interfaceParents.next()) { // L: 6851
+						if (var25.field1148) { // L: 6852
+							var25.field1148 = false;
 						} else {
-							ApproximateRouteStrategy.guestClanChannel = null; // L: 6903
+							InvDefinition.closeInterface(var25, true); // L: 6854
 						}
-
-						var1.serverPacket = null; // L: 6904
-						return true; // L: 6905
 					}
 
-					if (var17 >= 0) { // L: 6907
-						currentClanChannels[var17] = new ClanChannel(var3); // L: 6908
-					} else {
-						ApproximateRouteStrategy.guestClanChannel = new ClanChannel(var3); // L: 6911
+					widgetFlags = new NodeHashTable(512); // L: 6857
+
+					while (var3.offset < var17) { // L: 6858
+						var7 = var3.readInt(); // L: 6859
+						var8 = var3.readUnsignedShort(); // L: 6860
+						var29 = var3.readUnsignedShort(); // L: 6861
+						var30 = var3.readInt(); // L: 6862
+
+						for (int var32 = var8; var32 <= var29; ++var32) { // L: 6863
+							var34 = ((long)var7 << 32) + (long)var32; // L: 6864
+							widgetFlags.put(new IntegerNode(var30), var34); // L: 6865
+						}
 					}
 
-					var1.serverPacket = null; // L: 6913
-					return true; // L: 6914
+					var1.serverPacket = null; // L: 6868
+					return true; // L: 6869
 				}
 
-				class266.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1412 != null ? var1.field1412.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1400 != null ? var1.field1400.id * -1581409905 * 1593533807 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6916
-				class7.logOut(); // L: 6917
-			} catch (IOException var44) { // L: 6919
-				NetFileRequest.method4912(); // L: 6920
+				if (ServerPacket.field2756 == var1.serverPacket) { // L: 6871
+					rebootTimer = var3.readUnsignedShort() * 30; // L: 6872
+					field823 = cycleCntr; // L: 6873
+					var1.serverPacket = null; // L: 6874
+					return true; // L: 6875
+				}
+
+				if (ServerPacket.field2734 == var1.serverPacket) { // L: 6877
+					var17 = var3.readInt(); // L: 6878
+					var5 = var3.readUnsignedShort(); // L: 6879
+					if (var17 < -70000) { // L: 6880
+						var5 += 32768;
+					}
+
+					if (var17 >= 0) { // L: 6882
+						var27 = WorldMapData_1.getWidget(var17);
+					} else {
+						var27 = null; // L: 6883
+					}
+
+					if (var27 != null) { // L: 6884
+						for (var7 = 0; var7 < var27.itemIds.length; ++var7) { // L: 6885
+							var27.itemIds[var7] = 0; // L: 6886
+							var27.itemQuantities[var7] = 0; // L: 6887
+						}
+					}
+
+					class126.clearItemContainer(var5); // L: 6890
+					var7 = var3.readUnsignedShort(); // L: 6891
+
+					for (var8 = 0; var8 < var7; ++var8) { // L: 6892
+						var29 = var3.method6642(); // L: 6893
+						if (var29 == 255) { // L: 6894
+							var29 = var3.method6675();
+						}
+
+						var30 = var3.method6652(); // L: 6895
+						if (var27 != null && var8 < var27.itemIds.length) { // L: 6896 6897
+							var27.itemIds[var8] = var30; // L: 6898
+							var27.itemQuantities[var8] = var29; // L: 6899
+						}
+
+						ByteArrayPool.itemContainerSetItem(var5, var8, var30 - 1, var29); // L: 6902
+					}
+
+					if (var27 != null) { // L: 6904
+						Script.invalidateWidget(var27);
+					}
+
+					WorldMapID.method3717(); // L: 6905
+					changedItemContainers[++field711 - 1 & 31] = var5 & 32767; // L: 6906
+					var1.serverPacket = null; // L: 6907
+					return true; // L: 6908
+				}
+
+				if (ServerPacket.field2730 == var1.serverPacket) { // L: 6910
+					KeyHandler.loadRegions(true, var1.packetBuffer); // L: 6911
+					var1.serverPacket = null; // L: 6912
+					return true; // L: 6913
+				}
+
+				if (ServerPacket.field2780 == var1.serverPacket) { // L: 6915
+					var17 = var3.method6652(); // L: 6916
+					if (var17 == 65535) { // L: 6917
+						var17 = -1;
+					}
+
+					class6.playSong(var17); // L: 6918
+					var1.serverPacket = null; // L: 6919
+					return true; // L: 6920
+				}
+
+				if (ServerPacket.field2769 == var1.serverPacket) { // L: 6922
+					var17 = var3.method6653(); // L: 6923
+					if (var17 == 65535) { // L: 6924
+						var17 = -1;
+					}
+
+					var5 = var3.readMedium(); // L: 6925
+					ReflectionCheck.method1230(var17, var5); // L: 6926
+					var1.serverPacket = null; // L: 6927
+					return true; // L: 6928
+				}
+
+				if (ServerPacket.field2764 == var1.serverPacket) { // L: 6930
+					UserComparator9.updatePlayers(var3, var1.serverPacketLength); // L: 6931
+					EnumComposition.method2827(); // L: 6932
+					var1.serverPacket = null; // L: 6933
+					return true; // L: 6934
+				}
+
+				if (ServerPacket.field2785 == var1.serverPacket) { // L: 6936
+					var17 = var3.readInt(); // L: 6937
+					if (var17 != field704) { // L: 6938
+						field704 = var17; // L: 6939
+						FriendsChat.method5760(); // L: 6940
+					}
+
+					var1.serverPacket = null; // L: 6942
+					return true; // L: 6943
+				}
+
+				if (ServerPacket.field2742 == var1.serverPacket) { // L: 6945
+					var17 = var3.method6675(); // L: 6946
+					var51 = var3.method6643() == 1; // L: 6947
+					var27 = WorldMapData_1.getWidget(var17); // L: 6948
+					if (var51 != var27.isHidden) { // L: 6949
+						var27.isHidden = var51; // L: 6950
+						Script.invalidateWidget(var27); // L: 6951
+					}
+
+					var1.serverPacket = null; // L: 6953
+					return true; // L: 6954
+				}
+
+				if (ServerPacket.field2716 == var1.serverPacket) { // L: 6956
+					for (var17 = 0; var17 < SoundSystem.VarpDefinition_fileCount; ++var17) { // L: 6957
+						VarpDefinition var60 = class1.VarpDefinition_get(var17); // L: 6958
+						if (var60 != null) { // L: 6959
+							Varps.Varps_temp[var17] = 0; // L: 6960
+							Varps.Varps_main[var17] = 0; // L: 6961
+						}
+					}
+
+					WorldMapID.method3717(); // L: 6964
+					changedVarpCount += 32; // L: 6965
+					var1.serverPacket = null; // L: 6966
+					return true; // L: 6967
+				}
+
+				if (ServerPacket.field2798 == var1.serverPacket) { // L: 6969
+					var17 = var3.method6662(); // L: 6970
+					var5 = var3.method6652(); // L: 6971
+					var27 = WorldMapData_1.getWidget(var17); // L: 6972
+					if (var27.modelType != 2 || var5 != var27.modelId) { // L: 6973
+						var27.modelType = 2; // L: 6974
+						var27.modelId = var5; // L: 6975
+						Script.invalidateWidget(var27); // L: 6976
+					}
+
+					var1.serverPacket = null; // L: 6978
+					return true; // L: 6979
+				}
+
+				if (ServerPacket.field2754 == var1.serverPacket) { // L: 6981
+					tradeChatMode = var3.method6644(); // L: 6982
+					publicChatMode = var3.method6644(); // L: 6983
+					var1.serverPacket = null; // L: 6984
+					return true; // L: 6985
+				}
+
+				if (ServerPacket.field2741 == var1.serverPacket) { // L: 6987
+					var17 = var3.method6651(); // L: 6988
+					rootInterface = var17; // L: 6989
+					this.resizeRoot(false); // L: 6990
+					TextureProvider.Widget_resetModelFrames(var17); // L: 6991
+					ScriptFrame.runWidgetOnLoadListener(rootInterface); // L: 6992
+
+					for (var5 = 0; var5 < 100; ++var5) { // L: 6993
+						field831[var5] = true;
+					}
+
+					var1.serverPacket = null; // L: 6994
+					return true; // L: 6995
+				}
+
+				if (ServerPacket.field2729 == var1.serverPacket) { // L: 6997
+					var17 = var3.method6662(); // L: 6998
+					var26 = var3.readStringCp1252NullTerminated(); // L: 6999
+					var27 = WorldMapData_1.getWidget(var17); // L: 7000
+					if (!var26.equals(var27.text)) { // L: 7001
+						var27.text = var26; // L: 7002
+						Script.invalidateWidget(var27); // L: 7003
+					}
+
+					var1.serverPacket = null; // L: 7005
+					return true; // L: 7006
+				}
+
+				FriendsChat.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -678787115 * -1501005443 : -1) + "," + (var1.field1411 != null ? var1.field1411.id * -678787115 * -1501005443 : -1) + "," + (var1.field1399 != null ? var1.field1399.id * -678787115 * -1501005443 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 7008
+				PcmPlayer.logOut(); // L: 7009
+			} catch (IOException var44) { // L: 7011
+				ApproximateRouteStrategy.method1268(); // L: 7012
 			} catch (Exception var45) {
-				var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1412 != null ? var1.field1412.id * -1581409905 * 1593533807 : -1) + "," + (var1.field1400 != null ? var1.field1400.id * -1581409905 * 1593533807 : -1) + "," + var1.serverPacketLength + "," + (class93.localPlayer.pathX[0] + VertexNormal.baseX) + "," + (class93.localPlayer.pathY[0] + SoundSystem.baseY) + ","; // L: 6923
+				var26 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -678787115 * -1501005443 : -1) + "," + (var1.field1411 != null ? var1.field1411.id * -678787115 * -1501005443 : -1) + "," + (var1.field1399 != null ? var1.field1399.id * -678787115 * -1501005443 : -1) + "," + var1.serverPacketLength + "," + (class262.localPlayer.pathX[0] + class15.baseX) + "," + (class262.localPlayer.pathY[0] + WorldMapSprite.baseY) + ","; // L: 7015
 
-				for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 6924
-					var18 = var18 + var3.array[var6] + ",";
+				for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { // L: 7016
+					var26 = var26 + var3.array[var6] + ",";
 				}
 
-				class266.RunException_sendStackTrace(var18, var45); // L: 6925
-				class7.logOut(); // L: 6926
+				FriendsChat.RunException_sendStackTrace(var26, var45); // L: 7017
+				PcmPlayer.logOut(); // L: 7018
 			}
 
-			return true; // L: 6928
+			return true; // L: 7020
 		}
 	}
 
-	@ObfuscatedName("hk")
+	@ObfuscatedName("id")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
+		descriptor = "(I)V",
+		garbageValue = "-2138631971"
 	)
 	@Export("menu")
 	final void menu() {
-		class377.method6509(); // L: 7624
-		if (Script.dragInventoryWidget == null) { // L: 7625
-			if (clickedWidget == null) { // L: 7626
+		Skeleton.method4034(); // L: 7772
+		if (VerticalAlignment.dragInventoryWidget == null) { // L: 7773
+			if (clickedWidget == null) { // L: 7774
+				int var1 = MouseHandler.MouseHandler_lastButton; // L: 7775
 				int var2;
+				int var3;
 				int var4;
 				int var5;
-				int var9;
+				int var8;
 				int var10;
-				label272: {
-					int var1 = MouseHandler.MouseHandler_lastButton; // L: 7627
-					int var3;
-					int var8;
-					if (isMenuOpen) { // L: 7628
-						int var13;
-						int var15;
-						if (var1 != 1 && (mouseCam || var1 != 4)) { // L: 7629
-							var2 = MouseHandler.MouseHandler_x; // L: 7630
-							var3 = MouseHandler.MouseHandler_y; // L: 7631
-							if (var2 < class14.menuX - 10 || var2 > class14.menuX + class29.menuWidth + 10 || var3 < class243.menuY - 10 || var3 > class243.menuY + class24.menuHeight + 10) { // L: 7632
-								isMenuOpen = false; // L: 7633
-								var4 = class14.menuX; // L: 7634
-								var5 = class243.menuY; // L: 7635
-								var13 = class29.menuWidth; // L: 7636
-								var15 = class24.menuHeight; // L: 7637
-
-								for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 7639
-									if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var13 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var15) { // L: 7640
-										field719[var8] = true;
-									}
-								}
-							}
-						}
-
-						if (var1 == 1 || !mouseCam && var1 == 4) { // L: 7645
-							var2 = class14.menuX; // L: 7646
-							var3 = class243.menuY; // L: 7647
-							var4 = class29.menuWidth; // L: 7648
-							var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7649
-							var13 = MouseHandler.MouseHandler_lastPressedY; // L: 7650
-							var15 = -1; // L: 7651
-
-							for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7652
-								var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7653
-								if (var5 > var2 && var5 < var2 + var4 && var13 > var9 - 13 && var13 < var9 + 3) { // L: 7654
-									var15 = var8;
-								}
-							}
-
-							if (var15 != -1) { // L: 7656
-								Interpreter.method1888(var15);
-							}
-
-							isMenuOpen = false; // L: 7657
-							var8 = class14.menuX; // L: 7658
-							var9 = class243.menuY; // L: 7659
-							var10 = class29.menuWidth; // L: 7660
-							int var14 = class24.menuHeight; // L: 7661
-
-							for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 7663
-								if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var10 + var8 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var14) { // L: 7664
-									field719[var12] = true;
-								}
-							}
-						}
-					} else {
-						var2 = MilliClock.method2588(); // L: 7670
-						if ((var1 == 1 || !mouseCam && var1 == 4) && var2 >= 0) { // L: 7671
-							var3 = menuOpcodes[var2]; // L: 7672
-							if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 7673
-								var4 = menuArguments1[var2]; // L: 7674
-								var5 = menuArguments2[var2]; // L: 7675
-								Widget var6 = Frames.getWidget(var5); // L: 7676
-								var8 = class21.getWidgetFlags(var6); // L: 7678
-								boolean var7 = (var8 >> 28 & 1) != 0; // L: 7680
-								if (var7) { // L: 7682
-									break label272;
-								}
-
-								Object var10000 = null;
-								if (Canvas.method394(class21.getWidgetFlags(var6))) {
-									break label272;
-								}
-							}
-						}
-
-						if ((var1 == 1 || !mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7716 7717
-							var1 = 2; // L: 7718
-						}
-
-						if ((var1 == 1 || !mouseCam && var1 == 4) && menuOptionsCount > 0) { // L: 7721
-							Interpreter.method1888(var2); // L: 7722
-						}
-
-						if (var1 == 2 && menuOptionsCount > 0) { // L: 7724
-							this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+				int var14;
+				int var18;
+				if (isMenuOpen) { // L: 7776
+					if (var1 != 1 && (UserComparator3.mouseCam || var1 != 4)) { // L: 7777
+						var2 = MouseHandler.MouseHandler_x; // L: 7778
+						var3 = MouseHandler.MouseHandler_y; // L: 7779
+						if (var2 < StructComposition.menuX - 10 || var2 > StructComposition.menuX + UserComparator3.menuWidth + 10 || var3 < class143.menuY - 10 || var3 > class143.menuY + PendingSpawn.menuHeight + 10) { // L: 7780
+							isMenuOpen = false; // L: 7781
+							AccessFile.method6437(StructComposition.menuX, class143.menuY, UserComparator3.menuWidth, PendingSpawn.menuHeight); // L: 7782
 						}
 					}
 
-					return; // L: 7726
+					if (var1 == 1 || !UserComparator3.mouseCam && var1 == 4) { // L: 7785
+						var2 = StructComposition.menuX; // L: 7786
+						var3 = class143.menuY; // L: 7787
+						var4 = UserComparator3.menuWidth; // L: 7788
+						var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7789
+						var14 = MouseHandler.MouseHandler_lastPressedY; // L: 7790
+						int var17 = -1; // L: 7791
+
+						for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7792
+							var18 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7793
+							if (var5 > var2 && var5 < var2 + var4 && var14 > var18 - 13 && var14 < var18 + 3) { // L: 7794
+								var17 = var8;
+							}
+						}
+
+						if (var17 != -1 && var17 >= 0) { // L: 7796 7797
+							var8 = menuArguments1[var17]; // L: 7798
+							var18 = menuArguments2[var17]; // L: 7799
+							var10 = menuOpcodes[var17]; // L: 7800
+							int var11 = menuIdentifiers[var17]; // L: 7801
+							String var12 = menuActions[var17]; // L: 7802
+							String var13 = menuTargets[var17]; // L: 7803
+							GameObject.menuAction(var8, var18, var10, var11, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7804
+						}
+
+						isMenuOpen = false; // L: 7806
+						AccessFile.method6437(StructComposition.menuX, class143.menuY, UserComparator3.menuWidth, PendingSpawn.menuHeight); // L: 7807
+					}
+				} else {
+					var2 = HealthBarUpdate.method2283(); // L: 7811
+					if ((var1 == 1 || !UserComparator3.mouseCam && var1 == 4) && var2 >= 0) { // L: 7812
+						var3 = menuOpcodes[var2]; // L: 7813
+						if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 7814
+							label246: {
+								var4 = menuArguments1[var2]; // L: 7815
+								var5 = menuArguments2[var2]; // L: 7816
+								Widget var6 = WorldMapData_1.getWidget(var5); // L: 7817
+								var8 = class22.getWidgetFlags(var6); // L: 7819
+								boolean var7 = (var8 >> 28 & 1) != 0; // L: 7821
+								if (!var7) { // L: 7824
+									var10 = class22.getWidgetFlags(var6); // L: 7826
+									boolean var9 = (var10 >> 29 & 1) != 0; // L: 7828
+									if (!var9) { // L: 7830
+										break label246;
+									}
+								}
+
+								if (VerticalAlignment.dragInventoryWidget != null && !field734 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7832 7833
+									var18 = draggedWidgetX; // L: 7834
+									var10 = draggedWidgetY; // L: 7835
+									TaskHandler.method2625(class29.tempMenuAction, var18, var10); // L: 7837
+									class29.tempMenuAction = null; // L: 7838
+								}
+
+								field734 = false; // L: 7842
+								itemDragDuration = 0; // L: 7843
+								if (VerticalAlignment.dragInventoryWidget != null) { // L: 7844
+									Script.invalidateWidget(VerticalAlignment.dragInventoryWidget);
+								}
+
+								VerticalAlignment.dragInventoryWidget = WorldMapData_1.getWidget(var5); // L: 7845
+								dragItemSlotSource = var4; // L: 7846
+								draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7847
+								draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7848
+								if (var2 >= 0) { // L: 7849
+									WorldMapIcon_1.method3305(var2);
+								}
+
+								Script.invalidateWidget(VerticalAlignment.dragInventoryWidget); // L: 7850
+								return; // L: 7851
+							}
+						}
+					}
+
+					if ((var1 == 1 || !UserComparator3.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7855 7856
+						var1 = 2; // L: 7857
+					}
+
+					if ((var1 == 1 || !UserComparator3.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { // L: 7860 7862
+						var3 = menuArguments1[var2]; // L: 7863
+						var4 = menuArguments2[var2]; // L: 7864
+						var5 = menuOpcodes[var2]; // L: 7865
+						var14 = menuIdentifiers[var2]; // L: 7866
+						String var15 = menuActions[var2]; // L: 7867
+						String var16 = menuTargets[var2]; // L: 7868
+						GameObject.menuAction(var3, var4, var5, var14, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7869
+					}
+
+					if (var1 == 2 && menuOptionsCount > 0) { // L: 7872
+						this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+					}
 				}
 
-				if (Script.dragInventoryWidget != null && !field848 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7683 7684
-					var9 = draggedWidgetX; // L: 7685
-					var10 = draggedWidgetY; // L: 7686
-					MenuAction var11 = ReflectionCheck.tempMenuAction; // L: 7688
-					Script.menuAction(var11.param0, var11.param1, var11.opcode, var11.identifier, var11.action, var11.action, var9, var10); // L: 7690
-					ReflectionCheck.tempMenuAction = null; // L: 7692
-				}
-
-				field848 = false; // L: 7696
-				itemDragDuration = 0; // L: 7697
-				if (Script.dragInventoryWidget != null) { // L: 7698
-					WorldMapCacheName.invalidateWidget(Script.dragInventoryWidget);
-				}
-
-				Script.dragInventoryWidget = Frames.getWidget(var5); // L: 7699
-				dragItemSlotSource = var4; // L: 7700
-				draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7701
-				draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7702
-				if (var2 >= 0) { // L: 7703
-					ReflectionCheck.tempMenuAction = new MenuAction(); // L: 7704
-					ReflectionCheck.tempMenuAction.param0 = menuArguments1[var2]; // L: 7705
-					ReflectionCheck.tempMenuAction.param1 = menuArguments2[var2]; // L: 7706
-					ReflectionCheck.tempMenuAction.opcode = menuOpcodes[var2]; // L: 7707
-					ReflectionCheck.tempMenuAction.identifier = menuIdentifiers[var2]; // L: 7708
-					ReflectionCheck.tempMenuAction.action = menuActions[var2]; // L: 7709
-				}
-
-				WorldMapCacheName.invalidateWidget(Script.dragInventoryWidget); // L: 7711
 			}
 		}
-	} // L: 7712
+	} // L: 7874
 
-	@ObfuscatedName("hx")
+	@ObfuscatedName("it")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1407075512"
+		descriptor = "(B)Z",
+		garbageValue = "87"
 	)
 	@Export("shouldLeftClickOpenMenu")
 	final boolean shouldLeftClickOpenMenu() {
-		int var1 = MilliClock.method2588(); // L: 7729
-		return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class5.method51(var1)) && !menuShiftClick[var1]; // L: 7730
+		int var1 = HealthBarUpdate.method2283(); // L: 7877
+		boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 7878
+		if (!var2) { // L: 7879
+			boolean var3;
+			if (var1 < 0) { // L: 7882
+				var3 = false; // L: 7883
+			} else {
+				int var4 = menuOpcodes[var1]; // L: 7886
+				if (var4 >= 2000) { // L: 7887
+					var4 -= 2000;
+				}
+
+				if (var4 == 1007) { // L: 7888
+					var3 = true; // L: 7889
+				} else {
+					var3 = false; // L: 7892
+				}
+			}
+
+			var2 = var3; // L: 7894
+		}
+
+		return var2 && !menuShiftClick[var1]; // L: 7896
 	}
 
-	@ObfuscatedName("hp")
+	@ObfuscatedName("io")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "1521465353"
+		garbageValue = "1519538256"
 	)
 	@Export("openMenu")
 	final void openMenu(int var1, int var2) {
-		ReflectionCheck.method1126(var1, var2); // L: 7734
-		AbstractSocket.scene.menuOpen(class22.Client_plane, var1, var2, false); // L: 7735
-		isMenuOpen = true; // L: 7736
-	} // L: 7737
+		GrandExchangeEvent.method5222(var1, var2); // L: 7900
+		DevicePcmPlayerProvider.scene.menuOpen(SoundSystem.Client_plane, var1, var2, false); // L: 7901
+		isMenuOpen = true; // L: 7902
+	} // L: 7903
 
-	@ObfuscatedName("iy")
+	@ObfuscatedName("js")
 	@ObfuscatedSignature(
 		descriptor = "(ZI)V",
-		garbageValue = "2038823416"
+		garbageValue = "574875607"
 	)
 	@Export("resizeRoot")
 	final void resizeRoot(boolean var1) {
-		PlayerType.method4857(rootInterface, class32.canvasWidth, ReflectionCheck.canvasHeight, var1); // L: 9736
-	} // L: 9737
+		JagexCache.method2637(rootInterface, AttackOption.canvasWidth, class0.canvasHeight, var1); // L: 9916
+	} // L: 9917
 
-	@ObfuscatedName("ib")
+	@ObfuscatedName("jl")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;I)V",
-		garbageValue = "2012935641"
+		descriptor = "(Liv;I)V",
+		garbageValue = "1629073496"
 	)
 	@Export("alignWidget")
 	void alignWidget(Widget var1) {
-		Widget var2 = var1.parentId == -1 ? null : Frames.getWidget(var1.parentId); // L: 9740
+		Widget var2 = var1.parentId == -1 ? null : WorldMapData_1.getWidget(var1.parentId); // L: 9920
 		int var3;
 		int var4;
-		if (var2 == null) { // L: 9743
-			var3 = class32.canvasWidth; // L: 9744
-			var4 = ReflectionCheck.canvasHeight; // L: 9745
+		if (var2 == null) { // L: 9923
+			var3 = AttackOption.canvasWidth; // L: 9924
+			var4 = class0.canvasHeight; // L: 9925
 		} else {
-			var3 = var2.width; // L: 9748
-			var4 = var2.height; // L: 9749
+			var3 = var2.width; // L: 9928
+			var4 = var2.height; // L: 9929
 		}
 
-		Clock.alignWidgetSize(var1, var3, var4, false); // L: 9751
-		class24.alignWidgetPosition(var1, var3, var4); // L: 9752
-	} // L: 9753
+		FontName.alignWidgetSize(var1, var3, var4, false); // L: 9931
+		class43.alignWidgetPosition(var1, var3, var4); // L: 9932
+	} // L: 9933
 
-	@ObfuscatedName("jt")
+	@ObfuscatedName("ju")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-72"
+		descriptor = "(I)V",
+		garbageValue = "1390072147"
 	)
-	final void method1198() {
-		WorldMapCacheName.invalidateWidget(clickedWidget); // L: 10714
-		++Actor.widgetDragDuration; // L: 10715
-		if (field822 && field819) { // L: 10716
-			int var1 = MouseHandler.MouseHandler_x; // L: 10722
-			int var2 = MouseHandler.MouseHandler_y; // L: 10723
-			var1 -= widgetClickX; // L: 10724
-			var2 -= widgetClickY; // L: 10725
-			if (var1 < field740) { // L: 10726
-				var1 = field740;
+	final void method1298() {
+		Script.invalidateWidget(clickedWidget); // L: 10929
+		++UserComparator7.widgetDragDuration; // L: 10930
+		if (field731 && field821) { // L: 10931
+			int var1 = MouseHandler.MouseHandler_x; // L: 10937
+			int var2 = MouseHandler.MouseHandler_y; // L: 10938
+			var1 -= widgetClickX; // L: 10939
+			var2 -= widgetClickY; // L: 10940
+			if (var1 < field801) { // L: 10941
+				var1 = field801;
 			}
 
-			if (var1 + clickedWidget.width > field740 + clickedWidgetParent.width) { // L: 10727
-				var1 = field740 + clickedWidgetParent.width - clickedWidget.width;
+			if (var1 + clickedWidget.width > field801 + clickedWidgetParent.width) { // L: 10942
+				var1 = field801 + clickedWidgetParent.width - clickedWidget.width;
 			}
 
-			if (var2 < field821) { // L: 10728
-				var2 = field821;
+			if (var2 < field802) { // L: 10943
+				var2 = field802;
 			}
 
-			if (var2 + clickedWidget.height > field821 + clickedWidgetParent.height) { // L: 10729
-				var2 = field821 + clickedWidgetParent.height - clickedWidget.height;
+			if (var2 + clickedWidget.height > field802 + clickedWidgetParent.height) { // L: 10944
+				var2 = field802 + clickedWidgetParent.height - clickedWidget.height;
 			}
 
-			int var3 = var1 - field854; // L: 10730
-			int var4 = var2 - field804; // L: 10731
-			int var5 = clickedWidget.dragZoneSize; // L: 10732
-			if (Actor.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10733 10734
-				isDraggingWidget = true; // L: 10735
+			int var3 = var1 - field804; // L: 10945
+			int var4 = var2 - field805; // L: 10946
+			int var5 = clickedWidget.dragZoneSize; // L: 10947
+			if (UserComparator7.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10948 10949
+				isDraggingWidget = true; // L: 10950
 			}
 
-			int var6 = var1 - field740 + clickedWidgetParent.scrollX; // L: 10738
-			int var7 = var2 - field821 + clickedWidgetParent.scrollY; // L: 10739
+			int var6 = var1 - field801 + clickedWidgetParent.scrollX; // L: 10953
+			int var7 = var2 - field802 + clickedWidgetParent.scrollY; // L: 10954
 			ScriptEvent var8;
-			if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10740
-				var8 = new ScriptEvent(); // L: 10741
-				var8.widget = clickedWidget; // L: 10742
-				var8.mouseX = var6; // L: 10743
-				var8.mouseY = var7; // L: 10744
-				var8.args = clickedWidget.onDrag; // L: 10745
-				PacketWriter.runScriptEvent(var8); // L: 10746
+			if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10955
+				var8 = new ScriptEvent(); // L: 10956
+				var8.widget = clickedWidget; // L: 10957
+				var8.mouseX = var6; // L: 10958
+				var8.mouseY = var7; // L: 10959
+				var8.args = clickedWidget.onDrag; // L: 10960
+				WorldMapSection1.runScriptEvent(var8); // L: 10961
 			}
 
-			if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10748
-				if (isDraggingWidget) { // L: 10749
-					if (clickedWidget.onDragComplete != null) { // L: 10750
-						var8 = new ScriptEvent(); // L: 10751
-						var8.widget = clickedWidget; // L: 10752
-						var8.mouseX = var6; // L: 10753
-						var8.mouseY = var7; // L: 10754
-						var8.dragTarget = draggedOnWidget; // L: 10755
-						var8.args = clickedWidget.onDragComplete; // L: 10756
-						PacketWriter.runScriptEvent(var8); // L: 10757
+			if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10963
+				if (isDraggingWidget) { // L: 10964
+					if (clickedWidget.onDragComplete != null) { // L: 10965
+						var8 = new ScriptEvent(); // L: 10966
+						var8.widget = clickedWidget; // L: 10967
+						var8.mouseX = var6; // L: 10968
+						var8.mouseY = var7; // L: 10969
+						var8.dragTarget = draggedOnWidget; // L: 10970
+						var8.args = clickedWidget.onDragComplete; // L: 10971
+						WorldMapSection1.runScriptEvent(var8); // L: 10972
 					}
 
-					if (draggedOnWidget != null && StructComposition.method2892(clickedWidget) != null) { // L: 10759
-						PacketBufferNode var12 = class21.getPacketBufferNode(ClientPacket.field2586, packetWriter.isaacCipher); // L: 10761
-						var12.packetBuffer.method6611(draggedOnWidget.id); // L: 10762
-						var12.packetBuffer.method6602(clickedWidget.itemId); // L: 10763
-						var12.packetBuffer.writeShort(draggedOnWidget.childIndex); // L: 10764
-						var12.packetBuffer.writeInt(clickedWidget.id); // L: 10765
-						var12.packetBuffer.writeShort(draggedOnWidget.itemId); // L: 10766
-						var12.packetBuffer.method6602(clickedWidget.childIndex); // L: 10767
-						packetWriter.addNode(var12); // L: 10768
+					if (draggedOnWidget != null && PlayerComposition.method4851(clickedWidget) != null) { // L: 10974
+						PacketBufferNode var11 = InterfaceParent.getPacketBufferNode(ClientPacket.field2621, packetWriter.isaacCipher); // L: 10976
+						var11.packetBuffer.method6659(draggedOnWidget.id); // L: 10977
+						var11.packetBuffer.method6648(draggedOnWidget.childIndex); // L: 10978
+						var11.packetBuffer.method6705(draggedOnWidget.itemId); // L: 10979
+						var11.packetBuffer.method6658(clickedWidget.id); // L: 10980
+						var11.packetBuffer.method6649(clickedWidget.itemId); // L: 10981
+						var11.packetBuffer.method6705(clickedWidget.childIndex); // L: 10982
+						packetWriter.addNode(var11); // L: 10983
 					}
-				} else if (this.shouldLeftClickOpenMenu()) { // L: 10772
-					this.openMenu(field854 + widgetClickX, widgetClickY + field804); // L: 10773
-				} else if (menuOptionsCount > 0) { // L: 10775
-					int var11 = field854 + widgetClickX; // L: 10776
-					int var9 = widgetClickY + field804; // L: 10777
-					MenuAction var10 = ReflectionCheck.tempMenuAction; // L: 10779
-					Script.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var11, var9); // L: 10781
-					ReflectionCheck.tempMenuAction = null; // L: 10783
+				} else if (this.shouldLeftClickOpenMenu()) { // L: 10987
+					this.openMenu(field804 + widgetClickX, field805 + widgetClickY); // L: 10988
+				} else if (menuOptionsCount > 0) { // L: 10990
+					int var10 = field804 + widgetClickX; // L: 10991
+					int var9 = widgetClickY + field805; // L: 10992
+					TaskHandler.method2625(class29.tempMenuAction, var10, var9); // L: 10994
+					class29.tempMenuAction = null; // L: 10995
 				}
 
-				clickedWidget = null; // L: 10787
+				clickedWidget = null; // L: 10999
 			}
 
 		} else {
-			if (Actor.widgetDragDuration > 1) { // L: 10717
-				clickedWidget = null; // L: 10718
+			if (UserComparator7.widgetDragDuration > 1) { // L: 10932
+				clickedWidget = null; // L: 10933
 			}
 
 		}
-	} // L: 10720 10789
+	} // L: 10935 11001
 
-	@ObfuscatedName("ll")
+	@ObfuscatedName("ly")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lly;",
-		garbageValue = "-1180229355"
+		descriptor = "(I)Llc;",
+		garbageValue = "-1312829614"
 	)
 	@Export("username")
 	public Username username() {
-		return class93.localPlayer != null ? class93.localPlayer.username : null; // L: 11477
+		return class262.localPlayer != null ? class262.localPlayer.username : null; // L: 11665
 	}
 
-	@ObfuscatedName("gn")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "2028963456"
+		descriptor = "(CI)Z",
+		garbageValue = "-1708314526"
 	)
-	static boolean method1514() {
-		return (drawPlayerNames & 4) != 0; // L: 4422
+	public static final boolean method1746(char var0) {
+		if (Character.isISOControl(var0)) { // L: 28
+			return false;
+		} else if (DynamicObject.isAlphaNumeric(var0)) { // L: 29
+			return true;
+		} else {
+			char[] var1 = class366.field4093; // L: 31
+
+			int var2;
+			char var3;
+			for (var2 = 0; var2 < var1.length; ++var2) { // L: 32
+				var3 = var1[var2]; // L: 33
+				if (var0 == var3) { // L: 34
+					return true;
+				}
+			}
+
+			var1 = class366.field4092; // L: 38
+
+			for (var2 = 0; var2 < var1.length; ++var2) { // L: 39
+				var3 = var1[var2];
+				if (var0 == var3) {
+					return true; // L: 41
+				}
+			}
+
+			return false; // L: 44
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(III)Lbl;",
+		garbageValue = "-1490732059"
+	)
+	@Export("Messages_getByChannelAndID")
+	static Message Messages_getByChannelAndID(int var0, int var1) {
+		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35
+		return var2.getMessage(var1); // L: 36
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lbl;",
+		garbageValue = "-1820664660"
+	)
+	@Export("Messages_getMessage")
+	static Message Messages_getMessage(int var0) {
+		return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "920839392"
+	)
+	static int method1745(int var0, Script var1, boolean var2) {
+		int var3 = -1; // L: 565
+		Widget var4;
+		if (var0 >= 2000) { // L: 567
+			var0 -= 1000; // L: 568
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 569
+			var4 = WorldMapData_1.getWidget(var3); // L: 570
+		} else {
+			var4 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 572
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 573
+			ChatChannel.Interpreter_intStackSize -= 4; // L: 574
+			var4.rawX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 575
+			var4.rawY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 576
+			var4.xAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 577
+			var4.yAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 578
+			Script.invalidateWidget(var4); // L: 579
+			class1.client.alignWidget(var4); // L: 580
+			if (var3 != -1 && var4.type == 0) { // L: 581
+				WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1; // L: 582
+		} else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 584
+			ChatChannel.Interpreter_intStackSize -= 4; // L: 585
+			var4.rawWidth = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 586
+			var4.rawHeight = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 587
+			var4.widthAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 588
+			var4.heightAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 589
+			Script.invalidateWidget(var4); // L: 590
+			class1.client.alignWidget(var4); // L: 591
+			if (var3 != -1 && var4.type == 0) { // L: 592
+				WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var3 >> 16], var4, false);
+			}
+
+			return 1; // L: 593
+		} else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 595
+			boolean var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 596
+			if (var5 != var4.isHidden) { // L: 597
+				var4.isHidden = var5; // L: 598
+				Script.invalidateWidget(var4); // L: 599
+			}
+
+			return 1; // L: 601
+		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 603
+			var4.noClickThrough = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 604
+			return 1; // L: 605
+		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 607
+			var4.noScrollThrough = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 608
+			return 1; // L: 609
+		} else {
+			return 2; // L: 611
+		}
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(B)Lbk;",
+		garbageValue = "9"
+	)
+	@Export("getNextWorldListWorld")
+	static World getNextWorldListWorld() {
+		return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; // L: 242 243
 	}
 }
diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java
index c9441731d5..0b053d8a47 100644
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
@@ -4,659 +4,659 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hs")
+@ObfuscatedName("hw")
 @Implements("ClientPacket")
-public class ClientPacket implements class223 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2598;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2573;
+public class ClientPacket implements class224 {
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2574;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2575;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2576;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2577;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2578;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2599;
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2671;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	static final ClientPacket field2638;
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2582;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2583;
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2584;
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2585;
+	public static final ClientPacket field2647;
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2586;
-	@ObfuscatedName("g")
+	public static final ClientPacket field2575;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	static final ClientPacket field2587;
-	@ObfuscatedName("a")
+	public static final ClientPacket field2576;
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2604;
-	@ObfuscatedName("k")
+	static final ClientPacket field2577;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2589;
+	public static final ClientPacket field2578;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2588;
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2590;
-	@ObfuscatedName("x")
+	public static final ClientPacket field2580;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2652;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2592;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2593;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2648;
+	public static final ClientPacket field2581;
 	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2595;
-	@ObfuscatedName("q")
+	public static final ClientPacket field2582;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2664;
+	public static final ClientPacket field2583;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2639;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2585;
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2597;
-	@ObfuscatedName("ae")
+	public static final ClientPacket field2586;
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2653;
-	@ObfuscatedName("ap")
+	public static final ClientPacket field2587;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2678;
-	@ObfuscatedName("ab")
+	public static final ClientPacket field2643;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	static final ClientPacket field2600;
-	@ObfuscatedName("al")
+	public static final ClientPacket field2589;
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2601;
-	@ObfuscatedName("ad")
+	public static final ClientPacket field2648;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2602;
-	@ObfuscatedName("ai")
+	public static final ClientPacket field2625;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	static final ClientPacket field2667;
-	@ObfuscatedName("ar")
+	public static final ClientPacket field2592;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2624;
-	@ObfuscatedName("ag")
+	public static final ClientPacket field2593;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2605;
-	@ObfuscatedName("ax")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2596;
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2607;
-	@ObfuscatedName("aj")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2608;
-	@ObfuscatedName("am")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2579;
-	@ObfuscatedName("az")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2610;
-	@ObfuscatedName("av")
+	public static final ClientPacket field2595;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2611;
-	@ObfuscatedName("ac")
+	public static final ClientPacket field2676;
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2612;
+	public static final ClientPacket field2574;
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2598;
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	static final ClientPacket field2600;
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2678;
+	@ObfuscatedName("ak")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2681;
+	@ObfuscatedName("ad")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2602;
 	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2613;
+	static final ClientPacket field2603;
 	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2604;
+	@ObfuscatedName("az")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2601;
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2606;
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	static final ClientPacket field2607;
+	@ObfuscatedName("ab")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2608;
+	@ObfuscatedName("aq")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2609;
+	@ObfuscatedName("ae")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2614;
 	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2615;
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2616;
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2594;
-	@ObfuscatedName("af")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2642;
-	@ObfuscatedName("ak")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2670;
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2620;
-	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2621;
-	@ObfuscatedName("au")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2622;
+	public static final ClientPacket field2605;
 	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2623;
-	@ObfuscatedName("bd")
+	public static final ClientPacket field2612;
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2637;
-	@ObfuscatedName("bt")
+	public static final ClientPacket field2613;
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2625;
-	@ObfuscatedName("bq")
+	public static final ClientPacket field2617;
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2626;
-	@ObfuscatedName("bu")
+	public static final ClientPacket field2615;
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2627;
-	@ObfuscatedName("bl")
+	public static final ClientPacket field2616;
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2665;
-	@ObfuscatedName("bv")
+	public static final ClientPacket field2597;
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	static final ClientPacket field2629;
-	@ObfuscatedName("bm")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2630;
-	@ObfuscatedName("bz")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2631;
-	@ObfuscatedName("bh")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2632;
-	@ObfuscatedName("bs")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2633;
-	@ObfuscatedName("br")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2676;
-	@ObfuscatedName("bf")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2635;
-	@ObfuscatedName("ba")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2636;
-	@ObfuscatedName("be")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2619;
-	@ObfuscatedName("bj")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2603;
-	@ObfuscatedName("bx")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2639;
-	@ObfuscatedName("bp")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2651;
-	@ObfuscatedName("bn")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2641;
-	@ObfuscatedName("bo")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2580;
-	@ObfuscatedName("bw")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2643;
-	@ObfuscatedName("bi")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2644;
-	@ObfuscatedName("bb")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2645;
-	@ObfuscatedName("bk")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2646;
-	@ObfuscatedName("bg")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2647;
-	@ObfuscatedName("by")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2666;
-	@ObfuscatedName("bc")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2649;
-	@ObfuscatedName("cd")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2640;
-	@ObfuscatedName("cm")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2588;
-	@ObfuscatedName("cv")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2591;
-	@ObfuscatedName("cp")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2628;
-	@ObfuscatedName("ci")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2654;
-	@ObfuscatedName("ct")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2655;
-	@ObfuscatedName("cq")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2634;
-	@ObfuscatedName("cr")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2657;
-	@ObfuscatedName("cf")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2658;
-	@ObfuscatedName("cn")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2659;
-	@ObfuscatedName("cs")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2660;
-	@ObfuscatedName("cg")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2674;
-	@ObfuscatedName("co")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2662;
-	@ObfuscatedName("ck")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	public static final ClientPacket field2663;
-	@ObfuscatedName("cj")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2618;
-	@ObfuscatedName("cc")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2572;
-	@ObfuscatedName("cu")
+	public static final ClientPacket field2619;
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2650;
-	@ObfuscatedName("cz")
+	public static final ClientPacket field2610;
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2621;
+	@ObfuscatedName("av")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2622;
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2623;
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2673;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2641;
+	@ObfuscatedName("bq")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2668;
-	@ObfuscatedName("ce")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2669;
-	@ObfuscatedName("ch")
+	public static final ClientPacket field2627;
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2609;
-	@ObfuscatedName("cy")
+	public static final ClientPacket field2634;
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2581;
+	public static final ClientPacket field2629;
+	@ObfuscatedName("bb")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2590;
+	@ObfuscatedName("bv")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2631;
+	@ObfuscatedName("bc")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2632;
+	@ObfuscatedName("be")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2633;
+	@ObfuscatedName("ba")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2646;
+	@ObfuscatedName("bs")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2635;
+	@ObfuscatedName("br")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2636;
+	@ObfuscatedName("bw")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2655;
+	@ObfuscatedName("by")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2638;
+	@ObfuscatedName("bt")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2611;
+	@ObfuscatedName("bg")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2640;
+	@ObfuscatedName("bm")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2663;
+	@ObfuscatedName("bj")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2642;
+	@ObfuscatedName("bo")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2654;
+	@ObfuscatedName("bn")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2644;
+	@ObfuscatedName("bu")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2645;
+	@ObfuscatedName("bl")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2596;
+	@ObfuscatedName("bd")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2599;
+	@ObfuscatedName("bp")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2667;
+	@ObfuscatedName("bk")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2594;
+	@ObfuscatedName("bh")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2650;
+	@ObfuscatedName("bf")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2620;
+	@ObfuscatedName("cm")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2652;
 	@ObfuscatedName("cx")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2672;
-	@ObfuscatedName("ca")
+	public static final ClientPacket field2653;
+	@ObfuscatedName("cq")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2661;
-	@ObfuscatedName("cl")
+	public static final ClientPacket field2660;
+	@ObfuscatedName("cz")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2659;
+	@ObfuscatedName("cc")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2656;
+	@ObfuscatedName("cu")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2657;
+	@ObfuscatedName("cp")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2658;
+	@ObfuscatedName("cv")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2630;
+	@ObfuscatedName("cf")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2637;
+	@ObfuscatedName("cb")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2649;
+	@ObfuscatedName("cg")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2662;
+	@ObfuscatedName("ca")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2628;
+	@ObfuscatedName("cd")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2664;
+	@ObfuscatedName("ce")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2661;
+	@ObfuscatedName("cy")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2666;
+	@ObfuscatedName("ct")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2665;
+	@ObfuscatedName("ci")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2651;
+	@ObfuscatedName("cs")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2669;
+	@ObfuscatedName("co")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2670;
+	@ObfuscatedName("cj")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2671;
+	@ObfuscatedName("cr")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2672;
+	@ObfuscatedName("cl")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	static final ClientPacket field2591;
 	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2674;
+	@ObfuscatedName("ck")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2675;
-	@ObfuscatedName("db")
+	@ObfuscatedName("cn")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
-	public static final ClientPacket field2606;
-	@ObfuscatedName("dz")
+	public static final ClientPacket field2584;
+	@ObfuscatedName("ch")
 	@ObfuscatedSignature(
-		descriptor = "Lhs;"
+		descriptor = "Lhw;"
 	)
 	public static final ClientPacket field2677;
-	@ObfuscatedName("dj")
+	@ObfuscatedName("du")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2626;
+	@ObfuscatedName("db")
+	@ObfuscatedSignature(
+		descriptor = "Lhw;"
+	)
+	public static final ClientPacket field2679;
+	@ObfuscatedName("dm")
 	@ObfuscatedGetter(
-		intValue = -1958588669
+		intValue = -1324596651
 	)
 	@Export("id")
 	final int id;
-	@ObfuscatedName("dr")
+	@ObfuscatedName("dh")
 	@ObfuscatedGetter(
-		intValue = -209814861
+		intValue = -1674448375
 	)
 	@Export("length")
 	final int length;
 
 	static {
-		field2598 = new ClientPacket(0, 16); // L: 5
-		field2573 = new ClientPacket(1, -2); // L: 6
-		field2574 = new ClientPacket(2, -1); // L: 7
-		field2575 = new ClientPacket(3, 7); // L: 8
-		field2576 = new ClientPacket(4, 8); // L: 9
-		field2577 = new ClientPacket(5, 15); // L: 10
-		field2578 = new ClientPacket(6, 2); // L: 11
-		field2599 = new ClientPacket(7, 11); // L: 12
-		field2671 = new ClientPacket(8, -1); // L: 13
-		field2638 = new ClientPacket(9, 2); // L: 14
-		field2582 = new ClientPacket(10, 4); // L: 15
-		field2583 = new ClientPacket(11, 4); // L: 16
-		field2584 = new ClientPacket(12, -1); // L: 17
-		field2585 = new ClientPacket(13, 8); // L: 18
-		field2586 = new ClientPacket(14, 16); // L: 19
-		field2587 = new ClientPacket(15, -1); // L: 20
-		field2604 = new ClientPacket(16, 8); // L: 21
-		field2589 = new ClientPacket(17, -1); // L: 22
-		field2590 = new ClientPacket(18, 0); // L: 23
-		field2652 = new ClientPacket(19, 6); // L: 24
-		field2592 = new ClientPacket(20, 8); // L: 25
-		field2593 = new ClientPacket(21, 8); // L: 26
-		field2648 = new ClientPacket(22, 8); // L: 27
-		field2595 = new ClientPacket(23, -1); // L: 28
-		field2664 = new ClientPacket(24, -1); // L: 29
-		field2597 = new ClientPacket(25, 3); // L: 30
-		field2653 = new ClientPacket(26, -1); // L: 31
-		field2678 = new ClientPacket(27, 8); // L: 32
-		field2600 = new ClientPacket(28, -1); // L: 33
-		field2601 = new ClientPacket(29, 3); // L: 34
-		field2602 = new ClientPacket(30, 3); // L: 35
-		field2667 = new ClientPacket(31, 7); // L: 36
-		field2624 = new ClientPacket(32, 3); // L: 37
-		field2605 = new ClientPacket(33, 3); // L: 38
-		field2596 = new ClientPacket(34, -1); // L: 39
-		field2607 = new ClientPacket(35, -1); // L: 40
-		field2608 = new ClientPacket(36, 0); // L: 41
-		field2579 = new ClientPacket(37, 8); // L: 42
-		field2610 = new ClientPacket(38, -1); // L: 43
-		field2611 = new ClientPacket(39, 3);
-		field2612 = new ClientPacket(40, -1);
-		field2613 = new ClientPacket(41, 8); // L: 46
-		field2614 = new ClientPacket(42, -2);
-		field2615 = new ClientPacket(43, 11); // L: 48
-		field2616 = new ClientPacket(44, 8); // L: 49
-		field2594 = new ClientPacket(45, 0); // L: 50
-		field2642 = new ClientPacket(46, -1); // L: 51
-		field2670 = new ClientPacket(47, 3); // L: 52
-		field2620 = new ClientPacket(48, 3); // L: 53
-		field2621 = new ClientPacket(49, -1);
-		field2622 = new ClientPacket(50, -1);
-		field2623 = new ClientPacket(51, 11);
-		field2637 = new ClientPacket(52, 3); // L: 57
-		field2625 = new ClientPacket(53, 3); // L: 58
-		field2626 = new ClientPacket(54, 7);
-		field2627 = new ClientPacket(55, 8);
-		field2665 = new ClientPacket(56, -1); // L: 61
-		field2629 = new ClientPacket(57, -1);
-		field2630 = new ClientPacket(58, 4); // L: 63
-		field2631 = new ClientPacket(59, 16); // L: 64
-		field2632 = new ClientPacket(60, 8);
-		field2633 = new ClientPacket(61, 8);
-		field2676 = new ClientPacket(62, 7);
-		field2635 = new ClientPacket(63, 8);
-		field2636 = new ClientPacket(64, 3);
-		field2619 = new ClientPacket(65, 4);
-		field2603 = new ClientPacket(66, 8);
-		field2639 = new ClientPacket(67, 8);
-		field2651 = new ClientPacket(68, -1);
-		field2641 = new ClientPacket(69, 7);
-		field2580 = new ClientPacket(70, 1);
-		field2643 = new ClientPacket(71, 15);
-		field2644 = new ClientPacket(72, 0); // L: 77
-		field2645 = new ClientPacket(73, -1); // L: 78
-		field2646 = new ClientPacket(74, 2);
-		field2647 = new ClientPacket(75, 2); // L: 80
-		field2666 = new ClientPacket(76, 7); // L: 81
-		field2649 = new ClientPacket(77, 7); // L: 82
-		field2640 = new ClientPacket(78, 7); // L: 83
-		field2588 = new ClientPacket(79, -2); // L: 84
-		field2591 = new ClientPacket(80, 2); // L: 85
-		field2628 = new ClientPacket(81, -1); // L: 86
-		field2654 = new ClientPacket(82, 3); // L: 87
-		field2655 = new ClientPacket(83, -1); // L: 88
-		field2634 = new ClientPacket(84, 10); // L: 89
-		field2657 = new ClientPacket(85, 9); // L: 90
-		field2658 = new ClientPacket(86, 9); // L: 91
-		field2659 = new ClientPacket(87, 7); // L: 92
-		field2660 = new ClientPacket(88, -1); // L: 93
-		field2674 = new ClientPacket(89, 13); // L: 94
-		field2662 = new ClientPacket(90, 5); // L: 95
-		field2663 = new ClientPacket(91, 6); // L: 96
-		field2618 = new ClientPacket(92, 3); // L: 97
-		field2572 = new ClientPacket(93, 7); // L: 98
-		field2650 = new ClientPacket(94, 8); // L: 99
-		field2673 = new ClientPacket(95, 8); // L: 100
-		field2668 = new ClientPacket(96, 15); // L: 101
-		field2669 = new ClientPacket(97, 0); // L: 102
-		field2609 = new ClientPacket(98, 14); // L: 103
-		field2581 = new ClientPacket(99, 8); // L: 104
-		field2672 = new ClientPacket(100, 7); // L: 105
-		field2661 = new ClientPacket(101, 8); // L: 106
-		field2656 = new ClientPacket(102, 3); // L: 107
-		field2675 = new ClientPacket(103, 11); // L: 108
-		field2606 = new ClientPacket(104, 4); // L: 109
-		field2677 = new ClientPacket(105, 15); // L: 110
+		field2647 = new ClientPacket(0, 0); // L: 5
+		field2575 = new ClientPacket(1, 4); // L: 6
+		field2576 = new ClientPacket(2, 10); // L: 7
+		field2577 = new ClientPacket(3, 7); // L: 8
+		field2578 = new ClientPacket(4, 7); // L: 9
+		field2588 = new ClientPacket(5, 8); // L: 10
+		field2580 = new ClientPacket(6, 8); // L: 11
+		field2581 = new ClientPacket(7, 1); // L: 12
+		field2582 = new ClientPacket(8, -1); // L: 13
+		field2583 = new ClientPacket(9, -1);
+		field2639 = new ClientPacket(10, 15);
+		field2585 = new ClientPacket(11, 0);
+		field2586 = new ClientPacket(12, 6); // L: 17
+		field2587 = new ClientPacket(13, -1);
+		field2643 = new ClientPacket(14, -1);
+		field2589 = new ClientPacket(15, 7); // L: 20
+		field2648 = new ClientPacket(16, 13); // L: 21
+		field2625 = new ClientPacket(17, 3); // L: 22
+		field2592 = new ClientPacket(18, 8); // L: 23
+		field2593 = new ClientPacket(19, 0); // L: 24
+		field2579 = new ClientPacket(20, 8); // L: 25
+		field2595 = new ClientPacket(21, 3); // L: 26
+		field2676 = new ClientPacket(22, 16); // L: 27
+		field2574 = new ClientPacket(23, 4); // L: 28
+		field2598 = new ClientPacket(24, 8); // L: 29
+		field2600 = new ClientPacket(25, -1); // L: 30
+		field2678 = new ClientPacket(26, 7); // L: 31
+		field2681 = new ClientPacket(27, 3); // L: 32
+		field2602 = new ClientPacket(28, 7); // L: 33
+		field2603 = new ClientPacket(29, -1); // L: 34
+		field2604 = new ClientPacket(30, 7); // L: 35
+		field2601 = new ClientPacket(31, -1); // L: 36
+		field2606 = new ClientPacket(32, -1); // L: 37
+		field2607 = new ClientPacket(33, 2); // L: 38
+		field2608 = new ClientPacket(34, 3); // L: 39
+		field2609 = new ClientPacket(35, 4); // L: 40
+		field2614 = new ClientPacket(36, 7); // L: 41
+		field2605 = new ClientPacket(37, 3); // L: 42
+		field2612 = new ClientPacket(38, -1); // L: 43
+		field2613 = new ClientPacket(39, 7); // L: 44
+		field2617 = new ClientPacket(40, 11); // L: 45
+		field2615 = new ClientPacket(41, -1); // L: 46
+		field2616 = new ClientPacket(42, 7); // L: 47
+		field2597 = new ClientPacket(43, 3); // L: 48
+		field2618 = new ClientPacket(44, 3); // L: 49
+		field2619 = new ClientPacket(45, -1); // L: 50
+		field2610 = new ClientPacket(46, -1); // L: 51
+		field2621 = new ClientPacket(47, 16); // L: 52
+		field2622 = new ClientPacket(48, 2); // L: 53
+		field2623 = new ClientPacket(49, 7); // L: 54
+		field2673 = new ClientPacket(50, 3); // L: 55
+		field2641 = new ClientPacket(51, 8); // L: 56
+		field2668 = new ClientPacket(52, -2); // L: 57
+		field2627 = new ClientPacket(53, 3); // L: 58
+		field2634 = new ClientPacket(54, 2); // L: 59
+		field2629 = new ClientPacket(55, 2); // L: 60
+		field2590 = new ClientPacket(56, 8); // L: 61
+		field2631 = new ClientPacket(57, 8); // L: 62
+		field2632 = new ClientPacket(58, 14); // L: 63
+		field2633 = new ClientPacket(59, 8); // L: 64
+		field2646 = new ClientPacket(60, 15); // L: 65
+		field2635 = new ClientPacket(61, 9); // L: 66
+		field2636 = new ClientPacket(62, -1); // L: 67
+		field2655 = new ClientPacket(63, -1); // L: 68
+		field2638 = new ClientPacket(64, 8); // L: 69
+		field2611 = new ClientPacket(65, 11); // L: 70
+		field2640 = new ClientPacket(66, 8); // L: 71
+		field2663 = new ClientPacket(67, 8); // L: 72
+		field2642 = new ClientPacket(68, 15); // L: 73
+		field2654 = new ClientPacket(69, 15); // L: 74
+		field2644 = new ClientPacket(70, 0); // L: 75
+		field2645 = new ClientPacket(71, 8); // L: 76
+		field2596 = new ClientPacket(72, 9); // L: 77
+		field2599 = new ClientPacket(73, 0); // L: 78
+		field2667 = new ClientPacket(74, -1); // L: 79
+		field2594 = new ClientPacket(75, -2); // L: 80
+		field2650 = new ClientPacket(76, 11); // L: 81
+		field2620 = new ClientPacket(77, 16); // L: 82
+		field2652 = new ClientPacket(78, 3); // L: 83
+		field2653 = new ClientPacket(79, -1); // L: 84
+		field2660 = new ClientPacket(80, 8); // L: 85
+		field2659 = new ClientPacket(81, 8); // L: 86
+		field2656 = new ClientPacket(82, 5); // L: 87
+		field2657 = new ClientPacket(83, 7); // L: 88
+		field2658 = new ClientPacket(84, 8); // L: 89
+		field2630 = new ClientPacket(85, 8); // L: 90
+		field2637 = new ClientPacket(86, 8); // L: 91
+		field2649 = new ClientPacket(87, 3); // L: 92
+		field2662 = new ClientPacket(88, 6); // L: 93
+		field2628 = new ClientPacket(89, 8); // L: 94
+		field2664 = new ClientPacket(90, 4); // L: 95
+		field2661 = new ClientPacket(91, -1); // L: 96
+		field2666 = new ClientPacket(92, 11);
+		field2665 = new ClientPacket(93, -1);
+		field2651 = new ClientPacket(94, -2);
+		field2669 = new ClientPacket(95, -1); // L: 100
+		field2670 = new ClientPacket(96, -1); // L: 101
+		field2671 = new ClientPacket(97, 3);
+		field2672 = new ClientPacket(98, 8);
+		field2591 = new ClientPacket(99, -1); // L: 104
+		field2674 = new ClientPacket(100, 3);
+		field2675 = new ClientPacket(101, -1);
+		field2584 = new ClientPacket(102, -1); // L: 107
+		field2677 = new ClientPacket(103, 4); // L: 108
+		field2626 = new ClientPacket(104, 2); // L: 109
+		field2679 = new ClientPacket(105, 3); // L: 110
 	}
 
 	ClientPacket(int var1, int var2) {
@@ -664,56 +664,37 @@ public class ClientPacket implements class223 {
 		this.length = var2; // L: 116
 	} // L: 117
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1602650141"
+		descriptor = "(B)J",
+		garbageValue = "-87"
 	)
-	static void method4354() {
-		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 44
-			if (var0.obj != null) { // L: 45
-				var0.set();
-			}
+	@Export("currentTimeMillis")
+	public static final synchronized long currentTimeMillis() {
+		long var0 = System.currentTimeMillis(); // L: 14
+		if (var0 < class380.field4151) { // L: 15
+			class182.field2113 += class380.field4151 - var0; // L: 16
 		}
 
-	} // L: 47
+		class380.field4151 = var0; // L: 18
+		return class182.field2113 + var0; // L: 19
+	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;IIB)Loh;",
-		garbageValue = "14"
+		descriptor = "(Ljp;II)Lof;",
+		garbageValue = "873034758"
 	)
-	@Export("SpriteBuffer_getSprite")
-	public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
-		byte[] var4 = var0.takeFile(var1, var2); // L: 54
-		boolean var3;
-		if (var4 == null) { // L: 55
-			var3 = false; // L: 56
+	public static IndexedSprite method4492(AbstractArchive var0, int var1) {
+		byte[] var3 = var0.takeFileFlat(var1); // L: 97
+		boolean var2;
+		if (var3 == null) { // L: 98
+			var2 = false; // L: 99
 		} else {
-			ItemLayer.SpriteBuffer_decode(var4); // L: 59
-			var3 = true; // L: 60
+			class29.SpriteBuffer_decode(var3); // L: 102
+			var2 = true; // L: 103
 		}
 
-		if (!var3) { // L: 62
-			return null;
-		} else {
-			SpritePixels var5 = new SpritePixels(); // L: 65
-			var5.width = class396.SpriteBuffer_spriteWidth; // L: 66
-			var5.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 67
-			var5.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[0]; // L: 68
-			var5.yOffset = Calendar.SpriteBuffer_yOffsets[0]; // L: 69
-			var5.subWidth = class396.SpriteBuffer_spriteWidths[0]; // L: 70
-			var5.subHeight = class302.SpriteBuffer_spriteHeights[0]; // L: 71
-			int var6 = var5.subWidth * var5.subHeight; // L: 72
-			byte[] var7 = class396.SpriteBuffer_pixels[0]; // L: 73
-			var5.pixels = new int[var6]; // L: 74
-
-			for (int var8 = 0; var8 < var6; ++var8) { // L: 75
-				var5.pixels[var8] = MilliClock.SpriteBuffer_spritePalette[var7[var8] & 255];
-			}
-
-			MilliClock.method2587(); // L: 76
-			return var5; // L: 79
-		}
+		return !var2 ? null : class302.method5571(); // L: 105 106
 	}
 }
diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java
index dce1b5fd1d..4186636b63 100644
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -1,4 +1,3 @@
-import java.security.SecureRandom;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
@@ -8,57 +7,54 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cl")
+@ObfuscatedName("cn")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -437407307
+		intValue = -454250637
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("eg")
-	@Export("secureRandom")
-	static SecureRandom secureRandom;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("roofsHidden")
 	boolean roofsHidden;
 	@ObfuscatedName("y")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -660685365
+		intValue = -1571023127
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("b")
-	double field1337;
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
+	double field1312;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1285356667
+		intValue = 1112571497
 	)
 	@Export("musicVolume")
 	int musicVolume;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -140834991
+		intValue = 1870852049
 	)
 	@Export("soundEffectsVolume")
 	int soundEffectsVolume;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1768933319
+		intValue = 348107745
 	)
 	@Export("areaSoundEffectsVolume")
 	int areaSoundEffectsVolume;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -70,30 +66,30 @@ public class ClientPreferences {
 		this.windowMode = 1;
 		this.rememberedUsername = null;
 		this.hideUsername = false;
-		this.field1337 = 0.8D;
+		this.field1312 = 0.8D;
 		this.musicVolume = 127;
 		this.soundEffectsVolume = 127;
 		this.areaSoundEffectsVolume = 127;
 		this.parameters = new LinkedHashMap();
-		this.method2239(true); // L: 25
+		this.method2315(true); // L: 25
 	} // L: 26
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1; // L: 15
 		this.rememberedUsername = null; // L: 16
 		this.hideUsername = false; // L: 17
-		this.field1337 = 0.8D; // L: 18
+		this.field1312 = 0.8D; // L: 18
 		this.musicVolume = 127; // L: 19
 		this.soundEffectsVolume = 127; // L: 20
 		this.areaSoundEffectsVolume = 127; // L: 21
 		this.parameters = new LinkedHashMap(); // L: 22
 		if (var1 != null && var1.array != null) { // L: 29
-			int var2 = var1.readUnsignedByte(); // L: 33
-			if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 34
-				if (var1.readUnsignedByte() == 1) { // L: 38
+			int var2 = var1.readUnsignedByte();
+			if (var2 >= 0 && var2 <= ClientPreferences_optionCount) {
+				if (var1.readUnsignedByte() == 1) {
 					this.roofsHidden = true;
 				}
 
@@ -124,32 +120,32 @@ public class ClientPreferences {
 				}
 
 				if (var2 > 6) { // L: 59
-					this.field1337 = (double)var1.readUnsignedByte() / 100.0D; // L: 60
+					this.field1312 = (double)var1.readUnsignedByte() / 100.0D; // L: 60
 					this.musicVolume = var1.readUnsignedByte(); // L: 61
 					this.soundEffectsVolume = var1.readUnsignedByte(); // L: 62
 					this.areaSoundEffectsVolume = var1.readUnsignedByte(); // L: 63
 				}
 			} else {
-				this.method2239(true); // L: 35
+				this.method2315(true);
 			}
 		} else {
-			this.method2239(true); // L: 30
+			this.method2315(true); // L: 30
 		}
 
 	} // L: 67
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "2046027023"
+		descriptor = "(ZB)V",
+		garbageValue = "-49"
 	)
-	void method2239(boolean var1) {
+	void method2315(boolean var1) {
 	} // L: 69
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnd;",
-		garbageValue = "2063389348"
+		descriptor = "(I)Lnt;",
+		garbageValue = "1929327586"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -169,10 +165,36 @@ public class ClientPreferences {
 
 		var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 85
 		var1.writeBoolean(this.hideUsername); // L: 86
-		var1.writeByte((int)(100.0D * this.field1337)); // L: 87
+		var1.writeByte((int)(100.0D * this.field1312)); // L: 87
 		var1.writeByte(this.musicVolume); // L: 88
 		var1.writeByte(this.soundEffectsVolume); // L: 89
 		var1.writeByte(this.areaSoundEffectsVolume); // L: 90
 		return var1; // L: 91
 	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-648393673"
+	)
+	static int method2330(int var0, int var1, int var2) {
+		if (var2 > 179) { // L: 33
+			var1 /= 2;
+		}
+
+		if (var2 > 192) { // L: 34
+			var1 /= 2;
+		}
+
+		if (var2 > 217) { // L: 35
+			var1 /= 2;
+		}
+
+		if (var2 > 243) { // L: 36
+			var1 /= 2;
+		}
+
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 37
+		return var3; // L: 38
+	}
 }
diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java
index 553c7c9c97..f9b09cdfca 100644
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -1,119 +1,56 @@
 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("ez")
+@ObfuscatedName("en")
 @Implements("Clock")
 public abstract class Clock {
-	@ObfuscatedName("tg")
-	@Export("foundItemIds")
-	static short[] foundItemIds;
+	@ObfuscatedName("m")
+	@Export("SpriteBuffer_spriteHeights")
+	public static int[] SpriteBuffer_spriteHeights;
+	@ObfuscatedName("nx")
+	@ObfuscatedGetter(
+		intValue = 629539371
+	)
+	static int field1538;
 
 	Clock() {
 	} // L: 4
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1887937791"
+		descriptor = "(B)V",
+		garbageValue = "-111"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-1841090229"
+		descriptor = "(IIB)I",
+		garbageValue = "-104"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "-56"
+		descriptor = "([Lkm;IB)Lkm;",
+		garbageValue = "0"
 	)
-	@Export("loadInterface")
-	public static boolean loadInterface(int var0) {
-		if (Widget.Widget_loadedInterfaces[var0]) { // L: 205
-			return true;
-		} else if (!HealthBarUpdate.Widget_archive.tryLoadGroup(var0)) { // L: 206
-			return false;
-		} else {
-			int var1 = HealthBarUpdate.Widget_archive.getGroupFileCount(var0); // L: 207
-			if (var1 == 0) { // L: 208
-				Widget.Widget_loadedInterfaces[var0] = true; // L: 209
-				return true; // L: 210
-			} else {
-				if (Widget.Widget_interfaceComponents[var0] == null) { // L: 212
-					Widget.Widget_interfaceComponents[var0] = new Widget[var1];
-				}
+	@Export("findEnumerated")
+	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
+		Enumerated[] var2 = var0; // L: 17
 
-				for (int var2 = 0; var2 < var1; ++var2) { // L: 213
-					if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 214
-						byte[] var3 = HealthBarUpdate.Widget_archive.takeFile(var0, var2); // L: 215
-						if (var3 != null) { // L: 216
-							Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 217
-							Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 218
-							if (var3[0] == -1) { // L: 219
-								Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
-							} else {
-								Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 220
-							}
-						}
-					}
-				}
-
-				Widget.Widget_loadedInterfaces[var0] = true; // L: 224
-				return true; // L: 225
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
+			Enumerated var4 = var2[var3]; // L: 19
+			if (var1 == var4.rsOrdinal()) {
+				return var4; // L: 21
 			}
 		}
+
+		return null; // L: 25
 	}
-
-	@ObfuscatedName("jd")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;IIZI)V",
-		garbageValue = "-1829145394"
-	)
-	@Export("alignWidgetSize")
-	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
-		int var4 = var0.width; // L: 9786
-		int var5 = var0.height; // L: 9787
-		if (var0.widthAlignment == 0) { // L: 9788
-			var0.width = var0.rawWidth;
-		} else if (var0.widthAlignment == 1) { // L: 9789
-			var0.width = var1 - var0.rawWidth;
-		} else if (var0.widthAlignment == 2) { // L: 9790
-			var0.width = var0.rawWidth * var1 >> 14;
-		}
-
-		if (var0.heightAlignment == 0) { // L: 9791
-			var0.height = var0.rawHeight;
-		} else if (var0.heightAlignment == 1) { // L: 9792
-			var0.height = var2 - var0.rawHeight;
-		} else if (var0.heightAlignment == 2) { // L: 9793
-			var0.height = var2 * var0.rawHeight >> 14;
-		}
-
-		if (var0.widthAlignment == 4) { // L: 9794
-			var0.width = var0.field3060 * var0.height / var0.field2976;
-		}
-
-		if (var0.heightAlignment == 4) { // L: 9795
-			var0.height = var0.width * var0.field2976 / var0.field3060;
-		}
-
-		if (var0.contentType == 1337) { // L: 9796
-			Client.viewportWidget = var0;
-		}
-
-		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9797
-			ScriptEvent var6 = new ScriptEvent(); // L: 9798
-			var6.widget = var0; // L: 9799
-			var6.args = var0.onResize; // L: 9800
-			Client.scriptEvents.addFirst(var6); // L: 9801
-		}
-
-	} // L: 9803
 }
diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java
index 596a5c002e..1a6bbc7ab2 100644
--- a/runescape-client/src/main/java/CollisionMap.java
+++ b/runescape-client/src/main/java/CollisionMap.java
@@ -4,40 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fz")
+@ObfuscatedName("fl")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("dq")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1967137555
 	)
-	@Export("archive9")
-	static Archive archive9;
+	@Export("clientTickTimeIdx")
+	static int clientTickTimeIdx;
 	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 280751135
+		intValue = 1252151781
 	)
 	@Export("xInset")
-	int xInset;
-	@ObfuscatedName("ax")
+	public int xInset;
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -992681321
+		intValue = 193981903
 	)
 	@Export("yInset")
-	int yInset;
-	@ObfuscatedName("as")
+	public int yInset;
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 960002853
+		intValue = -2099973471
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1646122993
+		intValue = 3583519
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("flags")
 	public int[][] flags;
 
@@ -50,10 +50,10 @@ public class CollisionMap {
 		this.clear(); // L: 49
 	} // L: 50
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1513589499"
+		garbageValue = "-950310873"
 	)
 	@Export("clear")
 	public void clear() {
@@ -69,12 +69,12 @@ public class CollisionMap {
 
 	} // L: 59
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIZI)V",
-		garbageValue = "-1946469678"
+		descriptor = "(IIIIZB)V",
+		garbageValue = "87"
 	)
-	public void method3164(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3216(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset; // L: 62
 		var2 -= this.yInset; // L: 63
 		if (var3 == 0) { // L: 64
@@ -89,33 +89,33 @@ public class CollisionMap {
 			}
 
 			if (var4 == 2) { // L: 73
-				this.setFlag(var1, var2, 8);
-				this.setFlag(var1 + 1, var2, 128);
+				this.setFlag(var1, var2, 8); // L: 74
+				this.setFlag(var1 + 1, var2, 128); // L: 75
 			}
 
-			if (var4 == 3) {
+			if (var4 == 3) { // L: 77
 				this.setFlag(var1, var2, 32); // L: 78
-				this.setFlag(var1, var2 - 1, 2);
+				this.setFlag(var1, var2 - 1, 2); // L: 79
 			}
 		}
 
 		if (var3 == 1 || var3 == 3) { // L: 82
-			if (var4 == 0) {
-				this.setFlag(var1, var2, 1);
-				this.setFlag(var1 - 1, var2 + 1, 16);
+			if (var4 == 0) { // L: 83
+				this.setFlag(var1, var2, 1); // L: 84
+				this.setFlag(var1 - 1, var2 + 1, 16); // L: 85
 			}
 
-			if (var4 == 1) {
-				this.setFlag(var1, var2, 4);
-				this.setFlag(var1 + 1, var2 + 1, 64);
+			if (var4 == 1) { // L: 87
+				this.setFlag(var1, var2, 4); // L: 88
+				this.setFlag(var1 + 1, var2 + 1, 64); // L: 89
 			}
 
-			if (var4 == 2) {
-				this.setFlag(var1, var2, 16);
-				this.setFlag(var1 + 1, var2 - 1, 1);
+			if (var4 == 2) { // L: 91
+				this.setFlag(var1, var2, 16); // L: 92
+				this.setFlag(var1 + 1, var2 - 1, 1); // L: 93
 			}
 
-			if (var4 == 3) {
+			if (var4 == 3) { // L: 95
 				this.setFlag(var1, var2, 64); // L: 96
 				this.setFlag(var1 - 1, var2 - 1, 4); // L: 97
 			}
@@ -221,10 +221,10 @@ public class CollisionMap {
 
 	} // L: 182
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIZI)V",
-		garbageValue = "281902458"
+		descriptor = "(IIIIZB)V",
+		garbageValue = "-42"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -251,7 +251,7 @@ public class CollisionMap {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-1025691571"
+		garbageValue = "-1224404826"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -261,10 +261,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	} // L: 202
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-323601081"
+		garbageValue = "-1296944605"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -274,10 +274,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	} // L: 208
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "1796762342"
+		descriptor = "(IIIB)V",
+		garbageValue = "34"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -285,12 +285,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	} // L: 212
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIZI)V",
-		garbageValue = "2020526331"
+		garbageValue = "175119648"
 	)
-	public void method3156(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3217(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset; // L: 215
 		var2 -= this.yInset; // L: 216
 		if (var3 == 0) { // L: 217
@@ -437,10 +437,10 @@ public class CollisionMap {
 
 	} // L: 335
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIZI)V",
-		garbageValue = "1639638094"
+		garbageValue = "63758690"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -470,10 +470,10 @@ public class CollisionMap {
 
 	} // L: 354
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "-308385855"
+		garbageValue = "-1773345241"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -481,100 +481,57 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	} // L: 358
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-118708245"
+		garbageValue = "1650677027"
 	)
-	public void method3150(int var1, int var2) {
+	public void method3206(int var1, int var2) {
 		var1 -= this.xInset; // L: 361
 		var2 -= this.yInset; // L: 362
 		int[] var10000 = this.flags[var1]; // L: 363
 		var10000[var2] &= -262145;
 	} // L: 364
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "832294555"
-	)
-	public static int method3185(int var0) {
-		return class230.field2814[var0]; // L: 38
+	@ObfuscatedName("e")
+	static double method3213(double var0, double var2, double var4) {
+		return WallDecoration.method4429((var0 - var2) / var4) / var4; // L: 13
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-687702354"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "1850795522"
 	)
-	@Export("iLog")
-	public static int iLog(int var0) {
-		int var1 = 0; // L: 74
-		if (var0 < 0 || var0 >= 65536) { // L: 75
-			var0 >>>= 16; // L: 76
-			var1 += 16; // L: 77
-		}
+	@Export("setLoginResponseString")
+	static void setLoginResponseString(String var0, String var1, String var2) {
+		Login.Login_response1 = var0; // L: 1218
+		Login.Login_response2 = var1; // L: 1219
+		Login.Login_response3 = var2; // L: 1220
+	} // L: 1221
 
-		if (var0 >= 256) { // L: 79
-			var0 >>>= 8; // L: 80
-			var1 += 8; // L: 81
-		}
-
-		if (var0 >= 16) { // L: 83
-			var0 >>>= 4; // L: 84
-			var1 += 4; // L: 85
-		}
-
-		if (var0 >= 4) { // L: 87
-			var0 >>>= 2; // L: 88
-			var1 += 2; // L: 89
-		}
-
-		if (var0 >= 1) { // L: 91
-			var0 >>>= 1; // L: 92
-			++var1; // L: 93
-		}
-
-		return var0 + var1; // L: 95
-	}
-
-	@ObfuscatedName("gs")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "847550164"
+		descriptor = "(I)V",
+		garbageValue = "-719935819"
 	)
-	@Export("setWindowedMode")
-	static void setWindowedMode(int var0) {
-		Client.field858 = 0L; // L: 3913
-		if (var0 >= 2) { // L: 3914
-			Client.isResizable = true;
-		} else {
-			Client.isResizable = false; // L: 3915
-		}
+	public static void method3245() {
+		ObjectComposition.ObjectDefinition_cached.clear(); // L: 427
+		ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 428
+		ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 429
+		ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 430
+	} // L: 431
 
-		if (SpotAnimationDefinition.getWindowedMode() == 1) { // L: 3916
-			class23.client.setMaxCanvasSize(765, 503); // L: 3917
-		} else {
-			class23.client.setMaxCanvasSize(7680, 2160); // L: 3920
-		}
-
-		if (Client.gameState >= 25) { // L: 3922
-			PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); // L: 3924
-			var1.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); // L: 3925
-			var1.packetBuffer.writeShort(class32.canvasWidth); // L: 3926
-			var1.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 3927
-			Client.packetWriter.addNode(var1); // L: 3928
-		}
-
-	} // L: 3930
-
-	@ObfuscatedName("kp")
+	@ObfuscatedName("kh")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "16"
+		descriptor = "(I)V",
+		garbageValue = "1470187850"
 	)
-	static final void method3155() {
-		Client.field844 = Client.cycleCntr; // L: 11280
-		MusicPatch.ClanChat_inClanChat = true; // L: 11281
-	} // L: 11282
+	static final void method3244() {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11450
+			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11451
+			var1.method2213(); // L: 11452
+		}
+
+	} // L: 11454
 }
diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java
index 1fe5a3af85..a2508c83a2 100644
--- a/runescape-client/src/main/java/Coord.java
+++ b/runescape-client/src/main/java/Coord.java
@@ -4,30 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ii")
+@ObfuscatedName("iw")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("v")
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lof;"
+	)
+	@Export("titleboxSprite")
+	static IndexedSprite titleboxSprite;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1820038389
+		intValue = -1361865131
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2092998769
+		intValue = -1864154747
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 349527629
+		intValue = 807727247
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lii;)V"
+		descriptor = "(Liw;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane; // L: 15
@@ -52,40 +58,48 @@ public class Coord {
 
 	} // L: 27
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-738811910"
+		garbageValue = "-688819696"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y; // L: 30
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lii;B)Z",
-		garbageValue = "-43"
+		descriptor = "(Liw;I)Z",
+		garbageValue = "-1923777206"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
-		if (this.plane != var1.plane) {
+		if (this.plane != var1.plane) { // L: 40
 			return false;
-		} else if (this.x != var1.x) {
+		} else if (this.x != var1.x) { // L: 41
 			return false;
 		} else {
-			return this.y == var1.y;
+			return this.y == var1.y; // L: 42
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "36531623"
+		descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
+		garbageValue = "-23"
 	)
 	@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);
+		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 55
+	}
+
+	public int hashCode() {
+		return this.packed(); // L: 47
+	}
+
+	public String toString() {
+		return this.toString(","); // L: 51
 	}
 
 	public boolean equals(Object var1) {
@@ -96,218 +110,143 @@ public class Coord {
 		}
 	}
 
-	public int hashCode() {
-		return this.packed();
-	}
-
-	public String toString() {
-		return this.toString(",");
-	}
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("gk")
 	@ObfuscatedSignature(
-		descriptor = "(Lnb;B)V",
-		garbageValue = "-128"
+		descriptor = "(I)V",
+		garbageValue = "1693981343"
 	)
-	@Export("updatePlayer")
-	static final void updatePlayer(PacketBuffer var0) {
-		var0.importIndex(); // L: 37
-		int var1 = Client.localPlayerIndex; // L: 38
-		Player var2 = class93.localPlayer = Client.players[var1] = new Player(); // L: 39
-		var2.index = var1; // L: 40
-		int var3 = var0.readBits(30); // L: 41
-		byte var4 = (byte)(var3 >> 28); // L: 42
-		int var5 = var3 >> 14 & 16383; // L: 43
-		int var6 = var3 & 16383; // L: 44
-		var2.pathX[0] = var5 - VertexNormal.baseX; // L: 45
-		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
-		var2.pathY[0] = var6 - SoundSystem.baseY; // L: 47
-		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
-		class22.Client_plane = var2.plane = var4; // L: 49
-		if (Players.field1374[var1] != null) { // L: 50
-			var2.read(Players.field1374[var1]);
-		}
-
-		Players.Players_count = 0; // L: 51
-		Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
-		Players.field1370[var1] = 0; // L: 53
-		Players.Players_emptyIdxCount = 0; // L: 54
-
-		for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
-			if (var1 != var7) { // L: 56
-				int var8 = var0.readBits(18); // L: 57
-				int var9 = var8 >> 16; // L: 58
-				int var10 = var8 >> 8 & 597; // L: 59
-				int var11 = var8 & 597; // L: 60
-				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61
-				Players.Players_orientations[var7] = 0; // L: 62
-				Players.Players_targetIndices[var7] = -1; // L: 63
-				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64
-				Players.field1370[var7] = 0; // L: 65
+	static final void method4790() {
+		int var0 = SoundCache.field448 * 128 + 64; // L: 3896
+		int var1 = AttackOption.field1351 * 128 + 64; // L: 3897
+		int var2 = ItemContainer.getTileHeight(var0, var1, SoundSystem.Client_plane) - Client.field659; // L: 3898
+		if (ObjectSound.cameraX < var0) { // L: 3899
+			ObjectSound.cameraX = (var0 - ObjectSound.cameraX) * FloorUnderlayDefinition.field1707 / 1000 + ObjectSound.cameraX + Message.field602; // L: 3900
+			if (ObjectSound.cameraX > var0) { // L: 3901
+				ObjectSound.cameraX = var0;
 			}
 		}
 
-		var0.exportIndex(); // L: 67
-	} // L: 68
+		if (ObjectSound.cameraX > var0) { // L: 3903
+			ObjectSound.cameraX -= FloorUnderlayDefinition.field1707 * (ObjectSound.cameraX - var0) / 1000 + Message.field602; // L: 3904
+			if (ObjectSound.cameraX < var0) { // L: 3905
+				ObjectSound.cameraX = var0;
+			}
+		}
 
-	@ObfuscatedName("hm")
+		if (class160.cameraY < var2) { // L: 3907
+			class160.cameraY = (var2 - class160.cameraY) * FloorUnderlayDefinition.field1707 / 1000 + class160.cameraY + Message.field602; // L: 3908
+			if (class160.cameraY > var2) { // L: 3909
+				class160.cameraY = var2;
+			}
+		}
+
+		if (class160.cameraY > var2) { // L: 3911
+			class160.cameraY -= FloorUnderlayDefinition.field1707 * (class160.cameraY - var2) / 1000 + Message.field602; // L: 3912
+			if (class160.cameraY < var2) { // L: 3913
+				class160.cameraY = var2;
+			}
+		}
+
+		if (Canvas.cameraZ < var1) { // L: 3915
+			Canvas.cameraZ = (var1 - Canvas.cameraZ) * FloorUnderlayDefinition.field1707 / 1000 + Canvas.cameraZ + Message.field602; // L: 3916
+			if (Canvas.cameraZ > var1) { // L: 3917
+				Canvas.cameraZ = var1;
+			}
+		}
+
+		if (Canvas.cameraZ > var1) { // L: 3919
+			Canvas.cameraZ -= FloorUnderlayDefinition.field1707 * (Canvas.cameraZ - var1) / 1000 + Message.field602; // L: 3920
+			if (Canvas.cameraZ < var1) { // L: 3921
+				Canvas.cameraZ = var1;
+			}
+		}
+
+		var0 = WorldMapIcon_0.field2029 * 128 + 64; // L: 3923
+		var1 = class44.field315 * 128 + 64; // L: 3924
+		var2 = ItemContainer.getTileHeight(var0, var1, SoundSystem.Client_plane) - FriendsChat.field3815; // L: 3925
+		int var3 = var0 - ObjectSound.cameraX; // L: 3926
+		int var4 = var2 - class160.cameraY; // L: 3927
+		int var5 = var1 - Canvas.cameraZ; // L: 3928
+		int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3)); // L: 3929
+		int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; // L: 3930
+		int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; // L: 3931
+		if (var7 < 128) { // L: 3932
+			var7 = 128;
+		}
+
+		if (var7 > 383) { // L: 3933
+			var7 = 383;
+		}
+
+		if (class69.cameraPitch < var7) { // L: 3934
+			class69.cameraPitch = (var7 - class69.cameraPitch) * class20.field166 / 1000 + class69.cameraPitch + GrandExchangeOfferOwnWorldComparator.field607; // L: 3935
+			if (class69.cameraPitch > var7) { // L: 3936
+				class69.cameraPitch = var7;
+			}
+		}
+
+		if (class69.cameraPitch > var7) { // L: 3938
+			class69.cameraPitch -= class20.field166 * (class69.cameraPitch - var7) / 1000 + GrandExchangeOfferOwnWorldComparator.field607; // L: 3939
+			if (class69.cameraPitch < var7) { // L: 3940
+				class69.cameraPitch = var7;
+			}
+		}
+
+		int var9 = var8 - class32.cameraYaw; // L: 3942
+		if (var9 > 1024) { // L: 3943
+			var9 -= 2048;
+		}
+
+		if (var9 < -1024) { // L: 3944
+			var9 += 2048;
+		}
+
+		if (var9 > 0) { // L: 3945
+			class32.cameraYaw = class32.cameraYaw + GrandExchangeOfferOwnWorldComparator.field607 + var9 * class20.field166 / 1000; // L: 3946
+			class32.cameraYaw &= 2047; // L: 3947
+		}
+
+		if (var9 < 0) { // L: 3949
+			class32.cameraYaw -= -var9 * class20.field166 / 1000 + GrandExchangeOfferOwnWorldComparator.field607; // L: 3950
+			class32.cameraYaw &= 2047; // L: 3951
+		}
+
+		int var10 = var8 - class32.cameraYaw; // L: 3953
+		if (var10 > 1024) { // L: 3954
+			var10 -= 2048;
+		}
+
+		if (var10 < -1024) { // L: 3955
+			var10 += 2048;
+		}
+
+		if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { // L: 3956
+			class32.cameraYaw = var8;
+		}
+
+	} // L: 3957
+
+	@ObfuscatedName("ky")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "1649813812"
+		descriptor = "(I)V",
+		garbageValue = "57209027"
 	)
-	@Export("drawObject")
-	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
-		long var5 = AbstractSocket.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5612
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		int var14;
-		int var26;
-		if (var5 != 0L) { // L: 5613
-			var7 = AbstractSocket.scene.getObjectFlags(var0, var1, var2, var5); // L: 5614
-			var8 = var7 >> 6 & 3; // L: 5615
-			var9 = var7 & 31; // L: 5616
-			var10 = var3; // L: 5617
-			boolean var12 = 0L != var5; // L: 5620
-			if (var12) { // L: 5621
-				boolean var13 = (int)(var5 >>> 16 & 1L) == 1; // L: 5624
-				var12 = !var13; // L: 5626
-			}
+	static final void method4801() {
+		Client.field817 = Client.cycleCntr; // L: 11457
+	} // L: 11458
 
-			if (var12) { // L: 5630
-				var10 = var4;
-			}
-
-			int[] var19 = GameEngine.sceneMinimapSprite.pixels; // L: 5631
-			var26 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5632
-			var14 = class93.Entity_unpackID(var5); // L: 5633
-			ObjectComposition var15 = class23.getObjectDefinition(var14); // L: 5634
-			if (var15.mapSceneId != -1) { // L: 5635
-				IndexedSprite var16 = class10.mapSceneSprites[var15.mapSceneId]; // L: 5636
-				if (var16 != null) { // L: 5637
-					int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5638
-					int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5639
-					var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5640
-				}
-			} else {
-				if (var9 == 0 || var9 == 2) { // L: 5644
-					if (var8 == 0) { // L: 5645
-						var19[var26] = var10; // L: 5646
-						var19[var26 + 512] = var10; // L: 5647
-						var19[var26 + 1024] = var10; // L: 5648
-						var19[var26 + 1536] = var10; // L: 5649
-					} else if (var8 == 1) { // L: 5651
-						var19[var26] = var10; // L: 5652
-						var19[var26 + 1] = var10; // L: 5653
-						var19[var26 + 2] = var10; // L: 5654
-						var19[var26 + 3] = var10; // L: 5655
-					} else if (var8 == 2) { // L: 5657
-						var19[var26 + 3] = var10; // L: 5658
-						var19[var26 + 512 + 3] = var10; // L: 5659
-						var19[var26 + 1024 + 3] = var10; // L: 5660
-						var19[var26 + 1536 + 3] = var10; // L: 5661
-					} else if (var8 == 3) { // L: 5663
-						var19[var26 + 1536] = var10; // L: 5664
-						var19[var26 + 1536 + 1] = var10; // L: 5665
-						var19[var26 + 1536 + 2] = var10; // L: 5666
-						var19[var26 + 1536 + 3] = var10; // L: 5667
-					}
-				}
-
-				if (var9 == 3) { // L: 5670
-					if (var8 == 0) { // L: 5671
-						var19[var26] = var10;
-					} else if (var8 == 1) { // L: 5672
-						var19[var26 + 3] = var10;
-					} else if (var8 == 2) { // L: 5673
-						var19[var26 + 1536 + 3] = var10;
-					} else if (var8 == 3) { // L: 5674
-						var19[var26 + 1536] = var10;
-					}
-				}
-
-				if (var9 == 2) { // L: 5676
-					if (var8 == 3) { // L: 5677
-						var19[var26] = var10; // L: 5678
-						var19[var26 + 512] = var10; // L: 5679
-						var19[var26 + 1024] = var10; // L: 5680
-						var19[var26 + 1536] = var10; // L: 5681
-					} else if (var8 == 0) { // L: 5683
-						var19[var26] = var10; // L: 5684
-						var19[var26 + 1] = var10; // L: 5685
-						var19[var26 + 2] = var10; // L: 5686
-						var19[var26 + 3] = var10; // L: 5687
-					} else if (var8 == 1) { // L: 5689
-						var19[var26 + 3] = var10; // L: 5690
-						var19[var26 + 512 + 3] = var10; // L: 5691
-						var19[var26 + 1024 + 3] = var10; // L: 5692
-						var19[var26 + 1536 + 3] = var10; // L: 5693
-					} else if (var8 == 2) { // L: 5695
-						var19[var26 + 1536] = var10; // L: 5696
-						var19[var26 + 1536 + 1] = var10; // L: 5697
-						var19[var26 + 1536 + 2] = var10; // L: 5698
-						var19[var26 + 1536 + 3] = var10; // L: 5699
-					}
-				}
-			}
+	@ObfuscatedName("lg")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1607735940"
+	)
+	@Export("Clan_joinChat")
+	static final void Clan_joinChat(String var0) {
+		if (!var0.equals("")) { // L: 11479
+			PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); // L: 11481
+			var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 11482
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11483
+			Client.packetWriter.addNode(var1); // L: 11484
 		}
-
-		var5 = AbstractSocket.scene.getGameObjectTag(var0, var1, var2); // L: 5704
-		if (0L != var5) { // L: 5705
-			var7 = AbstractSocket.scene.getObjectFlags(var0, var1, var2, var5); // L: 5706
-			var8 = var7 >> 6 & 3; // L: 5707
-			var9 = var7 & 31; // L: 5708
-			var10 = class93.Entity_unpackID(var5); // L: 5709
-			ObjectComposition var20 = class23.getObjectDefinition(var10); // L: 5710
-			if (var20.mapSceneId != -1) { // L: 5711
-				IndexedSprite var28 = class10.mapSceneSprites[var20.mapSceneId]; // L: 5712
-				if (var28 != null) { // L: 5713
-					var26 = (var20.sizeX * 4 - var28.subWidth) / 2; // L: 5714
-					var14 = (var20.sizeY * 4 - var28.subHeight) / 2; // L: 5715
-					var28.drawAt(var1 * 4 + var26 + 48, var14 + (104 - var2 - var20.sizeY) * 4 + 48); // L: 5716
-				}
-			} else if (var9 == 9) { // L: 5719
-				int var25 = 15658734; // L: 5720
-				boolean var27 = var5 != 0L; // L: 5723
-				if (var27) { // L: 5724
-					boolean var21 = (int)(var5 >>> 16 & 1L) == 1; // L: 5727
-					var27 = !var21; // L: 5729
-				}
-
-				if (var27) { // L: 5733
-					var25 = 15597568;
-				}
-
-				int[] var22 = GameEngine.sceneMinimapSprite.pixels; // L: 5734
-				int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5735
-				if (var8 != 0 && var8 != 2) { // L: 5736
-					var22[var29] = var25; // L: 5743
-					var22[var29 + 1 + 512] = var25; // L: 5744
-					var22[var29 + 1024 + 2] = var25; // L: 5745
-					var22[var29 + 1536 + 3] = var25; // L: 5746
-				} else {
-					var22[var29 + 1536] = var25; // L: 5737
-					var22[var29 + 1 + 1024] = var25; // L: 5738
-					var22[var29 + 512 + 2] = var25; // L: 5739
-					var22[var29 + 3] = var25; // L: 5740
-				}
-			}
-		}
-
-		var5 = AbstractSocket.scene.getFloorDecorationTag(var0, var1, var2); // L: 5750
-		if (var5 != 0L) { // L: 5751
-			var7 = class93.Entity_unpackID(var5); // L: 5752
-			ObjectComposition var23 = class23.getObjectDefinition(var7); // L: 5753
-			if (var23.mapSceneId != -1) { // L: 5754
-				IndexedSprite var24 = class10.mapSceneSprites[var23.mapSceneId]; // L: 5755
-				if (var24 != null) { // L: 5756
-					var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5757
-					int var11 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5758
-					var24.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var23.sizeY) * 4 + var11 + 48); // L: 5759
-				}
-			}
-		}
-
-	} // L: 5763
+	} // L: 11485
 }
diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java
index d8b416a872..4222b6917b 100644
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -3,58 +3,30 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("be")
+@ObfuscatedName("bt")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "[Lop;"
-	)
-	@Export("title_muteSprite")
-	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	static IndexedSprite field553;
-	@ObfuscatedName("dh")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive7")
-	static Archive archive7;
-	@ObfuscatedName("dw")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive13")
-	static Archive archive13;
-	@ObfuscatedName("mm")
-	@ObfuscatedGetter(
-		intValue = 1430642749
-	)
-	@Export("selectedSpellWidget")
-	static int selectedSpellWidget;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1278002573
+		intValue = 420963985
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -308385855
+		intValue = -1138629961
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) { // L: 14
-			int var3 = class386.method6818(var1, var2); // L: 15
+			int var3 = class34.method402(var1, var2); // L: 15
 			var1 /= var3; // L: 16
 			var2 /= var3; // L: 17
 			this.inputRate = var1; // L: 18
@@ -63,13 +35,13 @@ public class Decimator {
 
 			for (int var4 = 0; var4 < var1; ++var4) { // L: 21
 				int[] var5 = this.table[var4]; // L: 22
-				double var6 = (double)var4 / (double)var1 + 6.0D; // L: 23
-				int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); // L: 24
-				if (var8 < 0) { // L: 25
+				double var6 = 6.0D + (double)var4 / (double)var1; // L: 23
+				int var8 = (int)Math.floor(var6 - 7.0D + 1.0D);
+				if (var8 < 0) {
 					var8 = 0;
 				}
 
-				int var9 = (int)Math.ceil(var6 + 7.0D); // L: 26
+				int var9 = (int)Math.ceil(7.0D + var6); // L: 26
 				if (var9 > 14) { // L: 27
 					var9 = 14;
 				}
@@ -82,49 +54,49 @@ public class Decimator {
 					}
 
 					var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6)); // L: 33
-					var5[var8] = (int)Math.floor(var14 * 65536.0D + 0.5D); // L: 34
+					var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14); // L: 34
 				}
 			}
 
 		}
 	} // L: 37
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "([BI)[B",
-		garbageValue = "25186157"
+		garbageValue = "-1846224274"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
 		if (this.table != null) { // L: 40
-			int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14; // L: 41
+			int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14; // L: 41
 			int[] var3 = new int[var2]; // L: 42
 			int var4 = 0; // L: 43
-			int var5 = 0; // L: 44
+			int var5 = 0;
 
 			int var6;
-			for (var6 = 0; var6 < var1.length; ++var6) { // L: 45
-				byte var7 = var1[var6]; // L: 46
-				int[] var8 = this.table[var5]; // L: 47
+			for (var6 = 0; var6 < var1.length; ++var6) {
+				byte var7 = var1[var6];
+				int[] var8 = this.table[var5];
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) { // L: 48
-					var3[var9 + var4] += var7 * var8[var9];
+					var3[var4 + var9] += var7 * var8[var9];
 				}
 
 				var5 += this.outputRate; // L: 49
 				var9 = var5 / this.inputRate; // L: 50
 				var4 += var9; // L: 51
-				var5 -= var9 * this.inputRate; // L: 52
+				var5 -= var9 * this.inputRate;
 			}
 
-			var1 = new byte[var2]; // L: 54
+			var1 = new byte[var2];
 
-			for (var6 = 0; var6 < var2; ++var6) { // L: 55
-				int var10 = var3[var6] + 32768 >> 16; // L: 56
-				if (var10 < -128) { // L: 57
+			for (var6 = 0; var6 < var2; ++var6) {
+				int var10 = var3[var6] + 32768 >> 16;
+				if (var10 < -128) {
 					var1[var6] = -128;
-				} else if (var10 > 127) { // L: 58
+				} else if (var10 > 127) {
 					var1[var6] = 127;
 				} else {
 					var1[var6] = (byte)var10; // L: 59
@@ -135,10 +107,10 @@ public class Decimator {
 		return var1; // L: 62
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-202023878"
+		descriptor = "(IB)I",
+		garbageValue = "0"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
@@ -149,10 +121,10 @@ public class Decimator {
 		return var1; // L: 67
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "1042913417"
+		garbageValue = "-946737566"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
@@ -163,74 +135,307 @@ public class Decimator {
 		return var1; // L: 72
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;II)Z",
-		garbageValue = "-1461937174"
+		descriptor = "(I)V",
+		garbageValue = "-1393447426"
 	)
-	static boolean method1075(AbstractArchive var0, int var1) {
-		byte[] var2 = var0.takeFileFlat(var1); // L: 189
-		if (var2 == null) { // L: 190
-			return false;
+	public static void method1160() {
+		class69.reflectionChecks = new IterableNodeDeque(); // L: 24
+	} // L: 25
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Les;",
+		garbageValue = "112"
+	)
+	public static HitSplatDefinition method1171(int var0) {
+		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 52
+		if (var1 != null) { // L: 53
+			return var1;
 		} else {
-			ItemLayer.SpriteBuffer_decode(var2); // L: 191
-			return true; // L: 192
+			byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 54
+			var1 = new HitSplatDefinition(); // L: 55
+			if (var2 != null) { // L: 56
+				var1.decode(new Buffer(var2));
+			}
+
+			HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 57
+			return var1; // L: 58
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1064690457"
+		garbageValue = "452122319"
 	)
-	public static void method1073() {
-		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 542
-	} // L: 543
+	public static void method1169() {
+		class233.midiPcmStream.clear(); // L: 44
+		class233.musicPlayerStatus = 1; // L: 45
+		InvDefinition.musicTrackArchive = null; // L: 46
+	} // L: 47
 
-	@ObfuscatedName("fy")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lfl;IIII)V",
-		garbageValue = "-1353639896"
+		descriptor = "(I)V",
+		garbageValue = "-1181477544"
 	)
-	static void method1074(SequenceDefinition var0, int var1, int var2, int var3) {
-		if (Client.soundEffectCount < 50 && ObjectComposition.clientPreferences.areaSoundEffectsVolume != 0) { // L: 3358
-			if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3359
-				int var4 = var0.soundEffects[var1]; // L: 3360
-				if (var4 != 0) { // L: 3361
-					int var5 = var4 >> 8; // L: 3362
-					int var6 = var4 >> 4 & 7; // L: 3363
-					int var7 = var4 & 15; // L: 3364
-					Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3365
-					Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3366
-					Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3367
-					Client.soundEffects[Client.soundEffectCount] = null; // L: 3368
-					int var8 = (var2 - 64) / 128; // L: 3369
-					int var9 = (var3 - 64) / 128; // L: 3370
-					Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3371
-					++Client.soundEffectCount; // L: 3372
+	public static void method1168() {
+		HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 94
+		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 95
+	} // L: 96
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIILgp;Lfl;B)V",
+		garbageValue = "-20"
+	)
+	static final void method1167(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
+		ObjectComposition var9 = Tiles.getObjectDefinition(var4); // L: 874
+		int var10;
+		int var11;
+		if (var5 != 1 && var5 != 3) { // L: 877
+			var10 = var9.sizeX; // L: 882
+			var11 = var9.sizeY; // L: 883
+		} else {
+			var10 = var9.sizeY; // L: 878
+			var11 = var9.sizeX; // L: 879
+		}
+
+		int var12;
+		int var13;
+		if (var10 + var2 <= 104) { // L: 889
+			var12 = (var10 >> 1) + var2; // L: 890
+			var13 = var2 + (var10 + 1 >> 1); // L: 891
+		} else {
+			var12 = var2; // L: 894
+			var13 = var2 + 1; // L: 895
+		}
+
+		int var14;
+		int var15;
+		if (var3 + var11 <= 104) { // L: 897
+			var14 = var3 + (var11 >> 1); // L: 898
+			var15 = var3 + (var11 + 1 >> 1); // L: 899
+		} else {
+			var14 = var3; // L: 902
+			var15 = var3 + 1; // L: 903
+		}
+
+		int[][] var16 = Tiles.Tiles_heights[var1]; // L: 905
+		int var17 = var16[var12][var15] + var16[var12][var14] + var16[var13][var14] + var16[var13][var15] >> 2; // L: 906
+		int var18 = (var2 << 7) + (var10 << 6); // L: 907
+		int var19 = (var3 << 7) + (var11 << 6); // L: 908
+		long var20 = UserComparator3.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 909
+		int var22 = (var5 << 6) + var6; // L: 910
+		if (var9.int3 == 1) { // L: 911
+			var22 += 256;
+		}
+
+		Object var30;
+		if (var6 == 22) { // L: 912
+			if (var9.animationId == -1 && var9.transforms == null) { // L: 914
+				var30 = var9.getModel(22, var5, var16, var18, var17, var19);
+			} else {
+				var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 915
+			}
+
+			var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 916
+			if (var9.interactType == 1) { // L: 917
+				var8.setBlockedByFloorDec(var2, var3);
+			}
+
+		} else if (var6 != 10 && var6 != 11) { // L: 920
+			if (var6 >= 12) { // L: 928
+				if (var9.animationId == -1 && var9.transforms == null) { // L: 930
+					var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
+				} else {
+					var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 931
+				}
+
+				var7.method4046(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 932
+				if (var9.interactType != 0) { // L: 933
+					var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+				}
+
+			} else if (var6 == 0) { // L: 936
+				if (var9.animationId == -1 && var9.transforms == null) { // L: 938
+					var30 = var9.getModel(0, var5, var16, var18, var17, var19);
+				} else {
+					var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 939
+				}
+
+				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1102[var5], 0, var20, var22); // L: 940
+				if (var9.interactType != 0) { // L: 941
+					var8.method3216(var2, var3, var6, var5, var9.boolean1);
+				}
+
+			} else if (var6 == 1) { // L: 944
+				if (var9.animationId == -1 && var9.transforms == null) { // L: 946
+					var30 = var9.getModel(1, var5, var16, var18, var17, var19);
+				} else {
+					var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 947
+				}
+
+				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1107[var5], 0, var20, var22); // L: 948
+				if (var9.interactType != 0) { // L: 949
+					var8.method3216(var2, var3, var6, var5, var9.boolean1);
+				}
+
+			} else {
+				int var23;
+				if (var6 == 2) { // L: 952
+					var23 = var5 + 1 & 3; // L: 953
+					Object var25;
+					Object var31;
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 956
+						var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 957
+						var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 958
+					} else {
+						var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 961
+						var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 962
+					}
+
+					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field1102[var5], Tiles.field1102[var23], var20, var22); // L: 964
+					if (var9.interactType != 0) { // L: 965
+						var8.method3216(var2, var3, var6, var5, var9.boolean1);
+					}
+
+				} else if (var6 == 3) { // L: 968
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 970
+						var30 = var9.getModel(3, var5, var16, var18, var17, var19);
+					} else {
+						var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 971
+					}
+
+					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1107[var5], 0, var20, var22); // L: 972
+					if (var9.interactType != 0) { // L: 973
+						var8.method3216(var2, var3, var6, var5, var9.boolean1);
+					}
+
+				} else if (var6 == 9) { // L: 976
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 978
+						var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
+					} else {
+						var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 979
+					}
+
+					var7.method4046(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 980
+					if (var9.interactType != 0) { // L: 981
+						var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+					}
+
+				} else if (var6 == 4) { // L: 984
+					if (var9.animationId == -1 && var9.transforms == null) { // L: 986
+						var30 = var9.getModel(4, var5, var16, var18, var17, var19);
+					} else {
+						var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 987
+					}
+
+					var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1102[var5], 0, 0, 0, var20, var22); // L: 988
+				} else {
+					long var24;
+					Object var26;
+					if (var6 == 5) { // L: 991
+						var23 = 16; // L: 992
+						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 993
+						if (0L != var24) { // L: 994
+							var23 = Tiles.getObjectDefinition(Message.Entity_unpackID(var24)).int2;
+						}
+
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 996
+							var26 = var9.getModel(4, var5, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 997
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field1102[var5], 0, var23 * Tiles.field1100[var5], var23 * Tiles.field1105[var5], var20, var22); // L: 998
+					} else if (var6 == 6) { // L: 1001
+						var23 = 8; // L: 1002
+						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1003
+						if (0L != var24) { // L: 1004
+							var23 = Tiles.getObjectDefinition(Message.Entity_unpackID(var24)).int2 / 2;
+						}
+
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1006
+							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1007
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field1106[var5], var23 * Tiles.field1097[var5], var20, var22); // L: 1008
+					} else if (var6 == 7) { // L: 1011
+						int var29 = var5 + 2 & 3; // L: 1013
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1014
+							var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
+						} else {
+							var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1015
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1016
+					} else if (var6 == 8) { // L: 1019
+						var23 = 8; // L: 1020
+						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1021
+						if (0L != var24) { // L: 1022
+							var23 = Tiles.getObjectDefinition(Message.Entity_unpackID(var24)).int2 / 2;
+						}
+
+						int var28 = var5 + 2 & 3; // L: 1025
+						Object var27;
+						if (var9.animationId == -1 && var9.transforms == null) { // L: 1026
+							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1027
+							var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1028
+						} else {
+							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1031
+							var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 1032
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field1106[var5], var23 * Tiles.field1097[var5], var20, var22); // L: 1034
+					}
 				}
 			}
+		} else {
+			if (var9.animationId == -1 && var9.transforms == null) { // L: 922
+				var30 = var9.getModel(10, var5, var16, var18, var17, var19);
+			} else {
+				var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1784, (Renderable)null); // L: 923
+			}
+
+			if (var30 != null) { // L: 924
+				var7.method4046(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
+			}
+
+			if (var9.interactType != 0) {
+				var8.addGameObject(var2, var3, var10, var11, var9.boolean1); // L: 925
+			}
+
 		}
-	} // L: 3373
+	} // L: 918 926 934 942 950 966 974 982 989 999 1009 1017 1035 1037
 
-	@ObfuscatedName("gx")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "5"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-1188638191"
 	)
-	static void method1068() {
-		if (Client.renderSelf) { // L: 4340
-			NetSocket.addPlayerToScene(class93.localPlayer, false); // L: 4341
+	static int method1162(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1184
+		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1185
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.itemId; // L: 1186
+			return 1; // L: 1187
+		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1189
+			if (var3.itemId != -1) { // L: 1190
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.itemQuantity;
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1191
+			}
+
+			return 1; // L: 1192
+		} else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1194
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1195
+			return 1; // L: 1196
+		} else {
+			return 2; // L: 1198
 		}
-
-	} // L: 4343
-
-	@ObfuscatedName("kd")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2146015753"
-	)
-	static final void method1071() {
-		Client.field836 = Client.cycleCntr; // L: 11276
-	} // L: 11277
+	}
 }
diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java
index 73f060694d..32a3f656e8 100644
--- a/runescape-client/src/main/java/DefaultsGroup.java
+++ b/runescape-client/src/main/java/DefaultsGroup.java
@@ -1,32 +1,36 @@
-import java.awt.FontMetrics;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lf")
+@ObfuscatedName("lm")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Llf;"
+		descriptor = "Llm;"
 	)
-	static final DefaultsGroup field3892;
-	@ObfuscatedName("c")
-	static int[] field3894;
-	@ObfuscatedName("ad")
-	@Export("loginScreenFontMetrics")
-	static FontMetrics loginScreenFontMetrics;
-	@ObfuscatedName("n")
+	static final DefaultsGroup field3890;
+	@ObfuscatedName("aq")
+	@ObfuscatedSignature(
+		descriptor = "Llw;"
+	)
+	static Bounds field3891;
+	@ObfuscatedName("fu")
+	@ObfuscatedSignature(
+		descriptor = "Llk;"
+	)
+	static AbstractSocket field3887;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1567646551
+		intValue = 1341790971
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3892 = new DefaultsGroup(3); // L: 4
+		field3890 = new DefaultsGroup(3); // L: 4
 	}
 
 	DefaultsGroup(int var1) {
diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java
index 227e5983de..0e7032755b 100644
--- 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("hn")
+@ObfuscatedName("hh")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lks;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhh;"
+		descriptor = "Lhm;"
 	)
-	class217 field2563;
+	class218 field2565;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue(); // L: 11
@@ -46,7 +46,7 @@ public final class DemotingHashTable {
 		this(var1, var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 27
@@ -77,16 +77,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 52
 		this.removeWrapper(var3); // L: 53
 	} // L: 54
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lhe;)V"
+		descriptor = "(Lha;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -99,11 +99,11 @@ public final class DemotingHashTable {
 	} // L: 62
 
 	@ObfuscatedName("y")
-	public void method4290(Object var1, long var2) {
+	public void method4456(Object var1, long var2) {
 		this.put(var1, var2, 1); // L: 65
 	} // L: 66
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) { // L: 69
@@ -122,8 +122,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5); // L: 78
-				if (this.field2563 != null) { // L: 79
-					this.field2563.method4282(var5.get()); // L: 80
+				if (this.field2565 != null) { // L: 79
+					this.field2565.method4438(var5.get()); // L: 80
 				}
 			}
 
@@ -134,7 +134,7 @@ public final class DemotingHashTable {
 		}
 	} // L: 87
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 90
@@ -155,7 +155,7 @@ public final class DemotingHashTable {
 
 	} // L: 109
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear(); // L: 112
diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
index bfbb980b11..d3b8e67c2d 100644
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -1,54 +1,41 @@
-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("mb")
+@ObfuscatedName("mg")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("rm")
-	@ObfuscatedSignature(
-		descriptor = "Lbd;"
-	)
-	@Export("pcmPlayer0")
-	static PcmPlayer pcmPlayer0;
-	@ObfuscatedName("em")
-	@ObfuscatedGetter(
-		intValue = 1745891823
-	)
-	@Export("currentPort")
-	static int currentPort;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1520925295
+		intValue = -1922177111
 	)
-	int field3946;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1280779565
-	)
-	int field3940;
+	int field3939;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1746870345
+		intValue = 1155417059
 	)
-	int field3945;
+	int field3937;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -187752831
+	)
+	int field3941;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lmy;",
-		garbageValue = "-10"
+		descriptor = "(I)Lms;",
+		garbageValue = "-1968333950"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (UserComparator5.formattedOperatingSystemName.startsWith("win")) { // L: 15
+		if (GraphicsObject.formattedOperatingSystemName.startsWith("win")) { // L: 15
 			var1 = 1;
-		} else if (UserComparator5.formattedOperatingSystemName.startsWith("mac")) { // L: 16
+		} else if (GraphicsObject.formattedOperatingSystemName.startsWith("mac")) { // L: 16
 			var1 = 2;
-		} else if (UserComparator5.formattedOperatingSystemName.startsWith("linux")) { // L: 17
+		} else if (GraphicsObject.formattedOperatingSystemName.startsWith("linux")) { // L: 17
 			var1 = 3;
 		} else {
 			var1 = 4; // L: 18
@@ -109,21 +96,21 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			} else if (var3.indexOf("10.0") != -1) { // L: 55
 				var7 = 11;
 			}
-		} else if (var1 == 2) {
-			if (var3.indexOf("10.4") != -1) {
+		} else if (var1 == 2) { // L: 57
+			if (var3.indexOf("10.4") != -1) { // L: 58
 				var7 = 20;
 			} else if (var3.indexOf("10.5") != -1) { // L: 59
 				var7 = 21;
-			} else if (var3.indexOf("10.6") != -1) {
+			} else if (var3.indexOf("10.6") != -1) { // L: 60
 				var7 = 22;
 			} else if (var3.indexOf("10.7") != -1) { // L: 61
 				var7 = 23;
 			} else if (var3.indexOf("10.8") != -1) { // L: 62
 				var7 = 24;
-			} else if (var3.indexOf("10.9") != -1) {
+			} else if (var3.indexOf("10.9") != -1) { // L: 63
 				var7 = 25;
-			} else if (var3.indexOf("10.10") != -1) { // L: 64
-				var7 = 26;
+			} else if (var3.indexOf("10.10") != -1) {
+				var7 = 26; // L: 64
 			} else if (var3.indexOf("10.11") != -1) { // L: 65
 				var7 = 27;
 			} else if (var3.indexOf("10.12") != -1) { // L: 66
@@ -146,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4; // L: 74
 		}
 
-		this.method6063(var5); // L: 75
+		this.method6099(var5); // L: 75
 		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77
 		int var11;
-		if (this.field3946 > 3) { // L: 80
+		if (this.field3939 > 3) { // L: 80
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0; // L: 81
@@ -163,36 +150,36 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = ""; // L: 87
 		String var18 = ""; // L: 88
 		int[] var23 = new int[3]; // L: 93
-		return new PlatformInfo(var1, var24, var7, var8, this.field3946, this.field3940, this.field3945, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97
+		return new PlatformInfo(var1, var24, var7, var8, this.field3939, this.field3937, this.field3941, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-33"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1264148958"
 	)
-	void method6063(String var1) {
+	void method6099(String var1) {
 		if (var1.startsWith("1.")) { // L: 101
-			this.method6064(var1); // L: 102
+			this.method6107(var1); // L: 102
 		} else {
-			this.method6078(var1); // L: 105
+			this.method6101(var1); // L: 105
 		}
 
 	} // L: 107
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "94"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "497638496"
 	)
-	void method6064(String var1) {
+	void method6107(String var1) {
 		String[] var2 = var1.split("\\."); // L: 110
 
 		try {
-			this.field3946 = Integer.parseInt(var2[1]); // L: 112
+			this.field3939 = Integer.parseInt(var2[1]); // L: 112
 			var2 = var2[2].split("_"); // L: 113
-			this.field3940 = Integer.parseInt(var2[0]); // L: 114
-			this.field3945 = Integer.parseInt(var2[1]); // L: 115
+			this.field3937 = Integer.parseInt(var2[0]); // L: 114
+			this.field3941 = Integer.parseInt(var2[1]); // L: 115
 		} catch (Exception var4) { // L: 117
 		}
 
@@ -201,82 +188,75 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1652585717"
+		garbageValue = "-2055431648"
 	)
-	void method6078(String var1) {
+	void method6101(String var1) {
 		String[] var2 = var1.split("\\."); // L: 121
 
 		try {
-			this.field3946 = Integer.parseInt(var2[0]); // L: 123
-			this.field3940 = Integer.parseInt(var2[1]); // L: 124
-			this.field3945 = Integer.parseInt(var2[2]); // L: 125
+			this.field3939 = Integer.parseInt(var2[0]); // L: 123
+			this.field3937 = Integer.parseInt(var2[1]);
+			this.field3941 = Integer.parseInt(var2[2]);
 		} catch (Exception var4) { // L: 127
 		}
 
-	} // L: 128
+	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIZIZI)V",
-		garbageValue = "848721482"
+		descriptor = "(Ljp;Ljp;ZII)V",
+		garbageValue = "2098353545"
 	)
-	@Export("doWorldSorting")
-	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-		if (var0 < var1) { // L: 177
-			int var6 = (var0 + var1) / 2; // L: 178
-			int var7 = var0; // L: 179
-			World var8 = Tiles.World_worlds[var6]; // L: 180
-			Tiles.World_worlds[var6] = Tiles.World_worlds[var1]; // L: 181
-			Tiles.World_worlds[var1] = var8; // L: 182
-
-			for (int var9 = var0; var9 < var1; ++var9) { // L: 183
-				World var11 = Tiles.World_worlds[var9]; // L: 185
-				int var12 = class12.compareWorlds(var11, var8, var2, var3); // L: 187
-				int var10;
-				if (var12 != 0) { // L: 188
-					if (var3) { // L: 189
-						var10 = -var12; // L: 190
-					} else {
-						var10 = var12; // L: 194
-					}
-				} else if (var4 == -1) { // L: 198
-					var10 = 0; // L: 199
-				} else {
-					int var13 = class12.compareWorlds(var11, var8, var4, var5); // L: 202
-					if (var5) { // L: 203
-						var10 = -var13;
-					} else {
-						var10 = var13; // L: 204
-					}
-				}
-
-				if (var10 <= 0) { // L: 206
-					World var14 = Tiles.World_worlds[var9]; // L: 207
-					Tiles.World_worlds[var9] = Tiles.World_worlds[var7]; // L: 208
-					Tiles.World_worlds[var7++] = var14; // L: 209
-				}
+	static void method6109(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
+		if (class377.clearLoginScreen) { // L: 124
+			if (var3 == 4) { // L: 125
+				Login.loginIndex = 4; // L: 126
 			}
 
-			Tiles.World_worlds[var1] = Tiles.World_worlds[var7]; // L: 213
-			Tiles.World_worlds[var7] = var8; // L: 214
-			doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 215
-			doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 216
+		} else {
+			Login.loginIndex = var3; // L: 130
+			Rasterizer2D.Rasterizer2D_clear(); // L: 131
+			byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 132
+			class339.leftTitleSprite = class125.convertJpgToSprite(var4); // L: 133
+			class377.rightTitleSprite = class339.leftTitleSprite.mirrorHorizontally(); // L: 134
+			class27.method364(var1, Client.worldProperties); // L: 135
+			Coord.titleboxSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 136
+			class289.titlebuttonSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 137
+			Login.runesSprite = WorldMapLabelSize.method3268(var1, "runes", ""); // L: 138
+			GrandExchangeEvents.title_muteSprite = WorldMapLabelSize.method3268(var1, "title_mute", ""); // L: 139
+			Login.options_buttons_0Sprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 140
+			NetFileRequest.field3577 = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 141
+			WorldMapCacheName.options_buttons_2Sprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 142
+			Login.field1005 = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 143
+			class126.field1477 = Login.options_buttons_0Sprite.subWidth; // L: 144
+			PcmPlayer.field416 = Login.options_buttons_0Sprite.subHeight; // L: 145
+			PendingSpawn.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 146
+			if (var2) { // L: 147
+				Login.Login_username = ""; // L: 148
+				Login.Login_password = ""; // L: 149
+			}
+
+			class0.field2 = 0; // L: 151
+			ItemLayer.otp = ""; // L: 152
+			Login.field1022 = true; // L: 153
+			Login.worldSelectOpen = false; // L: 154
+			if (!class4.clientPreferences.titleMusicDisabled) { // L: 155
+				Archive var5 = DynamicObject.archive6; // L: 156
+				int var6 = var5.getGroupId("scape main"); // L: 158
+				int var7 = var5.getFileId(var6, ""); // L: 159
+				WorldMapIcon_1.method3300(2, var5, var6, var7, 255, false); // L: 160
+			} else {
+				PcmPlayer.method856(2); // L: 163
+			}
+
+			class105.method2358(false); // L: 164
+			class377.clearLoginScreen = true; // L: 165
+			Login.xPadding = (AttackOption.canvasWidth - 765) / 2; // L: 166
+			Login.loginBoxX = Login.xPadding + 202; // L: 167
+			class25.loginBoxCenter = Login.loginBoxX + 180; // L: 168
+			class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 169
+			class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 170
+			Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 171
 		}
-
-	} // L: 218
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
-	)
-	static void method6068() {
-		Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57
-
-		while (var0.hasNext()) {
-			Message var1 = (Message)var0.next(); // L: 58
-			var1.clearIsFromIgnored(); // L: 60
-		}
-
-	} // L: 63
+	} // L: 128 172
 }
diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java
index 0fdf4803dc..5d1a859858 100644
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -9,18 +9,18 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("at")
+@ObfuscatedName("ac")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1982491607
+		intValue = -2055687751
 	)
 	@Export("capacity2")
 	int capacity2;
@@ -31,21 +31,21 @@ public class DevicePcmPlayer extends PcmPlayer {
 	DevicePcmPlayer() {
 	} // L: 18
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "4"
+		garbageValue = "86"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)PcmPlayer.field428, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21
+		this.format = new AudioFormat((float)class341.field3921, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21
 		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22
 	} // L: 23
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IS)V",
-		garbageValue = "-6942"
+		descriptor = "(II)V",
+		garbageValue = "-412057865"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
@@ -56,8 +56,8 @@ public class DevicePcmPlayer extends PcmPlayer {
 			this.line.start(); // L: 30
 			this.capacity2 = var1; // L: 31
 		} catch (LineUnavailableException var3) { // L: 33
-			if (SequenceDefinition.method3149(var1) != 1) { // L: 34
-				this.open(Player.method2128(var1)); // L: 35
+			if (class269.method4992(var1) != 1) { // L: 34
+				this.open(UrlRequester.method2504(var1)); // L: 35
 			} else {
 				this.line = null; // L: 38
 				throw var3; // L: 39
@@ -65,10 +65,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	} // L: 36 41
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-42"
+		garbageValue = "19"
 	)
 	@Export("position")
 	protected int position() {
@@ -96,10 +96,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1); // L: 59
 	} // L: 60
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "4345"
+		descriptor = "(I)V",
+		garbageValue = "-2004376502"
 	)
 	@Export("close")
 	protected void close() {
@@ -110,10 +110,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	} // L: 67
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2070498959"
+		garbageValue = "1448704014"
 	)
 	@Export("discard")
 	protected void discard() {
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index 663c5d311c..7ca135769a 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -3,16 +3,29 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("av")
+@ObfuscatedName("al")
 @Implements("DevicePcmPlayerProvider")
 public class DevicePcmPlayerProvider implements PlayerProvider {
+	@ObfuscatedName("sx")
+	@ObfuscatedSignature(
+		descriptor = "Lbh;"
+	)
+	@Export("friendSystem")
+	public static FriendSystem friendSystem;
+	@ObfuscatedName("gb")
+	@ObfuscatedSignature(
+		descriptor = "Lgp;"
+	)
+	@Export("scene")
+	static Scene scene;
+
 	DevicePcmPlayerProvider() {
 	} // L: 7
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lbd;",
-		garbageValue = "-597712139"
+		descriptor = "(I)Lbq;",
+		garbageValue = "2087332852"
 	)
 	@Export("player")
 	public PcmPlayer player() {
@@ -21,285 +34,89 @@ public class DevicePcmPlayerProvider implements PlayerProvider {
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "228217886"
+		descriptor = "(B)Lbk;",
+		garbageValue = "-11"
 	)
-	static boolean method385(char var0) {
-		return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 758
+	@Export("worldListStart")
+	static World worldListStart() {
+		World.World_listCount = 0; // L: 237
+		return Client.getNextWorldListWorld(); // L: 238
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("go")
 	@ObfuscatedSignature(
-		descriptor = "(IIIZII)J",
-		garbageValue = "-591767217"
+		descriptor = "(ZI)V",
+		garbageValue = "-2111274300"
 	)
-	@Export("calculateTag")
-	public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
-		long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 89
-		if (var3) { // L: 90
-			var5 |= 65536L;
+	@Export("addNpcsToScene")
+	static final void addNpcsToScene(boolean var0) {
+		for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4807
+			NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4808
+			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4809
+				int var3 = var2.x >> 7; // L: 4810
+				int var4 = var2.y >> 7; // L: 4811
+				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4812
+					if (var2.field1225 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4813
+						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4814
+							continue;
+						}
+
+						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4815
+					}
+
+					long var5 = UserComparator3.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4817
+					var2.playerCycle = Client.cycle; // L: 4818
+					scene.drawEntity(SoundSystem.Client_plane, var2.x, var2.y, ItemContainer.getTileHeight(var2.field1225 * 64 - 64 + var2.x, var2.field1225 * 64 - 64 + var2.y, SoundSystem.Client_plane), var2.field1225 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4819
+				}
+			}
 		}
 
-		return var5; // L: 91
-	}
+	} // L: 4823
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("ld")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIILgt;Lfz;B)V",
-		garbageValue = "85"
+		descriptor = "(Ljava/lang/String;ZI)V",
+		garbageValue = "552902364"
 	)
-	static final void method386(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
-		ObjectComposition var9 = class23.getObjectDefinition(var4); // L: 877
-		int var10;
-		int var11;
-		if (var5 != 1 && var5 != 3) { // L: 880
-			var10 = var9.sizeX; // L: 885
-			var11 = var9.sizeY; // L: 886
-		} else {
-			var10 = var9.sizeY; // L: 881
-			var11 = var9.sizeX; // L: 882
-		}
+	@Export("findItemDefinitions")
+	static void findItemDefinitions(String var0, boolean var1) {
+		var0 = var0.toLowerCase(); // L: 11616
+		short[] var2 = new short[16]; // L: 11617
+		int var3 = 0; // L: 11618
 
-		int var12;
-		int var13;
-		if (var10 + var2 <= 104) { // L: 892
-			var12 = (var10 >> 1) + var2; // L: 893
-			var13 = var2 + (var10 + 1 >> 1); // L: 894
-		} else {
-			var12 = var2; // L: 897
-			var13 = var2 + 1; // L: 898
-		}
-
-		int var14;
-		int var15;
-		if (var3 + var11 <= 104) { // L: 900
-			var14 = var3 + (var11 >> 1); // L: 901
-			var15 = var3 + (var11 + 1 >> 1); // L: 902
-		} else {
-			var14 = var3; // L: 905
-			var15 = var3 + 1; // L: 906
-		}
-
-		int[][] var16 = Tiles.Tiles_heights[var1]; // L: 908
-		int var17 = var16[var13][var15] + var16[var13][var14] + var16[var12][var14] + var16[var12][var15] >> 2; // L: 909
-		int var18 = (var2 << 7) + (var10 << 6); // L: 910
-		int var19 = (var3 << 7) + (var11 << 6); // L: 911
-		long var20 = calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 912
-		int var22 = (var5 << 6) + var6; // L: 913
-		if (var9.int3 == 1) { // L: 914
-			var22 += 256;
-		}
-
-		Object var30;
-		if (var6 == 22) { // L: 915
-			if (var9.animationId == -1 && var9.transforms == null) { // L: 917
-				var30 = var9.getModel(22, var5, var16, var18, var17, var19);
-			} else {
-				var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 918
-			}
-
-			var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 919
-			if (var9.interactType == 1) { // L: 920
-				var8.setBlockedByFloorDec(var2, var3);
-			}
-
-		} else if (var6 != 10 && var6 != 11) { // L: 923
-			if (var6 >= 12) { // L: 931
-				if (var9.animationId == -1 && var9.transforms == null) { // L: 933
-					var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
-				} else {
-					var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 934
+		for (int var4 = 0; var4 < ItemComposition.ItemDefinition_fileCount; ++var4) { // L: 11619
+			ItemComposition var9 = class250.ItemDefinition_get(var4); // L: 11620
+			if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11621 11622 11623
+				if (var3 >= 250) { // L: 11624
+					ApproximateRouteStrategy.foundItemIdCount = -1; // L: 11625
+					ClanChannel.foundItemIds = null; // L: 11626
+					return; // L: 11627
 				}
 
-				var7.method4007(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 935
-				if (var9.interactType != 0) { // L: 936
-					var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+				if (var3 >= var2.length) { // L: 11629
+					short[] var6 = new short[var2.length * 2]; // L: 11630
+
+					for (int var7 = 0; var7 < var3; ++var7) { // L: 11631
+						var6[var7] = var2[var7];
+					}
+
+					var2 = var6; // L: 11632
 				}
 
-			} else if (var6 == 0) { // L: 939
-				if (var9.animationId == -1 && var9.transforms == null) { // L: 941
-					var30 = var9.getModel(0, var5, var16, var18, var17, var19);
-				} else {
-					var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 942
-				}
-
-				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1117[var5], 0, var20, var22); // L: 943
-				if (var9.interactType != 0) { // L: 944
-					var8.method3164(var2, var3, var6, var5, var9.boolean1);
-				}
-
-			} else if (var6 == 1) { // L: 947
-				if (var9.animationId == -1 && var9.transforms == null) { // L: 949
-					var30 = var9.getModel(1, var5, var16, var18, var17, var19);
-				} else {
-					var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 950
-				}
-
-				var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1125[var5], 0, var20, var22); // L: 951
-				if (var9.interactType != 0) { // L: 952
-					var8.method3164(var2, var3, var6, var5, var9.boolean1);
-				}
-
-			} else {
-				int var23;
-				if (var6 == 2) { // L: 955
-					var23 = var5 + 1 & 3; // L: 956
-					Object var25;
-					Object var31;
-					if (var9.animationId == -1 && var9.transforms == null) { // L: 959
-						var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 960
-						var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 961
-					} else {
-						var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 964
-						var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 965
-					}
-
-					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field1117[var5], Tiles.field1117[var23], var20, var22); // L: 967
-					if (var9.interactType != 0) { // L: 968
-						var8.method3164(var2, var3, var6, var5, var9.boolean1);
-					}
-
-				} else if (var6 == 3) { // L: 971
-					if (var9.animationId == -1 && var9.transforms == null) { // L: 973
-						var30 = var9.getModel(3, var5, var16, var18, var17, var19);
-					} else {
-						var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 974
-					}
-
-					var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1125[var5], 0, var20, var22); // L: 975
-					if (var9.interactType != 0) { // L: 976
-						var8.method3164(var2, var3, var6, var5, var9.boolean1);
-					}
-
-				} else if (var6 == 9) { // L: 979
-					if (var9.animationId == -1 && var9.transforms == null) { // L: 981
-						var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
-					} else {
-						var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 982
-					}
-
-					var7.method4007(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 983
-					if (var9.interactType != 0) { // L: 984
-						var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
-					}
-
-				} else if (var6 == 4) { // L: 987
-					if (var9.animationId == -1 && var9.transforms == null) { // L: 989
-						var30 = var9.getModel(4, var5, var16, var18, var17, var19);
-					} else {
-						var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 990
-					}
-
-					var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field1117[var5], 0, 0, 0, var20, var22); // L: 991
-				} else {
-					long var24;
-					Object var26;
-					if (var6 == 5) { // L: 994
-						var23 = 16; // L: 995
-						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 996
-						if (var24 != 0L) { // L: 997
-							var23 = class23.getObjectDefinition(class93.Entity_unpackID(var24)).int2;
-						}
-
-						if (var9.animationId == -1 && var9.transforms == null) { // L: 999
-							var26 = var9.getModel(4, var5, var16, var18, var17, var19);
-						} else {
-							var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1000
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field1117[var5], 0, var23 * Tiles.field1126[var5], var23 * Tiles.field1123[var5], var20, var22); // L: 1001
-					} else if (var6 == 6) { // L: 1004
-						var23 = 8; // L: 1005
-						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1006
-						if (0L != var24) { // L: 1007
-							var23 = class23.getObjectDefinition(class93.Entity_unpackID(var24)).int2 / 2;
-						}
-
-						if (var9.animationId == -1 && var9.transforms == null) { // L: 1009
-							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
-						} else {
-							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1010
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field1128[var5], var23 * Tiles.field1129[var5], var20, var22); // L: 1011
-					} else if (var6 == 7) { // L: 1014
-						int var29 = var5 + 2 & 3; // L: 1016
-						if (var9.animationId == -1 && var9.transforms == null) { // L: 1017
-							var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
-						} else {
-							var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1018
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1019
-					} else if (var6 == 8) { // L: 1022
-						var23 = 8; // L: 1023
-						var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1024
-						if (var24 != 0L) { // L: 1025
-							var23 = class23.getObjectDefinition(class93.Entity_unpackID(var24)).int2 / 2;
-						}
-
-						int var28 = var5 + 2 & 3; // L: 1028
-						Object var27;
-						if (var9.animationId == -1 && var9.transforms == null) { // L: 1029
-							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1030
-							var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1031
-						} else {
-							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1034
-							var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 1035
-						}
-
-						var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field1128[var5], var23 * Tiles.field1129[var5], var20, var22); // L: 1037
-					}
-				}
-			}
-		} else {
-			if (var9.animationId == -1 && var9.transforms == null) { // L: 925
-				var30 = var9.getModel(10, var5, var16, var18, var17, var19);
-			} else {
-				var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field1801, (Renderable)null); // L: 926
-			}
-
-			if (var30 != null) { // L: 927
-				var7.method4007(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
-			}
-
-			if (var9.interactType != 0) { // L: 928
-				var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
-			}
-
-		}
-	} // L: 921 929 937 945 953 969 977 985 992 1002 1012 1020 1038 1040
-
-	@ObfuscatedName("hc")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIIIB)V",
-		garbageValue = "-12"
-	)
-	@Export("updatePendingSpawn")
-	static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		PendingSpawn var9 = null; // L: 7201
-
-		for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7202 7203 7208
-			if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7204
-				var9 = var10; // L: 7205
-				break;
+				var2[var3++] = (short)var4; // L: 11634
 			}
 		}
 
-		if (var9 == null) { // L: 7210
-			var9 = new PendingSpawn(); // L: 7211
-			var9.plane = var0; // L: 7212
-			var9.type = var3; // L: 7213
-			var9.x = var1; // L: 7214
-			var9.y = var2; // L: 7215
-			UserComparator5.method2448(var9); // L: 7216
-			Client.pendingSpawns.addFirst(var9); // L: 7217
+		ClanChannel.foundItemIds = var2; // L: 11636
+		PcmPlayer.foundItemIndex = 0; // L: 11637
+		ApproximateRouteStrategy.foundItemIdCount = var3; // L: 11638
+		String[] var8 = new String[ApproximateRouteStrategy.foundItemIdCount]; // L: 11639
+
+		for (int var5 = 0; var5 < ApproximateRouteStrategy.foundItemIdCount; ++var5) { // L: 11640
+			var8[var5] = class250.ItemDefinition_get(var2[var5]).name;
 		}
 
-		var9.id = var4; // L: 7219
-		var9.field1232 = var5; // L: 7220
-		var9.orientation = var6; // L: 7221
-		var9.delay = var7; // L: 7222
-		var9.hitpoints = var8; // L: 7223
-	} // L: 7224
+		short[] var10 = ClanChannel.foundItemIds; // L: 11641
+		class281.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11643
+	} // L: 11645
 }
diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java
index 6e7905751f..cbae170152 100644
--- a/runescape-client/src/main/java/DirectByteArrayCopier.java
+++ b/runescape-client/src/main/java/DirectByteArrayCopier.java
@@ -1,31 +1,25 @@
 import java.nio.ByteBuffer;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("if")
+@ObfuscatedName("iu")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("r")
-	static byte[][][] field3128;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1885485519
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "Lb;"
 	)
-	static int field3126;
-	@ObfuscatedName("v")
+	static ClanSettings field3128;
+	@ObfuscatedName("f")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	DirectByteArrayCopier() {
-	} // L: 10
-
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "74"
+		descriptor = "(I)[B",
+		garbageValue = "895258324"
 	)
 	@Export("get")
 	byte[] get() {
@@ -37,109 +31,27 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "([BB)V",
-		garbageValue = "43"
+		descriptor = "([BI)V",
+		garbageValue = "894306984"
 	)
 	@Export("set")
-	void set(byte[] var1) {
+	public void set(byte[] var1) {
 		this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20
 		this.directBuffer.position(0); // L: 21
 		this.directBuffer.put(var1); // L: 22
 	} // L: 23
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Ljp;IIIBZB)V",
-		garbageValue = "-95"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-1"
 	)
-	@Export("requestNetFile")
-	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
-		long var6 = (long)((var1 << 16) + var2); // L: 72
-		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 73
-		if (var8 == null) { // L: 74
-			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 75
-			if (var8 == null) { // L: 76
-				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 77
-				if (var8 != null) { // L: 78
-					if (var5) { // L: 79
-						var8.removeDual(); // L: 80
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 81
-						--NetCache.NetCache_pendingWritesCount; // L: 82
-						++NetCache.NetCache_pendingPriorityWritesCount; // L: 83
-					}
-
-				} else {
-					if (!var5) { // L: 87
-						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 88
-						if (var8 != null) { // L: 89
-							return;
-						}
-					}
-
-					var8 = new NetFileRequest(); // L: 91
-					var8.archive = var0; // L: 92
-					var8.crc = var3; // L: 93
-					var8.padding = var4; // L: 94
-					if (var5) { // L: 95
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 96
-						++NetCache.NetCache_pendingPriorityWritesCount; // L: 97
-					} else {
-						NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 100
-						NetCache.NetCache_pendingWrites.put(var8, var6); // L: 101
-						++NetCache.NetCache_pendingWritesCount; // L: 102
-					}
-
-				}
-			}
-		}
-	} // L: 85 104
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IZIZI)V",
-		garbageValue = "-1640664715"
-	)
-	@Export("sortWorldList")
-	static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
-		if (Tiles.World_worlds != null) { // L: 171
-			DesktopPlatformInfoProvider.doWorldSorting(0, Tiles.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
-		}
-
-	} // L: 174
-
-	@ObfuscatedName("go")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZI)V",
-		garbageValue = "-1591335539"
-	)
-	@Export("drawLoadingMessage")
-	static final void drawLoadingMessage(String var0, boolean var1) {
-		if (Client.showLoadingMessages) { // L: 4019
-			byte var2 = 4; // L: 4020
-			int var3 = var2 + 6; // L: 4021
-			int var4 = var2 + 6; // L: 4022
-			int var5 = UserComparator3.fontPlain12.lineWidth(var0, 250); // L: 4023
-			int var6 = UserComparator3.fontPlain12.lineCount(var0, 250) * 13; // L: 4024
-			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var6 + var2 + var2, 0); // L: 4025
-			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var6 + var2 + var2, 16777215); // L: 4026
-			UserComparator3.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4027
-			int var7 = var3 - var2; // L: 4028
-			int var8 = var4 - var2; // L: 4029
-			int var9 = var2 + var2 + var5; // L: 4030
-			int var10 = var2 + var2 + var6; // L: 4031
-
-			for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 4033
-				if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { // L: 4034
-					Client.field719[var11] = true;
-				}
-			}
-
-			if (var1) { // L: 4037
-				class26.rasterProvider.drawFull(0, 0); // L: 4038
-			} else {
-				PcmPlayer.method786(var3, var4, var5, var6); // L: 4041
-			}
-
-		}
-	} // L: 4043
+	static final void method4955(String var0) {
+		StringBuilder var10000 = new StringBuilder();
+		Object var10001 = null; // L: 121
+		var10000 = var10000.append("Please remove ").append(var0);
+		var10001 = null;
+		String var1 = var10000.append(" from your ignore list first").toString();
+		UserComparator10.addGameMessage(30, "", var1); // L: 123
+	} // L: 125
 }
diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java
index 984df98183..cec721d9f0 100644
--- a/runescape-client/src/main/java/DirectWrapper.java
+++ b/runescape-client/src/main/java/DirectWrapper.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("hd")
+@ObfuscatedName("hv")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1; // L: 8
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("get")
 	Object get() {
 		return this.obj; // L: 12
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("isSoft")
 	boolean isSoft() {
 		return false; // L: 16
diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java
index a683a04b93..40e2e9fdff 100644
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mf")
+@ObfuscatedName("mm")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cc")
+	@ObfuscatedName("cy")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cu")
+	@ObfuscatedName("ci")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cz")
+	@ObfuscatedName("cs")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("dj")
+	@ObfuscatedName("ce")
 	@Export("removeDual")
 	public void removeDual() {
 		if (this.nextDual != null) { // L: 9
diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java
index 0da4a47ea0..e7c7e246bd 100644
--- 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("ka")
+@ObfuscatedName("ke")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lmf;)V"
+		descriptor = "(Lmm;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1; // L: 18
 	} // L: 19
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lmf;)V"
+		descriptor = "(Lmm;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "()Lmf;"
+		descriptor = "()Lmm;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index 1844d4ee27..e98ca8db31 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -1,74 +1,76 @@
+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("cn")
+@ObfuscatedName("cb")
 @Implements("DynamicObject")
 public class DynamicObject extends Renderable {
-	@ObfuscatedName("ax")
+	@ObfuscatedName("dk")
 	@ObfuscatedSignature(
-		descriptor = "Lli;"
+		descriptor = "Ljf;"
 	)
-	static Bounds field1107;
-	@ObfuscatedName("v")
+	@Export("archive6")
+	static Archive archive6;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -335258197
+		intValue = -560532763
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1002371349
+		intValue = 1091706599
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1337909425
+		intValue = 973044997
 	)
 	@Export("orientation")
 	int orientation;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1976431629
+		intValue = 950758231
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1710957787
+		intValue = 1091816693
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1005968135
+		intValue = -1250349999
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lfl;"
+		descriptor = "Lfm;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1176341893
+		intValue = 238064293
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1918179577
+		intValue = 1153448059
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIZLgl;)V"
+		descriptor = "(IIIIIIIZLgr;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
 		this.id = var1; // L: 20
@@ -78,12 +80,12 @@ public class DynamicObject extends Renderable {
 		this.x = var5; // L: 24
 		this.y = var6; // L: 25
 		if (var7 != -1) { // L: 26
-			this.sequenceDefinition = LoginScreenAnimation.SequenceDefinition_get(var7); // L: 27
-			this.frame = 0; // L: 28
-			this.cycleStart = Client.cycle - 1; // L: 29
-			if (this.sequenceDefinition.field1891 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
+			this.sequenceDefinition = WorldMapScaleHandler.SequenceDefinition_get(var7); // L: 27
+			this.frame = 0;
+			this.cycleStart = Client.cycle - 1;
+			if (this.sequenceDefinition.field1894 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
 				DynamicObject var10 = (DynamicObject)var9; // L: 31
-				if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32
+				if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32
 					this.frame = var10.frame; // L: 33
 					this.cycleStart = var10.cycleStart; // L: 34
 					return; // L: 35
@@ -98,10 +100,10 @@ public class DynamicObject extends Renderable {
 
 	} // L: 43
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -131,7 +133,7 @@ public class DynamicObject extends Renderable {
 			this.cycleStart = Client.cycle - var1; // L: 60
 		}
 
-		ObjectComposition var12 = class23.getObjectDefinition(this.id); // L: 62
+		ObjectComposition var12 = Tiles.getObjectDefinition(this.id); // L: 62
 		if (var12.transforms != null) { // L: 63
 			var12 = var12.transform();
 		}
@@ -141,98 +143,103 @@ public class DynamicObject extends Renderable {
 		} else {
 			int var2;
 			int var3;
-			if (this.orientation != 1 && this.orientation != 3) {
-				var2 = var12.sizeX;
-				var3 = var12.sizeY;
+			if (this.orientation != 1 && this.orientation != 3) { // L: 67
+				var2 = var12.sizeX; // L: 72
+				var3 = var12.sizeY; // L: 73
 			} else {
-				var2 = var12.sizeY;
-				var3 = var12.sizeX;
+				var2 = var12.sizeY; // L: 68
+				var3 = var12.sizeX; // L: 69
 			}
 
-			int var4 = (var2 >> 1) + this.x;
-			int var5 = (var2 + 1 >> 1) + this.x;
-			int var6 = (var3 >> 1) + this.y;
-			int var7 = (var3 + 1 >> 1) + this.y;
-			int[][] var8 = Tiles.Tiles_heights[this.plane];
-			int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
-			int var10 = (this.x << 7) + (var2 << 6);
-			int var11 = (this.y << 7) + (var3 << 6);
-			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
+			int var4 = (var2 >> 1) + this.x; // L: 75
+			int var5 = (var2 + 1 >> 1) + this.x; // L: 76
+			int var6 = (var3 >> 1) + this.y; // L: 77
+			int var7 = (var3 + 1 >> 1) + this.y; // L: 78
+			int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79
+			int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; // L: 80
+			int var10 = (this.x << 7) + (var2 << 6); // L: 81
+			int var11 = (this.y << 7) + (var3 << 6); // L: 82
+			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;B)[B",
-		garbageValue = "1"
+		descriptor = "(I)Z",
+		garbageValue = "-593608457"
 	)
-	public static byte[] method2004(CharSequence var0) {
-		int var1 = var0.length(); // L: 66
-		byte[] var2 = new byte[var1]; // L: 67
+	public static boolean method2103() {
+		ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28
+		return var0 != null; // L: 29
+	}
 
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 68
-			char var4 = var0.charAt(var3); // L: 69
-			if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 70
-				var2[var3] = (byte)var4;
-			} else if (var4 == 8364) { // L: 71
-				var2[var3] = -128;
-			} else if (var4 == 8218) { // L: 72
-				var2[var3] = -126;
-			} else if (var4 == 402) { // L: 73
-				var2[var3] = -125;
-			} else if (var4 == 8222) { // L: 74
-				var2[var3] = -124;
-			} else if (var4 == 8230) { // L: 75
-				var2[var3] = -123;
-			} else if (var4 == 8224) { // L: 76
-				var2[var3] = -122;
-			} else if (var4 == 8225) { // L: 77
-				var2[var3] = -121;
-			} else if (var4 == 710) { // L: 78
-				var2[var3] = -120;
-			} else if (var4 == 8240) { // L: 79
-				var2[var3] = -119;
-			} else if (var4 == 352) {
-				var2[var3] = -118; // L: 80
-			} else if (var4 == 8249) { // L: 81
-				var2[var3] = -117;
-			} else if (var4 == 338) { // L: 82
-				var2[var3] = -116;
-			} else if (var4 == 381) { // L: 83
-				var2[var3] = -114;
-			} else if (var4 == 8216) { // L: 84
-				var2[var3] = -111;
-			} else if (var4 == 8217) { // L: 85
-				var2[var3] = -110;
-			} else if (var4 == 8220) { // L: 86
-				var2[var3] = -109;
-			} else if (var4 == 8221) { // L: 87
-				var2[var3] = -108;
-			} else if (var4 == 8226) { // L: 88
-				var2[var3] = -107;
-			} else if (var4 == 8211) { // L: 89
-				var2[var3] = -106;
-			} else if (var4 == 8212) { // L: 90
-				var2[var3] = -105;
-			} else if (var4 == 732) { // L: 91
-				var2[var3] = -104;
-			} else if (var4 == 8482) { // L: 92
-				var2[var3] = -103;
-			} else if (var4 == 353) { // L: 93
-				var2[var3] = -102;
-			} else if (var4 == 8250) { // L: 94
-				var2[var3] = -101;
-			} else if (var4 == 339) { // L: 95
-				var2[var3] = -100;
-			} else if (var4 == 382) { // L: 96
-				var2[var3] = -98;
-			} else if (var4 == 376) { // L: 97
-				var2[var3] = -97;
-			} else {
-				var2[var3] = 63; // L: 98
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(CS)Z",
+		garbageValue = "17436"
+	)
+	@Export("isAlphaNumeric")
+	public static boolean isAlphaNumeric(char var0) {
+		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 166
+	}
+
+	@ObfuscatedName("hm")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "1180457180"
+	)
+	static final void method2099(boolean var0) {
+		class233.playPcmPlayers(); // L: 5702
+		++Client.packetWriter.pendingWrites; // L: 5703
+		if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5704
+			Client.packetWriter.pendingWrites = 0; // L: 5705
+			if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5706
+				PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); // L: 5708
+				Client.packetWriter.addNode(var1); // L: 5709
+
+				try {
+					Client.packetWriter.flush(); // L: 5711
+				} catch (IOException var3) { // L: 5713
+					Client.hadNetworkError = true; // L: 5714
+				}
+			}
+
+		}
+	} // L: 5717
+
+	@ObfuscatedName("jd")
+	@ObfuscatedSignature(
+		descriptor = "([Liv;IIIZI)V",
+		garbageValue = "466452320"
+	)
+	@Export("resizeInterface")
+	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+		for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9951
+			Widget var6 = var0[var5]; // L: 9952
+			if (var6 != null && var6.parentId == var1) { // L: 9953 9954
+				FontName.alignWidgetSize(var6, var2, var3, var4); // L: 9955
+				class43.alignWidgetPosition(var6, var2, var3); // L: 9956
+				if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9957
+					var6.scrollX = var6.scrollWidth - var6.width;
+				}
+
+				if (var6.scrollX < 0) { // L: 9958
+					var6.scrollX = 0;
+				}
+
+				if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9959
+					var6.scrollY = var6.scrollHeight - var6.height;
+				}
+
+				if (var6.scrollY < 0) { // L: 9960
+					var6.scrollY = 0;
+				}
+
+				if (var6.type == 0) { // L: 9961
+					WorldMapLabelSize.revalidateWidgetScroll(var0, var6, var4);
+				}
 			}
 		}
 
-		return var2; // L: 100
-	}
+	} // L: 9963
 }
diff --git a/runescape-client/src/main/java/EnumComposition.java b/runescape-client/src/main/java/EnumComposition.java
index c0813f30ea..2806bda344 100644
--- a/runescape-client/src/main/java/EnumComposition.java
+++ b/runescape-client/src/main/java/EnumComposition.java
@@ -1,52 +1,59 @@
+import java.net.MalformedURLException;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("er")
+@ObfuscatedName("ep")
 @Implements("EnumComposition")
 public class EnumComposition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("EnumDefinition_archive")
 	static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("f")
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 422415445
+	)
+	static int field1629;
+	@ObfuscatedName("v")
 	@Export("inputType")
 	public char inputType;
 	@ObfuscatedName("y")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 865656165
+		intValue = -883966701
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -2113237229
+		intValue = 691082953
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -59,10 +66,10 @@ public class EnumComposition extends DualNode {
 		this.outputCount = 0; // L: 17
 	} // L: 22
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1467910885"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1541381103"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -78,8 +85,8 @@ public class EnumComposition extends DualNode {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "-60"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "1108617782"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -108,33 +115,58 @@ public class EnumComposition extends DualNode {
 				this.intVals = new int[this.outputCount]; // L: 63
 
 				for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64
-					this.keys[var3] = var1.readInt(); // L: 65
+					this.keys[var3] = var1.readInt();
 					this.intVals[var3] = var1.readInt(); // L: 66
 				}
 			}
 		}
 
-	} // L: 70
+	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-149949948"
+		garbageValue = "1940899899"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount; // L: 73
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljava/lang/String;Ljava/lang/String;I)Lop;",
-		garbageValue = "-1892718374"
+		descriptor = "(Ljava/lang/String;I)Z",
+		garbageValue = "-1376417697"
 	)
-	@Export("SpriteBuffer_getIndexedSpriteByName")
-	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
-		int var3 = var0.getGroupId(var1); // L: 109
-		int var4 = var0.getFileId(var3, var2); // L: 110
-		return AbstractByteArrayCopier.method4802(var0, var3, var4); // L: 111
+	static boolean method2831(String var0) {
+		if (var0 == null) { // L: 65
+			return false;
+		} else {
+			try {
+				new URL(var0);
+				return true; // L: 72
+			} catch (MalformedURLException var2) { // L: 69
+				return false; // L: 70
+			}
+		}
 	}
+
+	@ObfuscatedName("lx")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "49"
+	)
+	static void method2827() {
+		if (LoginPacket.field2800 != null) { // L: 11702
+			Client.field798 = Client.cycle; // L: 11703
+			LoginPacket.field2800.method5246(); // L: 11704
+
+			for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11705
+				if (Client.players[var0] != null) { // L: 11706
+					LoginPacket.field2800.method5245((Client.players[var0].x >> 7) + class15.baseX, (Client.players[var0].y >> 7) + WorldMapSprite.baseY); // L: 11707
+				}
+			}
+		}
+
+	} // L: 11711
 }
diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java
index d9e73460f8..cb7e099154 100644
--- 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("kj")
+@ObfuscatedName("km")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	int rsOrdinal();
diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
index ca9d02058d..d7d14860ee 100644
--- 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("hz")
+@ObfuscatedName("ht")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
-	DualNode field2566;
-	@ObfuscatedName("n")
+	DualNode field2567;
+	@ObfuscatedName("e")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("remainingCapacity")
 	int remainingCapacity;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lks;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field2566 = new DualNode(); // L: 8
+		this.field2567 = new DualNode(); // L: 8
 		this.deque = new IterableDualNodeQueue(); // L: 12
 		this.capacity = var1; // L: 15
 		this.remainingCapacity = var1; // L: 16
@@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable {
 		this.hashTable = new IterableNodeHashTable(var2); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lmf;"
+		descriptor = "(J)Lmm;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3; // L: 28
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	} // L: 38
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lmf;J)V"
+		descriptor = "(Lmm;J)V"
 	)
 	@Export("put")
 	public void put(DualNode var1, long var2) {
@@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable {
 			DualNode var4 = this.deque.removeLast(); // L: 42
 			var4.remove(); // L: 43
 			var4.removeDual(); // L: 44
-			if (var4 == this.field2566) { // L: 45
+			if (var4 == this.field2567) { // L: 45
 				var4 = this.deque.removeLast(); // L: 46
 				var4.remove(); // L: 47
 				var4.removeDual(); // L: 48
@@ -97,7 +97,7 @@ public final class EvictingDualNodeHashTable {
 	public void clear() {
 		this.deque.clear(); // L: 57
 		this.hashTable.clear(); // L: 58
-		this.field2566 = new DualNode(); // L: 59
+		this.field2567 = new DualNode(); // L: 59
 		this.remainingCapacity = this.capacity; // L: 60
 	} // L: 61
 }
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index e54bc84558..e01245d437 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -1,39 +1,34 @@
-import java.io.File;
-import java.io.RandomAccessFile;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gk")
+@ObfuscatedName("gy")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("j")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -311250571
+		intValue = 1056687123
 	)
-	static int field2363;
-	@ObfuscatedName("bq")
-	@ObfuscatedSignature(
-		descriptor = "Ljk;"
-	)
-	static GameBuild field2365;
-	@ObfuscatedName("v")
+	@Export("pcmSampleLength")
+	static int pcmSampleLength;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 771770075
+		intValue = -1204882397
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1803245333
+		intValue = 126335521
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1870263719
+		intValue = -301502337
 	)
 	@Export("z")
 	int z;
@@ -41,27 +36,74 @@ public class FaceNormal {
 	FaceNormal() {
 	} // L: 8
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/io/File;ZI)Z",
-		garbageValue = "-920183026"
+		descriptor = "(Ljp;I)V",
+		garbageValue = "-1897650462"
 	)
-	@Export("isWriteable")
-	public static boolean isWriteable(File var0, boolean var1) {
-		try {
-			RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); // L: 151
-			int var3 = var2.read(); // L: 152
-			var2.seek(0L); // L: 153
-			var2.write(var3); // L: 154
-			var2.seek(0L); // L: 155
-			var2.close(); // L: 156
-			if (var1) { // L: 157
-				var0.delete();
-			}
+	public static void method4252(AbstractArchive var0) {
+		GrandExchangeOfferUnitPriceComparator.FloorOverlayDefinition_archive = var0; // L: 26
+	} // L: 27
 
-			return true; // L: 158
-		} catch (Exception var4) { // L: 160
-			return false; // L: 161
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "67"
+	)
+	@Export("loadWorlds")
+	static boolean loadWorlds() {
+		try {
+			if (World.World_request == null) { // L: 31
+				World.World_request = ArchiveDiskActionHandler.urlRequester.request(new URL(class162.field1936));
+			} else if (World.World_request.isDone()) { // L: 33
+				byte[] var0 = World.World_request.getResponse(); // L: 34
+				Buffer var1 = new Buffer(var0); // L: 35
+				var1.readInt(); // L: 36
+				World.World_count = var1.readUnsignedShort(); // L: 37
+				World.World_worlds = new World[World.World_count];
+
+				World var3;
+				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 47
+					var3 = World.World_worlds[var2] = new World();
+					var3.id = var1.readUnsignedShort();
+					var3.properties = var1.readInt(); // L: 42
+					var3.host = var1.readStringCp1252NullTerminated();
+					var3.activity = var1.readStringCp1252NullTerminated();
+					var3.location = var1.readUnsignedByte();
+					var3.population = var1.readShort();
+				}
+
+				FileSystem.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
+				World.World_request = null; // L: 50
+				return true; // L: 51
+			}
+		} catch (Exception var4) { // L: 55
+			var4.printStackTrace(); // L: 56
+			World.World_request = null; // L: 57
+		}
+
+		return false; // L: 59
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIII)I",
+		garbageValue = "1748496485"
+	)
+	public static int method4253(int var0, int var1, int var2, int var3, int var4, int var5) {
+		if ((var5 & 1) == 1) { // L: 38
+			int var6 = var3; // L: 39
+			var3 = var4; // L: 40
+			var4 = var6; // L: 41
+		}
+
+		var2 &= 3; // L: 43
+		if (var2 == 0) { // L: 44
+			return var1;
+		} else if (var2 == 1) { // L: 45
+			return 7 - var0 - (var3 - 1);
+		} else {
+			return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 46
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java
index 6c2aafec29..60bafdd842 100644
--- a/runescape-client/src/main/java/FileSystem.java
+++ b/runescape-client/src/main/java/FileSystem.java
@@ -1,20 +1,21 @@
 import java.io.File;
 import java.util.Hashtable;
+import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ec")
+@ObfuscatedName("ej")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("v")
-	@Export("FileSystem_hasPermissions")
-	public static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("n")
-	@Export("FileSystem_cacheDir")
-	public static File FileSystem_cacheDir;
 	@ObfuscatedName("f")
+	@Export("FileSystem_hasPermissions")
+	static boolean FileSystem_hasPermissions;
+	@ObfuscatedName("e")
+	@Export("FileSystem_cacheDir")
+	static File FileSystem_cacheDir;
+	@ObfuscatedName("v")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
 
@@ -23,79 +24,151 @@ public class FileSystem {
 		FileSystem_cacheFiles = new Hashtable(16);
 	} // L: 9
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "383441651"
-	)
-	public static void method2548() {
-		ParamComposition.ParamDefinition_cached.clear(); // L: 68
-	} // L: 69
+	@ObfuscatedName("f")
+	static boolean method2644(long var0) {
+		int var2 = (int)(var0 >>> 14 & 3L); // L: 46
+		return var2 == 2; // L: 48
+	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-26460885"
+		descriptor = "([Lbk;II[I[IB)V",
+		garbageValue = "-67"
 	)
-	static final void method2545() {
-		if (!ViewportMouse.ViewportMouse_false0) { // L: 120
-			int var0 = Scene.Scene_cameraPitchSine; // L: 121
-			int var1 = Scene.Scene_cameraPitchCosine; // L: 122
-			int var2 = Scene.Scene_cameraYawSine; // L: 123
-			int var3 = Scene.Scene_cameraYawCosine; // L: 124
-			byte var4 = 50; // L: 125
-			short var5 = 3500; // L: 126
-			int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 127
-			int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 128
-			int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 129
-			int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 130
-			int var10 = Rasterizer3D.method3867(var7, var4, var1, var0); // L: 132
-			int var11 = Rasterizer3D.method3897(var7, var4, var1, var0); // L: 133
-			var7 = var10; // L: 134
-			var10 = Rasterizer3D.method3867(var9, var5, var1, var0); // L: 135
-			int var12 = Rasterizer3D.method3897(var9, var5, var1, var0); // L: 136
-			var9 = var10; // L: 137
-			var10 = Rasterizer3D.method3865(var6, var11, var3, var2); // L: 138
-			var11 = Rasterizer3D.method3866(var6, var11, var3, var2); // L: 139
-			var6 = var10; // L: 140
-			var10 = Rasterizer3D.method3865(var8, var12, var3, var2); // L: 141
-			var12 = Rasterizer3D.method3866(var8, var12, var3, var2); // L: 142
-			ViewportMouse.field2492 = (var10 + var6) / 2; // L: 144
-			class249.field3118 = (var9 + var7) / 2; // L: 145
-			ViewportMouse.field2497 = (var12 + var11) / 2; // L: 146
-			ViewportMouse.field2496 = (var10 - var6) / 2; // L: 147
-			WorldMapDecoration.field2082 = (var9 - var7) / 2; // L: 148
-			DirectByteArrayCopier.field3126 = (var12 - var11) / 2; // L: 149
-			class161.field1920 = Math.abs(ViewportMouse.field2496); // L: 150
-			class15.field140 = Math.abs(WorldMapDecoration.field2082); // L: 151
-			ApproximateRouteStrategy.field629 = Math.abs(DirectByteArrayCopier.field3126); // L: 152
-		}
-	} // L: 153
+	@Export("sortWorlds")
+	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+		if (var1 < var2) { // L: 81
+			int var5 = var1 - 1; // L: 82
+			int var6 = var2 + 1; // L: 83
+			int var7 = (var2 + var1) / 2; // L: 84
+			World var8 = var0[var7]; // L: 85
+			var0[var7] = var0[var1]; // L: 86
+			var0[var1] = var8; // L: 87
 
-	@ObfuscatedName("hv")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-828545505"
-	)
-	static final void method2547(int var0, int var1) {
-		if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7602
-			if (Client.showMouseOverText) { // L: 7603
-				int var2 = MilliClock.method2588(); // L: 7604
-				String var3;
-				if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7606
-					var3 = "Use" + " " + Client.selectedItemName + " " + "->";
-				} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7607
-					var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
-				} else {
-					var3 = MouseRecorder.method2098(var2); // L: 7608
+			while (var5 < var6) { // L: 88
+				boolean var9 = true; // L: 89
+
+				int var10;
+				int var11;
+				int var12;
+				do {
+					--var6; // L: 91
+
+					for (var10 = 0; var10 < 4; ++var10) { // L: 92
+						if (var3[var10] == 2) { // L: 95
+							var11 = var0[var6].index; // L: 96
+							var12 = var8.index; // L: 97
+						} else if (var3[var10] == 1) { // L: 99
+							var11 = var0[var6].population; // L: 100
+							var12 = var8.population; // L: 101
+							if (var11 == -1 && var4[var10] == 1) { // L: 102
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) { // L: 103
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) { // L: 105
+							var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106
+							var12 = var8.isMembersOnly() ? 1 : 0; // L: 107
+						} else {
+							var11 = var0[var6].id; // L: 110
+							var12 = var8.id; // L: 111
+						}
+
+						if (var11 != var12) { // L: 113
+							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117
+								var9 = false; // L: 119
+							}
+							break;
+						}
+
+						if (var10 == 3) { // L: 114
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				var9 = true; // L: 124
+
+				do {
+					++var5; // L: 126
+
+					for (var10 = 0; var10 < 4; ++var10) { // L: 127
+						if (var3[var10] == 2) { // L: 130
+							var11 = var0[var5].index; // L: 131
+							var12 = var8.index; // L: 132
+						} else if (var3[var10] == 1) { // L: 134
+							var11 = var0[var5].population; // L: 135
+							var12 = var8.population; // L: 136
+							if (var11 == -1 && var4[var10] == 1) { // L: 137
+								var11 = 2001;
+							}
+
+							if (var12 == -1 && var4[var10] == 1) { // L: 138
+								var12 = 2001;
+							}
+						} else if (var3[var10] == 3) { // L: 140
+							var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141
+							var12 = var8.isMembersOnly() ? 1 : 0; // L: 142
+						} else {
+							var11 = var0[var5].id; // L: 145
+							var12 = var8.id; // L: 146
+						}
+
+						if (var12 != var11) { // L: 148
+							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152
+								var9 = false; // L: 154
+							}
+							break;
+						}
+
+						if (var10 == 3) { // L: 149
+							var9 = false;
+						}
+					}
+				} while(var9);
+
+				if (var5 < var6) { // L: 159
+					World var13 = var0[var5]; // L: 160
+					var0[var5] = var0[var6]; // L: 161
+					var0[var6] = var13; // L: 162
 				}
-
-				if (Client.menuOptionsCount > 2) { // L: 7609
-					var3 = var3 + class44.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
-				}
-
-				Widget.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7610
 			}
+
+			sortWorlds(var0, var1, var6, var3, var4); // L: 165
+			sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166
 		}
-	} // L: 7611
+
+	} // L: 168
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1418977900"
+	)
+	static void method2647() {
+		Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 57
+
+		while (var0.hasNext()) {
+			Message var1 = (Message)var0.next(); // L: 58
+			var1.clearIsFromFriend(); // L: 60
+		}
+
+	} // L: 63
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;IIIB)V",
+		garbageValue = "75"
+	)
+	@Export("Widget_setKeyRate")
+	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		if (var0.field3037 == null) { // L: 998
+			throw new RuntimeException(); // L: 999
+		} else {
+			var0.field3037[var1] = var2; // L: 1001
+			var0.field3038[var1] = var3; // L: 1002
+		}
+	} // L: 1003
 }
diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java
index 5002f6dc61..fd1ef5c1b8 100644
--- a/runescape-client/src/main/java/FillMode.java
+++ b/runescape-client/src/main/java/FillMode.java
@@ -4,49 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("on")
+@ObfuscatedName("oj")
 @Implements("FillMode")
-public enum FillMode implements Enumerated {
-	@ObfuscatedName("v")
+public enum FillMode implements Enumerated
+{
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lon;"
+		descriptor = "Loj;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lon;"
+		descriptor = "Loj;"
 	)
-	field4233(1, 1),
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lon;"
-	)
-	field4232(2, 2);
-
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -662302415
-	)
-	public final int field4230;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1060401875
-	)
-	final int field4234;
-
-	FillMode(int var3, int var4) {
-		this.field4230 = var3; // L: 19
-		this.field4234 = var4; // L: 20
-	} // L: 21
-
+	field4241(1, 1),
 	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Loj;"
+	)
+	field4239(2, 2);
+
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 2014293349
+	)
+	static int field4244;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = -1583860177
+	)
+	public final int field4242;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -76883829
+	)
+	final int field4243;
+
+	FillMode(int var3, int var4) {
+		this.field4242 = var3; // L: 19
+		this.field4243 = var4; // L: 20
+	} // L: 21
+
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field4234; // L: 24
+		return this.field4243; // L: 24
 	}
 }
diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java
index a9c06db709..09e82e85d6 100644
--- a/runescape-client/src/main/java/FloorDecoration.java
+++ b/runescape-client/src/main/java/FloorDecoration.java
@@ -4,80 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("go")
+@ObfuscatedName("gq")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("v")
+	@ObfuscatedName("gx")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
+	)
+	@Export("mapSceneSprites")
+	static IndexedSprite[] mapSceneSprites;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 859770957
+		intValue = -1077391881
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1864149275
+		intValue = -1797231219
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1474470851
+		intValue = -1767125369
 	)
 	@Export("y")
 	int y;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("renderable")
 	public Renderable renderable;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = 5096767537878498943L
+		longValue = -640480651195446405L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -383801797
+		intValue = -1116841185
 	)
 	@Export("flags")
 	int flags;
 
 	FloorDecoration() {
 	} // L: 11
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lmi;",
-		garbageValue = "-71321726"
-	)
-	static class338[] method3834() {
-		return new class338[]{class338.field3914, class338.field3916, class338.field3915, class338.field3917}; // L: 16
-	}
-
-	@ObfuscatedName("ak")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-15"
-	)
-	@Export("runWidgetOnLoadListener")
-	static void runWidgetOnLoadListener(int var0) {
-		if (var0 != -1) { // L: 4321
-			if (Clock.loadInterface(var0)) { // L: 4322
-				Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 4323
-
-				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4324
-					Widget var3 = var1[var2]; // L: 4325
-					if (var3.onLoad != null) { // L: 4326
-						ScriptEvent var4 = new ScriptEvent(); // L: 4327
-						var4.widget = var3; // L: 4328
-						var4.args = var3.onLoad; // L: 4329
-						World.runScript(var4, 5000000, 0); // L: 4330
-					}
-				}
-
-			}
-		}
-	} // L: 4333
 }
diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java
index 9aa9000fc3..b7fff80a56 100644
--- a/runescape-client/src/main/java/FloorOverlayDefinition.java
+++ b/runescape-client/src/main/java/FloorOverlayDefinition.java
@@ -4,69 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eo")
+@ObfuscatedName("fq")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("FloorOverlayDefinition_cached")
-	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("f")
+	static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -313850043
+		intValue = -296019843
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1167855135
+		intValue = -1822468251
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1447154143
+		intValue = -1818252281
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1593028731
+		intValue = 237098067
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1490944887
+		intValue = -1367639577
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1914058459
+		intValue = 1127074157
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1757390819
+		intValue = 1492871957
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1776147055
+		intValue = 422172471
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1239811963
+		intValue = 724805775
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -78,337 +78,259 @@ public class FloorOverlayDefinition extends DualNode {
 	FloorOverlayDefinition() {
 		this.primaryRgb = 0; // L: 12
 		this.texture = -1; // L: 13
-		this.hideUnderlay = true;
+		this.hideUnderlay = true; // L: 14
 		this.secondaryRgb = -1; // L: 15
 	} // L: 23
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-593078672"
+		garbageValue = "-1526666702"
 	)
 	@Export("postDecode")
 	void postDecode() {
-		if (this.secondaryRgb != -1) { // L: 37
-			this.setHsl(this.secondaryRgb); // L: 38
-			this.secondaryHue = this.hue; // L: 39
-			this.secondarySaturation = this.saturation; // L: 40
-			this.secondaryLightness = this.lightness; // L: 41
+		if (this.secondaryRgb != -1) { // L: 41
+			this.setHsl(this.secondaryRgb); // L: 42
+			this.secondaryHue = this.hue; // L: 43
+			this.secondarySaturation = this.saturation; // L: 44
+			this.secondaryLightness = this.lightness; // L: 45
 		}
 
-		this.setHsl(this.primaryRgb); // L: 43
-	} // L: 44
+		this.setHsl(this.primaryRgb); // L: 47
+	} // L: 48
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1052896488"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "6"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
 		while (true) {
-			int var3 = var1.readUnsignedByte(); // L: 48
-			if (var3 == 0) { // L: 49
-				return; // L: 52
+			int var3 = var1.readUnsignedByte(); // L: 52
+			if (var3 == 0) { // L: 53
+				return; // L: 56
 			}
 
-			this.decodeNext(var1, var3, var2); // L: 50
+			this.decodeNext(var1, var3, var2); // L: 54
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;III)V",
-		garbageValue = "666748128"
+		descriptor = "(Lnt;III)V",
+		garbageValue = "-608043176"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
-		if (var2 == 1) { // L: 55
+		if (var2 == 1) { // L: 59
 			this.primaryRgb = var1.readMedium();
-		} else if (var2 == 2) {
-			this.texture = var1.readUnsignedByte(); // L: 56
-		} else if (var2 == 5) { // L: 57
+		} else if (var2 == 2) { // L: 60
+			this.texture = var1.readUnsignedByte();
+		} else if (var2 == 5) { // L: 61
 			this.hideUnderlay = false;
-		} else if (var2 == 7) {
-			this.secondaryRgb = var1.readMedium(); // L: 58
-		} else if (var2 == 8) { // L: 59
+		} else if (var2 == 7) { // L: 62
+			this.secondaryRgb = var1.readMedium();
+		} else if (var2 == 8) { // L: 63
 		}
 
-	} // L: 61
+	} // L: 65
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "273923551"
+		garbageValue = "2117241812"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
-		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64
-		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65
-		double var6 = (double)(var1 & 255) / 256.0D; // L: 66
-		double var8 = var2; // L: 67
-		if (var4 < var2) { // L: 68
+		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 68
+		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 69
+		double var6 = (double)(var1 & 255) / 256.0D; // L: 70
+		double var8 = var2; // L: 71
+		if (var4 < var2) { // L: 72
 			var8 = var4;
 		}
 
-		if (var6 < var8) { // L: 69
+		if (var6 < var8) { // L: 73
 			var8 = var6;
 		}
 
-		double var10 = var2; // L: 70
-		if (var4 > var2) { // L: 71
+		double var10 = var2; // L: 74
+		if (var4 > var2) { // L: 75
 			var10 = var4;
 		}
 
-		if (var6 > var10) { // L: 72
+		if (var6 > var10) { // L: 76
 			var10 = var6;
 		}
 
-		double var12 = 0.0D; // L: 73
-		double var14 = 0.0D; // L: 74
-		double var16 = (var10 + var8) / 2.0D; // L: 75
-		if (var8 != var10) { // L: 76
-			if (var16 < 0.5D) { // L: 77
-				var14 = (var10 - var8) / (var8 + var10);
+		double var12 = 0.0D; // L: 77
+		double var14 = 0.0D; // L: 78
+		double var16 = (var10 + var8) / 2.0D; // L: 79
+		if (var10 != var8) { // L: 80
+			if (var16 < 0.5D) { // L: 81
+				var14 = (var10 - var8) / (var10 + var8);
 			}
 
-			if (var16 >= 0.5D) { // L: 78
+			if (var16 >= 0.5D) { // L: 82
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var10 == var2) { // L: 79
+			if (var10 == var2) { // L: 83
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) { // L: 80
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+			} else if (var4 == var10) { // L: 84
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
 			} else if (var10 == var6) {
-				var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 81
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 85
 			}
 		}
 
-		var12 /= 6.0D; // L: 83
-		this.hue = (int)(256.0D * var12); // L: 84
-		this.saturation = (int)(256.0D * var14); // L: 85
-		this.lightness = (int)(256.0D * var16); // L: 86
-		if (this.saturation < 0) { // L: 87
+		var12 /= 6.0D; // L: 87
+		this.hue = (int)(var12 * 256.0D); // L: 88
+		this.saturation = (int)(var14 * 256.0D); // L: 89
+		this.lightness = (int)(256.0D * var16); // L: 90
+		if (this.saturation < 0) { // L: 91
 			this.saturation = 0;
-		} else if (this.saturation > 255) { // L: 88
+		} else if (this.saturation > 255) { // L: 92
 			this.saturation = 255;
 		}
 
-		if (this.lightness < 0) { // L: 89
+		if (this.lightness < 0) { // L: 93
 			this.lightness = 0;
-		} else if (this.lightness > 255) { // L: 90
+		} else if (this.lightness > 255) { // L: 94
 			this.lightness = 255;
 		}
 
-	} // L: 91
+	} // L: 95
 
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(S)[Len;",
-		garbageValue = "-10573"
-	)
-	static HorizontalAlignment[] method3103() {
-		return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field1628, HorizontalAlignment.field1624}; // L: 14
-	}
-
-	@ObfuscatedName("ar")
-	@ObfuscatedSignature(
-		descriptor = "(Lbm;S)V",
-		garbageValue = "10038"
-	)
-	@Export("PcmStream_disable")
-	static final void PcmStream_disable(PcmStream var0) {
-		var0.active = false; // L: 263
-		if (var0.sound != null) { // L: 264
-			var0.sound.position = 0;
-		}
-
-		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
-			PcmStream_disable(var1); // L: 265
-		}
-
-	} // L: 266
-
-	@ObfuscatedName("fr")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "672313899"
+		garbageValue = "1165486698"
 	)
-	static final void method3104() {
-		int var0;
-		int var1;
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		if (Client.oculusOrbState == 0) { // L: 3504
-			var0 = class93.localPlayer.x; // L: 3505
-			var1 = class93.localPlayer.y; // L: 3506
-			if (RouteStrategy.oculusOrbFocalPointX - var0 < -500 || RouteStrategy.oculusOrbFocalPointX - var0 > 500 || ModelData0.oculusOrbFocalPointY - var1 < -500 || ModelData0.oculusOrbFocalPointY - var1 > 500) { // L: 3507
-				RouteStrategy.oculusOrbFocalPointX = var0; // L: 3508
-				ModelData0.oculusOrbFocalPointY = var1; // L: 3509
-			}
+	static final void method3168() {
+		Object var10000 = null; // L: 128
+		String var0 = "You can't add yourself to your own friend list";
+		UserComparator10.addGameMessage(30, "", var0); // L: 130
+	} // L: 132
 
-			if (var0 != RouteStrategy.oculusOrbFocalPointX) { // L: 3511
-				RouteStrategy.oculusOrbFocalPointX += (var0 - RouteStrategy.oculusOrbFocalPointX) / 16;
-			}
+	@ObfuscatedName("kr")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;IIIB)V",
+		garbageValue = "-1"
+	)
+	@Export("drawMinimap")
+	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
+		class233.playPcmPlayers(); // L: 11313
+		SpriteMask var4 = var0.getSpriteMask(false); // L: 11314
+		if (var4 != null) { // L: 11315
+			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11316
+			if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11317
+				int var5 = Client.camAngleY & 2047; // L: 11318
+				int var6 = class262.localPlayer.x / 32 + 48; // L: 11319
+				int var7 = 464 - class262.localPlayer.y / 32; // L: 11320
+				class69.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11321
 
-			if (var1 != ModelData0.oculusOrbFocalPointY) { // L: 3512
-				ModelData0.oculusOrbFocalPointY += (var1 - ModelData0.oculusOrbFocalPointY) / 16;
-			}
+				int var8;
+				int var10;
+				int var16;
+				for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11322
+					var16 = Client.mapIconXs[var8] * 4 + 2 - class262.localPlayer.x / 32; // L: 11323
+					var10 = Client.mapIconYs[var8] * 4 + 2 - class262.localPlayer.y / 32; // L: 11324
+					class32.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11325
+				}
 
-			var2 = RouteStrategy.oculusOrbFocalPointX >> 7; // L: 3513
-			var3 = ModelData0.oculusOrbFocalPointY >> 7; // L: 3514
-			var4 = class105.getTileHeight(RouteStrategy.oculusOrbFocalPointX, ModelData0.oculusOrbFocalPointY, class22.Client_plane); // L: 3515
-			var5 = 0; // L: 3516
-			int var6;
-			if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3517
-				for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3518
-					for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3519
-						int var8 = class22.Client_plane; // L: 3520
-						if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3521
-							++var8;
-						}
-
-						int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3522
-						if (var9 > var5) { // L: 3523
-							var5 = var9;
+				int var11;
+				int var12;
+				for (var8 = 0; var8 < 104; ++var8) { // L: 11327
+					for (var16 = 0; var16 < 104; ++var16) { // L: 11328
+						NodeDeque var14 = Client.groundItems[SoundSystem.Client_plane][var8][var16]; // L: 11329
+						if (var14 != null) { // L: 11330
+							var11 = var8 * 4 + 2 - class262.localPlayer.x / 32; // L: 11331
+							var12 = var16 * 4 + 2 - class262.localPlayer.y / 32; // L: 11332
+							class32.drawSpriteOnMinimap(var1, var2, var11, var12, class171.mapDotSprites[0], var4); // L: 11333
 						}
 					}
 				}
-			}
 
-			var6 = var5 * 192; // L: 3527
-			if (var6 > 98048) { // L: 3528
-				var6 = 98048;
-			}
+				for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11337
+					NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11338
+					if (var9 != null && var9.isVisible()) { // L: 11339
+						NPCComposition var18 = var9.definition; // L: 11340
+						if (var18 != null && var18.transforms != null) { // L: 11341
+							var18 = var18.transform();
+						}
 
-			if (var6 < 32768) { // L: 3529
-				var6 = 32768;
-			}
-
-			if (var6 > Client.field727) { // L: 3530
-				Client.field727 += (var6 - Client.field727) / 24;
-			} else if (var6 < Client.field727) { // L: 3531
-				Client.field727 += (var6 - Client.field727) / 80;
-			}
-
-			class17.field148 = class105.getTileHeight(class93.localPlayer.x, class93.localPlayer.y, class22.Client_plane) - Client.camFollowHeight; // L: 3532
-		} else if (Client.oculusOrbState == 1) { // L: 3534
-			NPCComposition.method2791(); // L: 3535
-			short var10 = -1; // L: 3536
-			if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3537
-				var10 = 0;
-			} else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3538
-				var10 = 1024;
-			}
-
-			if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3539
-				if (var10 == 0) { // L: 3540
-					var10 = 1792;
-				} else if (var10 == 1024) { // L: 3541
-					var10 = 1280;
-				} else {
-					var10 = 1536; // L: 3542
-				}
-			} else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3544
-				if (var10 == 0) { // L: 3545
-					var10 = 256;
-				} else if (var10 == 1024) { // L: 3546
-					var10 = 768;
-				} else {
-					var10 = 512; // L: 3547
-				}
-			}
-
-			byte var11 = 0; // L: 3549
-			if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3550
-				var11 = -1;
-			} else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3551
-				var11 = 1;
-			}
-
-			var2 = 0; // L: 3552
-			if (var10 >= 0 || var11 != 0) { // L: 3553
-				var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 988767649 * 918404705 : Client.oculusOrbNormalSpeed * 615844635 * -503425261; // L: 3554
-				var2 *= 16; // L: 3555
-				Client.field732 = var10; // L: 3556
-				Client.field720 = var11; // L: 3557
-			}
-
-			if (Client.field718 < var2) { // L: 3559
-				Client.field718 += var2 / 8; // L: 3560
-				if (Client.field718 > var2) { // L: 3561
-					Client.field718 = var2;
-				}
-			} else if (Client.field718 > var2) { // L: 3563
-				Client.field718 = Client.field718 * 9 / 10;
-			}
-
-			if (Client.field718 > 0) { // L: 3564
-				var3 = Client.field718 / 16; // L: 3565
-				if (Client.field732 >= 0) { // L: 3566
-					var0 = Client.field732 - class376.cameraYaw & 2047; // L: 3567
-					var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3568
-					var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3569
-					RouteStrategy.oculusOrbFocalPointX += var4 * var3 / 65536; // L: 3570
-					ModelData0.oculusOrbFocalPointY += var3 * var5 / 65536; // L: 3571
-				}
-
-				if (Client.field720 != 0) { // L: 3573
-					class17.field148 += var3 * Client.field720; // L: 3574
-					if (class17.field148 > 0) { // L: 3575
-						class17.field148 = 0;
+						if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11342
+							var11 = var9.x / 32 - class262.localPlayer.x / 32; // L: 11343
+							var12 = var9.y / 32 - class262.localPlayer.y / 32; // L: 11344
+							class32.drawSpriteOnMinimap(var1, var2, var11, var12, class171.mapDotSprites[1], var4); // L: 11345
+						}
 					}
 				}
+
+				var8 = Players.Players_count; // L: 11349
+				int[] var17 = Players.Players_indices; // L: 11350
+
+				for (var10 = 0; var10 < var8; ++var10) { // L: 11351
+					Player var15 = Client.players[var17[var10]]; // L: 11352
+					if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class262.localPlayer) { // L: 11353
+						var12 = var15.x / 32 - class262.localPlayer.x / 32; // L: 11354
+						int var13 = var15.y / 32 - class262.localPlayer.y / 32; // L: 11355
+						if (var15.isFriend()) { // L: 11356
+							class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[3], var4);
+						} else if (class262.localPlayer.team != 0 && var15.team != 0 && var15.team == class262.localPlayer.team) { // L: 11357
+							class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[4], var4);
+						} else if (var15.isFriendsChatMember()) { // L: 11358
+							class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[5], var4);
+						} else if (var15.isClanMember()) { // L: 11359
+							class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[6], var4);
+						} else {
+							class32.drawSpriteOnMinimap(var1, var2, var12, var13, class171.mapDotSprites[2], var4); // L: 11360
+						}
+					}
+				}
+
+				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11363
+					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11364
+						NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11365
+						if (var19 != null) { // L: 11366
+							var11 = var19.x / 32 - class262.localPlayer.x / 32; // L: 11367
+							var12 = var19.y / 32 - class262.localPlayer.y / 32; // L: 11368
+							SoundSystem.worldToMinimap(var1, var2, var11, var12, BuddyRankComparator.mapMarkerSprites[1], var4); // L: 11369
+						}
+					}
+
+					if (Client.hintArrowType == 2) { // L: 11372
+						var10 = Client.hintArrowX * 4 - class15.baseX * 4 + 2 - class262.localPlayer.x / 32; // L: 11373
+						var11 = Client.hintArrowY * 4 - WorldMapSprite.baseY * 4 + 2 - class262.localPlayer.y / 32; // L: 11374
+						SoundSystem.worldToMinimap(var1, var2, var10, var11, BuddyRankComparator.mapMarkerSprites[1], var4); // L: 11375
+					}
+
+					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11377
+						Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11378
+						if (var20 != null) { // L: 11379
+							var11 = var20.x / 32 - class262.localPlayer.x / 32; // L: 11380
+							var12 = var20.y / 32 - class262.localPlayer.y / 32; // L: 11381
+							SoundSystem.worldToMinimap(var1, var2, var11, var12, BuddyRankComparator.mapMarkerSprites[1], var4); // L: 11382
+						}
+					}
+				}
+
+				if (Client.destinationX != 0) { // L: 11386
+					var10 = Client.destinationX * 4 + 2 - class262.localPlayer.x / 32; // L: 11387
+					var11 = Client.destinationY * 4 + 2 - class262.localPlayer.y / 32; // L: 11388
+					class32.drawSpriteOnMinimap(var1, var2, var10, var11, BuddyRankComparator.mapMarkerSprites[0], var4); // L: 11389
+				}
+
+				if (!class262.localPlayer.isHidden) { // L: 11391
+					Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+				}
 			} else {
-				Client.field732 = -1; // L: 3579
-				Client.field720 = -1; // L: 3580
+				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11393
 			}
 
-			if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3582
-				MouseHandler.method634(); // L: 3583
-			}
+			Client.field712[var3] = true; // L: 11394
 		}
-
-		if (MouseHandler.MouseHandler_currentButton == 4 && Client.mouseCam) { // L: 3586
-			var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3587
-			Client.camAngleDX = var0 * 2; // L: 3588
-			Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * 1903378733 * -460999003; // L: 3589
-			var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3590
-			Client.camAngleDY = var1 * 2; // L: 3591
-			Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (MouseHandler.MouseHandler_x + Client.mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -678881683 * -243899547; // L: 3592
-		} else {
-			if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3595
-				Client.camAngleDY += (-24 - Client.camAngleDY) / 2;
-			} else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3596
-				Client.camAngleDY += (24 - Client.camAngleDY) / 2;
-			} else {
-				Client.camAngleDY /= 2; // L: 3597
-			}
-
-			if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3598
-				Client.camAngleDX += (12 - Client.camAngleDX) / 2;
-			} else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3599
-				Client.camAngleDX += (-12 - Client.camAngleDX) / 2;
-			} else {
-				Client.camAngleDX /= 2; // L: 3600
-			}
-
-			Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3601
-			Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3602
-		}
-
-		Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3604
-		Client.camAngleX += Client.camAngleDX / 2; // L: 3605
-		if (Client.camAngleX < 128) { // L: 3606
-			Client.camAngleX = 128;
-		}
-
-		if (Client.camAngleX > 383) { // L: 3607
-			Client.camAngleX = 383;
-		}
-
-	} // L: 3608
+	} // L: 11395
 }
diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java
index 8b7694e7a9..c40d087612 100644
--- a/runescape-client/src/main/java/FloorUnderlayDefinition.java
+++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java
@@ -1,216 +1,239 @@
+import java.io.File;
+import java.io.RandomAccessFile;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ey")
+@ObfuscatedName("eo")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("rn")
+	@ObfuscatedGetter(
+		intValue = 595568273
+	)
+	static int field1707;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
-	static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("n")
+	public static AbstractArchive FloorUnderlayDefinition_archive;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
-	static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("f")
+	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -72962439
+		intValue = -686096887
 	)
 	@Export("rgb")
 	int rgb;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1393073383
+		intValue = 1212090999
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1777498607
+		intValue = -1608121883
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1425037395
+		intValue = 23970979
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1828983275
+		intValue = 1605807937
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
 
 	static {
-		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
+		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
 	}
 
-	FloorUnderlayDefinition() {
-		this.rgb = 0;
+	public FloorUnderlayDefinition() {
+		this.rgb = 0; // L: 12
 	}
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1519662904"
+		garbageValue = "-921241910"
 	)
 	@Export("postDecode")
-	void postDecode() {
-		this.setHsl(this.rgb); // L: 36
-	} // L: 37
+	public void postDecode() {
+		this.setHsl(this.rgb); // L: 19
+	} // L: 20
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "44"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-259716746"
 	)
 	@Export("decode")
-	void decode(Buffer var1, int var2) {
+	public void decode(Buffer var1, int var2) {
 		while (true) {
-			int var3 = var1.readUnsignedByte(); // L: 41
-			if (var3 == 0) { // L: 42
-				return; // L: 45
+			int var3 = var1.readUnsignedByte();
+			if (var3 == 0) {
+				return;
 			}
 
-			this.decodeNext(var1, var3, var2); // L: 43
+			this.decodeNext(var1, var3, var2);
 		}
 	}
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;III)V",
-		garbageValue = "-1482547443"
-	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2, int var3) {
-		if (var2 == 1) { // L: 48
-			this.rgb = var1.readMedium();
-		}
-
-	} // L: 50
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "46"
-	)
-	@Export("setHsl")
-	void setHsl(int var1) {
-		double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 53
-		double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 54
-		double var6 = (double)(var1 & 255) / 256.0D; // L: 55
-		double var8 = var2; // L: 56
-		if (var4 < var2) { // L: 57
-			var8 = var4;
-		}
-
-		if (var6 < var8) { // L: 58
-			var8 = var6;
-		}
-
-		double var10 = var2; // L: 59
-		if (var4 > var2) { // L: 60
-			var10 = var4;
-		}
-
-		if (var6 > var10) { // L: 61
-			var10 = var6;
-		}
-
-		double var12 = 0.0D; // L: 62
-		double var14 = 0.0D; // L: 63
-		double var16 = (var8 + var10) / 2.0D; // L: 64
-		if (var8 != var10) { // L: 65
-			if (var16 < 0.5D) { // L: 66
-				var14 = (var10 - var8) / (var10 + var8);
-			}
-
-			if (var16 >= 0.5D) { // L: 67
-				var14 = (var10 - var8) / (2.0D - var10 - var8);
-			}
-
-			if (var2 == var10) { // L: 68
-				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var10 == var4) { // L: 69
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
-			} else if (var6 == var10) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 70
-			}
-		}
-
-		var12 /= 6.0D; // L: 72
-		this.saturation = (int)(var14 * 256.0D); // L: 73
-		this.lightness = (int)(var16 * 256.0D); // L: 74
-		if (this.saturation < 0) { // L: 75
-			this.saturation = 0;
-		} else if (this.saturation > 255) { // L: 76
-			this.saturation = 255;
-		}
-
-		if (this.lightness < 0) { // L: 77
-			this.lightness = 0;
-		} else if (this.lightness > 255) { // L: 78
-			this.lightness = 255;
-		}
-
-		if (var16 > 0.5D) { // L: 79
-			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
-		} else {
-			this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 80
-		}
-
-		if (this.hueMultiplier < 1) { // L: 81
-			this.hueMultiplier = 1;
-		}
-
-		this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 82
-	} // L: 83
-
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "-899515900"
+		descriptor = "(Lnt;III)V",
+		garbageValue = "-1239829905"
 	)
-	public static String method2839(CharSequence var0) {
-		int var1 = var0.length(); // L: 11
-		StringBuilder var2 = new StringBuilder(var1); // L: 12
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2, int var3) {
+		if (var2 == 1) {
+			this.rgb = var1.readMedium();
+		}
 
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 13
-			char var4 = var0.charAt(var3); // L: 14
-			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15
-				if (var4 == ' ') { // L: 16
-					var2.append('+');
-				} else {
-					byte var5 = ServerPacket.charToByteCp1252(var4); // L: 18
-					var2.append('%'); // L: 19
-					int var6 = var5 >> 4 & 15; // L: 20
-					if (var6 >= 10) { // L: 21
-						var2.append((char)(var6 + 55));
-					} else {
-						var2.append((char)(var6 + 48)); // L: 22
-					}
+	}
 
-					var6 = var5 & 15; // L: 23
-					if (var6 >= 10) { // L: 24
-						var2.append((char)(var6 + 55));
-					} else {
-						var2.append((char)(var6 + 48));
-					}
-				}
-			} else {
-				var2.append(var4); // L: 25
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1158343935"
+	)
+	@Export("setHsl")
+	void setHsl(int var1) {
+		double var2 = (double)(var1 >> 16 & 255) / 256.0D;
+		double var4 = (double)(var1 >> 8 & 255) / 256.0D;
+		double var6 = (double)(var1 & 255) / 256.0D; // L: 38
+		double var8 = var2; // L: 39
+		if (var4 < var2) { // L: 40
+			var8 = var4;
+		}
+
+		if (var6 < var8) {
+			var8 = var6;
+		}
+
+		double var10 = var2;
+		if (var4 > var2) {
+			var10 = var4;
+		}
+
+		if (var6 > var10) { // L: 44
+			var10 = var6;
+		}
+
+		double var12 = 0.0D; // L: 45
+		double var14 = 0.0D;
+		double var16 = (var8 + var10) / 2.0D; // L: 47
+		if (var10 != var8) {
+			if (var16 < 0.5D) { // L: 49
+				var14 = (var10 - var8) / (var8 + var10);
+			}
+
+			if (var16 >= 0.5D) { // L: 50
+				var14 = (var10 - var8) / (2.0D - var10 - var8);
+			}
+
+			if (var2 == var10) { // L: 51
+				var12 = (var4 - var6) / (var10 - var8);
+			} else if (var4 == var10) { // L: 52
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+			} else if (var6 == var10) {
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D; // L: 53
 			}
 		}
 
-		return var2.toString(); // L: 28
+		var12 /= 6.0D; // L: 55
+		this.saturation = (int)(256.0D * var14); // L: 56
+		this.lightness = (int)(var16 * 256.0D); // L: 57
+		if (this.saturation < 0) { // L: 58
+			this.saturation = 0;
+		} else if (this.saturation > 255) { // L: 59
+			this.saturation = 255;
+		}
+
+		if (this.lightness < 0) { // L: 60
+			this.lightness = 0;
+		} else if (this.lightness > 255) { // L: 61
+			this.lightness = 255;
+		}
+
+		if (var16 > 0.5D) { // L: 62
+			this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16));
+		} else {
+			this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 63
+		}
+
+		if (this.hueMultiplier < 1) { // L: 64
+			this.hueMultiplier = 1;
+		}
+
+		this.hue = (int)(var12 * (double)this.hueMultiplier); // L: 65
+	} // L: 66
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)Ljava/io/File;",
+		garbageValue = "355010733"
+	)
+	@Export("getFile")
+	public static File getFile(String var0) {
+		if (!FileSystem.FileSystem_hasPermissions) { // L: 22
+			throw new RuntimeException("");
+		} else {
+			File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23
+			if (var1 != null) { // L: 24
+				return var1;
+			} else {
+				File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25
+				RandomAccessFile var3 = null; // L: 26
+
+				try {
+					File var4 = new File(var2.getParent()); // L: 28
+					if (!var4.exists()) { // L: 29
+						throw new RuntimeException("");
+					} else {
+						var3 = new RandomAccessFile(var2, "rw"); // L: 30
+						int var5 = var3.read(); // L: 31
+						var3.seek(0L); // L: 32
+						var3.write(var5); // L: 33
+						var3.seek(0L); // L: 34
+						var3.close(); // L: 35
+						FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36
+						return var2; // L: 37
+					}
+				} catch (Exception var8) {
+					try {
+						if (var3 != null) { // L: 41
+							var3.close(); // L: 42
+							var3 = null; // L: 43
+						}
+					} catch (Exception var7) { // L: 46
+					}
+
+					throw new RuntimeException(); // L: 48
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-19"
+	)
+	static final int method2924() {
+		return ViewportMouse.ViewportMouse_x; // L: 86
 	}
 }
diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java
index 08cec51ca8..09670e81d3 100644
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -2,7 +2,7 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("kt")
+@ObfuscatedName("kj")
 @Implements("Font")
 public final class Font extends AbstractFont {
 	public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
@@ -13,7 +13,7 @@ public final class Font extends AbstractFont {
 		super(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("drawGlyph")
 	final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15
@@ -55,7 +55,7 @@ public final class Font extends AbstractFont {
 		}
 	} // L: 44
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("drawGlyphAlpha")
 	final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 4e6f96c4ed..6c293ac989 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -2,54 +2,54 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
+import net.runelite.rs.Reflection;
 
-@ObfuscatedName("mv")
+@ObfuscatedName("mb")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("eu")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Lba;"
 	)
-	@Export("archive18")
-	static Archive archive18;
-	@ObfuscatedName("r")
+	@Export("pcmPlayerProvider")
+	static PlayerProvider pcmPlayerProvider;
+	@ObfuscatedName("m")
 	@Export("name")
 	String name;
 
@@ -63,187 +63,294 @@ public class FontName {
 	}
 
 	FontName(String var1) {
-		this.name = var1; // L: 16
-	} // L: 17
+		this.name = var1; // L: 20
+	} // L: 21
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lee;",
-		garbageValue = "743368656"
+		descriptor = "(B)[Lmb;",
+		garbageValue = "-107"
 	)
-	public static VarbitComposition method6299(int var0) {
-		VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 30
-		if (var1 != null) { // L: 31
-			return var1;
-		} else {
-			byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 32
-			var1 = new VarbitComposition(); // L: 33
-			if (var2 != null) { // L: 34
-				var1.decode(new Buffer(var2));
-			}
-
-			VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 35
-			return var1; // L: 36
-		}
+	public static FontName[] method6334() {
+		return new FontName[]{FontName_verdana15, FontName_verdana11, FontName_verdana13, FontName_bold12, FontName_plain11, FontName_plain12}; // L: 16
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "([BIIIIIIILgt;[Lfz;I)V",
-		garbageValue = "305716239"
+		descriptor = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "-562774219"
 	)
-	static final void method6296(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) {
-		Buffer var10 = new Buffer(var0); // L: 183
-		int var11 = -1; // L: 184
+	public static int method6335(CharSequence var0) {
+		return class8.method105(var0, 10, true); // L: 76
+	}
 
-		while (true) {
-			int var12 = var10.method6560(); // L: 186
-			if (var12 == 0) { // L: 187
-				return; // L: 242
-			}
-
-			var11 += var12; // L: 188
-			int var13 = 0; // L: 189
-
-			while (true) {
-				int var14 = var10.readUShortSmart(); // L: 191
-				if (var14 == 0) { // L: 192
-					break;
-				}
-
-				var13 += var14 - 1; // L: 193
-				int var15 = var13 & 63; // L: 194
-				int var16 = var13 >> 6 & 63; // L: 195
-				int var17 = var13 >> 12; // L: 196
-				int var18 = var10.readUnsignedByte(); // L: 197
-				int var19 = var18 >> 2; // L: 198
-				int var20 = var18 & 3; // L: 199
-				if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 200
-					ObjectComposition var21 = class23.getObjectDefinition(var11); // L: 201
-					int var24 = var16 & 7; // L: 204
-					int var25 = var15 & 7; // L: 205
-					int var27 = var21.sizeX; // L: 207
-					int var28 = var21.sizeY; // L: 208
-					int var29;
-					if ((var20 & 1) == 1) { // L: 210
-						var29 = var27; // L: 211
-						var27 = var28; // L: 212
-						var28 = var29; // L: 213
-					}
-
-					int var26 = var7 & 3; // L: 215
-					int var23;
-					if (var26 == 0) { // L: 216
-						var23 = var24; // L: 217
-					} else if (var26 == 1) { // L: 220
-						var23 = var25; // L: 221
-					} else if (var26 == 2) { // L: 224
-						var23 = 7 - var24 - (var27 - 1); // L: 225
-					} else {
-						var23 = 7 - var25 - (var28 - 1); // L: 228
-					}
-
-					var29 = var23 + var2; // L: 230
-					int var30 = var3 + class179.method3635(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 231
-					if (var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) { // L: 232
-						int var31 = var1; // L: 233
-						if ((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) { // L: 234
-							var31 = var1 - 1;
-						}
-
-						CollisionMap var32 = null; // L: 235
-						if (var31 >= 0) { // L: 236
-							var32 = var9[var31];
-						}
-
-						ClanChannelMember.method89(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32); // L: 237
-					}
-				}
-			}
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;",
+		garbageValue = "2"
+	)
+	@Export("loadClassFromDescriptor")
+	static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
+		if (var0.equals("B")) { // L: 222
+			return Byte.TYPE;
+		} else if (var0.equals("I")) { // L: 223
+			return Integer.TYPE;
+		} else if (var0.equals("S")) { // L: 224
+			return Short.TYPE;
+		} else if (var0.equals("J")) { // L: 225
+			return Long.TYPE;
+		} else if (var0.equals("Z")) { // L: 226
+			return Boolean.TYPE;
+		} else if (var0.equals("F")) { // L: 227
+			return Float.TYPE;
+		} else if (var0.equals("D")) { // L: 228
+			return Double.TYPE;
+		} else if (var0.equals("C")) { // L: 229
+			return Character.TYPE;
+		} else {
+			return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231
 		}
 	}
 
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1272154519"
+		descriptor = "(Ljava/lang/CharSequence;B)I",
+		garbageValue = "57"
 	)
-	static int method6298(int var0, Script var1, boolean var2) {
-		Widget var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1281
-		if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1282
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1283
-			return 1; // L: 1284
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1286
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1287
-			return 1; // L: 1288
-		} else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1290
-			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1291
-			return 1; // L: 1292
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1294
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1295
-			return 1; // L: 1296
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1298
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1299
-			return 1; // L: 1300
-		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1302
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1303
-			return 1; // L: 1304
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1306
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1307
-			return 1; // L: 1308
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1310
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1311
-			return 1; // L: 1312
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1314
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1315
-			return 1; // L: 1316
-		} else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1318
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1319
-			return 1; // L: 1320
-		} else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1322
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1323
-			return 1; // L: 1324
-		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1326
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color; // L: 1327
-			return 1; // L: 1328
-		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1330
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color2; // L: 1331
-			return 1; // L: 1332
-		} else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1334
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1335
-			return 1; // L: 1336
-		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1338
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1339
-			return 1; // L: 1340
-		} else if (var0 != 2615 && var0 != 2616) { // L: 1342
-			return 2; // L: 1346
+	@Export("hashString")
+	public static int hashString(CharSequence var0) {
+		int var1 = var0.length(); // L: 144
+		int var2 = 0; // L: 145
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 146
+			var2 = (var2 << 5) - var2 + class125.charToByteCp1252(var0.charAt(var3));
+		}
+
+		return var2; // L: 147
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIII)Z",
+		garbageValue = "840735253"
+	)
+	static final boolean method6331(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 94
+		if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 95
+			return false;
 		} else {
-			++class44.Interpreter_intStackSize; // L: 1343
-			return 1; // L: 1344
+			var7 = ViewportMouse.ViewportMouse_y - var6; // L: 96
+			if (var7 > var0 && var7 > var1 && var7 > var2) {
+				return false; // L: 97
+			} else {
+				var7 = ViewportMouse.ViewportMouse_x + var6; // L: 98
+				if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 99
+					return false;
+				} else {
+					var7 = ViewportMouse.ViewportMouse_x - var6; // L: 100
+					return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 101
+				}
+			}
 		}
 	}
 
-	@ObfuscatedName("fp")
+	@ObfuscatedName("fo")
 	@ObfuscatedSignature(
-		descriptor = "(IZZZB)Ljp;",
-		garbageValue = "28"
+		descriptor = "(I)I",
+		garbageValue = "-1913570357"
 	)
-	@Export("newArchive")
-	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
-		ArchiveDisk var4 = null; // L: 1917
-		if (JagexCache.JagexCache_dat2File != null) { // L: 1918
-			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class93.JagexCache_idxFiles[var0], 1000000);
+	static int method6329() {
+		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1714
+			int var0 = 0; // L: 1715
+
+			for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1716
+				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1717
+			}
+
+			return var0 * 10000 / Client.field898; // L: 1719
+		} else {
+			return 10000;
+		}
+	}
+
+	@ObfuscatedName("is")
+	@ObfuscatedSignature(
+		descriptor = "(Lev;IIII)V",
+		garbageValue = "-281003514"
+	)
+	@Export("addNpcToMenu")
+	static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) {
+		if (Client.menuOptionsCount < 400) { // L: 9175
+			if (var0.transforms != null) { // L: 9176
+				var0 = var0.transform();
+			}
+
+			if (var0 != null) { // L: 9177
+				if (var0.isInteractable) { // L: 9178
+					if (!var0.isFollower || Client.followerIndex == var1) { // L: 9179
+						String var4 = var0.name; // L: 9180
+						int var7;
+						int var8;
+						if (var0.combatLevel != 0) { // L: 9181
+							var7 = var0.combatLevel; // L: 9184
+							var8 = class262.localPlayer.combatLevel; // L: 9185
+							int var9 = var8 - var7; // L: 9187
+							String var6;
+							if (var9 < -9) { // L: 9188
+								var6 = SecureRandomFuture.colorStartTag(16711680); // L: 9189
+							} else if (var9 < -6) { // L: 9192
+								var6 = SecureRandomFuture.colorStartTag(16723968); // L: 9193
+							} else if (var9 < -3) { // L: 9196
+								var6 = SecureRandomFuture.colorStartTag(16740352); // L: 9197
+							} else if (var9 < 0) { // L: 9200
+								var6 = SecureRandomFuture.colorStartTag(16756736); // L: 9201
+							} else if (var9 > 9) { // L: 9204
+								var6 = SecureRandomFuture.colorStartTag(65280); // L: 9205
+							} else if (var9 > 6) { // L: 9208
+								var6 = SecureRandomFuture.colorStartTag(4259584); // L: 9209
+							} else if (var9 > 3) { // L: 9212
+								var6 = SecureRandomFuture.colorStartTag(8453888); // L: 9213
+							} else if (var9 > 0) { // L: 9216
+								var6 = SecureRandomFuture.colorStartTag(12648192); // L: 9217
+							} else {
+								var6 = SecureRandomFuture.colorStartTag(16776960); // L: 9220
+							}
+
+							var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9222
+						}
+
+						if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9224
+							class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9225
+						}
+
+						if (Client.isItemSelected == 1) { // L: 9228
+							class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9229
+						} else if (Client.isSpellSelected) { // L: 9232
+							if ((LoginPacket.selectedSpellFlags & 2) == 2) { // L: 9233
+								class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9234
+							}
+						} else {
+							int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9239
+							String[] var11 = var0.actions; // L: 9240
+							if (var11 != null) { // L: 9241
+								for (var7 = 4; var7 >= 0; --var7) { // L: 9242
+									if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9243
+										var8 = 0; // L: 9244
+										if (var7 == 0) { // L: 9245
+											var8 = var10 + 9;
+										}
+
+										if (var7 == 1) { // L: 9246
+											var8 = var10 + 10;
+										}
+
+										if (var7 == 2) { // L: 9247
+											var8 = var10 + 11;
+										}
+
+										if (var7 == 3) { // L: 9248
+											var8 = var10 + 12;
+										}
+
+										if (var7 == 4) { // L: 9249
+											var8 = var10 + 13;
+										}
+
+										class22.insertMenuItemNoShift(var11[var7], SecureRandomFuture.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9250
+									}
+								}
+							}
+
+							if (var11 != null) { // L: 9255
+								for (var7 = 4; var7 >= 0; --var7) { // L: 9256
+									if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9257
+										short var12 = 0; // L: 9258
+										if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 9259
+											if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class262.localPlayer.combatLevel) { // L: 9260
+												var12 = 2000; // L: 9261
+											}
+
+											var8 = 0; // L: 9263
+											if (var7 == 0) { // L: 9264
+												var8 = var12 + 9;
+											}
+
+											if (var7 == 1) { // L: 9265
+												var8 = var12 + 10;
+											}
+
+											if (var7 == 2) { // L: 9266
+												var8 = var12 + 11;
+											}
+
+											if (var7 == 3) { // L: 9267
+												var8 = var12 + 12;
+											}
+
+											if (var7 == 4) { // L: 9268
+												var8 = var12 + 13;
+											}
+
+											class22.insertMenuItemNoShift(var11[var7], SecureRandomFuture.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9269
+										}
+									}
+								}
+							}
+
+							if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9274
+								class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9275
+							}
+						}
+
+					}
+				}
+			}
+		}
+	} // L: 9279
+
+	@ObfuscatedName("jh")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;IIZS)V",
+		garbageValue = "-1497"
+	)
+	@Export("alignWidgetSize")
+	static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
+		int var4 = var0.width; // L: 9966
+		int var5 = var0.height; // L: 9967
+		if (var0.widthAlignment == 0) { // L: 9968
+			var0.width = var0.rawWidth;
+		} else if (var0.widthAlignment == 1) { // L: 9969
+			var0.width = var1 - var0.rawWidth;
+		} else if (var0.widthAlignment == 2) { // L: 9970
+			var0.width = var0.rawWidth * var1 >> 14;
 		}
 
-		return new Archive(var4, class43.masterDisk, var0, var1, var2, var3); // L: 1919
-	}
+		if (var0.heightAlignment == 0) { // L: 9971
+			var0.height = var0.rawHeight;
+		} else if (var0.heightAlignment == 1) { // L: 9972
+			var0.height = var2 - var0.rawHeight;
+		} else if (var0.heightAlignment == 2) {
+			var0.height = var2 * var0.rawHeight >> 14; // L: 9973
+		}
 
-	@ObfuscatedName("ln")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-81607341"
-	)
-	public static boolean method6297() {
-		return Client.staffModLevel >= 2; // L: 11491
-	}
+		if (var0.widthAlignment == 4) { // L: 9974
+			var0.width = var0.height * var0.field2977 / var0.field2957;
+		}
+
+		if (var0.heightAlignment == 4) { // L: 9975
+			var0.height = var0.field2957 * var0.width / var0.field2977;
+		}
+
+		if (var0.contentType == 1337) { // L: 9976
+			Client.viewportWidget = var0;
+		}
+
+		if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9977
+			ScriptEvent var6 = new ScriptEvent(); // L: 9978
+			var6.widget = var0; // L: 9979
+			var6.args = var0.onResize; // L: 9980
+			Client.scriptEvents.addFirst(var6); // L: 9981
+		}
+
+	} // L: 9983
 }
diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java
index ab6a630d53..0d85864261 100644
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -4,33 +4,27 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mu")
+@ObfuscatedName("mk")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	@Export("logoSprite")
-	static IndexedSprite logoSprite;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;)V"
+		descriptor = "(Ljp;Ljp;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1; // L: 14
@@ -38,10 +32,10 @@ public class Fonts {
 		this.map = new HashMap(); // L: 16
 	} // L: 17
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "([Lmv;I)Ljava/util/HashMap;",
-		garbageValue = "-1349307579"
+		descriptor = "([Lmb;B)Ljava/util/HashMap;",
+		garbageValue = "4"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -53,7 +47,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) { // L: 26
 				var2.put(var5, this.map.get(var5)); // L: 27
 			} else {
-				Font var6 = AbstractSocket.method5900(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
+				Font var6 = AbstractWorldMapData.method3696(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
 				if (var6 != null) { // L: 31
 					this.map.put(var5, var6); // L: 32
 					var2.put(var5, var6); // L: 33
@@ -63,4 +57,14 @@ public class Fonts {
 
 		return var2; // L: 39
 	}
+
+	@ObfuscatedName("jb")
+	@ObfuscatedSignature(
+		descriptor = "(ZB)V",
+		garbageValue = "-20"
+	)
+	@Export("setTapToDrop")
+	static void setTapToDrop(boolean var0) {
+		Client.tapToDrop = var0; // L: 10357
+	} // L: 10358
 }
diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java
index d069b10e6f..14d8f4c5e5 100644
--- a/runescape-client/src/main/java/Frames.java
+++ b/runescape-client/src/main/java/Frames.java
@@ -3,75 +3,102 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gd")
+@ObfuscatedName("gi")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "[Lgu;"
+		descriptor = "[Lgz;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;IZ)V",
-		garbageValue = "0"
+		descriptor = "(Ljp;Ljp;IZ)V"
 	)
-	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
-		NodeDeque var5 = new NodeDeque(); // L: 11
-		int var6 = var1.getGroupFileCount(var3); // L: 12
-		this.frames = new Animation[var6]; // L: 13
-		int[] var7 = var1.getGroupFileIds(var3); // L: 14
+	Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
+		NodeDeque var5 = new NodeDeque(); // L: 35
+		int var6 = var1.getGroupFileCount(var3); // L: 36
+		this.frames = new Animation[var6]; // L: 37
+		int[] var7 = var1.getGroupFileIds(var3); // L: 38
 
-		for (int var8 = 0; var8 < var7.length; ++var8) { // L: 15
-			byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 16
-			Skeleton var10 = null; // L: 17
-			int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 18
+		for (int var8 = 0; var8 < var7.length; ++var8) { // L: 39
+			byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40
+			Skeleton var10 = null; // L: 41
+			int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42
 
-			for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 19 20 25
-				if (var11 == var12.id) { // L: 21
-					var10 = var12; // L: 22
+			for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 44 49
+				if (var11 == var12.id) { // L: 45
+					var10 = var12; // L: 46
 					break;
 				}
 			}
 
-			if (var10 == null) { // L: 27
-				byte[] var13 = var2.getFile(var11, 0); // L: 30
-				var10 = new Skeleton(var11, var13); // L: 31
-				var5.addFirst(var10); // L: 32
+			if (var10 == null) { // L: 51
+				byte[] var13;
+				if (var4) { // L: 53
+					var13 = var2.getFile(0, var11);
+				} else {
+					var13 = var2.getFile(var11, 0); // L: 54
+				}
+
+				var10 = new Skeleton(var11, var13); // L: 55
+				var5.addFirst(var10); // L: 56
 			}
 
-			this.frames[var7[var8]] = new Animation(var9, var10); // L: 34
+			this.frames[var7[var8]] = new Animation(var9, var10); // L: 58
 		}
 
-	} // L: 36
+	} // L: 60
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "4"
+		descriptor = "(II)Z",
+		garbageValue = "1512659835"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
-		return this.frames[var1].hasAlphaTransform; // L: 39
+		return this.frames[var1].hasAlphaTransform; // L: 63
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lio;",
-		garbageValue = "416186781"
+		descriptor = "(S)V",
+		garbageValue = "-9614"
 	)
-	@Export("getWidget")
-	public static Widget getWidget(int var0) {
-		int var1 = var0 >> 16; // L: 188
-		int var2 = var0 & 65535; // L: 189
-		if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 190
-			boolean var3 = Clock.loadInterface(var1); // L: 191
-			if (!var3) { // L: 192
-				return null;
+	public static void method4257() {
+		try {
+			if (class233.musicPlayerStatus == 1) { // L: 76
+				int var0 = class233.midiPcmStream.method4660(); // L: 77
+				if (var0 > 0 && class233.midiPcmStream.isReady()) { // L: 78
+					var0 -= FaceNormal.pcmSampleLength; // L: 79
+					if (var0 < 0) { // L: 80
+						var0 = 0;
+					}
+
+					class233.midiPcmStream.setPcmStreamVolume(var0); // L: 81
+					return; // L: 82
+				}
+
+				class233.midiPcmStream.clear(); // L: 84
+				class233.midiPcmStream.removeAll(); // L: 85
+				if (InvDefinition.musicTrackArchive != null) { // L: 86
+					class233.musicPlayerStatus = 2;
+				} else {
+					class233.musicPlayerStatus = 0; // L: 87
+				}
+
+				ArchiveLoader.musicTrack = null; // L: 88
+				class215.soundCache = null; // L: 89
 			}
+		} catch (Exception var2) { // L: 92
+			var2.printStackTrace(); // L: 93
+			class233.midiPcmStream.clear(); // L: 94
+			class233.musicPlayerStatus = 0; // L: 95
+			ArchiveLoader.musicTrack = null; // L: 96
+			class215.soundCache = null; // L: 97
+			InvDefinition.musicTrackArchive = null; // L: 98
 		}
 
-		return Widget.Widget_interfaceComponents[var1][var2]; // L: 194
-	}
+	} // L: 100
 }
diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java
index a0b8f4bb6a..06501c0bf6 100644
--- a/runescape-client/src/main/java/Friend.java
+++ b/runescape-client/src/main/java/Friend.java
@@ -6,46 +6,52 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("lp")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("v")
+	@ObfuscatedName("go")
+	@ObfuscatedSignature(
+		descriptor = "Loa;"
+	)
+	@Export("compass")
+	static SpritePixels compass;
+	@ObfuscatedName("f")
 	boolean field3824;
-	@ObfuscatedName("n")
-	boolean field3823;
+	@ObfuscatedName("e")
+	boolean field3825;
 
 	Friend() {
-	} // L: 9
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(Llp;I)I",
-		garbageValue = "-1023710905"
+		garbageValue = "-1323328192"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
-		if (super.world == Client.worldId && Client.worldId != var1.world) { // L: 12
+		if (super.world == Client.worldId && Client.worldId != var1.world) {
 			return -1;
-		} else if (Client.worldId == var1.world && super.world != Client.worldId) { // L: 13
+		} else if (Client.worldId == var1.world && super.world != Client.worldId) {
 			return 1;
-		} else if (super.world != 0 && var1.world == 0) { // L: 14
+		} else if (super.world != 0 && var1.world == 0) {
 			return -1;
-		} else if (var1.world != 0 && super.world == 0) { // L: 15
+		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3824 && !var1.field3824) { // L: 16
+		} else if (this.field3824 && !var1.field3824) {
 			return -1;
-		} else if (!this.field3824 && var1.field3824) { // L: 17
+		} else if (!this.field3824 && var1.field3824) {
 			return 1;
-		} else if (this.field3823 && !var1.field3823) { // L: 18
+		} else if (this.field3825 && !var1.field3825) { // L: 18
 			return -1;
-		} else if (!this.field3823 && var1.field3823) { // L: 19
+		} else if (!this.field3825 && var1.field3825) {
 			return 1;
 		} else {
-			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24
+			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 24
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)I",
-		garbageValue = "539732409"
+		descriptor = "(Llf;I)I",
+		garbageValue = "-1545273649"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -55,4 +61,79 @@ public class Friend extends Buddy {
 	public int compareTo(Object var1) {
 		return this.compareToFriend((Friend)var1); // L: 33
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;I)I",
+		garbageValue = "-1856875972"
+	)
+	public static int method5774(CharSequence var0) {
+		int var1 = var0.length(); // L: 9
+		int var2 = 0; // L: 10
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 11
+			char var4 = var0.charAt(var3); // L: 12
+			if (var4 <= 127) { // L: 13
+				++var2;
+			} else if (var4 <= 2047) { // L: 14
+				var2 += 2;
+			} else {
+				var2 += 3; // L: 15
+			}
+		}
+
+		return var2;
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lnb;I)I",
+		garbageValue = "-1814552496"
+	)
+	public static final int method5773(LoginType var0) {
+		if (var0 == null) { // L: 16
+			return 12; // L: 17
+		} else {
+			switch(var0.field4090) { // L: 19
+			case 7:
+				return 20; // L: 21
+			default:
+				return 12; // L: 23
+			}
+		}
+	}
+
+	@ObfuscatedName("jn")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I)Z",
+		garbageValue = "-304151220"
+	)
+	@Export("runCs1")
+	static final boolean runCs1(Widget var0) {
+		if (var0.cs1Comparisons == null) { // L: 10051
+			return false;
+		} else {
+			for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 10052
+				int var2 = class27.method355(var0, var1); // L: 10053
+				int var3 = var0.cs1ComparisonValues[var1]; // L: 10054
+				if (var0.cs1Comparisons[var1] == 2) { // L: 10055
+					if (var2 >= var3) { // L: 10056
+						return false;
+					}
+				} else if (var0.cs1Comparisons[var1] == 3) { // L: 10058
+					if (var2 <= var3) { // L: 10059
+						return false;
+					}
+				} else if (var0.cs1Comparisons[var1] == 4) { // L: 10061
+					if (var3 == var2) { // L: 10062
+						return false;
+					}
+				} else if (var3 != var2) { // L: 10064
+					return false;
+				}
+			}
+
+			return true; // L: 10066
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java
index c4e7d786df..5c01a7d261 100644
--- a/runescape-client/src/main/java/FriendLoginUpdate.java
+++ b/runescape-client/src/main/java/FriendLoginUpdate.java
@@ -1,69 +1,33 @@
-import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lq")
+@ObfuscatedName("lh")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -641330339
+		intValue = 1437119291
 	)
-	public int field3828;
-	@ObfuscatedName("n")
+	public int field3829;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lly;"
+		descriptor = "Llc;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lly;I)V"
+		descriptor = "(Llc;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3828 = (int)(ObjectComposition.currentTimeMillis() / 1000L); // L: 106
+		this.field3829 = (int)(ClientPacket.currentTimeMillis() / 1000L); // L: 106
 		this.username = var1; // L: 107
 		this.world = (short)var2; // L: 108
 	} // L: 109
-
-	@ObfuscatedName("lb")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1148380845"
-	)
-	static void method5690(String var0) {
-		class363.field4079 = var0; // L: 11398
-
-		try {
-			String var1 = class23.client.getParameter(Integer.toString(18)); // L: 11400
-			String var2 = class23.client.getParameter(Integer.toString(13)); // L: 11401
-			String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11402
-			if (var0.length() == 0) { // L: 11403
-				var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
-			} else {
-				String var4 = var3 + "; Expires="; // L: 11405
-				long var6 = ObjectComposition.currentTimeMillis() + 94608000000L; // L: 11407
-				Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11409
-				int var8 = Calendar.Calendar_calendar.get(7); // L: 11410
-				int var9 = Calendar.Calendar_calendar.get(5); // L: 11411
-				int var10 = Calendar.Calendar_calendar.get(2); // L: 11412
-				int var11 = Calendar.Calendar_calendar.get(1); // L: 11413
-				int var12 = Calendar.Calendar_calendar.get(11); // L: 11414
-				int var13 = Calendar.Calendar_calendar.get(12); // L: 11415
-				int var14 = Calendar.Calendar_calendar.get(13); // L: 11416
-				String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 11417
-				var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11419
-			}
-
-			class42.method420(class23.client, "document.cookie=\"" + var3 + "\""); // L: 11421
-		} catch (Throwable var15) { // L: 11423
-		}
-
-	} // L: 11424
 }
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index 9d9695fe3e..baa9fa44df 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -4,1157 +4,359 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("by")
+@ObfuscatedName("bh")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
+	@ObfuscatedName("id")
+	@ObfuscatedGetter(
+		intValue = 1091220247
 	)
-	@Export("options_buttons_0Sprite")
-	static IndexedSprite options_buttons_0Sprite;
+	@Export("oculusOrbFocalPointX")
+	static int oculusOrbFocalPointX;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Llb;"
-	)
-	@Export("friendsList")
-	public final FriendsList friendsList;
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "Llo;"
 	)
+	@Export("friendsList")
+	public final FriendsList friendsList;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lli;"
+	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1124775275
+		intValue = -1019813463
 	)
-	int field941;
+	int field928;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnc;)V"
+		descriptor = "(Lnb;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field941 = 0; // L: 23
+		this.field928 = 0; // L: 23
 		this.loginType = var1; // L: 26
 		this.friendsList = new FriendsList(var1); // L: 27
 		this.ignoreList = new IgnoreList(var1); // L: 28
 	} // L: 29
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1883790130"
-	)
-	boolean method1689() {
-		return this.field941 == 2; // L: 32
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "6"
-	)
-	final void method1698() {
-		this.field941 = 1; // L: 36
-	} // L: 37
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "103"
+		descriptor = "(B)Z",
+		garbageValue = "1"
+	)
+	boolean method1804() {
+		return this.field928 == 2; // L: 32
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(S)V",
+		garbageValue = "-26603"
+	)
+	final void method1817() {
+		this.field928 = 1; // L: 36
+	} // L: 37
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-1640361249"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2); // L: 40
-		this.field941 = 2; // L: 41
-		Varps.method4647(); // L: 42
-	} // L: 43
+		this.field928 = 2; // L: 41
+
+		for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43
+			Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44
+			var4.clearIsFriend(); // L: 45
+		}
+
+		FileSystem.method2647(); // L: 47
+		if (class289.friendsChat != null) { // L: 48
+			class289.friendsChat.clearFriends(); // L: 49
+		}
+
+	} // L: 52
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1668816694"
+		garbageValue = "1325813770"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
-		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 46
-			if ((long)var1.field3828 < ObjectComposition.currentTimeMillis() / 1000L - 5L) { // L: 47
+		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55
+			if ((long)var1.field3829 < ClientPacket.currentTimeMillis() / 1000L - 5L) { // L: 56
 				if (var1.world > 0) {
-					World.addGameMessage(5, "", var1.username + " has logged in."); // L: 48
+					UserComparator10.addGameMessage(5, "", var1.username + " has logged in."); // L: 57
 				}
 
-				if (var1.world == 0) { // L: 49
-					World.addGameMessage(5, "", var1.username + " has logged out.");
+				if (var1.world == 0) { // L: 58
+					UserComparator10.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
-				var1.remove(); // L: 50
+				var1.remove(); // L: 59
 			}
 		}
 
-	} // L: 53
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "118"
-	)
-	@Export("clear")
-	final void clear() {
-		this.field941 = 0; // L: 56
-		this.friendsList.clear(); // L: 57
-		this.ignoreList.clear(); // L: 58
-	} // L: 59
+	} // L: 62
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;ZI)Z",
-		garbageValue = "-1207370332"
+		descriptor = "(B)V",
+		garbageValue = "120"
+	)
+	@Export("clear")
+	final void clear() {
+		this.field928 = 0; // L: 65
+		this.friendsList.clear(); // L: 66
+		this.ignoreList.clear(); // L: 67
+	} // L: 68
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Llc;ZI)Z",
+		garbageValue = "2140108913"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
-		if (var1 == null) { // L: 62
+		if (var1 == null) { // L: 71
 			return false;
-		} else if (var1.equals(class93.localPlayer.username)) { // L: 63
+		} else if (var1.equals(class262.localPlayer.username)) { // L: 72
 			return true;
 		} else {
-			return this.friendsList.isFriended(var1, var2); // L: 64
+			return this.friendsList.isFriended(var1, var2); // L: 73
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Llc;I)Z",
+		garbageValue = "668891946"
+	)
+	@Export("isIgnored")
+	final boolean isIgnored(Username var1) {
+		if (var1 == null) { // L: 78
+			return false;
+		} else {
+			return this.ignoreList.contains(var1); // L: 79
 		}
 	}
 
 	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(Lly;I)Z",
-		garbageValue = "279756852"
-	)
-	@Export("isIgnored")
-	final boolean isIgnored(Username var1) {
-		if (var1 == null) { // L: 69
-			return false;
-		} else {
-			return this.ignoreList.contains(var1); // L: 70
-		}
-	}
-
-	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-2078408502"
+		garbageValue = "-935678134"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
-		if (var1 != null) {
-			Username var2 = new Username(var1, this.loginType);
-			if (var2.hasCleanName()) {
-				if (this.friendsListIsFull()) {
-					Tiles.method2053();
+		if (var1 != null) { // L: 84
+			Username var2 = new Username(var1, this.loginType); // L: 85
+			if (var2.hasCleanName()) { // L: 86
+				if (this.friendsListIsFull()) { // L: 87
+					GrandExchangeEvent.method5223(); // L: 88
+				} else if (class262.localPlayer.username.equals(var2)) { // L: 91
+					FloorOverlayDefinition.method3168(); // L: 92
+				} else if (this.isFriended(var2, false)) { // L: 95
+					MusicPatchNode2.method4537(var1); // L: 96
+				} else if (this.isIgnored(var2)) { // L: 99
+					DirectByteArrayCopier.method4955(var1); // L: 100
 				} else {
-					StringBuilder var10000;
-					String var4;
-					if (class93.localPlayer.username.equals(var2)) {
-						var10000 = null;
-						var4 = "You can't add yourself to your own friend list";
-						World.addGameMessage(30, "", var4);
-					} else if (this.isFriended(var2, false)) {
-						WorldMapManager.method3490(var1);
-					} else if (this.isIgnored(var2)) { // L: 95
-						var10000 = new StringBuilder();
-						Object var10001 = null;
-						var10000 = var10000.append("Please remove ").append(var1);
-						var10001 = null;
-						var4 = var10000.append(" from your ignore list first").toString();
-						World.addGameMessage(30, "", var4);
-					} else {
-						PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher);
-						var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1));
-						var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-						Client.packetWriter.addNode(var3);
-					}
+					class375.method6530(var1); // L: 103
 				}
 			}
 		}
-	} // L: 80
+	} // L: 89 93 97 101 104
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1614251669"
+		descriptor = "(B)Z",
+		garbageValue = "-69"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field759 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field740 != 1; // L: 143
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-7"
+		garbageValue = "0"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
-		if (var1 != null) {
-			Username var2 = new Username(var1, this.loginType);
-			if (var2.hasCleanName()) {
-				StringBuilder var10000;
-				String var4;
-				if (this.canAddIgnore()) {
-					var10000 = null; // L: 140
-					var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
-					World.addGameMessage(30, "", var4);
-				} else if (class93.localPlayer.username.equals(var2)) {
-					var10000 = null;
-					var4 = "You can't add yourself to your own ignore list";
-					World.addGameMessage(30, "", var4);
+		if (var1 != null) { // L: 150
+			Username var2 = new Username(var1, this.loginType); // L: 151
+			if (var2.hasCleanName()) { // L: 152
+				Object var10000;
+				String var3;
+				if (this.canAddIgnore()) { // L: 153
+					var10000 = null; // L: 155
+					var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
+					UserComparator10.addGameMessage(30, "", var3); // L: 157
+				} else if (class262.localPlayer.username.equals(var2)) { // L: 162
+					var10000 = null; // L: 164
+					var3 = "You can't add yourself to your own ignore list";
+					UserComparator10.addGameMessage(30, "", var3); // L: 166
+				} else if (this.isIgnored(var2)) { // L: 171
+					class314.method5693(var1); // L: 172
+				} else if (this.isFriended(var2, false)) { // L: 175
+					ClanSettings.method201(var1); // L: 176
 				} else {
-					Object var10001;
-					if (this.isIgnored(var2)) {
-						var10000 = (new StringBuilder()).append(var1);
-						var10001 = null;
-						var4 = var10000.append(" is already on your ignore list").toString();
-						World.addGameMessage(30, "", var4);
-					} else if (this.isFriended(var2, false)) {
-						var10000 = new StringBuilder();
-						var10001 = null;
-						var10000 = var10000.append("Please remove ").append(var1);
-						var10001 = null;
-						var4 = var10000.append(" from your friend list first").toString();
-						World.addGameMessage(30, "", var4);
-					} else {
-						PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher);
-						var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1));
-						var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-						Client.packetWriter.addNode(var3);
-					}
+					TextureProvider.method4291(var1); // L: 179
 				}
 			}
 		}
-	} // L: 181
+	} // L: 160 169 173 177 180
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1390615002"
+		descriptor = "(B)Z",
+		garbageValue = "6"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field759 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field740 != 1; // L: 205
 	}
 
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "752053487"
-	)
-	@Export("removeFriend")
-	final void removeFriend(String var1) {
-		if (var1 != null) {
-			Username var2 = new Username(var1, this.loginType);
-			if (var2.hasCleanName()) { // L: 193
-				if (this.friendsList.removeByUsername(var2)) {
-					Decimator.method1071();
-					PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1)); // L: 198
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 199
-					Client.packetWriter.addNode(var3);
-				}
-
-				Varps.method4647();
-			}
-		}
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-1893508939"
-	)
-	@Export("removeIgnore")
-	final void removeIgnore(String var1) {
-		if (var1 != null) {
-			Username var2 = new Username(var1, this.loginType);
-			if (var2.hasCleanName()) {
-				if (this.ignoreList.removeByUsername(var2)) { // L: 209
-					Decimator.method1071();
-					PacketBufferNode var3 = class21.getPacketBufferNode(ClientPacket.field2655, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var1));
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-					Client.packetWriter.addNode(var3); // L: 215
-				}
-
-				MouseRecorder.FriendSystem_invalidateIgnoreds();
-			}
-		}
-	} // L: 218
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Lly;B)Z",
-		garbageValue = "96"
-	)
-	@Export("isFriendAndHasWorld")
-	final boolean isFriendAndHasWorld(Username var1) {
-		Friend var2 = (Friend)this.friendsList.getByUsername(var1);
-		return var2 != null && var2.hasWorld();
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Lnb;II)V",
-		garbageValue = "-1580432233"
-	)
-	@Export("updatePlayers")
-	static final void updatePlayers(PacketBuffer var0, int var1) {
-		int var2 = var0.offset; // L: 71
-		Players.Players_pendingUpdateCount = 0; // L: 72
-		PcmPlayer.method750(var0); // L: 73
-
-		for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75
-			int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76
-			Player var5 = Client.players[var4]; // L: 77
-			int var6 = var0.readUnsignedByte(); // L: 78
-			if ((var6 & 128) != 0) { // L: 79
-				var6 += var0.readUnsignedByte() << 8;
-			}
-
-			byte var7 = -1; // L: 81
-			if ((var6 & 8) != 0) { // L: 82
-				var5.targetIndex = var0.readUnsignedShort(); // L: 83
-				if (var5.targetIndex == 65535) { // L: 84
-					var5.targetIndex = -1;
-				}
-			}
-
-			int var8;
-			if ((var6 & 256) != 0) { // L: 86
-				var5.spotAnimation = var0.method6604(); // L: 87
-				var8 = var0.method6613(); // L: 88
-				var5.field1277 = var8 >> 16; // L: 89
-				var5.field1287 = (var8 & 65535) + Client.cycle; // L: 90
-				var5.spotAnimationFrame = 0; // L: 91
-				var5.spotAnimationFrameCycle = 0; // L: 92
-				if (var5.field1287 > Client.cycle) { // L: 93
-					var5.spotAnimationFrame = -1;
-				}
-
-				if (var5.spotAnimation == 65535) { // L: 94
-					var5.spotAnimation = -1;
-				}
-			}
-
-			int var9;
-			int var11;
-			int var12;
-			int var15;
-			if ((var6 & 16) != 0) { // L: 96
-				var8 = var0.method6549(); // L: 97
-				int var10;
-				int var13;
-				int var18;
-				if (var8 > 0) { // L: 98
-					for (var9 = 0; var9 < var8; ++var9) { // L: 99
-						var11 = -1; // L: 101
-						var12 = -1; // L: 102
-						var13 = -1; // L: 103
-						var10 = var0.readUShortSmart(); // L: 104
-						if (var10 == 32767) { // L: 105
-							var10 = var0.readUShortSmart(); // L: 106
-							var12 = var0.readUShortSmart(); // L: 107
-							var11 = var0.readUShortSmart(); // L: 108
-							var13 = var0.readUShortSmart(); // L: 109
-						} else if (var10 != 32766) { // L: 111
-							var12 = var0.readUShortSmart(); // L: 112
-						} else {
-							var10 = -1; // L: 114
-						}
-
-						var18 = var0.readUShortSmart(); // L: 115
-						var5.addHitSplat(var10, var12, var11, var13, Client.cycle, var18); // L: 116
-					}
-				}
-
-				var9 = var0.readUnsignedByte(); // L: 119
-				if (var9 > 0) { // L: 120
-					for (var10 = 0; var10 < var9; ++var10) { // L: 121
-						var11 = var0.readUShortSmart(); // L: 122
-						var12 = var0.readUShortSmart(); // L: 123
-						if (var12 != 32767) { // L: 124
-							var13 = var0.readUShortSmart(); // L: 125
-							var18 = var0.method6671(); // L: 126
-							var15 = var12 > 0 ? var0.method6595() : var18; // L: 127
-							var5.addHealthBar(var11, Client.cycle, var12, var13, var18, var15); // L: 128
-						} else {
-							var5.removeHealthBar(var11); // L: 130
-						}
-					}
-				}
-			}
-
-			if ((var6 & 1) != 0) { // L: 134
-				var5.field1264 = var0.method6605(); // L: 135
-				if (var5.pathLength == 0) { // L: 136
-					var5.orientation = var5.field1264; // L: 137
-					var5.field1264 = -1; // L: 138
-				}
-			}
-
-			if ((var6 & 2048) != 0) { // L: 141
-				Players.field1373[var4] = var0.method6593(); // L: 142
-			}
-
-			if ((var6 & 512) != 0) { // L: 144
-				for (var8 = 0; var8 < 3; ++var8) { // L: 145
-					var5.actions[var8] = var0.readStringCp1252NullTerminated();
-				}
-			}
-
-			if ((var6 & 8192) != 0) { // L: 147
-				var5.field1278 = var0.method6559(); // L: 148
-				var5.field1280 = var0.method6597(); // L: 149
-				var5.field1269 = var0.method6597(); // L: 150
-				var5.field1238 = var0.method6593(); // L: 151
-				var5.field1265 = var0.readUnsignedShort() + Client.cycle; // L: 152
-				var5.field1283 = var0.method6604() + Client.cycle; // L: 153
-				var5.field1284 = var0.method6605(); // L: 154
-				if (var5.field1218) { // L: 155
-					var5.field1278 += var5.tileX; // L: 156
-					var5.field1280 += var5.tileY; // L: 157
-					var5.field1269 += var5.tileX; // L: 158
-					var5.field1238 += var5.tileY; // L: 159
-					var5.pathLength = 0; // L: 160
-				} else {
-					var5.field1278 += var5.pathX[0]; // L: 163
-					var5.field1280 += var5.pathY[0]; // L: 164
-					var5.field1269 += var5.pathX[0]; // L: 165
-					var5.field1238 += var5.pathY[0]; // L: 166
-					var5.pathLength = 1; // L: 167
-				}
-
-				var5.field1274 = 0; // L: 169
-			}
-
-			if ((var6 & 64) != 0) { // L: 171
-				var8 = var0.method6604(); // L: 172
-				PlayerType var16 = (PlayerType)Messages.findEnumerated(class372.PlayerType_values(), var0.method6549()); // L: 173
-				boolean var20 = var0.method6595() == 1; // L: 174
-				var11 = var0.method6595(); // L: 175
-				var12 = var0.offset; // L: 176
-				if (var5.username != null && var5.appearance != null) { // L: 177
-					boolean var21 = false; // L: 178
-					if (var16.isUser && NetSocket.friendSystem.isIgnored(var5.username)) { // L: 179 180
-						var21 = true;
-					}
-
-					if (!var21 && Client.field755 == 0 && !var5.isHidden) { // L: 182
-						Players.field1384.offset = 0; // L: 183
-						var0.method6677(Players.field1384.array, 0, var11); // L: 184
-						Players.field1384.offset = 0; // L: 185
-						String var14 = AbstractFont.escapeBrackets(class43.method433(MusicPatch.method4592(Players.field1384))); // L: 186
-						var5.overheadText = var14.trim(); // L: 187
-						var5.overheadTextColor = var8 >> 8; // L: 188
-						var5.overheadTextEffect = var8 & 255; // L: 189
-						var5.overheadTextCyclesRemaining = 150; // L: 190
-						var5.isAutoChatting = var20; // L: 191
-						var5.field1248 = var5 != class93.localPlayer && var16.isUser && "" != Client.field863 && var14.toLowerCase().indexOf(Client.field863) == -1; // L: 192
-						if (var16.isPrivileged) { // L: 194
-							var15 = var20 ? 91 : 1;
-						} else {
-							var15 = var20 ? 90 : 2; // L: 195
-						}
-
-						if (var16.modIcon != -1) {
-							World.addGameMessage(var15, SecureRandomFuture.method1982(var16.modIcon) + var5.username.getName(), var14); // L: 196
-						} else {
-							World.addGameMessage(var15, var5.username.getName(), var14); // L: 197
-						}
-					}
-				}
-
-				var0.offset = var12 + var11; // L: 200
-			}
-
-			if ((var6 & 2) != 0) { // L: 202
-				var8 = var0.method6595(); // L: 203
-				byte[] var22 = new byte[var8]; // L: 204
-				Buffer var17 = new Buffer(var22); // L: 205
-				var0.method6677(var22, 0, var8); // L: 206
-				Players.field1374[var4] = var17; // L: 207
-				var5.read(var17); // L: 208
-			}
-
-			if ((var6 & 4) != 0) { // L: 210
-				var8 = var0.method6603(); // L: 211
-				if (var8 == 65535) { // L: 212
-					var8 = -1;
-				}
-
-				var9 = var0.method6595(); // L: 213
-				class32.performPlayerAnimation(var5, var8, var9); // L: 214
-			}
-
-			if ((var6 & 4096) != 0) { // L: 216
-				var7 = var0.method6597(); // L: 217
-			}
-
-			if ((var6 & 32) != 0) { // L: 219
-				var5.overheadText = var0.readStringCp1252NullTerminated(); // L: 220
-				if (var5.overheadText.charAt(0) == '~') { // L: 221
-					var5.overheadText = var5.overheadText.substring(1); // L: 222
-					World.addGameMessage(2, var5.username.getName(), var5.overheadText); // L: 223
-				} else if (var5 == class93.localPlayer) {
-					World.addGameMessage(2, var5.username.getName(), var5.overheadText);
-				}
-
-				var5.isAutoChatting = false;
-				var5.overheadTextColor = 0; // L: 229
-				var5.overheadTextEffect = 0;
-				var5.overheadTextCyclesRemaining = 150;
-			}
-
-			if (var5.field1218) { // L: 233
-				if (var7 == 127) { // L: 234
-					var5.resetPath(var5.tileX, var5.tileY);
-				} else {
-					byte var19;
-					if (var7 != -1) { // L: 237
-						var19 = var7;
-					} else {
-						var19 = Players.field1373[var4]; // L: 238
-					}
-
-					var5.method2129(var5.tileX, var5.tileY, var19); // L: 239
-				}
-			}
-		}
-
-		if (var0.offset - var2 != var1) { // L: 246
-			throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 247
-		}
-	} // L: 249
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1063766627"
-	)
-	public static void method1746() {
-		try {
-			JagexCache.JagexCache_dat2File.close(); // L: 225
-
-			for (int var0 = 0; var0 < SoundCache.idxCount; ++var0) { // L: 226
-				class93.JagexCache_idxFiles[var0].close();
-			}
-
-			JagexCache.JagexCache_idx255File.close(); // L: 227
-			JagexCache.JagexCache_randomDat.close(); // L: 228
-		} catch (Exception var2) { // L: 230
-		}
-
-	} // L: 231
-
 	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Lkt;Lkt;Lkt;B)V",
-		garbageValue = "0"
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-120"
 	)
-	@Export("drawTitle")
-	static void drawTitle(Font var0, Font var1, Font var2) {
-		Login.xPadding = (class32.canvasWidth - 765) / 2; // L: 1003
-		Login.loginBoxX = Login.xPadding + 202; // L: 1004
-		UserComparator4.loginBoxCenter = Login.loginBoxX + 180; // L: 1005
-		byte var3;
-		int var4;
-		int var12;
-		int var25;
-		int var26;
-		int var32;
-		int var41;
-		if (Login.worldSelectOpen) { // L: 1006
-			if (class337.worldSelectBackSprites == null) { // L: 1008
-				class337.worldSelectBackSprites = class369.method6443(GrandExchangeOfferAgeComparator.archive8, "sl_back", "");
+	@Export("removeFriend")
+	final void removeFriend(String var1) {
+		if (var1 != null) { // L: 212
+			Username var2 = new Username(var1, this.loginType); // L: 213
+			if (var2.hasCleanName()) { // L: 214
+				if (this.friendsList.removeByUsername(var2)) { // L: 215
+					Coord.method4801(); // L: 216
+					PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2612, Client.packetWriter.isaacCipher); // L: 218
+					var3.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var1)); // L: 219
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 220
+					Client.packetWriter.addNode(var3); // L: 221
+				}
+
+				for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 224
+					Player var4 = Client.players[Players.Players_indices[var5]]; // L: 225
+					var4.clearIsFriend(); // L: 226
+				}
+
+				FileSystem.method2647(); // L: 228
+				if (class289.friendsChat != null) { // L: 229
+					class289.friendsChat.clearFriends(); // L: 230
+				}
+
 			}
-
-			Archive var42;
-			IndexedSprite[] var46;
-			if (class25.worldSelectFlagSprites == null) { // L: 1009
-				var42 = GrandExchangeOfferAgeComparator.archive8; // L: 1011
-				var41 = var42.getGroupId("sl_flags"); // L: 1013
-				var26 = var42.getFileId(var41, ""); // L: 1014
-				var46 = VerticalAlignment.method2799(var42, var41, var26); // L: 1015
-				class25.worldSelectFlagSprites = var46; // L: 1017
-			}
-
-			if (HitSplatDefinition.worldSelectArrows == null) { // L: 1019
-				var42 = GrandExchangeOfferAgeComparator.archive8; // L: 1021
-				var41 = var42.getGroupId("sl_arrows"); // L: 1023
-				var26 = var42.getFileId(var41, ""); // L: 1024
-				var46 = VerticalAlignment.method2799(var42, var41, var26); // L: 1025
-				HitSplatDefinition.worldSelectArrows = var46; // L: 1027
-			}
-
-			if (class18.worldSelectStars == null) { // L: 1029
-				var42 = GrandExchangeOfferAgeComparator.archive8; // L: 1031
-				var41 = var42.getGroupId("sl_stars"); // L: 1033
-				var26 = var42.getFileId(var41, ""); // L: 1034
-				var46 = VerticalAlignment.method2799(var42, var41, var26); // L: 1035
-				class18.worldSelectStars = var46; // L: 1037
-			}
-
-			if (class19.worldSelectLeftSprite == null) { // L: 1039
-				class19.worldSelectLeftSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferAgeComparator.archive8, "leftarrow", "");
-			}
-
-			if (WorldMapID.worldSelectRightSprite == null) { // L: 1040
-				WorldMapID.worldSelectRightSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferAgeComparator.archive8, "rightarrow", "");
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1041
-			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1042
-			Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1043
-			var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1044
-			if (class18.worldSelectStars != null) { // L: 1045
-				class18.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1046
-				var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1047
-				class18.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1048
-				var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1049
-			}
-
-			if (HitSplatDefinition.worldSelectArrows != null) { // L: 1051
-				var32 = Login.xPadding + 280; // L: 1052
-				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1053
-					HitSplatDefinition.worldSelectArrows[2].drawAt(var32, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[0].drawAt(var32, 4); // L: 1054
-				}
-
-				if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1055
-					HitSplatDefinition.worldSelectArrows[3].drawAt(var32 + 15, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[1].drawAt(var32 + 15, 4); // L: 1056
-				}
-
-				var0.draw("World", var32 + 32, 17, 16777215, -1); // L: 1057
-				var4 = Login.xPadding + 390; // L: 1058
-				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1059
-					HitSplatDefinition.worldSelectArrows[2].drawAt(var4, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[0].drawAt(var4, 4); // L: 1060
-				}
-
-				if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1061
-					HitSplatDefinition.worldSelectArrows[3].drawAt(var4 + 15, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1062
-				}
-
-				var0.draw("Players", var4 + 32, 17, 16777215, -1); // L: 1063
-				var41 = Login.xPadding + 500; // L: 1064
-				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1065
-					HitSplatDefinition.worldSelectArrows[2].drawAt(var41, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[0].drawAt(var41, 4); // L: 1066
-				}
-
-				if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1067
-					HitSplatDefinition.worldSelectArrows[3].drawAt(var41 + 15, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[1].drawAt(var41 + 15, 4); // L: 1068
-				}
-
-				var0.draw("Location", var41 + 32, 17, 16777215, -1); // L: 1069
-				var26 = Login.xPadding + 610; // L: 1070
-				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1071
-					HitSplatDefinition.worldSelectArrows[2].drawAt(var26, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[0].drawAt(var26, 4); // L: 1072
-				}
-
-				if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1073
-					HitSplatDefinition.worldSelectArrows[3].drawAt(var26 + 15, 4);
-				} else {
-					HitSplatDefinition.worldSelectArrows[1].drawAt(var26 + 15, 4); // L: 1074
-				}
-
-				var0.draw("Type", var26 + 32, 17, 16777215, -1); // L: 1075
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1077
-			var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1078
-			Login.hoveredWorldIndex = -1; // L: 1079
-			if (class337.worldSelectBackSprites != null) { // L: 1080
-				var3 = 88; // L: 1081
-				byte var37 = 19; // L: 1082
-				var41 = 765 / (var3 + 1) - 1; // L: 1083
-				var26 = 480 / (var37 + 1); // L: 1084
-
-				int var35;
-				do {
-					var25 = var26; // L: 1086
-					var35 = var41; // L: 1087
-					if (var26 * (var41 - 1) >= World.World_count) { // L: 1088
-						--var41;
-					}
-
-					if (var41 * (var26 - 1) >= World.World_count) { // L: 1089
-						--var26;
-					}
-
-					if (var41 * (var26 - 1) >= World.World_count) { // L: 1090
-						--var26;
-					}
-				} while(var26 != var25 || var41 != var35); // L: 1091
-
-				var25 = (765 - var41 * var3) / (var41 + 1); // L: 1093
-				if (var25 > 5) { // L: 1094
-					var25 = 5;
-				}
-
-				var35 = (480 - var37 * var26) / (var26 + 1); // L: 1095
-				if (var35 > 5) { // L: 1096
-					var35 = 5;
-				}
-
-				int var36 = (765 - var41 * var3 - var25 * (var41 - 1)) / 2; // L: 1097
-				int var38 = (480 - var37 * var26 - var35 * (var26 - 1)) / 2; // L: 1098
-				int var29 = (var26 + World.World_count - 1) / var26; // L: 1099
-				Login.worldSelectPagesCount = var29 - var41; // L: 1100
-				if (class19.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1101
-					class19.worldSelectLeftSprite.drawAt(8, ReflectionCheck.canvasHeight / 2 - class19.worldSelectLeftSprite.subHeight / 2); // L: 1102
-				}
-
-				if (WorldMapID.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1104
-					WorldMapID.worldSelectRightSprite.drawAt(class32.canvasWidth - WorldMapID.worldSelectRightSprite.subWidth - 8, ReflectionCheck.canvasHeight / 2 - WorldMapID.worldSelectRightSprite.subHeight / 2); // L: 1105
-				}
-
-				var12 = var38 + 23; // L: 1107
-				int var39 = var36 + Login.xPadding; // L: 1108
-				int var14 = 0; // L: 1109
-				boolean var15 = false; // L: 1110
-				int var16 = Login.worldSelectPage; // L: 1111
-
-				int var17;
-				for (var17 = var16 * var26; var17 < World.World_count && var16 - Login.worldSelectPage < var41; ++var17) { // L: 1112 1113
-					World var18 = Tiles.World_worlds[var17]; // L: 1116
-					boolean var19 = true; // L: 1117
-					String var20 = Integer.toString(var18.population); // L: 1118
-					if (var18.population == -1) { // L: 1119
-						var20 = "OFF"; // L: 1120
-						var19 = false; // L: 1121
-					} else if (var18.population > 1980) { // L: 1123
-						var20 = "FULL"; // L: 1124
-						var19 = false; // L: 1125
-					}
-
-					int var22 = 0; // L: 1128
-					byte var21;
-					if (var18.isBeta()) { // L: 1129
-						if (var18.isMembersOnly()) { // L: 1130
-							var21 = 7;
-						} else {
-							var21 = 6; // L: 1131
-						}
-					} else if (var18.isDeadman()) { // L: 1133
-						var22 = 16711680; // L: 1134
-						if (var18.isMembersOnly()) { // L: 1135
-							var21 = 5;
-						} else {
-							var21 = 4; // L: 1136
-						}
-					} else if (var18.method1643()) { // L: 1138
-						if (var18.isMembersOnly()) { // L: 1139
-							var21 = 9;
-						} else {
-							var21 = 8; // L: 1140
-						}
-					} else if (var18.isPvp()) { // L: 1142
-						if (var18.isMembersOnly()) { // L: 1143
-							var21 = 3;
-						} else {
-							var21 = 2; // L: 1144
-						}
-					} else if (var18.isMembersOnly()) { // L: 1147
-						var21 = 1;
-					} else {
-						var21 = 0; // L: 1148
-					}
-
-					if (MouseHandler.MouseHandler_x >= var39 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var3 + var39 && MouseHandler.MouseHandler_y < var37 + var12 && var19) { // L: 1150
-						Login.hoveredWorldIndex = var17; // L: 1151
-						class337.worldSelectBackSprites[var21].drawTransOverlayAt(var39, var12, 128, 16777215); // L: 1152
-						var15 = true; // L: 1153
-					} else {
-						class337.worldSelectBackSprites[var21].drawAt(var39, var12); // L: 1155
-					}
-
-					if (class25.worldSelectFlagSprites != null) { // L: 1156
-						class25.worldSelectFlagSprites[(var18.isMembersOnly() ? 8 : 0) + var18.location].drawAt(var39 + 29, var12);
-					}
-
-					var0.drawCentered(Integer.toString(var18.id), var39 + 15, var37 / 2 + var12 + 5, var22, -1); // L: 1157
-					var1.drawCentered(var20, var39 + 60, var37 / 2 + var12 + 5, 268435455, -1); // L: 1158
-					var12 = var12 + var37 + var35; // L: 1159
-					++var14; // L: 1160
-					if (var14 >= var26) {
-						var12 = var38 + 23; // L: 1161
-						var39 = var39 + var3 + var25; // L: 1162
-						var14 = 0; // L: 1163
-						++var16; // L: 1164
-					}
-				}
-
-				if (var15) { // L: 1167
-					var17 = var1.stringWidth(Tiles.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1168
-					int var30 = var1.ascent + 8; // L: 1169
-					int var40 = MouseHandler.MouseHandler_y + 25; // L: 1170
-					if (var40 + var30 > 480) { // L: 1171
-						var40 = MouseHandler.MouseHandler_y - 25 - var30; // L: 1172
-					}
-
-					Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var40, var17, var30, 16777120); // L: 1174
-					Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var40, var17, var30, 0); // L: 1175
-					var1.drawCentered(Tiles.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var40 + var1.ascent + 4, 0, -1); // L: 1176
-				}
-			}
-
-			class26.rasterProvider.drawFull(0, 0); // L: 1179
-		} else {
-			Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1183
-			class20.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1184
-			Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1185
-			if (Client.gameState == 0 || Client.gameState == 5) { // L: 1186
-				var3 = 20; // L: 1187
-				var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1188
-				var4 = 253 - var3; // L: 1189
-				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1190
-				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1191
-				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1192
-				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1193
-				var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1194
-			}
-
-			String var5;
-			String var6;
-			short var31;
-			short var33;
-			if (Client.gameState == 20) { // L: 1196
-				class260.titleboxSprite.drawAt(Login.loginBoxX + 180 - class260.titleboxSprite.subWidth / 2, 271 - class260.titleboxSprite.subHeight / 2); // L: 1197
-				var31 = 201; // L: 1198
-				var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1199
-				var32 = var31 + 15; // L: 1200
-				var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1201
-				var32 += 15; // L: 1202
-				var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1203
-				var32 += 15; // L: 1204
-				var32 += 7; // L: 1205
-				if (Login.loginIndex != 4) { // L: 1206
-					var0.draw("Login: ", Login.loginBoxX + 180 - 110, var32, 16777215, 0); // L: 1207
-					var33 = 200; // L: 1208
-					var5 = ObjectComposition.clientPreferences.hideUsername ? class6.method67(Login.Login_username) : Login.Login_username; // L: 1211
-
-					for (var6 = var5; var0.stringWidth(var6) > var33; var6 = var6.substring(0, var6.length() - 1)) { // L: 1213 1214 1215
-					}
-
-					var0.draw(AbstractFont.escapeBrackets(var6), Login.loginBoxX + 180 - 70, var32, 16777215, 0); // L: 1217
-					var32 += 15; // L: 1218
-
-					String var7;
-					for (var7 = class6.method67(Login.Login_password); var0.stringWidth(var7) > var33; var7 = var7.substring(1)) { // L: 1219 1220 1221
-					}
-
-					var0.draw("Password: " + var7, Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1223
-					var32 += 15; // L: 1224
-				}
-			}
-
-			if (Client.gameState == 10 || Client.gameState == 11) { // L: 1227
-				class260.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1228
-				short var23;
-				if (Login.loginIndex == 0) { // L: 1229
-					var31 = 251; // L: 1230
-					var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1231
-					var32 = var31 + 30; // L: 1232
-					var4 = Login.loginBoxX + 180 - 80; // L: 1233
-					var23 = 291; // L: 1234
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1235
-					var0.drawLines("New User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1236
-					var4 = Login.loginBoxX + 180 + 80; // L: 1237
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1238
-					var0.drawLines("Existing User", var4 - 73, var23 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1239
-				} else if (Login.loginIndex == 1) { // L: 1241
-					var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1242
-					var31 = 236; // L: 1243
-					var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1244
-					var32 = var31 + 15; // L: 1245
-					var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1246
-					var32 += 15; // L: 1247
-					var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1248
-					var32 += 15; // L: 1249
-					var4 = Login.loginBoxX + 180 - 80; // L: 1250
-					var23 = 321; // L: 1251
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1252
-					var0.drawCentered("Continue", var4, var23 + 5, 16777215, 0); // L: 1253
-					var4 = Login.loginBoxX + 180 + 80; // L: 1254
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1255
-					var0.drawCentered("Cancel", var4, var23 + 5, 16777215, 0); // L: 1256
-				} else if (Login.loginIndex == 2) { // L: 1258
-					var31 = 201; // L: 1259
-					var0.drawCentered(Login.Login_response1, UserComparator4.loginBoxCenter, var31, 16776960, 0); // L: 1260
-					var32 = var31 + 15; // L: 1261
-					var0.drawCentered(Login.Login_response2, UserComparator4.loginBoxCenter, var32, 16776960, 0); // L: 1262
-					var32 += 15; // L: 1263
-					var0.drawCentered(Login.Login_response3, UserComparator4.loginBoxCenter, var32, 16776960, 0); // L: 1264
-					var32 += 15; // L: 1265
-					var32 += 7; // L: 1266
-					var0.draw("Login: ", UserComparator4.loginBoxCenter - 110, var32, 16777215, 0); // L: 1267
-					var33 = 200; // L: 1268
-
-					for (var5 = ScriptEvent.method2086(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1269 1270 1271
-					}
-
-					var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), UserComparator4.loginBoxCenter - 70, var32, 16777215, 0); // L: 1273
-					var32 += 15; // L: 1274
-
-					for (var6 = class6.method67(Login.Login_password); var0.stringWidth(var6) > var33; var6 = var6.substring(1)) { // L: 1275 1276 1277
-					}
-
-					var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), UserComparator4.loginBoxCenter - 108, var32, 16777215, 0); // L: 1279
-					var32 += 15; // L: 1280
-					var31 = 277; // L: 1281
-					var25 = UserComparator4.loginBoxCenter + -117; // L: 1282
-					boolean var9 = Client.Login_isUsernameRemembered; // L: 1284
-					boolean var10 = Login.field1041; // L: 1285
-					IndexedSprite var27 = var9 ? (var10 ? ClanChannel.field33 : GrandExchangeOffer.options_buttons_2Sprite) : (var10 ? Decimator.field553 : options_buttons_0Sprite); // L: 1287
-					var27.drawAt(var25, var31); // L: 1290
-					var25 = var25 + var27.subWidth + 5; // L: 1291
-					var1.draw("Remember username", var25, var31 + 13, 16776960, 0); // L: 1292
-					var25 = UserComparator4.loginBoxCenter + 24; // L: 1293
-					IndexedSprite var11 = Script.method1995(ObjectComposition.clientPreferences.hideUsername, Login.field1047); // L: 1294
-					var11.drawAt(var25, var31); // L: 1295
-					var25 = var25 + var11.subWidth + 5; // L: 1296
-					var1.draw("Hide username", var25, var31 + 13, 16776960, 0); // L: 1297
-					var32 = var31 + 15; // L: 1298
-					var12 = UserComparator4.loginBoxCenter - 80; // L: 1299
-					short var13 = 321; // L: 1300
-					Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1301
-					var0.drawCentered("Login", var12, var13 + 5, 16777215, 0); // L: 1302
-					var12 = UserComparator4.loginBoxCenter + 80; // L: 1303
-					Login.titlebuttonSprite.drawAt(var12 - 73, var13 - 20); // L: 1304
-					var0.drawCentered("Cancel", var12, var13 + 5, 16777215, 0); // L: 1305
-					var31 = 357; // L: 1306
-					switch(Login.field1039) { // L: 1307
-					case 2:
-						MusicPatchPcmStream.field2885 = "Having trouble logging in?"; // L: 1312
-						break;
-					default:
-						MusicPatchPcmStream.field2885 = "Can't login? Click here."; // L: 1309
-					}
-
-					DynamicObject.field1107 = new Bounds(UserComparator4.loginBoxCenter, var31, var1.stringWidth(MusicPatchPcmStream.field2885), 11); // L: 1315
-					GrandExchangeOfferOwnWorldComparator.field631 = new Bounds(UserComparator4.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1316
-					var1.drawCentered(MusicPatchPcmStream.field2885, UserComparator4.loginBoxCenter, var31, 16777215, 0); // L: 1317
-				} else if (Login.loginIndex == 3) { // L: 1319
-					var31 = 201; // L: 1320
-					var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1321
-					var32 = var31 + 20; // L: 1322
-					var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1323
-					var32 += 15; // L: 1324
-					var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1325
-					var32 += 15; // L: 1326
-					var4 = Login.loginBoxX + 180; // L: 1327
-					var23 = 276; // L: 1328
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1329
-					var2.drawCentered("Try again", var4, var23 + 5, 16777215, 0); // L: 1330
-					var4 = Login.loginBoxX + 180; // L: 1331
-					var23 = 326; // L: 1332
-					Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1333
-					var2.drawCentered("Forgotten password?", var4, var23 + 5, 16777215, 0); // L: 1334
-				} else {
-					short var8;
-					if (Login.loginIndex == 4) { // L: 1336
-						var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1337
-						var31 = 236; // L: 1338
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1339
-						var32 = var31 + 15; // L: 1340
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1341
-						var32 += 15; // L: 1342
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1343
-						var32 += 15; // L: 1344
-						var0.draw("PIN: " + class6.method67(Varps.otp) + (Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var32, 16777215, 0); // L: 1345
-						var32 -= 8; // L: 1346
-						var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1347
-						var32 += 15; // L: 1348
-						var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var32, 16776960, 0); // L: 1349
-						var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1350
-						var41 = var32 - var0.ascent; // L: 1351
-						IndexedSprite var34;
-						if (Login.field1043) { // L: 1353
-							var34 = GrandExchangeOffer.options_buttons_2Sprite; // L: 1354
-						} else {
-							var34 = options_buttons_0Sprite; // L: 1357
-						}
-
-						var34.drawAt(var4, var41); // L: 1359
-						var32 += 15; // L: 1360
-						var25 = Login.loginBoxX + 180 - 80; // L: 1361
-						var8 = 321; // L: 1362
-						Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1363
-						var0.drawCentered("Continue", var25, var8 + 5, 16777215, 0); // L: 1364
-						var25 = Login.loginBoxX + 180 + 80; // L: 1365
-						Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1366
-						var0.drawCentered("Cancel", var25, var8 + 5, 16777215, 0); // L: 1367
-						var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1368
-					} else if (Login.loginIndex == 5) { // L: 1370
-						var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1371
-						var31 = 221; // L: 1372
-						var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1373
-						var32 = var31 + 15; // L: 1374
-						var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1375
-						var32 += 15; // L: 1376
-						var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1377
-						var32 += 15; // L: 1378
-						var32 += 14; // L: 1379
-						var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var32, 16777215, 0); // L: 1380
-						var33 = 174; // L: 1381
-
-						for (var5 = ScriptEvent.method2086(); var0.stringWidth(var5) > var33; var5 = var5.substring(1)) { // L: 1382 1383 1384
-						}
-
-						var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? class44.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var32, 16777215, 0); // L: 1386
-						var32 += 15; // L: 1387
-						var26 = Login.loginBoxX + 180 - 80; // L: 1388
-						short var45 = 321; // L: 1389
-						Login.titlebuttonSprite.drawAt(var26 - 73, var45 - 20); // L: 1390
-						var0.drawCentered("Recover", var26, var45 + 5, 16777215, 0); // L: 1391
-						var26 = Login.loginBoxX + 180 + 80; // L: 1392
-						Login.titlebuttonSprite.drawAt(var26 - 73, var45 - 20); // L: 1393
-						var0.drawCentered("Back", var26, var45 + 5, 16777215, 0); // L: 1394
-						var45 = 356; // L: 1395
-						var1.drawCentered("Still having trouble logging in?", UserComparator4.loginBoxCenter, var45, 268435455, 0); // L: 1396
-					} else if (Login.loginIndex == 6) { // L: 1398
-						var31 = 201; // L: 1399
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1400
-						var32 = var31 + 15; // L: 1401
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1402
-						var32 += 15; // L: 1403
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1404
-						var32 += 15; // L: 1405
-						var4 = Login.loginBoxX + 180; // L: 1406
-						var23 = 321; // L: 1407
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1408
-						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1409
-					} else if (Login.loginIndex == 7) { // L: 1411
-						var31 = 216; // L: 1412
-						var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1413
-						var32 = var31 + 15; // L: 1414
-						var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1415
-						var32 += 15; // L: 1416
-						var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1417
-						var32 += 15; // L: 1418
-						var4 = Login.loginBoxX + 180 - 80; // L: 1419
-						var23 = 321; // L: 1420
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1421
-						var0.drawCentered("Set Date of Birth", var4, var23 + 5, 16777215, 0); // L: 1422
-						var4 = Login.loginBoxX + 180 + 80; // L: 1423
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1424
-						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1425
-					} else if (Login.loginIndex == 8) { // L: 1427
-						var31 = 216; // L: 1428
-						var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var31, 16776960, 0); // L: 1429
-						var32 = var31 + 15; // L: 1430
-						var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1431
-						var32 += 15; // L: 1432
-						var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var32, 16776960, 0); // L: 1433
-						var32 += 15; // L: 1434
-						var4 = Login.loginBoxX + 180 - 80; // L: 1435
-						var23 = 321; // L: 1436
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1437
-						var0.drawCentered("Privacy Policy", var4, var23 + 5, 16777215, 0); // L: 1438
-						var4 = Login.loginBoxX + 180 + 80; // L: 1439
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1440
-						var0.drawCentered("Back", var4, var23 + 5, 16777215, 0); // L: 1441
-					} else if (Login.loginIndex == 12) { // L: 1443
-						var31 = 201; // L: 1444
-						String var24 = ""; // L: 1445
-						var5 = ""; // L: 1446
-						var6 = ""; // L: 1447
-						switch(Login.field1032) { // L: 1448
-						case 0:
-							var24 = "Your account has been disabled."; // L: 1463
-							var5 = Strings.field3306; // L: 1464
-							var6 = ""; // L: 1465
-							break;
-						case 1:
-							var24 = "Account locked as we suspect it has been stolen."; // L: 1451
-							var5 = Strings.field3327; // L: 1452
-							var6 = ""; // L: 1453
-							break;
-						default:
-							ClanChannelMember.Login_promptCredentials(false); // L: 1458
-						}
-
-						var0.drawCentered(var24, Login.loginBoxX + 180, var31, 16776960, 0); // L: 1469
-						var32 = var31 + 15; // L: 1470
-						var2.drawCentered(var5, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1471
-						var32 += 15; // L: 1472
-						var2.drawCentered(var6, Login.loginBoxX + 180, var32, 16776960, 0); // L: 1473
-						var32 += 15; // L: 1474
-						var25 = Login.loginBoxX + 180; // L: 1475
-						var8 = 276; // L: 1476
-						Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1477
-						var0.drawCentered("Support Page", var25, var8 + 5, 16777215, 0); // L: 1478
-						var25 = Login.loginBoxX + 180; // L: 1479
-						var8 = 326; // L: 1480
-						Login.titlebuttonSprite.drawAt(var25 - 73, var8 - 20); // L: 1481
-						var0.drawCentered("Back", var25, var8 + 5, 16777215, 0); // L: 1482
-					} else if (Login.loginIndex == 24) { // L: 1484
-						var31 = 221; // L: 1485
-						var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var31, 16777215, 0); // L: 1486
-						var32 = var31 + 15; // L: 1487
-						var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1488
-						var32 += 15; // L: 1489
-						var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var32, 16777215, 0); // L: 1490
-						var32 += 15; // L: 1491
-						var4 = Login.loginBoxX + 180; // L: 1492
-						var23 = 301; // L: 1493
-						Login.titlebuttonSprite.drawAt(var4 - 73, var23 - 20); // L: 1494
-						var0.drawCentered("Ok", var4, var23 + 5, 16777215, 0); // L: 1495
-					}
-				}
-			}
-
-			if (Client.gameState >= 10) { // L: 1498
-				int[] var28 = new int[4]; // L: 1499
-				Rasterizer2D.Rasterizer2D_getClipArray(var28); // L: 1500
-				Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, ReflectionCheck.canvasHeight); // L: 1501
-				class24.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1502
-				class24.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1503
-				Rasterizer2D.Rasterizer2D_setClipArray(var28); // L: 1504
-			}
-
-			Decimator.title_muteSprite[ObjectComposition.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1506
-			if (Client.gameState > 5 && Language.Language_EN == class378.clientLanguage) { // L: 1507
-				if (class69.field597 != null) { // L: 1508
-					var32 = Login.xPadding + 5; // L: 1509
-					var33 = 463; // L: 1510
-					byte var43 = 100; // L: 1511
-					byte var44 = 35; // L: 1512
-					class69.field597.drawAt(var32, var33); // L: 1513
-					var0.drawCentered("World" + " " + Client.worldId, var43 / 2 + var32, var44 / 2 + var33 - 2, 16777215, 0); // L: 1514
-					if (MilliClock.World_request != null) { // L: 1515
-						var1.drawCentered("Loading...", var43 / 2 + var32, var44 / 2 + var33 + 12, 16777215, 0);
-					} else {
-						var1.drawCentered("Click to switch", var43 / 2 + var32, var44 / 2 + var33 + 12, 16777215, 0); // L: 1516
-					}
-				} else {
-					class69.field597 = EnumComposition.SpriteBuffer_getIndexedSpriteByName(GrandExchangeOfferAgeComparator.archive8, "sl_button", ""); // L: 1519
-				}
-			}
-
 		}
-	} // L: 1181 1522
+	} // L: 233
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "79"
+	)
+	@Export("removeIgnore")
+	final void removeIgnore(String var1) {
+		if (var1 != null) { // L: 236
+			Username var2 = new Username(var1, this.loginType); // L: 237
+			if (var2.hasCleanName()) { // L: 238
+				if (this.ignoreList.removeByUsername(var2)) { // L: 239
+					Coord.method4801(); // L: 240
+					PacketBufferNode var3 = InterfaceParent.getPacketBufferNode(ClientPacket.field2587, Client.packetWriter.isaacCipher); // L: 242
+					var3.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var1)); // L: 243
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 244
+					Client.packetWriter.addNode(var3); // L: 245
+				}
+
+				World.FriendSystem_invalidateIgnoreds(); // L: 247
+			}
+		}
+	} // L: 248
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(Llc;I)Z",
+		garbageValue = "1657999347"
+	)
+	@Export("isFriendAndHasWorld")
+	final boolean isFriendAndHasWorld(Username var1) {
+		Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 260
+		return var2 != null && var2.hasWorld(); // L: 261
+	}
+
+	@ObfuscatedName("hz")
+	@ObfuscatedSignature(
+		descriptor = "(Lcr;I)V",
+		garbageValue = "702642598"
+	)
+	static final void method1875(PendingSpawn var0) {
+		long var1 = 0L; // L: 7331
+		int var3 = -1; // L: 7332
+		int var4 = 0; // L: 7333
+		int var5 = 0; // L: 7334
+		if (var0.type == 0) { // L: 7335
+			var1 = DevicePcmPlayerProvider.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 1) { // L: 7336
+			var1 = DevicePcmPlayerProvider.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 2) { // L: 7337
+			var1 = DevicePcmPlayerProvider.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var0.type == 3) { // L: 7338
+			var1 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
+		}
+
+		if (var1 != 0L) { // L: 7339
+			int var6 = DevicePcmPlayerProvider.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7340
+			var3 = Message.Entity_unpackID(var1); // L: 7341
+			var4 = var6 & 31; // L: 7342
+			var5 = var6 >> 6 & 3; // L: 7343
+		}
+
+		var0.objectId = var3; // L: 7345
+		var0.field1210 = var4; // L: 7346
+		var0.field1209 = var5; // L: 7347
+	} // L: 7348
+
+	@ObfuscatedName("kl")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)Lci;",
+		garbageValue = "-81"
+	)
+	static final InterfaceParent method1867(int var0, int var1, int var2) {
+		InterfaceParent var3 = new InterfaceParent(); // L: 11254
+		var3.group = var1; // L: 11255
+		var3.type = var2; // L: 11256
+		Client.interfaceParents.put(var3, (long)var0); // L: 11257
+		TextureProvider.Widget_resetModelFrames(var1); // L: 11258
+		Widget var4 = WorldMapData_1.getWidget(var0); // L: 11259
+		Script.invalidateWidget(var4); // L: 11260
+		if (Client.meslayerContinueWidget != null) { // L: 11261
+			Script.invalidateWidget(Client.meslayerContinueWidget); // L: 11262
+			Client.meslayerContinueWidget = null; // L: 11263
+		}
+
+		WorldMapScaleHandler.method3856(); // L: 11265
+		WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11266
+		ScriptFrame.runWidgetOnLoadListener(var1); // L: 11267
+		if (Client.rootInterface != -1) { // L: 11268
+			class8.runIntfCloseListeners(Client.rootInterface, 1);
+		}
+
+		return var3; // L: 11269
+	}
 }
diff --git a/runescape-client/src/main/java/FriendsChat.java b/runescape-client/src/main/java/FriendsChat.java
index 543902a3db..9bf0cf1da3 100644
--- a/runescape-client/src/main/java/FriendsChat.java
+++ b/runescape-client/src/main/java/FriendsChat.java
@@ -1,229 +1,347 @@
+import java.io.DataInputStream;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lt")
+@ObfuscatedName("lj")
 @Implements("FriendsChat")
 public class FriendsChat extends UserList {
-	@ObfuscatedName("n")
+	@ObfuscatedName("rh")
+	@ObfuscatedGetter(
+		intValue = 1112314023
+	)
+	static int field3815;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Llc;"
+		descriptor = "Llz;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
 	@ObfuscatedName("y")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -78473377
+		intValue = 1281242043
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1952190137
+		intValue = -2021937321
 	)
-	int field3817;
+	int field3821;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnc;Llc;)V"
+		descriptor = "(Lnb;Llz;)V"
 	)
 	public FriendsChat(LoginType var1, Usernamed var2) {
 		super(100); // L: 18
 		this.name = null; // L: 11
 		this.owner = null; // L: 12
-		this.field3817 = 1; // L: 15
+		this.field3821 = 1; // L: 15
 		this.loginType = var1; // L: 19
 		this.localUser = var2; // L: 20
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llx;",
-		garbageValue = "126"
+		descriptor = "(I)Llf;",
+		garbageValue = "1590299985"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate(); // L: 24
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llx;",
-		garbageValue = "1924184817"
+		descriptor = "(II)[Llf;",
+		garbageValue = "-1320557093"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1]; // L: 28
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-11"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "370345592"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = WorldMapSection0.method3589(var1); // L: 32
-	} // L: 33
+		long var5 = 0L;
+		int var7 = var1.length();
 
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "-412609184"
-	)
-	@Export("setOwner")
-	final void setOwner(String var1) {
-		this.owner = WorldMapSection0.method3589(var1); // L: 36
-	} // L: 37
+		for (int var8 = 0; var8 < var7; ++var8) { // L: 38
+			var5 *= 37L;
+			char var9 = var1.charAt(var8);
+			if (var9 >= 'A' && var9 <= 'Z') {
+				var5 += (long)(var9 + 1 - 65);
+			} else if (var9 >= 'a' && var9 <= 'z') {
+				var5 += (long)(var9 + 1 - 97);
+			} else if (var9 >= '0' && var9 <= '9') {
+				var5 += (long)(var9 + 27 - 48);
+			}
+
+			if (var5 >= 177917621779460413L) {
+				break;
+			}
+		}
+
+		while (0L == var5 % 37L && var5 != 0L) {
+			var5 /= 37L;
+		}
+
+		String var10 = class80.base37DecodeLong(var5); // L: 49
+		if (var10 == null) {
+			var10 = "";
+		}
+
+		this.name = var10; // L: 53
+	} // L: 54
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281712604"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "919584410"
+	)
+	@Export("setOwner")
+	final void setOwner(String var1) {
+		long var5 = 0L; // L: 61
+		int var7 = var1.length(); // L: 62
+
+		for (int var8 = 0; var8 < var7; ++var8) { // L: 63
+			var5 *= 37L; // L: 64
+			char var9 = var1.charAt(var8); // L: 65
+			if (var9 >= 'A' && var9 <= 'Z') { // L: 66
+				var5 += (long)(var9 + 1 - 65);
+			} else if (var9 >= 'a' && var9 <= 'z') { // L: 67
+				var5 += (long)(var9 + 1 - 97);
+			} else if (var9 >= '0' && var9 <= '9') {
+				var5 += (long)(var9 + 27 - 48); // L: 68
+			}
+
+			if (var5 >= 177917621779460413L) { // L: 69
+				break;
+			}
+		}
+
+		while (0L == var5 % 37L && 0L != var5) { // L: 71
+			var5 /= 37L;
+		}
+
+		String var10 = class80.base37DecodeLong(var5); // L: 74
+		if (var10 == null) { // L: 75
+			var10 = "";
+		}
+
+		this.owner = var10; // L: 78
+	} // L: 79
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1598769296"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
-		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 40
-		long var2 = var1.readLong(); // L: 41
-		long var5 = var2; // L: 43
+		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82
+		long var2 = var1.readLong(); // L: 83
+		long var5 = var2; // L: 85
 		String var4;
 		int var7;
-		if (var2 > 0L && var2 < 6582952005840035281L) { // L: 45
-			if (0L == var2 % 37L) { // L: 49
-				var4 = null; // L: 50
+		if (var2 > 0L && var2 < 6582952005840035281L) { // L: 87
+			if (0L == var2 % 37L) { // L: 91
+				var4 = null; // L: 92
 			} else {
-				var7 = 0; // L: 53
+				var7 = 0; // L: 95
 
-				for (long var8 = var2; var8 != 0L; var8 /= 37L) { // L: 54 55 57
-					++var7; // L: 56
+				for (long var8 = var2; 0L != var8; var8 /= 37L) { // L: 96 97 99
+					++var7; // L: 98
 				}
 
-				StringBuilder var10 = new StringBuilder(var7); // L: 59
+				StringBuilder var10 = new StringBuilder(var7); // L: 101
 
-				while (0L != var5) { // L: 60
-					long var11 = var5; // L: 61
-					var5 /= 37L; // L: 62
-					var10.append(class305.base37Table[(int)(var11 - var5 * 37L)]); // L: 63
+				while (var5 != 0L) { // L: 102
+					long var11 = var5; // L: 103
+					var5 /= 37L; // L: 104
+					var10.append(class306.base37Table[(int)(var11 - 37L * var5)]); // L: 105
 				}
 
-				var4 = var10.reverse().toString(); // L: 65
+				var4 = var10.reverse().toString(); // L: 107
 			}
 		} else {
-			var4 = null; // L: 46
+			var4 = null; // L: 88
 		}
 
-		this.readName(var4); // L: 67
-		this.minKick = var1.readByte(); // L: 68
-		var7 = var1.readUnsignedByte(); // L: 69
-		if (var7 != 255) { // L: 70
-			this.clear(); // L: 71
+		this.readName(var4); // L: 109
+		this.minKick = var1.readByte(); // L: 110
+		var7 = var1.readUnsignedByte(); // L: 111
+		if (var7 != 255) { // L: 112
+			this.clear(); // L: 113
 
-			for (int var13 = 0; var13 < var7; ++var13) { // L: 72
-				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 73
-				int var14 = var1.readUnsignedShort(); // L: 74
-				var9.set(var14, ++this.field3817 - 1); // L: 75
-				var9.rank = var1.readByte(); // L: 76
-				var1.readStringCp1252NullTerminated(); // L: 77
-				this.isLocalPlayer(var9); // L: 78
+			for (int var13 = 0; var13 < var7; ++var13) { // L: 114
+				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 115
+				int var14 = var1.readUnsignedShort(); // L: 116
+				var9.set(var14, ++this.field3821 - 1); // L: 117
+				var9.rank = var1.readByte(); // L: 118
+				var1.readStringCp1252NullTerminated(); // L: 119
+				this.isLocalPlayer(var9); // L: 120
 			}
 
 		}
-	} // L: 80
+	} // L: 122
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "817545734"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1315927757"
 	)
-	public final void method5659(Buffer var1) {
-		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 83
-		int var3 = var1.readUnsignedShort(); // L: 84
-		byte var4 = var1.readByte(); // L: 85
-		boolean var5 = false; // L: 86
-		if (var4 == -128) { // L: 87
+	public final void method5751(Buffer var1) {
+		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 125
+		int var3 = var1.readUnsignedShort(); // L: 126
+		byte var4 = var1.readByte(); // L: 127
+		boolean var5 = false; // L: 128
+		if (var4 == -128) { // L: 129
 			var5 = true;
 		}
 
 		ClanMate var6;
-		if (var5) { // L: 88
-			if (this.getSize() == 0) { // L: 89
+		if (var5) { // L: 130
+			if (this.getSize() == 0) { // L: 131
 				return;
 			}
 
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 90
-			if (var6 != null && var6.getWorld() == var3) { // L: 91
-				this.remove(var6); // L: 92
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 132
+			if (var6 != null && var6.getWorld() == var3) { // L: 133
+				this.remove(var6); // L: 134
 			}
 		} else {
-			var1.readStringCp1252NullTerminated(); // L: 96
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 97
-			if (var6 == null) { // L: 98
-				if (this.getSize() > super.capacity) { // L: 99
+			var1.readStringCp1252NullTerminated(); // L: 138
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 139
+			if (var6 == null) { // L: 140
+				if (this.getSize() > super.capacity) { // L: 141
 					return;
 				}
 
-				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 100
+				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 142
 			}
 
-			var6.set(var3, ++this.field3817 - 1); // L: 102
-			var6.rank = var4; // L: 103
-			this.isLocalPlayer(var6); // L: 104
+			var6.set(var3, ++this.field3821 - 1); // L: 144
+			var6.rank = var4; // L: 145
+			this.isLocalPlayer(var6); // L: 146
 		}
 
-	} // L: 106
+	} // L: 148
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "308669829"
+		descriptor = "(B)V",
+		garbageValue = "-41"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 109
-			((ClanMate)this.get(var1)).clearIsFriend(); // L: 110
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 151
+			((ClanMate)this.get(var1)).clearIsFriend(); // L: 152
 		}
 
-	} // L: 112
+	} // L: 154
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1091935656"
+		garbageValue = "24878188"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 115
-			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 116
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 157
+			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 158
 		}
 
-	} // L: 118
+	} // L: 160
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Lll;I)V",
-		garbageValue = "-263854446"
+		descriptor = "(Llt;I)V",
+		garbageValue = "1528059933"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
-		if (var1.getUsername().equals(this.localUser.username())) { // L: 121
+		if (var1.getUsername().equals(this.localUser.username())) { // L: 163
 			this.rank = var1.rank;
 		}
 
-	} // L: 122
+	} // L: 164
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V",
+		garbageValue = "1551905858"
+	)
+	@Export("RunException_sendStackTrace")
+	public static void RunException_sendStackTrace(String var0, Throwable var1) {
+		if (var1 != null) {
+			var1.printStackTrace();
+		} else {
+			try {
+				String var2 = ""; // L: 33
+				if (var1 != null) { // L: 34
+					var2 = GrandExchangeOfferNameComparator.method5193(var1);
+				}
+
+				if (var0 != null) { // L: 35
+					if (var1 != null) { // L: 36
+						var2 = var2 + " | ";
+					}
+
+					var2 = var2 + var0; // L: 37
+				}
+
+				System.out.println("Error: " + var2); // L: 39
+				var2 = var2.replace(':', '.'); // L: 40
+				var2 = var2.replace('@', '_'); // L: 41
+				var2 = var2.replace('&', '_'); // L: 42
+				var2 = var2.replace('#', '_'); // L: 43
+				if (RunException.RunException_applet == null) { // L: 44
+					return;
+				}
+
+				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + Login.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + GZipDecompressor.clientType + "&e=" + var2); // L: 45
+				DataInputStream var4 = new DataInputStream(var3.openStream()); // L: 46
+				var4.read(); // L: 47
+				var4.close(); // L: 48
+			} catch (Exception var5) { // L: 50
+			}
+
+		}
+	} // L: 51
+
+	@ObfuscatedName("lk")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "3"
+	)
+	static void method5760() {
+		if (Client.oculusOrbState == 1) { // L: 11678
+			Client.field705 = true; // L: 11679
+		}
+
+	} // L: 11681
 }
diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java
index 86e34a9c5a..f7d2fcb696 100644
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/runescape-client/src/main/java/FriendsList.java
@@ -3,68 +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("lb")
+@ObfuscatedName("lo")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("rn")
-	@ObfuscatedGetter(
-		intValue = 993918805
-	)
-	static int field3812;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1152075333
+		intValue = 1954413
 	)
-	int field3808;
-	@ObfuscatedName("p")
+	int field3812;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lkm;"
+		descriptor = "Lkd;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnc;)V"
+		descriptor = "(Lnb;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400); // L: 17
-		this.field3808 = 1; // L: 13
+		this.field3812 = 1; // L: 13
 		this.friendLoginUpdates = new LinkDeque(); // L: 14
 		this.loginType = var1; // L: 18
 	} // L: 19
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llx;",
-		garbageValue = "126"
+		descriptor = "(I)Llf;",
+		garbageValue = "1590299985"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend(); // L: 22
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llx;",
-		garbageValue = "1924184817"
+		descriptor = "(II)[Llf;",
+		garbageValue = "-1320557093"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1]; // L: 26
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;ZB)Z",
-		garbageValue = "112"
+		descriptor = "(Llc;ZB)Z",
+		garbageValue = "0"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -76,10 +70,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "1726713479"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "730412999"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -87,10 +81,10 @@ public class FriendsList extends UserList {
 			if (var1.offset < var2) { // L: 37
 				boolean var3 = var1.readUnsignedByte() == 1; // L: 38
 				Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 39
-				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-				int var6 = var1.readUnsignedShort();
-				int var7 = var1.readUnsignedByte();
-				int var8 = var1.readUnsignedByte();
+				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40
+				int var6 = var1.readUnsignedShort(); // L: 41
+				int var7 = var1.readUnsignedByte(); // L: 42
+				int var8 = var1.readUnsignedByte(); // L: 43
 				boolean var9 = (var8 & 2) != 0; // L: 44
 				boolean var10 = (var8 & 1) != 0; // L: 45
 				if (var6 > 0) { // L: 46
@@ -143,9 +137,9 @@ public class FriendsList extends UserList {
 					}
 
 					if (var6 != var11.world) { // L: 88
-						var11.int2 = ++this.field3808 - 1; // L: 89
+						var11.int2 = ++this.field3812 - 1; // L: 89
 						if (var11.world == -1 && var6 == 0) { // L: 90
-							var11.int2 = -(var11.int2 * -2116718473) * -1023710905;
+							var11.int2 = -(var11.int2 * 1083271825) * -286288271;
 						}
 
 						var11.world = var6; // L: 91
@@ -153,7 +147,7 @@ public class FriendsList extends UserList {
 
 					var11.rank = var7; // L: 93
 					var11.field3824 = var9; // L: 94
-					var11.field3823 = var10; // L: 95
+					var11.field3825 = var10; // L: 95
 					continue; // L: 96
 				}
 
@@ -165,212 +159,51 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("iw")
 	@ObfuscatedSignature(
-		descriptor = "(Lmr;ILjava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "98"
+		descriptor = "(ILjava/lang/String;S)V",
+		garbageValue = "2200"
 	)
-	static String method5650(IterableNodeHashTable var0, int var1, String var2) {
-		if (var0 == null) { // L: 40
-			return var2;
-		} else {
-			ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 41
-			return var3 == null ? var2 : (String)var3.obj; // L: 42 43
-		}
-	}
+	static void method5711(int var0, String var1) {
+		int var2 = Players.Players_count; // L: 8737
+		int[] var3 = Players.Players_indices; // L: 8738
+		boolean var4 = false; // L: 8739
+		Username var5 = new Username(var1, LoginScreenAnimation.loginType); // L: 8740
 
-	@ObfuscatedName("al")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "574138081"
-	)
-	static int method5647(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		if (var0 == ScriptOpcodes.ADD) { // L: 2751
-			class44.Interpreter_intStackSize -= 2; // L: 2752
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2753
-			var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2754
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 + var4; // L: 2755
-			return 1; // L: 2756
-		} else if (var0 == ScriptOpcodes.SUB) { // L: 2758
-			class44.Interpreter_intStackSize -= 2; // L: 2759
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2760
-			var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2761
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 - var4; // L: 2762
-			return 1; // L: 2763
-		} else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2765
-			class44.Interpreter_intStackSize -= 2; // L: 2766
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2767
-			var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2768
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4 * var3; // L: 2769
-			return 1; // L: 2770
-		} else if (var0 == ScriptOpcodes.DIV) { // L: 2772
-			class44.Interpreter_intStackSize -= 2; // L: 2773
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2774
-			var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2775
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 / var4; // L: 2776
-			return 1; // L: 2777
-		} else if (var0 == ScriptOpcodes.RANDOM) { // L: 2779
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2780
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2781
-			return 1; // L: 2782
-		} else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2784
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2785
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2786
-			return 1; // L: 2787
-		} else {
-			int var5;
-			int var6;
-			int var7;
-			if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2789
-				class44.Interpreter_intStackSize -= 5; // L: 2790
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2791
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2792
-				var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2793
-				var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 2794
-				var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 4]; // L: 2795
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5); // L: 2796
-				return 1; // L: 2797
-			} else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2799
-				class44.Interpreter_intStackSize -= 2; // L: 2800
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2801
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2802
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; // L: 2803
-				return 1; // L: 2804
-			} else if (var0 == ScriptOpcodes.SETBIT) { // L: 2806
-				class44.Interpreter_intStackSize -= 2; // L: 2807
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2808
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2809
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2810
-				return 1; // L: 2811
-			} else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2813
-				class44.Interpreter_intStackSize -= 2; // L: 2814
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2815
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2816
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2817
-				return 1; // L: 2818
-			} else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2820
-				class44.Interpreter_intStackSize -= 2; // L: 2821
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2822
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2823
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2824
-				return 1; // L: 2825
-			} else if (var0 == ScriptOpcodes.MOD) { // L: 2827
-				class44.Interpreter_intStackSize -= 2; // L: 2828
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2829
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2830
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 % var4; // L: 2831
-				return 1; // L: 2832
-			} else if (var0 == ScriptOpcodes.POW) { // L: 2834
-				class44.Interpreter_intStackSize -= 2; // L: 2835
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2836
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2837
-				if (var3 == 0) { // L: 2838
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0;
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2839
+		for (int var6 = 0; var6 < var2; ++var6) { // L: 8741
+			Player var7 = Client.players[var3[var6]]; // L: 8742
+			if (var7 != null && var7 != class262.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8743
+				PacketBufferNode var8;
+				if (var0 == 1) { // L: 8744
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8746
+					var8.packetBuffer.method6705(var3[var6]); // L: 8747
+					var8.packetBuffer.method6640(0); // L: 8748
+					Client.packetWriter.addNode(var8); // L: 8749
+				} else if (var0 == 4) { // L: 8751
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8753
+					var8.packetBuffer.method6640(0); // L: 8754
+					var8.packetBuffer.method6648(var3[var6]); // L: 8755
+					Client.packetWriter.addNode(var8); // L: 8756
+				} else if (var0 == 6) { // L: 8758
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 8760
+					var8.packetBuffer.method6649(var3[var6]); // L: 8761
+					var8.packetBuffer.method6639(0); // L: 8762
+					Client.packetWriter.addNode(var8); // L: 8763
+				} else if (var0 == 7) { // L: 8765
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 8767
+					var8.packetBuffer.writeByte(0); // L: 8768
+					var8.packetBuffer.method6705(var3[var6]); // L: 8769
+					Client.packetWriter.addNode(var8); // L: 8770
 				}
 
-				return 1; // L: 2840
-			} else if (var0 == ScriptOpcodes.INVPOW) { // L: 2842
-				class44.Interpreter_intStackSize -= 2; // L: 2843
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2844
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2845
-				if (var3 == 0) { // L: 2846
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2847
-					return 1; // L: 2848
-				} else {
-					switch(var4) { // L: 2850
-					case 0:
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2868
-						break; // L: 2869
-					case 1:
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3; // L: 2863
-						break; // L: 2864
-					case 2:
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2878
-						break;
-					case 3:
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2873
-						break; // L: 2874
-					case 4:
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2858
-						break; // L: 2859
-					default:
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2853
-					}
-
-					return 1; // L: 2882
-				}
-			} else if (var0 == ScriptOpcodes.AND) { // L: 2884
-				class44.Interpreter_intStackSize -= 2; // L: 2885
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2886
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2887
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 & var4; // L: 2888
-				return 1; // L: 2889
-			} else if (var0 == ScriptOpcodes.OR) { // L: 2891
-				class44.Interpreter_intStackSize -= 2; // L: 2892
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2893
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2894
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 | var4; // L: 2895
-				return 1; // L: 2896
-			} else if (var0 == ScriptOpcodes.SCALE) { // L: 2898
-				class44.Interpreter_intStackSize -= 3; // L: 2899
-				long var9 = (long)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2900
-				long var11 = (long)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2901
-				long var13 = (long)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2902
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 2903
-				return 1; // L: 2904
-			} else if (var0 == 4025) { // L: 2906
-				var3 = SequenceDefinition.method3149(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 2907
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3; // L: 2908
-				return 1; // L: 2909
-			} else if (var0 == 4026) { // L: 2911
-				class44.Interpreter_intStackSize -= 2; // L: 2912
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2913
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2914
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2915
-				return 1; // L: 2916
-			} else if (var0 == 4027) { // L: 2918
-				class44.Interpreter_intStackSize -= 3; // L: 2919
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2920
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2921
-				var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2922
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class342.method6043(var3, var4, var5); // L: 2923
-				return 1; // L: 2924
-			} else if (var0 == 4028) { // L: 2926
-				class44.Interpreter_intStackSize -= 3; // L: 2927
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2928
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2929
-				var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2930
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = World.method1685(var3, var4, var5); // L: 2931
-				return 1; // L: 2932
-			} else if (var0 == 4029) { // L: 2934
-				class44.Interpreter_intStackSize -= 3; // L: 2935
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2936
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2937
-				var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2938
-				var6 = 31 - var5; // L: 2939
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 << var6 >>> var4 + var6; // L: 2940
-				return 1; // L: 2941
-			} else if (var0 == 4030) { // L: 2943
-				class44.Interpreter_intStackSize -= 4; // L: 2944
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2945
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2946
-				var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2947
-				var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 2948
-				var3 = World.method1685(var3, var5, var6); // L: 2949
-				var7 = CollisionMap.method3185(var6 - var5 + 1); // L: 2950
-				if (var4 > var7) { // L: 2951
-					var4 = var7;
-				}
-
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 2952
-				return 1; // L: 2953
-			} else {
-				return 2; // L: 2955
+				var4 = true; // L: 8772
+				break;
 			}
 		}
-	}
+
+		if (!var4) { // L: 8776
+			UserComparator10.addGameMessage(4, "", "Unable to find " + var1);
+		}
+
+	} // L: 8777
 }
diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java
index 16c5ad4814..6f246c5e9e 100644
--- a/runescape-client/src/main/java/GZipDecompressor.java
+++ b/runescape-client/src/main/java/GZipDecompressor.java
@@ -1,13 +1,20 @@
 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("og")
+@ObfuscatedName("or")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 2117115219
+	)
+	@Export("clientType")
+	public static int clientType;
+	@ObfuscatedName("f")
 	@Export("inflater")
 	Inflater inflater;
 
@@ -22,16 +29,16 @@ public class GZipDecompressor {
 		this(-1, 1000000, 1000000); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;[BB)V",
-		garbageValue = "48"
+		descriptor = "(Lnt;[BI)V",
+		garbageValue = "1826658043"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {
 		if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16
-			if (this.inflater == null) { // L: 17
-				this.inflater = new Inflater(true);
+			if (this.inflater == null) {
+				this.inflater = new Inflater(true); // L: 17
 			}
 
 			try {
diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java
index 9b33ea473d..02780209e3 100644
--- a/runescape-client/src/main/java/GameBuild.java
+++ b/runescape-client/src/main/java/GameBuild.java
@@ -3,44 +3,43 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jk")
+@ObfuscatedName("js")
 @Implements("GameBuild")
 public class GameBuild {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljk;"
-	)
-	@Export("LIVE")
-	public static final GameBuild LIVE;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljk;"
-	)
-	@Export("BUILDLIVE")
-	public static final GameBuild BUILDLIVE;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Ljs;"
+	)
+	@Export("LIVE")
+	static final GameBuild LIVE;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ljs;"
+	)
+	@Export("BUILDLIVE")
+	static final GameBuild BUILDLIVE;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Ljs;"
 	)
 	@Export("RC")
-	public static final GameBuild RC;
+	static final GameBuild RC;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Ljk;"
+		descriptor = "Ljs;"
 	)
 	@Export("WIP")
-	public static final GameBuild WIP;
-	@ObfuscatedName("p")
+	static final GameBuild WIP;
+	@ObfuscatedName("j")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 629900867
+		intValue = -104611059
 	)
 	@Export("buildId")
-	public final int buildId;
+	final int buildId;
 
 	static {
 		LIVE = new GameBuild("LIVE", 0); // L: 5
@@ -50,364 +49,23 @@ public class GameBuild {
 	}
 
 	GameBuild(String var1, int var2) {
-		this.name = var1; // L: 13
-		this.buildId = var2; // L: 14
-	} // L: 15
+		this.name = var1; // L: 17
+		this.buildId = var2; // L: 18
+	} // L: 19
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "4"
+		descriptor = "(CI)Z",
+		garbageValue = "-562774219"
 	)
-	static int method4843(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == 6600) { // L: 3792
-			var3 = class22.Client_plane; // L: 3793
-			int var15 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 3794
-			int var8 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 3795
-			HealthBarUpdate.getWorldMap().method6110(var3, var15, var8, true); // L: 3796
-			return 1; // L: 3797
+	@Export("isCharPrintable")
+	public static boolean isCharPrintable(char var0) {
+		if (var0 >= ' ' && var0 <= '~') { // L: 200
+			return true;
+		} else if (var0 >= 160 && var0 <= 255) { // L: 201
+			return true;
 		} else {
-			WorldMapArea var9;
-			if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3799
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3800
-				String var16 = ""; // L: 3801
-				var9 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3802
-				if (var9 != null) { // L: 3803
-					var16 = var9.getExternalName(); // L: 3804
-				}
-
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; // L: 3806
-				return 1; // L: 3807
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3809
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3810
-				HealthBarUpdate.getWorldMap().setCurrentMapAreaId(var3); // L: 3811
-				return 1; // L: 3812
-			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3814
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getZoomLevel(); // L: 3815
-				return 1; // L: 3816
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3818
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3819
-				HealthBarUpdate.getWorldMap().setZoomPercentage(var3); // L: 3820
-				return 1; // L: 3821
-			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3823
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3824
-				return 1; // L: 3825
-			} else {
-				Coord var14;
-				if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3827
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3828
-					HealthBarUpdate.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3829
-					return 1; // L: 3830
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3832
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3833
-					HealthBarUpdate.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3834
-					return 1; // L: 3835
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3837
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3838
-					HealthBarUpdate.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3839
-					return 1; // L: 3840
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3842
-					var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3843
-					HealthBarUpdate.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3844
-					return 1; // L: 3845
-				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3847
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayX(); // L: 3848
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayY(); // L: 3849
-					return 1; // L: 3850
-				} else {
-					WorldMapArea var11;
-					if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3852
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3853
-						var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3854
-						if (var11 == null) { // L: 3855
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3856
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3859
-						}
-
-						return 1; // L: 3861
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3863
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3864
-						var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3865
-						if (var11 == null) { // L: 3866
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3867
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3868
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3871
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3872
-						}
-
-						return 1; // L: 3874
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3876
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3877
-						var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3878
-						if (var11 == null) { // L: 3879
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3880
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3881
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3882
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3883
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3886
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3887
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3888
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3889
-						}
-
-						return 1; // L: 3891
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3893
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3894
-						var11 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3895
-						if (var11 == null) { // L: 3896
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3897
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3900
-						}
-
-						return 1; // L: 3902
-					} else if (var0 == 6615) { // L: 3904
-						var14 = HealthBarUpdate.getWorldMap().getDisplayCoord(); // L: 3905
-						if (var14 == null) { // L: 3906
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3907
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3908
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var14.x; // L: 3911
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var14.y; // L: 3912
-						}
-
-						return 1; // L: 3914
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3916
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().currentMapAreaId(); // L: 3917
-						return 1; // L: 3918
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3920
-						var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3921
-						var11 = HealthBarUpdate.getWorldMap().getCurrentMapArea(); // L: 3922
-						if (var11 == null) { // L: 3923
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3924
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3925
-							return 1; // L: 3926
-						} else {
-							int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3928
-							if (var12 == null) { // L: 3929
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3930
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3931
-							} else {
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12[0]; // L: 3934
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12[1]; // L: 3935
-							}
-
-							return 1; // L: 3937
-						}
-					} else {
-						Coord var5;
-						if (var0 == 6618) { // L: 3939
-							var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3940
-							var11 = HealthBarUpdate.getWorldMap().getCurrentMapArea(); // L: 3941
-							if (var11 == null) { // L: 3942
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3943
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3944
-								return 1; // L: 3945
-							} else {
-								var5 = var11.coord(var14.x, var14.y); // L: 3947
-								if (var5 == null) { // L: 3948
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3949
-								} else {
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.packed(); // L: 3952
-								}
-
-								return 1; // L: 3954
-							}
-						} else {
-							Coord var10;
-							if (var0 == 6619) { // L: 3956
-								class44.Interpreter_intStackSize -= 2; // L: 3957
-								var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3958
-								var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3959
-								Skeleton.method3922(var3, var10, false); // L: 3960
-								return 1; // L: 3961
-							} else if (var0 == 6620) { // L: 3963
-								class44.Interpreter_intStackSize -= 2; // L: 3964
-								var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3965
-								var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3966
-								Skeleton.method3922(var3, var10, true); // L: 3967
-								return 1; // L: 3968
-							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3970
-								class44.Interpreter_intStackSize -= 2; // L: 3971
-								var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3972
-								var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3973
-								var9 = HealthBarUpdate.getWorldMap().getMapArea(var3); // L: 3974
-								if (var9 == null) { // L: 3975
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3976
-									return 1; // L: 3977
-								} else {
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3979
-									return 1; // L: 3980
-								}
-							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3982
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayWith(); // L: 3983
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getDisplayHeight(); // L: 3984
-								return 1; // L: 3985
-							} else if (var0 == 6623) { // L: 3987
-								var14 = new Coord(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3988
-								var11 = HealthBarUpdate.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3989
-								if (var11 == null) { // L: 3990
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3991
-								} else {
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var11.getId(); // L: 3994
-								}
-
-								return 1; // L: 3996
-							} else if (var0 == 6624) { // L: 3998
-								HealthBarUpdate.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 3999
-								return 1; // L: 4000
-							} else if (var0 == 6625) { // L: 4002
-								HealthBarUpdate.getWorldMap().resetMaxFlashCount(); // L: 4003
-								return 1; // L: 4004
-							} else if (var0 == 6626) { // L: 4006
-								HealthBarUpdate.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 4007
-								return 1; // L: 4008
-							} else if (var0 == 6627) { // L: 4010
-								HealthBarUpdate.getWorldMap().resetCyclesPerFlash(); // L: 4011
-								return 1; // L: 4012
-							} else {
-								boolean var13;
-								if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4014
-									var13 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 4015
-									HealthBarUpdate.getWorldMap().setPerpetualFlash(var13); // L: 4016
-									return 1; // L: 4017
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4019
-									var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4020
-									HealthBarUpdate.getWorldMap().flashElement(var3); // L: 4021
-									return 1; // L: 4022
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4024
-									var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4025
-									HealthBarUpdate.getWorldMap().flashCategory(var3); // L: 4026
-									return 1; // L: 4027
-								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4029
-									HealthBarUpdate.getWorldMap().stopCurrentFlashes(); // L: 4030
-									return 1; // L: 4031
-								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4033
-									var13 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 4034
-									HealthBarUpdate.getWorldMap().setElementsDisabled(var13); // L: 4035
-									return 1; // L: 4036
-								} else {
-									boolean var7;
-									if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4038
-										class44.Interpreter_intStackSize -= 2; // L: 4039
-										var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 4040
-										var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 4041
-										HealthBarUpdate.getWorldMap().disableElement(var3, var7); // L: 4042
-										return 1; // L: 4043
-									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4045
-										class44.Interpreter_intStackSize -= 2; // L: 4046
-										var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 4047
-										var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 4048
-										HealthBarUpdate.getWorldMap().setCategoryDisabled(var3, var7); // L: 4049
-										return 1; // L: 4050
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4052
-										Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4053
-										return 1; // L: 4054
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4056
-										var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4057
-										Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4058
-										return 1; // L: 4059
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4061
-										var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4062
-										Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = HealthBarUpdate.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4063
-										return 1; // L: 4064
-									} else if (var0 == 6638) { // L: 4066
-										class44.Interpreter_intStackSize -= 2; // L: 4067
-										var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 4068
-										var10 = new Coord(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 4069
-										var5 = HealthBarUpdate.getWorldMap().method6153(var3, var10); // L: 4070
-										if (var5 == null) { // L: 4071
-											Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4072
-										} else {
-											Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.packed(); // L: 4075
-										}
-
-										return 1; // L: 4077
-									} else {
-										AbstractWorldMapIcon var6;
-										if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4079
-											var6 = HealthBarUpdate.getWorldMap().iconStart(); // L: 4080
-											if (var6 == null) { // L: 4081
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4082
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4083
-											} else {
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4086
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4087
-											}
-
-											return 1; // L: 4089
-										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4091
-											var6 = HealthBarUpdate.getWorldMap().iconNext(); // L: 4092
-											if (var6 == null) { // L: 4093
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4094
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4095
-											} else {
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4098
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4099
-											}
-
-											return 1; // L: 4101
-										} else {
-											WorldMapElement var4;
-											if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4103
-												var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4104
-												var4 = class6.WorldMapElement_get(var3); // L: 4105
-												if (var4.name == null) { // L: 4106
-													Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 4107
-												} else {
-													Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name; // L: 4110
-												}
-
-												return 1; // L: 4112
-											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4114
-												var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4115
-												var4 = class6.WorldMapElement_get(var3); // L: 4116
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.textSize; // L: 4117
-												return 1; // L: 4118
-											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4120
-												var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4121
-												var4 = class6.WorldMapElement_get(var3); // L: 4122
-												if (var4 == null) { // L: 4123
-													Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4124
-												} else {
-													Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.category; // L: 4127
-												}
-
-												return 1; // L: 4129
-											} else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4131
-												var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4132
-												var4 = class6.WorldMapElement_get(var3); // L: 4133
-												if (var4 == null) { // L: 4134
-													Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4135
-												} else {
-													Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4138
-												}
-
-												return 1; // L: 4140
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4142
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class69.worldMapEvent.mapElement; // L: 4143
-												return 1; // L: 4144
-											} else if (var0 == 6698) { // L: 4146
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class69.worldMapEvent.coord1.packed(); // L: 4147
-												return 1; // L: 4148
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4150
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class69.worldMapEvent.coord2.packed(); // L: 4151
-												return 1; // L: 4152
-											} else {
-												return 2; // L: 4154
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
+			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 202
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/GameEngine.java b/runescape-client/src/main/java/GameEngine.java
index 001315c0fa..302ff95074 100644
--- a/runescape-client/src/main/java/GameEngine.java
+++ b/runescape-client/src/main/java/GameEngine.java
@@ -4,7 +4,6 @@ import java.awt.Container;
 import java.awt.EventQueue;
 import java.awt.Frame;
 import java.awt.Graphics;
-import java.awt.Image;
 import java.awt.Insets;
 import java.awt.LayoutManager;
 import java.awt.Rectangle;
@@ -25,185 +24,159 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("af")
+@ObfuscatedName("aa")
 @Implements("GameEngine")
 public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener {
-	@ObfuscatedName("qg")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
-	)
-	@Export("sceneMinimapSprite")
-	static SpritePixels sceneMinimapSprite;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ldp;"
+		descriptor = "Lda;"
 	)
 	@Export("taskHandler")
 	protected static TaskHandler taskHandler;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Laf;"
+		descriptor = "Laa;"
 	)
 	@Export("gameEngine")
 	static GameEngine gameEngine;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 661166393
+		intValue = -1592553527
 	)
 	@Export("GameEngine_redundantStartThreadCount")
 	static int GameEngine_redundantStartThreadCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = 3801980113368397719L
+		longValue = 8033536561469626209L
 	)
 	@Export("stopTimeMs")
 	static long stopTimeMs;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("isKilled")
 	static boolean isKilled;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 849049895
+		intValue = -1667530929
 	)
 	@Export("cycleDurationMillis")
 	static int cycleDurationMillis;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1089824943
+		intValue = -897639339
 	)
 	@Export("fiveOrOne")
 	static int fiveOrOne;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1080528073
+		intValue = -71568651
 	)
 	@Export("fps")
 	protected static int fps;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lez;"
-	)
-	@Export("clock")
-	protected static Clock clock;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("graphicsTickTimes")
-	protected static long[] graphicsTickTimes;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -1807936759
-	)
-	@Export("graphicsTickTimeIdx")
-	static int graphicsTickTimeIdx;
-	@ObfuscatedName("g")
+	static long[] graphicsTickTimes;
+	@ObfuscatedName("t")
 	@Export("clientTickTimes")
-	protected static long[] clientTickTimes;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 1202015039
-	)
-	@Export("clientTickTimeIdx")
-	static int clientTickTimeIdx;
-	@ObfuscatedName("ax")
-	static Image field354;
-	@ObfuscatedName("as")
-	@ObfuscatedGetter(
-		intValue = 116937435
-	)
-	static int field355;
+	static long[] clientTickTimes;
 	@ObfuscatedName("aq")
+	@ObfuscatedGetter(
+		intValue = 403418391
+	)
+	static int field341;
+	@ObfuscatedName("ay")
 	@Export("volatileFocus")
 	static volatile boolean volatileFocus;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		longValue = 6246927008582722683L
+		longValue = 735532951630652423L
 	)
 	@Export("garbageCollectorLastCollectionTime")
 	static long garbageCollectorLastCollectionTime;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		longValue = -7805304911218154981L
+		longValue = -2068701588192565283L
 	)
 	@Export("garbageCollectorLastCheckTimeMs")
 	static long garbageCollectorLastCheckTimeMs;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("hasErrored")
 	boolean hasErrored;
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1091351445
+		intValue = -1593755803
 	)
 	@Export("contentWidth")
 	protected int contentWidth;
-	@ObfuscatedName("m")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -2128033235
+		intValue = -1016616117
 	)
 	@Export("contentHeight")
 	protected int contentHeight;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1437613301
+		intValue = -555916595
 	)
 	@Export("canvasX")
 	int canvasX;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -179382835
+		intValue = -1657620013
 	)
 	@Export("canvasY")
 	int canvasY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1558391463
+		intValue = -1863798935
 	)
-	int field350;
-	@ObfuscatedName("ae")
+	int field334;
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = -422930921
+		intValue = 333844793
 	)
-	int field348;
-	@ObfuscatedName("ap")
+	int field328;
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 59571423
+		intValue = 6136823
 	)
 	@Export("maxCanvasWidth")
 	int maxCanvasWidth;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -45318295
+		intValue = 290386939
 	)
 	@Export("maxCanvasHeight")
 	int maxCanvasHeight;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@Export("frame")
 	Frame frame;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("canvas")
 	java.awt.Canvas canvas;
 	@ObfuscatedName("ag")
 	@Export("fullRedraw")
 	volatile boolean fullRedraw;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@Export("resizeCanvasNextFrame")
 	boolean resizeCanvasNextFrame;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("isCanvasInvalid")
 	volatile boolean isCanvasInvalid;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		longValue = 8555805370222747289L
+		longValue = -109758639681671179L
 	)
-	volatile long field363;
-	@ObfuscatedName("at")
+	volatile long field348;
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "Lam;"
+		descriptor = "Lao;"
 	)
 	@Export("mouseWheelHandler")
 	MouseWheelHandler mouseWheelHandler;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@Export("clipboard")
 	Clipboard clipboard;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@Export("eventQueue")
 	final EventQueue eventQueue;
 
@@ -217,7 +190,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
 		fps = 0; // L: 50
 		graphicsTickTimes = new long[32]; // L: 53
 		clientTickTimes = new long[32]; // L: 55
-		field355 = 500; // L: 73
+		field341 = 500; // L: 73
 		volatileFocus = true; // L: 82
 		garbageCollectorLastCollectionTime = -1L; // L: 85
 		garbageCollectorLastCheckTimeMs = -1L; // L: 86
@@ -230,7 +203,7 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
 		this.fullRedraw = true; // L: 71
 		this.resizeCanvasNextFrame = false; // L: 74
 		this.isCanvasInvalid = false; // L: 75
-		this.field363 = 0L; // L: 76
+		this.field348 = 0L; // L: 76
 		EventQueue var1 = null; // L: 89
 
 		try {
@@ -239,334 +212,325 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
 		}
 
 		this.eventQueue = var1; // L: 94
-		class19.method225(new DevicePcmPlayerProvider()); // L: 95
+		BufferedNetSocket.method5960(new DevicePcmPlayerProvider()); // L: 95
 	} // L: 96
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-1134068726"
+		garbageValue = "2123531727"
 	)
 	@Export("setMaxCanvasSize")
 	protected final void setMaxCanvasSize(int var1, int var2) {
 		if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 99
-			this.method490();
+			this.method582();
 		}
 
 		this.maxCanvasWidth = var1; // L: 100
 		this.maxCanvasHeight = var2; // L: 101
 	} // L: 102
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;B)V",
-		garbageValue = "104"
+		descriptor = "(Ljava/lang/Object;I)V",
+		garbageValue = "-2062739769"
 	)
 	@Export("post")
 	final void post(Object var1) {
 		if (this.eventQueue != null) { // L: 105
 			for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 106
-				try {
-					Thread.sleep(1L); // L: 125
-				} catch (InterruptedException var4) { // L: 127
-				}
+				class18.method272(1L);
 			}
 
 			if (var1 != null) {
-				this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 130
+				this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 107
 			}
 
 		}
-	} // L: 131
+	} // L: 108
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ldw;",
-		garbageValue = "-92"
+		descriptor = "(B)Lei;",
+		garbageValue = "6"
 	)
 	@Export("mouseWheel")
 	protected MouseWheel mouseWheel() {
-		if (this.mouseWheelHandler == null) { // L: 134
-			this.mouseWheelHandler = new MouseWheelHandler(); // L: 135
-			this.mouseWheelHandler.addTo(this.canvas); // L: 136
+		if (this.mouseWheelHandler == null) { // L: 111
+			this.mouseWheelHandler = new MouseWheelHandler(); // L: 112
+			this.mouseWheelHandler.addTo(this.canvas); // L: 113
 		}
 
-		return this.mouseWheelHandler; // L: 138
+		return this.mouseWheelHandler; // L: 115
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "383352988"
+		garbageValue = "272269884"
 	)
 	@Export("setUpClipboard")
 	protected void setUpClipboard() {
-		this.clipboard = this.getToolkit().getSystemClipboard(); // L: 142
-	} // L: 143
+		this.clipboard = this.getToolkit().getSystemClipboard(); // L: 119
+	} // L: 120
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "973874436"
+		garbageValue = "-476290304"
 	)
 	@Export("clipboardSetString")
 	protected void clipboardSetString(String var1) {
-		this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 146
-	} // L: 147
+		this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 123
+	} // L: 124
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1238474569"
+		garbageValue = "1189108596"
 	)
 	@Export("setUpKeyboard")
 	protected final void setUpKeyboard() {
-		class243.method4668(); // L: 150
-		LoginScreenAnimation.method2236(this.canvas); // L: 151
-	} // L: 152
+		NetCache.method5177(); // L: 127
+		SoundCache.method932(this.canvas); // L: 128
+	} // L: 129
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "-59"
+		garbageValue = "72"
 	)
 	@Export("setUpMouse")
 	protected final void setUpMouse() {
-		java.awt.Canvas var1 = this.canvas; // L: 155
-		var1.addMouseListener(MouseHandler.MouseHandler_instance); // L: 157
-		var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 158
-		var1.addFocusListener(MouseHandler.MouseHandler_instance); // L: 159
-	} // L: 161
+		PacketBufferNode.method4497(this.canvas); // L: 132
+	} // L: 133
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1759538265"
+		descriptor = "(B)V",
+		garbageValue = "58"
 	)
 	@Export("resizeCanvas")
 	final void resizeCanvas() {
-		Container var1 = this.container(); // L: 164
-		if (var1 != null) { // L: 165
-			Bounds var2 = this.getFrameContentBounds(); // L: 166
-			this.contentWidth = Math.max(var2.highX, this.field350); // L: 167
-			this.contentHeight = Math.max(var2.highY, this.field348); // L: 168
-			if (this.contentWidth <= 0) { // L: 169
+		Container var1 = this.container(); // L: 136
+		if (var1 != null) { // L: 137
+			Bounds var2 = this.getFrameContentBounds(); // L: 138
+			this.contentWidth = Math.max(var2.highX, this.field334); // L: 139
+			this.contentHeight = Math.max(var2.highY, this.field328); // L: 140
+			if (this.contentWidth <= 0) { // L: 141
 				this.contentWidth = 1;
 			}
 
-			if (this.contentHeight <= 0) { // L: 170
+			if (this.contentHeight <= 0) { // L: 142
 				this.contentHeight = 1;
 			}
 
-			class32.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 171
-			ReflectionCheck.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 172
-			this.canvasX = (this.contentWidth - class32.canvasWidth) / 2; // L: 173
-			this.canvasY = 0; // L: 174
-			this.canvas.setSize(class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 175
-			class26.rasterProvider = new RasterProvider(class32.canvasWidth, ReflectionCheck.canvasHeight, this.canvas); // L: 176
-			if (var1 == this.frame) { // L: 177
-				Insets var3 = this.frame.getInsets(); // L: 178
-				this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); // L: 179
+			AttackOption.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 143
+			class0.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 144
+			this.canvasX = (this.contentWidth - AttackOption.canvasWidth) / 2; // L: 145
+			this.canvasY = 0; // L: 146
+			this.canvas.setSize(AttackOption.canvasWidth, class0.canvasHeight); // L: 147
+			AbstractWorldMapData.rasterProvider = new RasterProvider(AttackOption.canvasWidth, class0.canvasHeight, this.canvas); // L: 148
+			if (var1 == this.frame) { // L: 149
+				Insets var3 = this.frame.getInsets(); // L: 150
+				this.canvas.setLocation(this.canvasX + var3.left, this.canvasY + var3.top); // L: 151
 			} else {
-				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 181
+				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 153
 			}
 
-			this.fullRedraw = true; // L: 182
-			this.resizeGame(); // L: 183
+			this.fullRedraw = true; // L: 154
+			this.resizeGame(); // L: 155
 		}
-	} // L: 184
+	} // L: 156
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "50"
+		garbageValue = "-95"
 	)
 	@Export("resizeGame")
 	protected abstract void resizeGame();
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2101906226"
+		descriptor = "(B)V",
+		garbageValue = "97"
 	)
 	@Export("clearBackground")
 	void clearBackground() {
-		int var1 = this.canvasX; // L: 189
-		int var2 = this.canvasY; // L: 190
-		int var3 = this.contentWidth - class32.canvasWidth - var1; // L: 191
-		int var4 = this.contentHeight - ReflectionCheck.canvasHeight - var2; // L: 192
-		if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 193
+		int var1 = this.canvasX; // L: 161
+		int var2 = this.canvasY; // L: 162
+		int var3 = this.contentWidth - AttackOption.canvasWidth - var1; // L: 163
+		int var4 = this.contentHeight - class0.canvasHeight - var2; // L: 164
+		if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 165
 			try {
-				Container var5 = this.container(); // L: 195
-				int var6 = 0; // L: 196
-				int var7 = 0; // L: 197
-				if (var5 == this.frame) { // L: 198
-					Insets var8 = this.frame.getInsets(); // L: 199
-					var6 = var8.left; // L: 200
-					var7 = var8.top; // L: 201
+				Container var5 = this.container(); // L: 167
+				int var6 = 0; // L: 168
+				int var7 = 0; // L: 169
+				if (var5 == this.frame) { // L: 170
+					Insets var8 = this.frame.getInsets(); // L: 171
+					var6 = var8.left; // L: 172
+					var7 = var8.top; // L: 173
 				}
 
-				Graphics var10 = var5.getGraphics(); // L: 203
-				var10.setColor(Color.black); // L: 204
+				Graphics var10 = var5.getGraphics(); // L: 175
+				var10.setColor(Color.black); // L: 176
 				if (var1 > 0) {
-					var10.fillRect(var6, var7, var1, this.contentHeight); // L: 205
+					var10.fillRect(var6, var7, var1, this.contentHeight); // L: 177
 				}
 
-				if (var2 > 0) { // L: 206
+				if (var2 > 0) { // L: 178
 					var10.fillRect(var6, var7, this.contentWidth, var2);
 				}
 
-				if (var3 > 0) { // L: 207
+				if (var3 > 0) { // L: 179
 					var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight);
 				}
 
-				if (var4 > 0) { // L: 208
+				if (var4 > 0) { // L: 180
 					var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4);
 				}
-			} catch (Exception var9) { // L: 210
+			} catch (Exception var9) { // L: 182
 			}
 		}
 
-	} // L: 212
+	} // L: 184
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "6"
+		descriptor = "(I)V",
+		garbageValue = "-4788971"
 	)
 	@Export("replaceCanvas")
 	final void replaceCanvas() {
-		SoundSystem.method803(this.canvas); // L: 215
-		java.awt.Canvas var1 = this.canvas; // L: 216
-		var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 218
-		var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 219
-		var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 220
-		MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 221
-		if (this.mouseWheelHandler != null) { // L: 223
+		class18.method275(this.canvas); // L: 187
+		java.awt.Canvas var1 = this.canvas; // L: 188
+		var1.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 190
+		var1.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 191
+		var1.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 192
+		MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 193
+		if (this.mouseWheelHandler != null) { // L: 195
 			this.mouseWheelHandler.removeFrom(this.canvas);
 		}
 
-		this.addCanvas(); // L: 224
-		LoginScreenAnimation.method2236(this.canvas); // L: 225
-		java.awt.Canvas var2 = this.canvas; // L: 226
-		var2.addMouseListener(MouseHandler.MouseHandler_instance); // L: 228
-		var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 229
-		var2.addFocusListener(MouseHandler.MouseHandler_instance); // L: 230
-		if (this.mouseWheelHandler != null) { // L: 232
+		this.addCanvas(); // L: 196
+		SoundCache.method932(this.canvas); // L: 197
+		PacketBufferNode.method4497(this.canvas); // L: 198
+		if (this.mouseWheelHandler != null) { // L: 199
 			this.mouseWheelHandler.addTo(this.canvas);
 		}
 
-		this.method490(); // L: 233
-	} // L: 234
+		this.method582(); // L: 200
+	} // L: 201
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "428962423"
+		garbageValue = "-812079878"
 	)
 	@Export("startThread")
 	protected final void startThread(int var1, int var2, int var3) {
 		try {
-			if (gameEngine != null) { // L: 238
-				++GameEngine_redundantStartThreadCount; // L: 239
-				if (GameEngine_redundantStartThreadCount >= 3) { // L: 240
-					this.error("alreadyloaded"); // L: 241
-					return; // L: 242
+			if (gameEngine != null) { // L: 205
+				++GameEngine_redundantStartThreadCount; // L: 206
+				if (GameEngine_redundantStartThreadCount >= 3) { // L: 207
+					this.error("alreadyloaded"); // L: 208
+					return; // L: 209
 				}
 
-				this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 244
-				return; // L: 245
+				this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 211
+				return; // L: 212
 			}
 
-			gameEngine = this; // L: 247
-			class32.canvasWidth = var1; // L: 248
-			ReflectionCheck.canvasHeight = var2; // L: 249
-			RunException.RunException_revision = var3; // L: 250
-			RunException.RunException_applet = this; // L: 251
-			if (taskHandler == null) { // L: 252
+			gameEngine = this; // L: 214
+			AttackOption.canvasWidth = var1; // L: 215
+			class0.canvasHeight = var2; // L: 216
+			RunException.RunException_revision = var3; // L: 217
+			RunException.RunException_applet = this; // L: 218
+			if (taskHandler == null) { // L: 219
 				taskHandler = new TaskHandler();
 			}
 
-			taskHandler.newThreadTask(this, 1); // L: 253
-		} catch (Exception var5) { // L: 255
-			class266.RunException_sendStackTrace((String)null, var5); // L: 256
-			this.error("crash"); // L: 257
+			taskHandler.newThreadTask(this, 1); // L: 220
+		} catch (Exception var5) { // L: 222
+			FriendsChat.RunException_sendStackTrace((String)null, var5); // L: 223
+			this.error("crash"); // L: 224
 		}
 
-	} // L: 259
+	} // L: 226
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1032083147"
+		garbageValue = "2087382687"
 	)
 	@Export("addCanvas")
 	final synchronized void addCanvas() {
-		Container var1 = this.container(); // L: 262
-		if (this.canvas != null) { // L: 263
-			this.canvas.removeFocusListener(this); // L: 264
-			var1.remove(this.canvas); // L: 265
+		Container var1 = this.container(); // L: 229
+		if (this.canvas != null) { // L: 230
+			this.canvas.removeFocusListener(this); // L: 231
+			var1.remove(this.canvas); // L: 232
 		}
 
-		class32.canvasWidth = Math.max(var1.getWidth(), this.field350); // L: 267
-		ReflectionCheck.canvasHeight = Math.max(var1.getHeight(), this.field348); // L: 268
+		AttackOption.canvasWidth = Math.max(var1.getWidth(), this.field334); // L: 234
+		class0.canvasHeight = Math.max(var1.getHeight(), this.field328); // L: 235
 		Insets var2;
-		if (this.frame != null) { // L: 269
-			var2 = this.frame.getInsets(); // L: 270
-			class32.canvasWidth -= var2.right + var2.left; // L: 271
-			ReflectionCheck.canvasHeight -= var2.bottom + var2.top; // L: 272
+		if (this.frame != null) { // L: 236
+			var2 = this.frame.getInsets(); // L: 237
+			AttackOption.canvasWidth -= var2.left + var2.right; // L: 238
+			class0.canvasHeight -= var2.top + var2.bottom; // L: 239
 		}
 
-		this.canvas = new Canvas(this); // L: 274
-		var1.setBackground(Color.BLACK); // L: 275
-		var1.setLayout((LayoutManager)null); // L: 276
-		var1.add(this.canvas); // L: 277
-		this.canvas.setSize(class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 278
-		this.canvas.setVisible(true); // L: 279
-		this.canvas.setBackground(Color.BLACK); // L: 280
-		if (var1 == this.frame) { // L: 281
-			var2 = this.frame.getInsets(); // L: 282
-			this.canvas.setLocation(var2.left + this.canvasX, this.canvasY + var2.top); // L: 283
+		this.canvas = new Canvas(this); // L: 241
+		var1.setBackground(Color.BLACK); // L: 242
+		var1.setLayout((LayoutManager)null); // L: 243
+		var1.add(this.canvas); // L: 244
+		this.canvas.setSize(AttackOption.canvasWidth, class0.canvasHeight); // L: 245
+		this.canvas.setVisible(true); // L: 246
+		this.canvas.setBackground(Color.BLACK); // L: 247
+		if (var1 == this.frame) { // L: 248
+			var2 = this.frame.getInsets(); // L: 249
+			this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 250
 		} else {
-			this.canvas.setLocation(this.canvasX, this.canvasY); // L: 285
+			this.canvas.setLocation(this.canvasX, this.canvasY); // L: 252
 		}
 
-		this.canvas.addFocusListener(this); // L: 286
-		this.canvas.requestFocus(); // L: 287
-		this.fullRedraw = true; // L: 288
-		if (class26.rasterProvider != null && class32.canvasWidth == class26.rasterProvider.width && ReflectionCheck.canvasHeight == class26.rasterProvider.height) { // L: 289
-			((RasterProvider)class26.rasterProvider).setComponent(this.canvas); // L: 290
-			class26.rasterProvider.drawFull(0, 0); // L: 291
+		this.canvas.addFocusListener(this); // L: 253
+		this.canvas.requestFocus(); // L: 254
+		this.fullRedraw = true; // L: 255
+		if (AbstractWorldMapData.rasterProvider != null && AttackOption.canvasWidth == AbstractWorldMapData.rasterProvider.width && class0.canvasHeight == AbstractWorldMapData.rasterProvider.height) { // L: 256
+			((RasterProvider)AbstractWorldMapData.rasterProvider).setComponent(this.canvas); // L: 257
+			AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 258
 		} else {
-			class26.rasterProvider = new RasterProvider(class32.canvasWidth, ReflectionCheck.canvasHeight, this.canvas); // L: 294
+			AbstractWorldMapData.rasterProvider = new RasterProvider(AttackOption.canvasWidth, class0.canvasHeight, this.canvas); // L: 261
 		}
 
-		this.isCanvasInvalid = false; // L: 296
-		this.field363 = ObjectComposition.currentTimeMillis(); // L: 297
-	} // L: 298
+		this.isCanvasInvalid = false; // L: 263
+		this.field348 = ClientPacket.currentTimeMillis(); // L: 264
+	} // L: 265
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1231993586"
+		garbageValue = "1590867757"
 	)
 	@Export("checkHost")
 	protected final boolean checkHost() {
-		String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 301
-		if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 302
-			if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 303
-				if (var1.endsWith("127.0.0.1")) { // L: 304
+		String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 268
+		if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 269
+			if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 270
+				if (var1.endsWith("127.0.0.1")) { // L: 271
 					return true;
 				} else {
 					while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
-						var1 = var1.substring(0, var1.length() - 1); // L: 305
+						var1 = var1.substring(0, var1.length() - 1); // L: 272
 					}
 
-					if (var1.endsWith("192.168.1.")) { // L: 306
+					if (var1.endsWith("192.168.1.")) { // L: 273
 						return true;
 					} else {
-						this.error("invalidhost"); // L: 307
-						return false; // L: 308
+						this.error("invalidhost"); // L: 274
+						return false; // L: 275
 					}
 				}
 			} else {
@@ -577,455 +541,438 @@ public abstract class GameEngine extends Applet implements Runnable, FocusListen
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "996629970"
+		descriptor = "(B)V",
+		garbageValue = "85"
 	)
 	@Export("clientTick")
 	void clientTick() {
-		long var1 = ObjectComposition.currentTimeMillis(); // L: 361
-		long var3 = clientTickTimes[clientTickTimeIdx]; // L: 362
-		clientTickTimes[clientTickTimeIdx] = var1; // L: 363
-		clientTickTimeIdx = clientTickTimeIdx + 1 & 31; // L: 364
-		if (var3 != 0L && var1 > var3) { // L: 365
+		long var1 = ClientPacket.currentTimeMillis(); // L: 328
+		long var3 = clientTickTimes[CollisionMap.clientTickTimeIdx]; // L: 329
+		clientTickTimes[CollisionMap.clientTickTimeIdx] = var1; // L: 330
+		CollisionMap.clientTickTimeIdx = CollisionMap.clientTickTimeIdx + 1 & 31; // L: 331
+		if (var3 != 0L && var1 > var3) { // L: 332
 		}
 
-		synchronized(this) { // L: 366
-			WorldMapSection1.hasFocus = volatileFocus; // L: 367
-		} // L: 368
+		synchronized(this) { // L: 333
+			class397.hasFocus = volatileFocus; // L: 334
+		} // L: 335
 
-		this.doCycle(); // L: 369
-	} // L: 370
+		this.doCycle(); // L: 336
+	} // L: 337
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-49"
+		descriptor = "(I)V",
+		garbageValue = "1414104897"
 	)
 	@Export("graphicsTick")
 	void graphicsTick() {
-		Container var1 = this.container(); // L: 373
-		long var2 = ObjectComposition.currentTimeMillis(); // L: 374
-		long var4 = graphicsTickTimes[graphicsTickTimeIdx]; // L: 375
-		graphicsTickTimes[graphicsTickTimeIdx] = var2; // L: 376
-		graphicsTickTimeIdx = graphicsTickTimeIdx + 1 & 31; // L: 377
-		if (0L != var4 && var2 > var4) { // L: 378
-			int var6 = (int)(var2 - var4); // L: 379
-			fps = ((var6 >> 1) + 32000) / var6; // L: 380
+		Container var1 = this.container(); // L: 340
+		long var2 = ClientPacket.currentTimeMillis(); // L: 341
+		long var4 = graphicsTickTimes[ReflectionCheck.graphicsTickTimeIdx]; // L: 342
+		graphicsTickTimes[ReflectionCheck.graphicsTickTimeIdx] = var2; // L: 343
+		ReflectionCheck.graphicsTickTimeIdx = ReflectionCheck.graphicsTickTimeIdx + 1 & 31; // L: 344
+		if (0L != var4 && var2 > var4) { // L: 345
+			int var6 = (int)(var2 - var4); // L: 346
+			fps = ((var6 >> 1) + 32000) / var6; // L: 347
 		}
 
-		if (++field355 - 1 > 50) { // L: 382
-			field355 -= 50; // L: 383
-			this.fullRedraw = true; // L: 384
-			this.canvas.setSize(class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 385
-			this.canvas.setVisible(true); // L: 386
-			if (var1 == this.frame) { // L: 387
-				Insets var7 = this.frame.getInsets(); // L: 388
-				this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); // L: 389
+		if (++field341 - 1 > 50) { // L: 349
+			field341 -= 50; // L: 350
+			this.fullRedraw = true; // L: 351
+			this.canvas.setSize(AttackOption.canvasWidth, class0.canvasHeight); // L: 352
+			this.canvas.setVisible(true); // L: 353
+			if (var1 == this.frame) { // L: 354
+				Insets var7 = this.frame.getInsets(); // L: 355
+				this.canvas.setLocation(this.canvasX + var7.left, var7.top + this.canvasY); // L: 356
 			} else {
-				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 391
+				this.canvas.setLocation(this.canvasX, this.canvasY); // L: 358
 			}
 		}
 
-		if (this.isCanvasInvalid) { // L: 393
+		if (this.isCanvasInvalid) { // L: 360
 			this.replaceCanvas();
 		}
 
-		this.method493(); // L: 394
-		this.draw(this.fullRedraw); // L: 395
-		if (this.fullRedraw) { // L: 396
+		this.method581(); // L: 361
+		this.draw(this.fullRedraw); // L: 362
+		if (this.fullRedraw) { // L: 363
 			this.clearBackground();
 		}
 
-		this.fullRedraw = false; // L: 397
-	} // L: 398
+		this.fullRedraw = false; // L: 364
+	} // L: 365
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "45"
+		descriptor = "(I)V",
+		garbageValue = "179024739"
 	)
-	final void method493() {
-		Bounds var1 = this.getFrameContentBounds(); // L: 401
-		if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 402
-			this.resizeCanvas(); // L: 403
-			this.resizeCanvasNextFrame = false; // L: 404
+	final void method581() {
+		Bounds var1 = this.getFrameContentBounds(); // L: 368
+		if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { // L: 369
+			this.resizeCanvas(); // L: 370
+			this.resizeCanvasNextFrame = false; // L: 371
 		}
 
-	} // L: 406
+	} // L: 373
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1998261621"
+		garbageValue = "-1411086569"
 	)
-	final void method490() {
-		this.resizeCanvasNextFrame = true; // L: 409
-	} // L: 410
+	final void method582() {
+		this.resizeCanvasNextFrame = true; // L: 376
+	} // L: 377
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "928825308"
+		garbageValue = "-1781774601"
 	)
 	@Export("kill")
 	final synchronized void kill() {
-		if (!isKilled) { // L: 413
-			isKilled = true; // L: 414
+		if (!isKilled) { // L: 380
+			isKilled = true; // L: 381
 
 			try {
-				this.canvas.removeFocusListener(this); // L: 416
-			} catch (Exception var5) { // L: 418
+				this.canvas.removeFocusListener(this); // L: 383
+			} catch (Exception var5) { // L: 385
 			}
 
 			try {
-				this.kill0(); // L: 420
-			} catch (Exception var4) { // L: 422
+				this.kill0(); // L: 387
+			} catch (Exception var4) { // L: 389
 			}
 
-			if (this.frame != null) { // L: 423
+			if (this.frame != null) { // L: 390
 				try {
-					System.exit(0); // L: 425
-				} catch (Throwable var3) { // L: 427
+					System.exit(0); // L: 392
+				} catch (Throwable var3) { // L: 394
 				}
 			}
 
-			if (taskHandler != null) { // L: 429
+			if (taskHandler != null) { // L: 396
 				try {
-					taskHandler.close(); // L: 431
-				} catch (Exception var2) { // L: 433
+					taskHandler.close(); // L: 398
+				} catch (Exception var2) { // L: 400
 				}
 			}
 
-			this.vmethod1471(); // L: 435
+			this.vmethod1278(); // L: 402
 		}
-	} // L: 436
+	} // L: 403
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-232069568"
+		garbageValue = "-1587549695"
 	)
 	@Export("setUp")
 	protected abstract void setUp();
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "68"
+		descriptor = "(I)V",
+		garbageValue = "2087654500"
 	)
 	@Export("doCycle")
 	protected abstract void doCycle();
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(ZS)V",
-		garbageValue = "9311"
+		descriptor = "(ZB)V",
+		garbageValue = "49"
 	)
 	@Export("draw")
 	protected abstract void draw(boolean var1);
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "561275520"
+		garbageValue = "1785168903"
 	)
 	@Export("kill0")
 	protected abstract void kill0();
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;ZI)V",
-		garbageValue = "91092739"
+		garbageValue = "1399625911"
 	)
 	@Export("drawInitial")
 	protected final void drawInitial(int var1, String var2, boolean var3) {
 		try {
-			Graphics var4 = this.canvas.getGraphics(); // L: 519
-			if (KitDefinition.fontHelvetica13 == null) { // L: 520
-				KitDefinition.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 521
-				DefaultsGroup.loginScreenFontMetrics = this.canvas.getFontMetrics(KitDefinition.fontHelvetica13); // L: 522
+			Graphics var4 = this.canvas.getGraphics(); // L: 470
+			if (class13.fontHelvetica13 == null) { // L: 471
+				class13.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 472
+				class265.loginScreenFontMetrics = this.canvas.getFontMetrics(class13.fontHelvetica13); // L: 473
 			}
 
-			if (var3) { // L: 524
-				var4.setColor(Color.black); // L: 525
-				var4.fillRect(0, 0, class32.canvasWidth, ReflectionCheck.canvasHeight); // L: 526
+			if (var3) { // L: 475
+				var4.setColor(Color.black); // L: 476
+				var4.fillRect(0, 0, AttackOption.canvasWidth, class0.canvasHeight); // L: 477
 			}
 
-			Color var5 = new Color(140, 17, 17); // L: 528
+			Color var5 = new Color(140, 17, 17); // L: 479
 
 			try {
-				if (field354 == null) { // L: 530
-					field354 = this.canvas.createImage(304, 34);
+				if (MilliClock.field1527 == null) { // L: 481
+					MilliClock.field1527 = this.canvas.createImage(304, 34);
 				}
 
-				Graphics var6 = field354.getGraphics(); // L: 531
-				var6.setColor(var5); // L: 532
-				var6.drawRect(0, 0, 303, 33); // L: 533
-				var6.fillRect(2, 2, var1 * 3, 30); // L: 534
-				var6.setColor(Color.black); // L: 535
-				var6.drawRect(1, 1, 301, 31); // L: 536
-				var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 537
-				var6.setFont(KitDefinition.fontHelvetica13); // L: 538
-				var6.setColor(Color.white); // L: 539
-				var6.drawString(var2, (304 - DefaultsGroup.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 540
-				var4.drawImage(field354, class32.canvasWidth / 2 - 152, ReflectionCheck.canvasHeight / 2 - 18, (ImageObserver)null); // L: 541
-			} catch (Exception var9) { // L: 543
-				int var7 = class32.canvasWidth / 2 - 152; // L: 544
-				int var8 = ReflectionCheck.canvasHeight / 2 - 18; // L: 545
-				var4.setColor(var5); // L: 546
-				var4.drawRect(var7, var8, 303, 33); // L: 547
-				var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 548
-				var4.setColor(Color.black); // L: 549
-				var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 550
-				var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 551
-				var4.setFont(KitDefinition.fontHelvetica13); // L: 552
-				var4.setColor(Color.white); // L: 553
-				var4.drawString(var2, var7 + (304 - DefaultsGroup.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 554
+				Graphics var6 = MilliClock.field1527.getGraphics(); // L: 482
+				var6.setColor(var5); // L: 483
+				var6.drawRect(0, 0, 303, 33); // L: 484
+				var6.fillRect(2, 2, var1 * 3, 30); // L: 485
+				var6.setColor(Color.black); // L: 486
+				var6.drawRect(1, 1, 301, 31); // L: 487
+				var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 488
+				var6.setFont(class13.fontHelvetica13); // L: 489
+				var6.setColor(Color.white); // L: 490
+				var6.drawString(var2, (304 - class265.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 491
+				var4.drawImage(MilliClock.field1527, AttackOption.canvasWidth / 2 - 152, class0.canvasHeight / 2 - 18, (ImageObserver)null); // L: 492
+			} catch (Exception var9) { // L: 494
+				int var7 = AttackOption.canvasWidth / 2 - 152; // L: 495
+				int var8 = class0.canvasHeight / 2 - 18; // L: 496
+				var4.setColor(var5); // L: 497
+				var4.drawRect(var7, var8, 303, 33); // L: 498
+				var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 499
+				var4.setColor(Color.black); // L: 500
+				var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 501
+				var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 502
+				var4.setFont(class13.fontHelvetica13); // L: 503
+				var4.setColor(Color.white); // L: 504
+				var4.drawString(var2, var7 + (304 - class265.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 505
 			}
-		} catch (Exception var10) { // L: 557
-			this.canvas.repaint(); // L: 558
+		} catch (Exception var10) { // L: 508
+			this.canvas.repaint(); // L: 509
 		}
 
-	} // L: 560
+	} // L: 511
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "82"
+		descriptor = "(I)V",
+		garbageValue = "-1903578766"
 	)
-	protected final void method501() {
-		field354 = null; // L: 563
-		KitDefinition.fontHelvetica13 = null; // L: 564
-		DefaultsGroup.loginScreenFontMetrics = null; // L: 565
-	} // L: 566
+	protected final void method672() {
+		MilliClock.field1527 = null; // L: 514
+		class13.fontHelvetica13 = null; // L: 515
+		class265.loginScreenFontMetrics = null; // L: 516
+	} // L: 517
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-1"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1320809291"
 	)
 	@Export("error")
 	protected void error(String var1) {
-		if (!this.hasErrored) { // L: 569
-			this.hasErrored = true; // L: 570
-			System.out.println("error_game_" + var1); // L: 571
+		if (!this.hasErrored) { // L: 520
+			this.hasErrored = true; // L: 521
+			System.out.println("error_game_" + var1); // L: 522
 
 			try {
-				this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 573
-			} catch (Exception var3) { // L: 575
+				this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 524
+			} catch (Exception var3) { // L: 526
 			}
 
 		}
-	} // L: 576
+	} // L: 527
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/awt/Container;",
-		garbageValue = "1142166715"
+		descriptor = "(B)Ljava/awt/Container;",
+		garbageValue = "1"
 	)
 	@Export("container")
 	Container container() {
-		return (Container)(this.frame != null ? this.frame : this); // L: 579
+		return (Container)(this.frame != null ? this.frame : this); // L: 530
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lli;",
-		garbageValue = "1389693294"
+		descriptor = "(B)Llw;",
+		garbageValue = "-6"
 	)
 	@Export("getFrameContentBounds")
 	Bounds getFrameContentBounds() {
-		Container var1 = this.container(); // L: 584
-		int var2 = Math.max(var1.getWidth(), this.field350); // L: 585
-		int var3 = Math.max(var1.getHeight(), this.field348); // L: 586
-		if (this.frame != null) { // L: 587
-			Insets var4 = this.frame.getInsets(); // L: 588
-			var2 -= var4.right + var4.left; // L: 589
-			var3 -= var4.bottom + var4.top; // L: 590
+		Container var1 = this.container(); // L: 535
+		int var2 = Math.max(var1.getWidth(), this.field334); // L: 536
+		int var3 = Math.max(var1.getHeight(), this.field328); // L: 537
+		if (this.frame != null) { // L: 538
+			Insets var4 = this.frame.getInsets(); // L: 539
+			var2 -= var4.right + var4.left; // L: 540
+			var3 -= var4.bottom + var4.top; // L: 541
 		}
 
-		return new Bounds(var2, var3); // L: 592
+		return new Bounds(var2, var3); // L: 543
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-45"
+		descriptor = "(I)Z",
+		garbageValue = "-969524667"
 	)
 	@Export("hasFrame")
 	protected final boolean hasFrame() {
-		return this.frame != null; // L: 596
+		return this.frame != null; // L: 547
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-992375266"
+		garbageValue = "-1888551887"
 	)
-	protected abstract void vmethod1471();
-
-	public final void destroy() {
-		if (this == gameEngine && !isKilled) { // L: 449
-			stopTimeMs = ObjectComposition.currentTimeMillis(); // L: 450
-			long var1 = 4999L; // L: 454
-
-			try {
-				Thread.sleep(var1); // L: 457
-			} catch (InterruptedException var5) { // L: 459
-			}
-
-			try {
-				Thread.sleep(1L); // L: 463
-			} catch (InterruptedException var4) { // L: 465
-			}
-
-			this.kill(); // L: 475
-		}
-	} // L: 476
+	protected abstract void vmethod1278();
 
 	public final synchronized void paint(Graphics var1) {
-		if (this == gameEngine && !isKilled) { // L: 483
-			this.fullRedraw = true; // L: 484
-			if (ObjectComposition.currentTimeMillis() - this.field363 > 1000L) { // L: 485
-				Rectangle var2 = var1.getClipBounds(); // L: 486
-				if (var2 == null || var2.width >= class32.canvasWidth && var2.height >= ReflectionCheck.canvasHeight) {
-					this.isCanvasInvalid = true; // L: 487
+		if (this == gameEngine && !isKilled) { // L: 434
+			this.fullRedraw = true; // L: 435
+			if (ClientPacket.currentTimeMillis() - this.field348 > 1000L) { // L: 436
+				Rectangle var2 = var1.getClipBounds(); // L: 437
+				if (var2 == null || var2.width >= AttackOption.canvasWidth && var2.height >= class0.canvasHeight) {
+					this.isCanvasInvalid = true; // L: 438
 				}
 			}
 
 		}
-	} // L: 489
+	} // L: 440
 
-	public final void start() {
-		if (this == gameEngine && !isKilled) { // L: 439
-			stopTimeMs = 0L; // L: 440
+	public final void destroy() {
+		if (this == gameEngine && !isKilled) { // L: 423
+			stopTimeMs = ClientPacket.currentTimeMillis(); // L: 424
+			class18.method272(5000L); // L: 425
+			this.kill(); // L: 426
 		}
-	} // L: 441
-
-	public final void stop() {
-		if (this == gameEngine && !isKilled) { // L: 444
-			stopTimeMs = ObjectComposition.currentTimeMillis() + 4000L; // L: 445
-		}
-	} // L: 446
-
-	public final void update(Graphics var1) {
-		this.paint(var1); // L: 479
-	} // L: 480
-
-	public final void focusGained(FocusEvent var1) {
-		volatileFocus = true; // L: 492
-		this.fullRedraw = true; // L: 493
-	} // L: 494
-
-	public final void focusLost(FocusEvent var1) {
-		volatileFocus = false; // L: 497
-	} // L: 498
-
-	public void run() {
-		try {
-			if (TaskHandler.javaVendor != null) { // L: 313
-				String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 314
-				if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 315
-					String var2 = TaskHandler.javaVersion; // L: 316
-					if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 317
-						this.error("wrongjava"); // L: 318
-						return; // L: 319
-					}
-
-					if (var2.startsWith("1.6.0_")) { // L: 321
-						int var3;
-						for (var3 = 6; var3 < var2.length() && UserComparator10.isDigit(var2.charAt(var3)); ++var3) { // L: 322 323
-						}
-
-						String var4 = var2.substring(6, var3); // L: 324
-						if (class20.isNumber(var4) && class82.method1908(var4) < 10) { // L: 325
-							this.error("wrongjava"); // L: 326
-							return; // L: 327
-						}
-					}
-
-					fiveOrOne = 5; // L: 330
-				}
-			}
-
-			this.setFocusCycleRoot(true); // L: 333
-			this.addCanvas(); // L: 334
-			this.setUp(); // L: 335
-
-			Object var8;
-			try {
-				var8 = new NanoClock(); // L: 339
-			} catch (Throwable var6) { // L: 341
-				var8 = new MilliClock(); // L: 342
-			}
-
-			clock = (Clock)var8; // L: 345
-
-			while (0L == stopTimeMs || ObjectComposition.currentTimeMillis() < stopTimeMs) { // L: 346
-				class260.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); // L: 347
-
-				for (int var5 = 0; var5 < class260.gameCyclesToDo; ++var5) { // L: 348
-					this.clientTick();
-				}
-
-				this.graphicsTick(); // L: 349
-				this.post(this.canvas); // L: 350
-			}
-		} catch (Exception var7) { // L: 353
-			class266.RunException_sendStackTrace((String)null, var7); // L: 354
-			this.error("crash"); // L: 355
-		}
-
-		this.kill(); // L: 357
-	} // L: 358
-
-	public final void windowDeactivated(WindowEvent var1) {
-	} // L: 507
-
-	public final void windowIconified(WindowEvent var1) {
-	} // L: 509
-
-	public final void windowClosed(WindowEvent var1) {
-	} // L: 501
-
-	public final void windowClosing(WindowEvent var1) {
-		this.destroy(); // L: 504
-	} // L: 505
-
-	public final void windowActivated(WindowEvent var1) {
-	} // L: 500
-
-	public final void windowOpened(WindowEvent var1) {
-	} // L: 510
+	} // L: 427
 
 	public abstract void init();
 
-	public final void windowDeiconified(WindowEvent var1) {
-	} // L: 508
+	public void run() {
+		try {
+			if (TaskHandler.javaVendor != null) { // L: 280
+				String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 281
+				if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 282
+					String var2 = TaskHandler.javaVersion; // L: 283
+					if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 284
+						this.error("wrongjava"); // L: 285
+						return; // L: 286
+					}
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-1726985857"
-	)
-	static int method538(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14
-		if (var2 == null) { // L: 15
-			return -1;
-		} else {
-			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17
+					if (var2.startsWith("1.6.0_")) { // L: 288
+						int var3;
+						for (var3 = 6; var3 < var2.length() && class105.isDigit(var2.charAt(var3)); ++var3) { // L: 289 290
+						}
+
+						String var4 = var2.substring(6, var3); // L: 291
+						if (Varps.isNumber(var4) && FontName.method6335(var4) < 10) { // L: 292
+							this.error("wrongjava"); // L: 293
+							return; // L: 294
+						}
+					}
+
+					fiveOrOne = 5; // L: 297
+				}
+			}
+
+			this.setFocusCycleRoot(true); // L: 300
+			this.addCanvas(); // L: 301
+			this.setUp(); // L: 302
+
+			Object var8;
+			try {
+				var8 = new NanoClock(); // L: 306
+			} catch (Throwable var6) { // L: 308
+				var8 = new MilliClock(); // L: 309
+			}
+
+			class160.clock = (Clock)var8; // L: 312
+
+			while (0L == stopTimeMs || ClientPacket.currentTimeMillis() < stopTimeMs) { // L: 313
+				class372.gameCyclesToDo = class160.clock.wait(cycleDurationMillis, fiveOrOne); // L: 314
+
+				for (int var5 = 0; var5 < class372.gameCyclesToDo; ++var5) { // L: 315
+					this.clientTick();
+				}
+
+				this.graphicsTick(); // L: 316
+				this.post(this.canvas); // L: 317
+			}
+		} catch (Exception var7) { // L: 320
+			FriendsChat.RunException_sendStackTrace((String)null, var7); // L: 321
+			this.error("crash"); // L: 322
 		}
+
+		this.kill(); // L: 324
+	} // L: 325
+
+	public final void update(Graphics var1) {
+		this.paint(var1); // L: 430
+	} // L: 431
+
+	public final void start() {
+		if (this == gameEngine && !isKilled) { // L: 413
+			stopTimeMs = 0L; // L: 414
+		}
+	} // L: 415
+
+	public final void windowActivated(WindowEvent var1) {
+	} // L: 451
+
+	public final void windowClosing(WindowEvent var1) {
+		this.destroy(); // L: 455
+	} // L: 456
+
+	public final void windowDeiconified(WindowEvent var1) {
+	} // L: 459
+
+	public final void windowOpened(WindowEvent var1) {
+	} // L: 461
+
+	public final void windowClosed(WindowEvent var1) {
+	} // L: 452
+
+	public final void windowDeactivated(WindowEvent var1) {
+	} // L: 458
+
+	public final void focusLost(FocusEvent var1) {
+		volatileFocus = false; // L: 448
+	} // L: 449
+
+	public final void stop() {
+		if (this == gameEngine && !isKilled) { // L: 418
+			stopTimeMs = ClientPacket.currentTimeMillis() + 4000L; // L: 419
+		}
+	} // L: 420
+
+	public final void windowIconified(WindowEvent var1) {
+	} // L: 460
+
+	public final void focusGained(FocusEvent var1) {
+		volatileFocus = true; // L: 443
+		this.fullRedraw = true; // L: 444
+	} // L: 445
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)J",
+		garbageValue = "-1582150364"
+	)
+	static long method716(int var0, int var1, int var2) {
+		return (long)(var2 << 16 | var0 << 8 | var1); // L: 38
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("hu")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-2043539672"
+		descriptor = "(I)Z",
+		garbageValue = "1255982290"
 	)
-	static void method572(int var0) {
-		Login.loginIndex = 12; // L: 1635
-		Login.field1032 = var0; // L: 1636
-	} // L: 1637
+	static final boolean method717() {
+		return Client.isMenuOpen; // L: 7756
+	}
 }
diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java
index 79bb17320b..b443892827 100644
--- a/runescape-client/src/main/java/GameObject.java
+++ b/runescape-client/src/main/java/GameObject.java
@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hj")
+@ObfuscatedName("hf")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -254047513
+		intValue = -1608001459
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1917415421
+		intValue = 1563453913
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1140262961
+		intValue = 1270457979
 	)
 	@Export("centerX")
 	int centerX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 364858457
+		intValue = -1248595947
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("renderable")
 	public Renderable renderable;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -202388443
+		intValue = 1891554599
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1674574095
+		intValue = 835758211
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -2078907755
+		intValue = -1267971371
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1202737381
+		intValue = -509888291
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -129893675
+		intValue = -2077981723
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -327316739
+		intValue = 569603025
 	)
-	int field2554;
-	@ObfuscatedName("l")
+	int field2552;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -137941941
+		intValue = -1288318445
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = 1142152799211342585L
+		longValue = 4383749992013445467L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2139353773
+		intValue = 1389469279
 	)
 	@Export("flags")
 	int flags;
@@ -96,15 +96,804 @@ public final class GameObject {
 		this.flags = 0; // L: 17
 	} // L: 19
 
-	@ObfuscatedName("gj")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "7"
+		garbageValue = "-126"
 	)
-	static void method4279() {
-		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4346
-			NetSocket.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4347
+	public static void method4431() {
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 116
+			if (ArchiveDiskActionHandler.field3557 != 0) { // L: 117
+				ArchiveDiskActionHandler.field3557 = 1; // L: 118
+
+				try {
+					ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 120
+				} catch (InterruptedException var3) { // L: 122
+				}
+			}
+
+		}
+	} // L: 125
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1327988393"
+	)
+	static void method4433() {
+		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 195
+			Login.currentLoginField = 1; // L: 196
+		} else {
+			Login.currentLoginField = 0; // L: 199
 		}
 
-	} // L: 4349
+	} // L: 201
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1544544242"
+	)
+	static void method4432() {
+		Login.loginIndex = 24; // L: 1527
+		CollisionMap.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1528
+	} // L: 1529
+
+	@ObfuscatedName("ir")
+	@ObfuscatedSignature(
+		descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V",
+		garbageValue = "-1747523197"
+	)
+	@Export("menuAction")
+	static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
+		if (var2 >= 2000) { // L: 7935
+			var2 -= 2000;
+		}
+
+		PacketBufferNode var8;
+		if (var2 == 1) { // L: 7936
+			Client.mouseCrossX = var6; // L: 8020
+			Client.mouseCrossY = var7; // L: 8021
+			Client.mouseCrossColor = 2; // L: 8022
+			Client.mouseCrossState = 0; // L: 8023
+			Client.destinationX = var0; // L: 8024
+			Client.destinationY = var1; // L: 8025
+			var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2642, Client.packetWriter.isaacCipher); // L: 8027
+			var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8028
+			var8.packetBuffer.writeShort(var3); // L: 8029
+			var8.packetBuffer.method6649(Timer.selectedItemSlot); // L: 8030
+			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8031
+			var8.packetBuffer.method6658(class246.selectedItemWidget); // L: 8032
+			var8.packetBuffer.writeShort(WorldMapSprite.baseY + var1); // L: 8033
+			var8.packetBuffer.method6648(Buddy.selectedItemId); // L: 8034
+			Client.packetWriter.addNode(var8); // L: 8035
+		} else if (var2 == 2) {
+			Client.mouseCrossX = var6; // L: 8632
+			Client.mouseCrossY = var7; // L: 8633
+			Client.mouseCrossColor = 2; // L: 8634
+			Client.mouseCrossState = 0; // L: 8635
+			Client.destinationX = var0; // L: 8636
+			Client.destinationY = var1; // L: 8637
+			var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 8638
+			var8.packetBuffer.method6648(Client.field634); // L: 8639
+			var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8640
+			var8.packetBuffer.method6705(Client.selectedSpellChildIndex); // L: 8641
+			var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8642
+			var8.packetBuffer.method6658(class15.selectedSpellWidget); // L: 8643
+			var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8644
+			var8.packetBuffer.method6649(var3); // L: 8645
+			Client.packetWriter.addNode(var8); // L: 8646
+		} else if (var2 == 3) {
+			Client.mouseCrossX = var6; // L: 8427
+			Client.mouseCrossY = var7; // L: 8428
+			Client.mouseCrossColor = 2; // L: 8429
+			Client.mouseCrossState = 0; // L: 8430
+			Client.destinationX = var0; // L: 8431
+			Client.destinationY = var1; // L: 8432
+			var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher); // L: 8434
+			var8.packetBuffer.writeShort(WorldMapSprite.baseY + var1); // L: 8435
+			var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8436
+			var8.packetBuffer.method6648(var0 + class15.baseX); // L: 8437
+			var8.packetBuffer.writeShort(var3); // L: 8438
+			Client.packetWriter.addNode(var8); // L: 8439
+		} else if (var2 == 4) {
+			Client.mouseCrossX = var6; // L: 8669
+			Client.mouseCrossY = var7; // L: 8670
+			Client.mouseCrossColor = 2; // L: 8671
+			Client.mouseCrossState = 0; // L: 8672
+			Client.destinationX = var0; // L: 8673
+			Client.destinationY = var1; // L: 8674
+			var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); // L: 8676
+			var8.packetBuffer.method6648(WorldMapSprite.baseY + var1); // L: 8677
+			var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8678
+			var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8679
+			var8.packetBuffer.method6648(var3); // L: 8680
+			Client.packetWriter.addNode(var8); // L: 8681
+		} else if (var2 == 5) {
+			Client.mouseCrossX = var6; // L: 8314
+			Client.mouseCrossY = var7; // L: 8315
+			Client.mouseCrossColor = 2; // L: 8316
+			Client.mouseCrossState = 0; // L: 8317
+			Client.destinationX = var0; // L: 8318
+			Client.destinationY = var1; // L: 8319
+			var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); // L: 8321
+			var8.packetBuffer.writeShort(var0 + class15.baseX); // L: 8322
+			var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8323
+			var8.packetBuffer.writeShort(var3); // L: 8324
+			var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8325
+			Client.packetWriter.addNode(var8); // L: 8326
+		} else if (var2 == 6) {
+			Client.mouseCrossX = var6; // L: 8617
+			Client.mouseCrossY = var7; // L: 8618
+			Client.mouseCrossColor = 2; // L: 8619
+			Client.mouseCrossState = 0; // L: 8620
+			Client.destinationX = var0; // L: 8621
+			Client.destinationY = var1; // L: 8622
+			var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); // L: 8624
+			var8.packetBuffer.writeShort(var3); // L: 8625
+			var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8626
+			var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8627
+			var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8628
+			Client.packetWriter.addNode(var8); // L: 8629
+		} else {
+			PacketBufferNode var9;
+			NPC var13;
+			if (var2 == 7) {
+				var13 = Client.npcs[var3]; // L: 8558
+				if (var13 != null) { // L: 8559
+					Client.mouseCrossX = var6; // L: 8560
+					Client.mouseCrossY = var7; // L: 8561
+					Client.mouseCrossColor = 2; // L: 8562
+					Client.mouseCrossState = 0; // L: 8563
+					Client.destinationX = var0; // L: 8564
+					Client.destinationY = var1; // L: 8565
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2666, Client.packetWriter.isaacCipher); // L: 8567
+					var9.packetBuffer.method6648(var3); // L: 8568
+					var9.packetBuffer.method6648(Buddy.selectedItemId); // L: 8569
+					var9.packetBuffer.method6658(class246.selectedItemWidget); // L: 8570
+					var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8571
+					var9.packetBuffer.writeShort(Timer.selectedItemSlot); // L: 8572
+					Client.packetWriter.addNode(var9); // L: 8573
+				}
+			} else if (var2 == 8) {
+				var13 = Client.npcs[var3]; // L: 8052
+				if (var13 != null) { // L: 8053
+					Client.mouseCrossX = var6; // L: 8054
+					Client.mouseCrossY = var7; // L: 8055
+					Client.mouseCrossColor = 2; // L: 8056
+					Client.mouseCrossState = 0; // L: 8057
+					Client.destinationX = var0; // L: 8058
+					Client.destinationY = var1; // L: 8059
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2617, Client.packetWriter.isaacCipher); // L: 8060
+					var9.packetBuffer.method6649(Client.selectedSpellChildIndex); // L: 8061
+					var9.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8062
+					var9.packetBuffer.writeShort(Client.field634); // L: 8063
+					var9.packetBuffer.method6649(var3); // L: 8064
+					var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8065
+					Client.packetWriter.addNode(var9); // L: 8066
+				}
+			} else if (var2 == 9) {
+				var13 = Client.npcs[var3]; // L: 8108
+				if (var13 != null) { // L: 8109
+					Client.mouseCrossX = var6; // L: 8110
+					Client.mouseCrossY = var7; // L: 8111
+					Client.mouseCrossColor = 2; // L: 8112
+					Client.mouseCrossState = 0; // L: 8113
+					Client.destinationX = var0; // L: 8114
+					Client.destinationY = var1; // L: 8115
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2671, Client.packetWriter.isaacCipher); // L: 8117
+					var9.packetBuffer.method6648(var3); // L: 8118
+					var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8119
+					Client.packetWriter.addNode(var9); // L: 8120
+				}
+			} else if (var2 == 10) {
+				var13 = Client.npcs[var3]; // L: 8272
+				if (var13 != null) { // L: 8273
+					Client.mouseCrossX = var6; // L: 8274
+					Client.mouseCrossY = var7; // L: 8275
+					Client.mouseCrossColor = 2; // L: 8276
+					Client.mouseCrossState = 0; // L: 8277
+					Client.destinationX = var0; // L: 8278
+					Client.destinationY = var1; // L: 8279
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); // L: 8281
+					var9.packetBuffer.method6649(var3); // L: 8282
+					var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8283
+					Client.packetWriter.addNode(var9); // L: 8284
+				}
+			} else if (var2 == 11) {
+				var13 = Client.npcs[var3]; // L: 8442
+				if (var13 != null) { // L: 8443
+					Client.mouseCrossX = var6; // L: 8444
+					Client.mouseCrossY = var7; // L: 8445
+					Client.mouseCrossColor = 2; // L: 8446
+					Client.mouseCrossState = 0; // L: 8447
+					Client.destinationX = var0; // L: 8448
+					Client.destinationY = var1; // L: 8449
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8451
+					var9.packetBuffer.method6648(var3); // L: 8452
+					var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8453
+					Client.packetWriter.addNode(var9); // L: 8454
+				}
+			} else if (var2 == 12) {
+				var13 = Client.npcs[var3]; // L: 7953
+				if (var13 != null) { // L: 7954
+					Client.mouseCrossX = var6; // L: 7955
+					Client.mouseCrossY = var7; // L: 7956
+					Client.mouseCrossColor = 2; // L: 7957
+					Client.mouseCrossState = 0; // L: 7958
+					Client.destinationX = var0; // L: 7959
+					Client.destinationY = var1; // L: 7960
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2681, Client.packetWriter.isaacCipher); // L: 7962
+					var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7963
+					var9.packetBuffer.method6705(var3); // L: 7964
+					Client.packetWriter.addNode(var9); // L: 7965
+				}
+			} else if (var2 == 13) {
+				var13 = Client.npcs[var3]; // L: 7996
+				if (var13 != null) { // L: 7997
+					Client.mouseCrossX = var6; // L: 7998
+					Client.mouseCrossY = var7; // L: 7999
+					Client.mouseCrossColor = 2; // L: 8000
+					Client.mouseCrossState = 0; // L: 8001
+					Client.destinationX = var0; // L: 8002
+					Client.destinationY = var1; // L: 8003
+					var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); // L: 8005
+					var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8006
+					var9.packetBuffer.method6705(var3); // L: 8007
+					Client.packetWriter.addNode(var9); // L: 8008
+				}
+			} else {
+				Player var15;
+				if (var2 == 14) {
+					var15 = Client.players[var3]; // L: 8587
+					if (var15 != null) { // L: 8588
+						Client.mouseCrossX = var6; // L: 8589
+						Client.mouseCrossY = var7; // L: 8590
+						Client.mouseCrossColor = 2; // L: 8591
+						Client.mouseCrossState = 0; // L: 8592
+						Client.destinationX = var0; // L: 8593
+						Client.destinationY = var1; // L: 8594
+						var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); // L: 8596
+						var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8597
+						var9.packetBuffer.writeShort(var3); // L: 8598
+						var9.packetBuffer.method6649(Timer.selectedItemSlot); // L: 8599
+						var9.packetBuffer.method6649(Buddy.selectedItemId); // L: 8600
+						var9.packetBuffer.writeIntME(class246.selectedItemWidget); // L: 8601
+						Client.packetWriter.addNode(var9); // L: 8602
+					}
+				} else if (var2 == 15) {
+					var15 = Client.players[var3]; // L: 8238
+					if (var15 != null) { // L: 8239
+						Client.mouseCrossX = var6; // L: 8240
+						Client.mouseCrossY = var7; // L: 8241
+						Client.mouseCrossColor = 2; // L: 8242
+						Client.mouseCrossState = 0; // L: 8243
+						Client.destinationX = var0; // L: 8244
+						Client.destinationY = var1; // L: 8245
+						var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2611, Client.packetWriter.isaacCipher); // L: 8246
+						var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8247
+						var9.packetBuffer.method6658(class15.selectedSpellWidget); // L: 8248
+						var9.packetBuffer.method6649(var3); // L: 8249
+						var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8250
+						var9.packetBuffer.method6705(Client.field634); // L: 8251
+						Client.packetWriter.addNode(var9); // L: 8252
+					}
+				} else if (var2 == 16) {
+					Client.mouseCrossX = var6; // L: 8220
+					Client.mouseCrossY = var7; // L: 8221
+					Client.mouseCrossColor = 2; // L: 8222
+					Client.mouseCrossState = 0; // L: 8223
+					Client.destinationX = var0; // L: 8224
+					Client.destinationY = var1; // L: 8225
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); // L: 8227
+					var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8228
+					var8.packetBuffer.method6659(class246.selectedItemWidget); // L: 8229
+					var8.packetBuffer.method6648(Buddy.selectedItemId); // L: 8230
+					var8.packetBuffer.writeShort(Timer.selectedItemSlot); // L: 8231
+					var8.packetBuffer.writeShort(var3); // L: 8232
+					var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8233
+					var8.packetBuffer.method6648(WorldMapSprite.baseY + var1); // L: 8234
+					Client.packetWriter.addNode(var8); // L: 8235
+				} else if (var2 == 17) {
+					Client.mouseCrossX = var6; // L: 8649
+					Client.mouseCrossY = var7; // L: 8650
+					Client.mouseCrossColor = 2; // L: 8651
+					Client.mouseCrossState = 0; // L: 8652
+					Client.destinationX = var0; // L: 8653
+					Client.destinationY = var1; // L: 8654
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); // L: 8655
+					var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8656
+					var8.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8657
+					var8.packetBuffer.method6649(var3); // L: 8658
+					var8.packetBuffer.method6648(Client.selectedSpellChildIndex); // L: 8659
+					var8.packetBuffer.method6649(var0 + class15.baseX); // L: 8660
+					var8.packetBuffer.method6648(Client.field634); // L: 8661
+					var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8662
+					Client.packetWriter.addNode(var8); // L: 8663
+				} else if (var2 == 18) {
+					Client.mouseCrossX = var6; // L: 8340
+					Client.mouseCrossY = var7; // L: 8341
+					Client.mouseCrossColor = 2; // L: 8342
+					Client.mouseCrossState = 0; // L: 8343
+					Client.destinationX = var0; // L: 8344
+					Client.destinationY = var1; // L: 8345
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); // L: 8347
+					var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8348
+					var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8349
+					var8.packetBuffer.method6705(var0 + class15.baseX); // L: 8350
+					var8.packetBuffer.method6649(var3); // L: 8351
+					Client.packetWriter.addNode(var8); // L: 8352
+				} else if (var2 == 19) {
+					Client.mouseCrossX = var6; // L: 8701
+					Client.mouseCrossY = var7; // L: 8702
+					Client.mouseCrossColor = 2; // L: 8703
+					Client.mouseCrossState = 0; // L: 8704
+					Client.destinationX = var0; // L: 8705
+					Client.destinationY = var1; // L: 8706
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8708
+					var8.packetBuffer.method6705(var0 + class15.baseX); // L: 8709
+					var8.packetBuffer.writeShort(var3); // L: 8710
+					var8.packetBuffer.writeShort(WorldMapSprite.baseY + var1); // L: 8711
+					var8.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8712
+					Client.packetWriter.addNode(var8); // L: 8713
+				} else if (var2 == 20) {
+					Client.mouseCrossX = var6; // L: 8288
+					Client.mouseCrossY = var7; // L: 8289
+					Client.mouseCrossColor = 2; // L: 8290
+					Client.mouseCrossState = 0; // L: 8291
+					Client.destinationX = var0; // L: 8292
+					Client.destinationY = var1; // L: 8293
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); // L: 8295
+					var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8296
+					var8.packetBuffer.method6649(WorldMapSprite.baseY + var1); // L: 8297
+					var8.packetBuffer.writeShort(var0 + class15.baseX); // L: 8298
+					var8.packetBuffer.method6649(var3); // L: 8299
+					Client.packetWriter.addNode(var8); // L: 8300
+				} else if (var2 == 21) {
+					Client.mouseCrossX = var6; // L: 8474
+					Client.mouseCrossY = var7; // L: 8475
+					Client.mouseCrossColor = 2; // L: 8476
+					Client.mouseCrossState = 0; // L: 8477
+					Client.destinationX = var0; // L: 8478
+					Client.destinationY = var1; // L: 8479
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); // L: 8481
+					var8.packetBuffer.method6705(var3); // L: 8482
+					var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8483
+					var8.packetBuffer.method6648(var0 + class15.baseX); // L: 8484
+					var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8485
+					Client.packetWriter.addNode(var8); // L: 8486
+				} else if (var2 == 22) {
+					Client.mouseCrossX = var6; // L: 8355
+					Client.mouseCrossY = var7; // L: 8356
+					Client.mouseCrossColor = 2; // L: 8357
+					Client.mouseCrossState = 0; // L: 8358
+					Client.destinationX = var0; // L: 8359
+					Client.destinationY = var1; // L: 8360
+					var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); // L: 8362
+					var8.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8363
+					var8.packetBuffer.method6705(var0 + class15.baseX); // L: 8364
+					var8.packetBuffer.method6648(var3); // L: 8365
+					var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8366
+					Client.packetWriter.addNode(var8); // L: 8367
+				} else if (var2 == 23) {
+					if (Client.isMenuOpen) { // L: 8012
+						DevicePcmPlayerProvider.scene.setViewportWalking(); // L: 8013
+					} else {
+						DevicePcmPlayerProvider.scene.menuOpen(SoundSystem.Client_plane, var0, var1, true); // L: 8016
+					}
+				} else {
+					PacketBufferNode var11;
+					Widget var16;
+					if (var2 == 24) {
+						var16 = WorldMapData_1.getWidget(var1); // L: 8606
+						boolean var12 = true; // L: 8607
+						if (var16.contentType > 0) { // L: 8608
+							var12 = class343.method6080(var16);
+						}
+
+						if (var12) { // L: 8609
+							var11 = InterfaceParent.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8611
+							var11.packetBuffer.writeInt(var1); // L: 8612
+							Client.packetWriter.addNode(var11); // L: 8613
+						}
+					} else {
+						if (var2 == 25) {
+							var16 = class17.getWidgetChild(var1, var0); // L: 8204
+							if (var16 != null) { // L: 8205
+								class20.Widget_runOnTargetLeave(); // L: 8206
+								ItemComposition.selectSpell(var1, var0, ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var16)), var16.itemId); // L: 8207
+								Client.isItemSelected = 0; // L: 8208
+								Client.selectedSpellActionName = SecureRandomCallable.Widget_getSpellActionName(var16); // L: 8209
+								if (Client.selectedSpellActionName == null) { // L: 8210
+									Client.selectedSpellActionName = "null";
+								}
+
+								if (var16.isIf3) { // L: 8211
+									Client.selectedSpellName = var16.dataText + SecureRandomFuture.colorStartTag(16777215);
+								} else {
+									Client.selectedSpellName = SecureRandomFuture.colorStartTag(65280) + var16.spellName + SecureRandomFuture.colorStartTag(16777215); // L: 8212
+								}
+							}
+
+							return; // L: 8214
+						}
+
+						if (var2 == 26) {
+							class20.method288(); // L: 8217
+						} else {
+							int var10;
+							Widget var14;
+							if (var2 == 28) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8387
+								var8.packetBuffer.writeInt(var1); // L: 8388
+								Client.packetWriter.addNode(var8); // L: 8389
+								var14 = WorldMapData_1.getWidget(var1); // L: 8390
+								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8391
+									var10 = var14.cs1Instructions[0][1]; // L: 8392
+									Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 8393
+									class6.changeGameOptions(var10); // L: 8394
+								}
+							} else if (var2 == 29) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8039
+								var8.packetBuffer.writeInt(var1); // L: 8040
+								Client.packetWriter.addNode(var8); // L: 8041
+								var14 = WorldMapData_1.getWidget(var1); // L: 8042
+								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8043
+									var10 = var14.cs1Instructions[0][1]; // L: 8044
+									if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8045
+										Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8046
+										class6.changeGameOptions(var10); // L: 8047
+									}
+								}
+							} else if (var2 == 30) {
+								if (Client.meslayerContinueWidget == null) { // L: 8134
+									ClanChannelMember.resumePauseWidget(var1, var0); // L: 8135
+									Client.meslayerContinueWidget = class17.getWidgetChild(var1, var0); // L: 8136
+									Script.invalidateWidget(Client.meslayerContinueWidget); // L: 8137
+								}
+							} else if (var2 == 31) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8490
+								var8.packetBuffer.method6648(Timer.selectedItemSlot); // L: 8491
+								var8.packetBuffer.method6658(var1); // L: 8492
+								var8.packetBuffer.method6705(Buddy.selectedItemId); // L: 8493
+								var8.packetBuffer.writeIntME(class246.selectedItemWidget); // L: 8494
+								var8.packetBuffer.method6648(var3); // L: 8495
+								var8.packetBuffer.method6705(var0); // L: 8496
+								Client.packetWriter.addNode(var8); // L: 8497
+								Client.field869 = 0; // L: 8498
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8499
+								Client.field729 = var0; // L: 8500
+							} else if (var2 == 32) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); // L: 8399
+								var8.packetBuffer.method6648(var0); // L: 8400
+								var8.packetBuffer.writeShort(var3); // L: 8401
+								var8.packetBuffer.method6649(Client.selectedSpellChildIndex); // L: 8402
+								var8.packetBuffer.writeInt(var1); // L: 8403
+								var8.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8404
+								Client.packetWriter.addNode(var8); // L: 8405
+								Client.field869 = 0; // L: 8406
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8407
+								Client.field729 = var0; // L: 8408
+							} else if (var2 == 33) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2663, Client.packetWriter.isaacCipher); // L: 8071
+								var8.packetBuffer.writeInt(var1); // L: 8072
+								var8.packetBuffer.writeShort(var0); // L: 8073
+								var8.packetBuffer.method6649(var3); // L: 8074
+								Client.packetWriter.addNode(var8); // L: 8075
+								Client.field869 = 0; // L: 8076
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8077
+								Client.field729 = var0; // L: 8078
+							} else if (var2 == 34) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2638, Client.packetWriter.isaacCipher); // L: 8548
+								var8.packetBuffer.writeInt(var1); // L: 8549
+								var8.packetBuffer.method6648(var0); // L: 8550
+								var8.packetBuffer.method6649(var3); // L: 8551
+								Client.packetWriter.addNode(var8); // L: 8552
+								Client.field869 = 0; // L: 8553
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8554
+								Client.field729 = var0; // L: 8555
+							} else if (var2 == 35) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2628, Client.packetWriter.isaacCipher); // L: 8515
+								var8.packetBuffer.method6648(var0); // L: 8516
+								var8.packetBuffer.method6649(var3); // L: 8517
+								var8.packetBuffer.method6659(var1); // L: 8518
+								Client.packetWriter.addNode(var8); // L: 8519
+								Client.field869 = 0; // L: 8520
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8521
+								Client.field729 = var0; // L: 8522
+							} else if (var2 == 36) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2590, Client.packetWriter.isaacCipher); // L: 7986
+								var8.packetBuffer.method6658(var1); // L: 7987
+								var8.packetBuffer.method6649(var0); // L: 7988
+								var8.packetBuffer.method6648(var3); // L: 7989
+								Client.packetWriter.addNode(var8); // L: 7990
+								Client.field869 = 0; // L: 7991
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 7992
+								Client.field729 = var0; // L: 7993
+							} else if (var2 == 37) {
+								var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2580, Client.packetWriter.isaacCipher); // L: 8537
+								var8.packetBuffer.method6705(var3); // L: 8538
+								var8.packetBuffer.writeShort(var0); // L: 8539
+								var8.packetBuffer.method6658(var1); // L: 8540
+								Client.packetWriter.addNode(var8); // L: 8541
+								Client.field869 = 0; // L: 8542
+								Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8543
+								Client.field729 = var0; // L: 8544
+							} else {
+								if (var2 == 38) {
+									class20.Widget_runOnTargetLeave(); // L: 8096
+									var16 = WorldMapData_1.getWidget(var1); // L: 8097
+									Client.isItemSelected = 1; // L: 8098
+									Timer.selectedItemSlot = var0; // L: 8099
+									class246.selectedItemWidget = var1; // L: 8100
+									Buddy.selectedItemId = var3; // L: 8101
+									Script.invalidateWidget(var16); // L: 8102
+									Client.selectedItemName = SecureRandomFuture.colorStartTag(16748608) + class250.ItemDefinition_get(var3).name + SecureRandomFuture.colorStartTag(16777215); // L: 8103
+									if (Client.selectedItemName == null) { // L: 8104
+										Client.selectedItemName = "null";
+									}
+
+									return; // L: 8105
+								}
+
+								if (var2 == 39) {
+									var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); // L: 8504
+									var8.packetBuffer.writeIntME(var1); // L: 8505
+									var8.packetBuffer.method6649(var3); // L: 8506
+									var8.packetBuffer.method6648(var0); // L: 8507
+									Client.packetWriter.addNode(var8); // L: 8508
+									Client.field869 = 0; // L: 8509
+									Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8510
+									Client.field729 = var0; // L: 8511
+								} else if (var2 == 40) {
+									var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2641, Client.packetWriter.isaacCipher); // L: 8526
+									var8.packetBuffer.writeShort(var0); // L: 8527
+									var8.packetBuffer.writeIntME(var1); // L: 8528
+									var8.packetBuffer.writeShort(var3); // L: 8529
+									Client.packetWriter.addNode(var8); // L: 8530
+									Client.field869 = 0; // L: 8531
+									Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8532
+									Client.field729 = var0; // L: 8533
+								} else if (var2 == 41) {
+									var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher); // L: 8304
+									var8.packetBuffer.writeShort(var0); // L: 8305
+									var8.packetBuffer.method6649(var3); // L: 8306
+									var8.packetBuffer.writeIntME(var1); // L: 8307
+									Client.packetWriter.addNode(var8); // L: 8308
+									Client.field869 = 0; // L: 8309
+									Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8310
+									Client.field729 = var0; // L: 8311
+								} else if (var2 == 42) {
+									var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); // L: 8330
+									var8.packetBuffer.method6648(var3); // L: 8331
+									var8.packetBuffer.method6648(var0); // L: 8332
+									var8.packetBuffer.writeInt(var1); // L: 8333
+									Client.packetWriter.addNode(var8); // L: 8334
+									Client.field869 = 0; // L: 8335
+									Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8336
+									Client.field729 = var0; // L: 8337
+								} else if (var2 == 43) {
+									var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2645, Client.packetWriter.isaacCipher); // L: 8691
+									var8.packetBuffer.writeIntME(var1); // L: 8692
+									var8.packetBuffer.writeShort(var3); // L: 8693
+									var8.packetBuffer.method6705(var0); // L: 8694
+									Client.packetWriter.addNode(var8); // L: 8695
+									Client.field869 = 0; // L: 8696
+									Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8697
+									Client.field729 = var0; // L: 8698
+								} else if (var2 == 44) {
+									var15 = Client.players[var3]; // L: 8458
+									if (var15 != null) { // L: 8459
+										Client.mouseCrossX = var6; // L: 8460
+										Client.mouseCrossY = var7; // L: 8461
+										Client.mouseCrossColor = 2; // L: 8462
+										Client.mouseCrossState = 0; // L: 8463
+										Client.destinationX = var0; // L: 8464
+										Client.destinationY = var1; // L: 8465
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8467
+										var9.packetBuffer.method6705(var3); // L: 8468
+										var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8469
+										Client.packetWriter.addNode(var9); // L: 8470
+									}
+								} else if (var2 == 45) {
+									var15 = Client.players[var3]; // L: 7969
+									if (var15 != null) { // L: 7970
+										Client.mouseCrossX = var6; // L: 7971
+										Client.mouseCrossY = var7; // L: 7972
+										Client.mouseCrossColor = 2; // L: 7973
+										Client.mouseCrossState = 0; // L: 7974
+										Client.destinationX = var0; // L: 7975
+										Client.destinationY = var1; // L: 7976
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2625, Client.packetWriter.isaacCipher); // L: 7978
+										var9.packetBuffer.method6649(var3); // L: 7979
+										var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7980
+										Client.packetWriter.addNode(var9); // L: 7981
+									}
+								} else if (var2 == 46) {
+									var15 = Client.players[var3]; // L: 7937
+									if (var15 != null) { // L: 7938
+										Client.mouseCrossX = var6; // L: 7939
+										Client.mouseCrossY = var7; // L: 7940
+										Client.mouseCrossColor = 2; // L: 7941
+										Client.mouseCrossState = 0; // L: 7942
+										Client.destinationX = var0; // L: 7943
+										Client.destinationY = var1; // L: 7944
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 7946
+										var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7947
+										var9.packetBuffer.method6649(var3); // L: 7948
+										Client.packetWriter.addNode(var9); // L: 7949
+									}
+								} else if (var2 == 47) {
+									var15 = Client.players[var3]; // L: 8256
+									if (var15 != null) { // L: 8257
+										Client.mouseCrossX = var6; // L: 8258
+										Client.mouseCrossY = var7; // L: 8259
+										Client.mouseCrossColor = 2; // L: 8260
+										Client.mouseCrossState = 0; // L: 8261
+										Client.destinationX = var0; // L: 8262
+										Client.destinationY = var1; // L: 8263
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8265
+										var9.packetBuffer.method6640(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8266
+										var9.packetBuffer.method6648(var3); // L: 8267
+										Client.packetWriter.addNode(var9); // L: 8268
+									}
+								} else if (var2 == 48) {
+									var15 = Client.players[var3]; // L: 8411
+									if (var15 != null) { // L: 8412
+										Client.mouseCrossX = var6; // L: 8413
+										Client.mouseCrossY = var7; // L: 8414
+										Client.mouseCrossColor = 2; // L: 8415
+										Client.mouseCrossState = 0; // L: 8416
+										Client.destinationX = var0; // L: 8417
+										Client.destinationY = var1; // L: 8418
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher); // L: 8420
+										var9.packetBuffer.method6648(var3); // L: 8421
+										var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8422
+										Client.packetWriter.addNode(var9); // L: 8423
+									}
+								} else if (var2 == 49) {
+									var15 = Client.players[var3]; // L: 8370
+									if (var15 != null) { // L: 8371
+										Client.mouseCrossX = var6; // L: 8372
+										Client.mouseCrossY = var7; // L: 8373
+										Client.mouseCrossColor = 2; // L: 8374
+										Client.mouseCrossState = 0; // L: 8375
+										Client.destinationX = var0; // L: 8376
+										Client.destinationY = var1; // L: 8377
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 8379
+										var9.packetBuffer.method6649(var3); // L: 8380
+										var9.packetBuffer.method6639(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8381
+										Client.packetWriter.addNode(var9); // L: 8382
+									}
+								} else if (var2 == 50) {
+									var15 = Client.players[var3]; // L: 8188
+									if (var15 != null) { // L: 8189
+										Client.mouseCrossX = var6; // L: 8190
+										Client.mouseCrossY = var7; // L: 8191
+										Client.mouseCrossColor = 2; // L: 8192
+										Client.mouseCrossState = 0; // L: 8193
+										Client.destinationX = var0; // L: 8194
+										Client.destinationY = var1; // L: 8195
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 8197
+										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8198
+										var9.packetBuffer.method6705(var3); // L: 8199
+										Client.packetWriter.addNode(var9); // L: 8200
+									}
+								} else if (var2 == 51) {
+									var15 = Client.players[var3]; // L: 8141
+									if (var15 != null) { // L: 8142
+										Client.mouseCrossX = var6; // L: 8143
+										Client.mouseCrossY = var7; // L: 8144
+										Client.mouseCrossColor = 2; // L: 8145
+										Client.mouseCrossState = 0; // L: 8146
+										Client.destinationX = var0; // L: 8147
+										Client.destinationY = var1; // L: 8148
+										var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2674, Client.packetWriter.isaacCipher); // L: 8150
+										var9.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8151
+										var9.packetBuffer.writeShort(var3); // L: 8152
+										Client.packetWriter.addNode(var9); // L: 8153
+									}
+								} else if (var2 != 1007 && var2 != 57) {
+									if (var2 == 58) {
+										var16 = class17.getWidgetChild(var1, var0); // L: 8157
+										if (var16 != null) { // L: 8158
+											var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); // L: 8160
+											var9.packetBuffer.method6649(var16.itemId); // L: 8161
+											var9.packetBuffer.writeIntME(var1); // L: 8162
+											var9.packetBuffer.method6705(Client.selectedSpellChildIndex); // L: 8163
+											var9.packetBuffer.method6648(var0); // L: 8164
+											var9.packetBuffer.writeInt(class15.selectedSpellWidget); // L: 8165
+											var9.packetBuffer.writeShort(Client.field634); // L: 8166
+											Client.packetWriter.addNode(var9); // L: 8167
+										}
+									} else if (var2 == 1001) {
+										Client.mouseCrossX = var6; // L: 8081
+										Client.mouseCrossY = var7; // L: 8082
+										Client.mouseCrossColor = 2; // L: 8083
+										Client.mouseCrossState = 0; // L: 8084
+										Client.destinationX = var0; // L: 8085
+										Client.destinationY = var1; // L: 8086
+										var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2623, Client.packetWriter.isaacCipher); // L: 8088
+										var8.packetBuffer.method6649(var3); // L: 8089
+										var8.packetBuffer.method6641(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8090
+										var8.packetBuffer.method6705(WorldMapSprite.baseY + var1); // L: 8091
+										var8.packetBuffer.method6648(var0 + class15.baseX); // L: 8092
+										Client.packetWriter.addNode(var8); // L: 8093
+									} else if (var2 == 1002) {
+										Client.mouseCrossX = var6; // L: 8124
+										Client.mouseCrossY = var7; // L: 8125
+										Client.mouseCrossColor = 2; // L: 8126
+										Client.mouseCrossState = 0; // L: 8127
+										var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); // L: 8129
+										var8.packetBuffer.writeShort(var3); // L: 8130
+										Client.packetWriter.addNode(var8); // L: 8131
+									} else if (var2 == 1003) {
+										Client.mouseCrossX = var6; // L: 8171
+										Client.mouseCrossY = var7; // L: 8172
+										Client.mouseCrossColor = 2; // L: 8173
+										Client.mouseCrossState = 0; // L: 8174
+										var13 = Client.npcs[var3]; // L: 8175
+										if (var13 != null) { // L: 8176
+											NPCComposition var17 = var13.definition; // L: 8177
+											if (var17.transforms != null) { // L: 8178
+												var17 = var17.transform();
+											}
+
+											if (var17 != null) { // L: 8179
+												var11 = InterfaceParent.getPacketBufferNode(ClientPacket.field2634, Client.packetWriter.isaacCipher); // L: 8181
+												var11.packetBuffer.method6649(var17.id); // L: 8182
+												Client.packetWriter.addNode(var11); // L: 8183
+											}
+										}
+									} else if (var2 == 1004) {
+										Client.mouseCrossX = var6; // L: 8577
+										Client.mouseCrossY = var7; // L: 8578
+										Client.mouseCrossColor = 2; // L: 8579
+										Client.mouseCrossState = 0; // L: 8580
+										var8 = InterfaceParent.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); // L: 8582
+										var8.packetBuffer.writeShort(var3); // L: 8583
+										Client.packetWriter.addNode(var8); // L: 8584
+									} else if (var2 == 1005) {
+										var16 = WorldMapData_1.getWidget(var1); // L: 8716
+										if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8717
+											UserComparator10.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class250.ItemDefinition_get(var3).name);
+										} else {
+											var9 = InterfaceParent.getPacketBufferNode(ClientPacket.field2629, Client.packetWriter.isaacCipher); // L: 8720
+											var9.packetBuffer.writeShort(var3); // L: 8721
+											Client.packetWriter.addNode(var9); // L: 8722
+										}
+
+										Client.field869 = 0; // L: 8724
+										Login.field1034 = WorldMapData_1.getWidget(var1); // L: 8725
+										Client.field729 = var0; // L: 8726
+									} else if (var2 == 1012 || var2 == 1011 || var2 == 1009 || var2 == 1008 || var2 == 1010) {
+										class80.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8666
+									}
+								} else {
+									var16 = class17.getWidgetChild(var1, var0); // L: 8684
+									if (var16 != null) { // L: 8685
+										MouseHandler.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8686
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (Client.isItemSelected != 0) { // L: 8728
+			Client.isItemSelected = 0; // L: 8729
+			Script.invalidateWidget(WorldMapData_1.getWidget(class246.selectedItemWidget)); // L: 8730
+		}
+
+		if (Client.isSpellSelected) { // L: 8732
+			class20.Widget_runOnTargetLeave();
+		}
+
+		if (Login.field1034 != null && Client.field869 == 0) { // L: 8733
+			Script.invalidateWidget(Login.field1034);
+		}
+
+	} // L: 8734
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index 61f41ceceb..b3cb3e789c 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -4,22 +4,22 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("js")
+@ObfuscatedName("jt")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 512263149
+		intValue = 664373343
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = 6451811657459395973L
+		longValue = -1846074913095996279L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "Lju;"
 	)
@@ -28,23 +28,23 @@ public class GrandExchangeEvent {
 	@ObfuscatedName("y")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;BI)V"
+		descriptor = "(Lnt;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
-		this.offerName = var1.readStringCp1252NullTerminated(); // L: 111
+		this.offerName = var1.readStringCp1252NullTerminated();
 		this.previousOfferName = var1.readStringCp1252NullTerminated(); // L: 112
 		this.world = var1.readUnsignedShort(); // L: 113
 		this.age = var1.readLong(); // L: 114
 		int var4 = var1.readInt(); // L: 115
 		int var5 = var1.readInt(); // L: 116
 		this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117
-		this.grandExchangeOffer.method5092(2); // L: 118
-		this.grandExchangeOffer.method5102(var2); // L: 119
+		this.grandExchangeOffer.method5224(2); // L: 118
+		this.grandExchangeOffer.method5229(var2); // L: 119
 		this.grandExchangeOffer.unitPrice = var4; // L: 120
 		this.grandExchangeOffer.totalQuantity = var5; // L: 121
 		this.grandExchangeOffer.currentQuantity = 0; // L: 122
@@ -52,23 +52,87 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3; // L: 124
 	} // L: 125
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "-72"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "827394451"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName; // L: 128
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "1720963732"
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "73"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName; // L: 132
 	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(B)[Loj;",
+		garbageValue = "-77"
+	)
+	@Export("FillMode_values")
+	public static FillMode[] FillMode_values() {
+		return new FillMode[]{FillMode.field4239, FillMode.SOLID, FillMode.field4241}; // L: 15
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1329889616"
+	)
+	static final void method5223() {
+		Object var10000 = null; // L: 107
+		String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members";
+		UserComparator10.addGameMessage(30, "", var0); // L: 109
+	} // L: 111
+
+	@ObfuscatedName("iy")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-106576024"
+	)
+	static void method5222(int var0, int var1) {
+		int var2 = class309.fontBold12.stringWidth("Choose Option"); // L: 7910
+
+		int var3;
+		int var4;
+		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7911
+			var4 = class309.fontBold12.stringWidth(class0.method1(var3)); // L: 7912
+			if (var4 > var2) { // L: 7913
+				var2 = var4;
+			}
+		}
+
+		var2 += 8; // L: 7915
+		var3 = Client.menuOptionsCount * 15 + 22; // L: 7916
+		var4 = var0 - var2 / 2; // L: 7917
+		if (var2 + var4 > AttackOption.canvasWidth) { // L: 7918
+			var4 = AttackOption.canvasWidth - var2;
+		}
+
+		if (var4 < 0) { // L: 7919
+			var4 = 0;
+		}
+
+		int var5 = var1; // L: 7920
+		if (var1 + var3 > class0.canvasHeight) { // L: 7921
+			var5 = class0.canvasHeight - var3;
+		}
+
+		if (var5 < 0) { // L: 7922
+			var5 = 0;
+		}
+
+		StructComposition.menuX = var4; // L: 7923
+		class143.menuY = var5; // L: 7924
+		UserComparator3.menuWidth = var2; // L: 7925
+		PendingSpawn.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7926
+	} // L: 7927
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index 3af42a53aa..e044c9294e 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -7,27 +7,28 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jm")
+@ObfuscatedName("jk")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
 	@ObfuscatedName("y")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("jp")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "[Lof;"
 	)
-	static Widget field3626;
-	@ObfuscatedName("v")
+	@Export("title_muteSprite")
+	static IndexedSprite[] title_muteSprite;
+	@ObfuscatedName("f")
 	@Export("events")
 	public final List events;
 
@@ -40,7 +41,7 @@ public class GrandExchangeEvents {
 	} // L: 67
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Z)V",
+		descriptor = "(Lnt;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -62,10 +63,10 @@ public class GrandExchangeEvents {
 
 	} // L: 92
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/Comparator;ZI)V",
-		garbageValue = "-1954624010"
+		descriptor = "(Ljava/util/Comparator;ZS)V",
+		garbageValue = "255"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -77,38 +78,41 @@ public class GrandExchangeEvents {
 
 	} // L: 101
 
-	@ObfuscatedName("hy")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-1158444411"
+		descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
+		garbageValue = "38"
 	)
-	@Export("worldToScreen")
-	static final void worldToScreen(int var0, int var1, int var2) {
-		if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4997
-			int var3 = class105.getTileHeight(var0, var1, class22.Client_plane) - var2; // L: 5002
-			var0 -= MouseHandler.cameraX; // L: 5003
-			var3 -= SecureRandomCallable.cameraY; // L: 5004
-			var1 -= class105.cameraZ; // L: 5005
-			int var4 = Rasterizer3D.Rasterizer3D_sine[SpotAnimationDefinition.cameraPitch]; // L: 5006
-			int var5 = Rasterizer3D.Rasterizer3D_cosine[SpotAnimationDefinition.cameraPitch]; // L: 5007
-			int var6 = Rasterizer3D.Rasterizer3D_sine[class376.cameraYaw]; // L: 5008
-			int var7 = Rasterizer3D.Rasterizer3D_cosine[class376.cameraYaw]; // L: 5009
-			int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5010
-			var1 = var7 * var1 - var0 * var6 >> 16; // L: 5011
-			var0 = var8; // L: 5012
-			var8 = var5 * var3 - var4 * var1 >> 16; // L: 5013
-			var1 = var5 * var1 + var4 * var3 >> 16; // L: 5014
-			if (var1 >= 50) { // L: 5016
-				Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5017
-				Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5018
-			} else {
-				Client.viewportTempX = -1; // L: 5021
-				Client.viewportTempY = -1; // L: 5022
+	public static String method5182(String var0) {
+		int var1 = var0.length(); // L: 170
+		char[] var2 = new char[var1]; // L: 171
+		byte var3 = 2; // L: 172
+
+		for (int var4 = 0; var4 < var1; ++var4) { // L: 173
+			char var5 = var0.charAt(var4); // L: 174
+			if (var3 == 0) { // L: 175
+				var5 = Character.toLowerCase(var5);
+			} else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 176
+				var5 = HitSplatDefinition.method3013(var5);
 			}
 
-		} else {
-			Client.viewportTempX = -1; // L: 4998
-			Client.viewportTempY = -1; // L: 4999
+			if (Character.isLetter(var5)) { // L: 177
+				var3 = 0;
+			} else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 178
+				if (Character.isSpaceChar(var5)) { // L: 179
+					if (var3 != 2) { // L: 180
+						var3 = 1;
+					}
+				} else {
+					var3 = 1; // L: 182
+				}
+			} else {
+				var3 = 2;
+			}
+
+			var2[var4] = var5; // L: 183
 		}
-	} // L: 5000 5024
+
+		return new String(var2); // L: 185
+	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java
index d846735da8..c0cbf459e8 100644
--- a/runescape-client/src/main/java/GrandExchangeOffer.java
+++ b/runescape-client/src/main/java/GrandExchangeOffer.java
@@ -7,42 +7,36 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("ju")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	@Export("options_buttons_2Sprite")
-	static IndexedSprite options_buttons_2Sprite;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1898711
+		intValue = -1583312423
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1229494071
+		intValue = 1337068893
 	)
 	@Export("unitPrice")
 	public int unitPrice;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -822093809
+		intValue = 85465659
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1567060795
+		intValue = -631103109
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 176369301
+		intValue = 1719757481
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -51,7 +45,7 @@ public class GrandExchangeOffer {
 	} // L: 13
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Z)V",
+		descriptor = "(Lnt;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -63,20 +57,20 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt(); // L: 21
 	} // L: 22
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "184180839"
+		descriptor = "(B)I",
+		garbageValue = "10"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7; // L: 50
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1399016532"
+		descriptor = "(B)I",
+		garbageValue = "48"
 	)
 	@Export("type")
 	public int type() {
@@ -85,20 +79,20 @@ public class GrandExchangeOffer {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1177781475"
+		descriptor = "(IB)V",
+		garbageValue = "-59"
 	)
-	void method5092(int var1) {
+	void method5224(int var1) {
 		this.state &= -8; // L: 58
 		this.state = (byte)(this.state | var1 & 7); // L: 59
 	} // L: 60
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "110"
+		descriptor = "(II)V",
+		garbageValue = "-1688062511"
 	)
-	void method5102(int var1) {
+	void method5229(int var1) {
 		this.state &= -9; // L: 63
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8); // L: 64
diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
index c977745673..8809efabec 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
@@ -1,95 +1,76 @@
 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("jt")
+@ObfuscatedName("jy")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("dl")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive8")
-	static Archive archive8;
-	@ObfuscatedName("fq")
-	@ObfuscatedGetter(
-		longValue = 172020438683337197L
-	)
-	static long field3634;
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljs;I)I",
-		garbageValue = "119350129"
+		descriptor = "(Ljt;Ljt;B)I",
+		garbageValue = "1"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 21
 	}
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;IB)V",
-		garbageValue = "26"
-	)
-	static void method5068(AbstractArchive var0, int var1) {
-		if ((var1 & 536870912) != 0) { // L: 192
-			Fonts.logoSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 193
-		} else if ((var1 & 1073741824) != 0) { // L: 195
-			Fonts.logoSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 196
-		} else {
-			Fonts.logoSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 199
-		}
-
-	} // L: 201
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-324437873"
-	)
-	static final int method5067(int var0, int var1) {
-		int var2 = var1 * 57 + var0; // L: 840
-		var2 ^= var2 << 13; // L: 841
-		int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 842
-		return var3 >> 19 & 255; // L: 843
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "918594995"
+		descriptor = "(Lbk;I)V",
+		garbageValue = "1304582630"
 	)
-	static int method5064(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1172
-		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1173
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.itemId; // L: 1174
-			return 1; // L: 1175
-		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1177
-			if (var3.itemId != -1) { // L: 1178
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1179
+	@Export("changeWorld")
+	static void changeWorld(World var0) {
+		if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1497
+			Client.isMembersWorld = var0.isMembersOnly(); // L: 1498
+			boolean var1 = var0.isMembersOnly(); // L: 1499
+			if (var1 != ItemComposition.ItemDefinition_inMembersWorld) { // L: 1501
+				Projectile.method2075(); // L: 1502
+				ItemComposition.ItemDefinition_inMembersWorld = var1; // L: 1503
 			}
-
-			return 1; // L: 1180
-		} else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1182
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1183
-			return 1; // L: 1184
-		} else {
-			return 2; // L: 1186
 		}
-	}
+
+		if (var0.properties != Client.worldProperties) { // L: 1507
+			class27.method364(ModeWhere.archive8, var0.properties); // L: 1508
+		}
+
+		Client.worldHost = var0.host; // L: 1510
+		Client.worldId = var0.id; // L: 1511
+		Client.worldProperties = var0.properties; // L: 1512
+		UserComparator7.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1513
+		MouseRecorder.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1514
+		UserComparator2.currentPort = UserComparator7.worldPort; // L: 1515
+	} // L: 1516
+
+	@ObfuscatedName("lz")
+	@ObfuscatedSignature(
+		descriptor = "(IIZB)V",
+		garbageValue = "-56"
+	)
+	static final void method5203(int var0, int var1, boolean var2) {
+		if (Client.currentClanChannels[var0] != null) { // L: 11524
+			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method49()) { // L: 11525
+				ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11526
+				PacketWriter var4 = Client.packetWriter; // L: 11527
+				PacketBufferNode var5 = InterfaceParent.getPacketBufferNode(ClientPacket.field2675, var4.isaacCipher); // L: 11528
+				var5.packetBuffer.writeByte(4 + class44.stringCp1252NullTerminatedByteSize(var3.name)); // L: 11529
+				var5.packetBuffer.writeByte(var0); // L: 11530
+				var5.packetBuffer.writeShort(var1); // L: 11531
+				var5.packetBuffer.writeBoolean(var2); // L: 11532
+				var5.packetBuffer.writeStringCp1252NullTerminated(var3.name); // L: 11533
+				var4.addNode(var5); // L: 11534
+			}
+		}
+	} // L: 11535
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
index 8ff14d9cb0..9af602042f 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
@@ -1,16 +1,21 @@
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jc")
+@ObfuscatedName("je")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljs;I)I",
-		garbageValue = "-929613700"
+		descriptor = "(Ljt;Ljt;I)I",
+		garbageValue = "1398133242"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -25,16 +30,56 @@ final class GrandExchangeOfferNameComparator implements Comparator {
 		return super.equals(var1); // L: 64
 	}
 
-	@ObfuscatedName("fu")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-1454161058"
+		descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;",
+		garbageValue = "-1807946914"
 	)
-	static void method5059(int var0, int var1) {
-		if (ObjectComposition.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3401
-			LoginScreenAnimation.method2219(WorldMapManager.archive11, var0, 0, ObjectComposition.clientPreferences.musicVolume, false); // L: 3402
-			Client.field881 = true; // L: 3403
+	static String method5193(Throwable var0) throws IOException {
+		String var1;
+		if (var0 instanceof RunException) { // L: 67
+			RunException var2 = (RunException)var0; // L: 68
+			var1 = var2.message + " | "; // L: 69
+			var0 = var2.throwable; // L: 70
+		} else {
+			var1 = ""; // L: 72
 		}
 
-	} // L: 3405
+		StringWriter var12 = new StringWriter(); // L: 73
+		PrintWriter var3 = new PrintWriter(var12); // L: 74
+		var0.printStackTrace(var3); // L: 75
+		var3.close(); // L: 76
+		String var4 = var12.toString(); // L: 77
+		BufferedReader var5 = new BufferedReader(new StringReader(var4)); // L: 78
+		String var6 = var5.readLine(); // L: 79
+
+		while (true) {
+			while (true) {
+				String var7 = var5.readLine(); // L: 81
+				if (var7 == null) { // L: 82
+					var1 = var1 + "| " + var6; // L: 100
+					return var1; // L: 101
+				}
+
+				int var8 = var7.indexOf(40); // L: 83
+				int var9 = var7.indexOf(41, var8 + 1); // L: 84
+				if (var8 >= 0 && var9 >= 0) { // L: 85
+					String var10 = var7.substring(var8 + 1, var9); // L: 86
+					int var11 = var10.indexOf(".java:"); // L: 87
+					if (var11 >= 0) { // L: 88
+						var10 = var10.substring(0, var11) + var10.substring(var11 + 5); // L: 89
+						var1 = var1 + var10 + ' '; // L: 90
+						continue; // L: 91
+					}
+
+					var7 = var7.substring(0, var8); // L: 93
+				}
+
+				var7 = var7.trim(); // L: 95
+				var7 = var7.substring(var7.lastIndexOf(32) + 1); // L: 96
+				var7 = var7.substring(var7.lastIndexOf(9) + 1); // L: 97
+				var1 = var1 + var7 + ' '; // L: 98
+			}
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
index 863a63ae10..042917e171 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
@@ -1,3 +1,4 @@
+import java.security.SecureRandom;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
@@ -5,160 +6,78 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bk")
+@ObfuscatedName("bp")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "Lli;"
-	)
-	static Bounds field631;
-	@ObfuscatedName("gw")
+	@ObfuscatedName("ro")
 	@ObfuscatedGetter(
-		intValue = 1130183005
+		intValue = -2144247307
 	)
-	static int field632;
-	@ObfuscatedName("ob")
+	static int field607;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 972437249
+	)
+	public static int field608;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ldc;"
+		descriptor = "[[Liv;"
 	)
-	@Export("varcs")
-	static Varcs varcs;
-	@ObfuscatedName("oo")
+	@Export("Widget_interfaceComponents")
+	public static Widget[][] Widget_interfaceComponents;
+	@ObfuscatedName("dn")
 	@ObfuscatedSignature(
-		descriptor = "Lnu;"
+		descriptor = "Ljf;"
 	)
-	static class369 field634;
-	@ObfuscatedName("v")
+	@Export("archive13")
+	static Archive archive13;
+	@ObfuscatedName("f")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
-	} // L: 11583
+	} // L: 11744
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljs;I)I",
-		garbageValue = "-1562146243"
+		descriptor = "(Ljt;Ljt;B)I",
+		garbageValue = "16"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		if (var2.world == var1.world) { // L: 11586
+		if (var2.world == var1.world) { // L: 11747
 			return 0;
 		} else {
-			if (this.filterWorlds) { // L: 11587
-				if (Client.worldId == var1.world) { // L: 11588
+			if (this.filterWorlds) { // L: 11748
+				if (Client.worldId == var1.world) { // L: 11749
 					return -1;
 				}
 
-				if (var2.world == Client.worldId) { // L: 11589
+				if (var2.world == Client.worldId) { // L: 11750
 					return 1;
 				}
 			}
 
-			return var1.world < var2.world ? -1 : 1; // L: 11591
+			return var1.world < var2.world ? -1 : 1; // L: 11752
 		}
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 11599
-	}
-
 	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11595
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 11756
 	}
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lep;",
-		garbageValue = "-78"
-	)
-	@Export("getInvDefinition")
-	public static InvDefinition getInvDefinition(int var0) {
-		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21
-		if (var1 != null) { // L: 22
-			return var1;
-		} else {
-			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23
-			var1 = new InvDefinition(); // L: 24
-			if (var2 != null) { // L: 25
-				var1.decode(new Buffer(var2));
-			}
-
-			InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26
-			return var1; // L: 27
-		}
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 11760
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1916477751"
+		descriptor = "(I)Ljava/security/SecureRandom;",
+		garbageValue = "287723584"
 	)
-	@Export("clearItemContainer")
-	static void clearItemContainer(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
-		if (var1 != null) { // L: 64
-			for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
-				var1.ids[var2] = -1; // L: 66
-				var1.quantities[var2] = 0; // L: 67
-			}
-
-		}
-	} // L: 69
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1870393029"
-	)
-	public static int method1166(int var0) {
-		return class229.method4374(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 68
+	static SecureRandom method1271() {
+		SecureRandom var0 = new SecureRandom(); // L: 39
+		var0.nextInt(); // L: 40
+		return var0; // L: 41
 	}
-
-	@ObfuscatedName("ai")
-	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "1889329497"
-	)
-	public static int method1176(byte[] var0, int var1, int var2) {
-		int var3 = -1; // L: 45
-
-		for (int var4 = var1; var4 < var2; ++var4) { // L: 46
-			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 47
-		}
-
-		var3 = ~var3; // L: 49
-		return var3; // L: 50
-	}
-
-	@ObfuscatedName("gl")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "2022835517"
-	)
-	@Export("addNpcsToScene")
-	static final void addNpcsToScene(boolean var0) {
-		for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4390
-			NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4391
-			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4392
-				int var3 = var2.x >> 7; // L: 4393
-				int var4 = var2.y >> 7; // L: 4394
-				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4395
-					if (var2.field1239 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4396
-						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4397
-							continue;
-						}
-
-						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4398
-					}
-
-					long var5 = DevicePcmPlayerProvider.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4400
-					var2.playerCycle = Client.cycle; // L: 4401
-					AbstractSocket.scene.drawEntity(class22.Client_plane, var2.x, var2.y, class105.getTileHeight(var2.field1239 * 64 - 64 + var2.x, var2.field1239 * 64 - 64 + var2.y, class22.Client_plane), var2.field1239 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4402
-				}
-			}
-		}
-
-	} // L: 4406
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
index a3e0a16641..2736a60a88 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
@@ -1,24 +1,16 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jr")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("ef")
-	@ObfuscatedGetter(
-		intValue = 1162087447
-	)
-	@Export("js5Port")
-	static int js5Port;
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljs;I)I",
-		garbageValue = "1946951772"
+		descriptor = "(Ljt;Ljt;I)I",
+		garbageValue = "-518931969"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
index 8436fc5f81..3d2e3cc812 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
@@ -4,33 +4,34 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jz")
+@ObfuscatedName("jx")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljs;I)I",
-		garbageValue = "2126049073"
+		descriptor = "Ljp;"
+	)
+	@Export("FloorOverlayDefinition_archive")
+	static AbstractArchive FloorOverlayDefinition_archive;
+	@ObfuscatedName("z")
+	@Export("musicTrackBoolean")
+	static boolean musicTrackBoolean;
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljt;Ljt;I)I",
+		garbageValue = "-1968162163"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 51
 	}
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;B)V",
-		garbageValue = "55"
-	)
-	public static void method5109(AbstractArchive var0) {
-		EnumComposition.EnumDefinition_archive = var0; // L: 25
-	} // L: 26
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47
+	}
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
index 9e7a92366b..781e0c6719 100644
--- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
@@ -4,13 +4,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jj")
+@ObfuscatedName("jz")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljs;Ljs;I)I",
-		garbageValue = "78911903"
+		descriptor = "(Ljt;Ljt;I)I",
+		garbageValue = "448917166"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -25,20 +25,210 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		return super.equals(var1); // L: 36
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "([BZI)Ljava/lang/Object;",
-		garbageValue = "-1900092184"
+		descriptor = "(Lns;II)V",
+		garbageValue = "-1956438799"
 	)
-	public static Object method5079(byte[] var0, boolean var1) {
-		if (var0 == null) { // L: 7
-			return null;
-		} else if (var0.length > 136) { // L: 8
-			DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10
-			var2.set(var0); // L: 11
-			return var2; // L: 12
-		} else {
-			return var0; // L: 25
+	@Export("readPlayerUpdate")
+	static void readPlayerUpdate(PacketBuffer var0, int var1) {
+		boolean var2 = var0.readBits(1) == 1; // L: 199
+		if (var2) { // L: 200
+			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
 		}
-	}
+
+		int var3 = var0.readBits(2); // L: 201
+		Player var4 = Client.players[var1]; // L: 202
+		if (var3 == 0) { // L: 203
+			if (var2) { // L: 204
+				var4.field1201 = false; // L: 205
+			} else if (Client.localPlayerIndex == var1) { // L: 208
+				throw new RuntimeException();
+			} else {
+				Players.Players_regions[var1] = (var4.plane << 28) + (class15.baseX + var4.pathX[0] >> 13 << 14) + (WorldMapSprite.baseY + var4.pathY[0] >> 13); // L: 209
+				if (var4.field1280 != -1) { // L: 210
+					Players.Players_orientations[var1] = var4.field1280;
+				} else {
+					Players.Players_orientations[var1] = var4.orientation; // L: 211
+				}
+
+				Players.Players_targetIndices[var1] = var4.targetIndex; // L: 212
+				Client.players[var1] = null; // L: 213
+				if (var0.readBits(1) != 0) { // L: 214
+					class35.updateExternalPlayer(var0, var1);
+				}
+
+			}
+		} else {
+			int var5;
+			int var6;
+			int var7;
+			if (var3 == 1) { // L: 217
+				var5 = var0.readBits(3); // L: 218
+				var6 = var4.pathX[0]; // L: 219
+				var7 = var4.pathY[0]; // L: 220
+				if (var5 == 0) { // L: 221
+					--var6; // L: 222
+					--var7; // L: 223
+				} else if (var5 == 1) { // L: 225
+					--var7;
+				} else if (var5 == 2) { // L: 226
+					++var6; // L: 227
+					--var7; // L: 228
+				} else if (var5 == 3) { // L: 230
+					--var6;
+				} else if (var5 == 4) { // L: 231
+					++var6;
+				} else if (var5 == 5) { // L: 232
+					--var6; // L: 233
+					++var7; // L: 234
+				} else if (var5 == 6) { // L: 236
+					++var7;
+				} else if (var5 == 7) { // L: 237
+					++var6; // L: 238
+					++var7; // L: 239
+				}
+
+				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 241
+					var4.resetPath(var6, var7); // L: 242
+					var4.field1201 = false; // L: 243
+				} else if (var2) { // L: 245
+					var4.field1201 = true; // L: 246
+					var4.tileX = var6; // L: 247
+					var4.tileY = var7; // L: 248
+				} else {
+					var4.field1201 = false; // L: 251
+					var4.method2217(var6, var7, Players.field1361[var1]); // L: 252
+				}
+
+			} else if (var3 == 2) { // L: 256
+				var5 = var0.readBits(4); // L: 257
+				var6 = var4.pathX[0]; // L: 258
+				var7 = var4.pathY[0]; // L: 259
+				if (var5 == 0) { // L: 260
+					var6 -= 2; // L: 261
+					var7 -= 2; // L: 262
+				} else if (var5 == 1) { // L: 264
+					--var6; // L: 265
+					var7 -= 2; // L: 266
+				} else if (var5 == 2) { // L: 268
+					var7 -= 2;
+				} else if (var5 == 3) { // L: 269
+					++var6; // L: 270
+					var7 -= 2; // L: 271
+				} else if (var5 == 4) { // L: 273
+					var6 += 2; // L: 274
+					var7 -= 2; // L: 275
+				} else if (var5 == 5) { // L: 277
+					var6 -= 2; // L: 278
+					--var7; // L: 279
+				} else if (var5 == 6) { // L: 281
+					var6 += 2; // L: 282
+					--var7; // L: 283
+				} else if (var5 == 7) { // L: 285
+					var6 -= 2;
+				} else if (var5 == 8) { // L: 286
+					var6 += 2;
+				} else if (var5 == 9) { // L: 287
+					var6 -= 2; // L: 288
+					++var7; // L: 289
+				} else if (var5 == 10) { // L: 291
+					var6 += 2; // L: 292
+					++var7; // L: 293
+				} else if (var5 == 11) { // L: 295
+					var6 -= 2; // L: 296
+					var7 += 2; // L: 297
+				} else if (var5 == 12) { // L: 299
+					--var6; // L: 300
+					var7 += 2; // L: 301
+				} else if (var5 == 13) { // L: 303
+					var7 += 2;
+				} else if (var5 == 14) { // L: 304
+					++var6; // L: 305
+					var7 += 2; // L: 306
+				} else if (var5 == 15) { // L: 308
+					var6 += 2; // L: 309
+					var7 += 2; // L: 310
+				}
+
+				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 312
+					var4.resetPath(var6, var7); // L: 313
+					var4.field1201 = false; // L: 314
+				} else if (var2) { // L: 316
+					var4.field1201 = true; // L: 317
+					var4.tileX = var6; // L: 318
+					var4.tileY = var7; // L: 319
+				} else {
+					var4.field1201 = false; // L: 322
+					var4.method2217(var6, var7, Players.field1361[var1]); // L: 323
+				}
+
+			} else {
+				var5 = var0.readBits(1); // L: 327
+				int var8;
+				int var9;
+				int var10;
+				int var11;
+				if (var5 == 0) { // L: 328
+					var6 = var0.readBits(12); // L: 329
+					var7 = var6 >> 10; // L: 330
+					var8 = var6 >> 5 & 31; // L: 331
+					if (var8 > 15) { // L: 332
+						var8 -= 32;
+					}
+
+					var9 = var6 & 31; // L: 333
+					if (var9 > 15) { // L: 334
+						var9 -= 32;
+					}
+
+					var10 = var8 + var4.pathX[0]; // L: 335
+					var11 = var9 + var4.pathY[0]; // L: 336
+					if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 337
+						if (var2) { // L: 341
+							var4.field1201 = true; // L: 342
+							var4.tileX = var10; // L: 343
+							var4.tileY = var11; // L: 344
+						} else {
+							var4.field1201 = false; // L: 347
+							var4.method2217(var10, var11, Players.field1361[var1]); // L: 348
+						}
+					} else {
+						var4.resetPath(var10, var11); // L: 338
+						var4.field1201 = false; // L: 339
+					}
+
+					var4.plane = (byte)(var7 + var4.plane & 3); // L: 350
+					if (Client.localPlayerIndex == var1) { // L: 351
+						SoundSystem.Client_plane = var4.plane;
+					}
+
+				} else {
+					var6 = var0.readBits(30); // L: 354
+					var7 = var6 >> 28; // L: 355
+					var8 = var6 >> 14 & 16383; // L: 356
+					var9 = var6 & 16383; // L: 357
+					var10 = (var8 + class15.baseX + var4.pathX[0] & 16383) - class15.baseX; // L: 358
+					var11 = (var9 + WorldMapSprite.baseY + var4.pathY[0] & 16383) - WorldMapSprite.baseY; // L: 359
+					if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 360
+						var4.resetPath(var10, var11); // L: 361
+						var4.field1201 = false; // L: 362
+					} else if (var2) { // L: 364
+						var4.field1201 = true; // L: 365
+						var4.tileX = var10; // L: 366
+						var4.tileY = var11; // L: 367
+					} else {
+						var4.field1201 = false; // L: 370
+						var4.method2217(var10, var11, Players.field1361[var1]); // L: 371
+					}
+
+					var4.plane = (byte)(var7 + var4.plane & 3); // L: 373
+					if (Client.localPlayerIndex == var1) { // L: 374
+						SoundSystem.Client_plane = var4.plane;
+					}
+
+				}
+			}
+		}
+	} // L: 206 215 254 325 352 375
 }
diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java
index 9443720a40..7d40b476ab 100644
--- a/runescape-client/src/main/java/GraphicsDefaults.java
+++ b/runescape-client/src/main/java/GraphicsDefaults.java
@@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lz")
+@ObfuscatedName("lb")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1949566455
+		intValue = -1984805427
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1513831133
+		intValue = -1191054589
 	)
-	public int field3897;
-	@ObfuscatedName("f")
+	public int field3892;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 791427789
+		intValue = 269750755
 	)
 	@Export("mapScenes")
 	public int mapScenes;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -14842639
+		intValue = -109749595
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 765584361
-	)
-	public int field3900;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1577822991
-	)
-	public int field3901;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -1223274063
-	)
-	public int field3905;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -1228774673
+		intValue = 1879938001
 	)
 	public int field3903;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 616409549
+	)
+	public int field3902;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 854150451
+	)
+	public int field3897;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -901027001
+	)
+	public int field3899;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = 2096329335
+	)
+	public int field3900;
 	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -353348843
+		intValue = 1403628021
 	)
-	public int field3904;
-	@ObfuscatedName("s")
+	public int field3901;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1865970227
+		intValue = 1431986937
 	)
-	public int field3898;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1606283035
-	)
-	public int field3906;
+	public int field3896;
 
 	public GraphicsDefaults() {
 		this.compass = -1; // L: 7
-		this.field3897 = -1; // L: 8
+		this.field3892 = -1; // L: 8
 		this.mapScenes = -1; // L: 9
 		this.headIconsPk = -1; // L: 10
-		this.field3900 = -1; // L: 11
-		this.field3901 = -1; // L: 12
-		this.field3905 = -1; // L: 13
-		this.field3903 = -1; // L: 14
-		this.field3904 = -1; // L: 15
-		this.field3898 = -1; // L: 16
-		this.field3906 = -1; // L: 17
+		this.field3903 = -1; // L: 11
+		this.field3902 = -1; // L: 12
+		this.field3897 = -1; // L: 13
+		this.field3899 = -1; // L: 14
+		this.field3900 = -1; // L: 15
+		this.field3901 = -1; // L: 16
+		this.field3896 = -1; // L: 17
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;B)V",
-		garbageValue = "-61"
+		descriptor = "(Ljp;I)V",
+		garbageValue = "1205783534"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3892.group); // L: 20
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3890.group); // L: 20
 		Buffer var3 = new Buffer(var2); // L: 21
 
 		while (true) {
@@ -98,20 +98,20 @@ public class GraphicsDefaults {
 
 			switch(var4) { // L: 25
 			case 1:
-				var3.readMedium(); // L: 28
-				break;
+				var3.readMedium(); // L: 31
+				break; // L: 32
 			case 2:
-				this.compass = var3.method6583(); // L: 33
-				this.field3897 = var3.method6583(); // L: 34
-				this.mapScenes = var3.method6583(); // L: 35
-				this.headIconsPk = var3.method6583(); // L: 36
-				this.field3900 = var3.method6583(); // L: 37
-				this.field3901 = var3.method6583(); // L: 38
-				this.field3905 = var3.method6583(); // L: 39
-				this.field3903 = var3.method6583(); // L: 40
-				this.field3904 = var3.method6583(); // L: 41
-				this.field3898 = var3.method6583(); // L: 42
-				this.field3906 = var3.method6583(); // L: 43
+				this.compass = var3.method6630(); // L: 36
+				this.field3892 = var3.method6630(); // L: 37
+				this.mapScenes = var3.method6630(); // L: 38
+				this.headIconsPk = var3.method6630(); // L: 39
+				this.field3903 = var3.method6630(); // L: 40
+				this.field3902 = var3.method6630(); // L: 41
+				this.field3897 = var3.method6630(); // L: 42
+				this.field3899 = var3.method6630(); // L: 43
+				this.field3900 = var3.method6630(); // L: 44
+				this.field3901 = var3.method6630(); // L: 45
+				this.field3896 = var3.method6630(); // L: 46
 			}
 		}
 	}
diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java
index 145b3d8d05..02532dd1a5 100644
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -3,66 +3,68 @@ 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("cm")
+@ObfuscatedName("cx")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Renderable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
+	@Export("formattedOperatingSystemName")
+	public static String formattedOperatingSystemName;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -177863619
+		intValue = -1904705757
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 2035613177
+		intValue = -117960567
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1151722421
+		intValue = -1714081181
 	)
 	@Export("plane")
 	int plane;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lfl;"
+		descriptor = "Lfm;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 886051665
+		intValue = -868861481
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1737947099
+		intValue = -1366179757
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1509450081
+		intValue = 774867755
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1147002155
+		intValue = -1955367267
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1179440823
+		intValue = 1076483913
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -76,20 +78,20 @@ public final class GraphicsObject extends Renderable {
 		this.y = var4; // L: 24
 		this.height = var5; // L: 25
 		this.cycleStart = var7 + var6; // L: 26
-		int var8 = VarcInt.SpotAnimationDefinition_get(this.id).sequence; // L: 27
+		int var8 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 27
 		if (var8 != -1) { // L: 28
 			this.isFinished = false; // L: 29
-			this.sequenceDefinition = LoginScreenAnimation.SequenceDefinition_get(var8); // L: 30
+			this.sequenceDefinition = WorldMapScaleHandler.SequenceDefinition_get(var8); // L: 30
 		} else {
 			this.isFinished = true; // L: 32
 		}
 
 	} // L: 33
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1622052519"
+		garbageValue = "-1850791831"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -108,14 +110,14 @@ public final class GraphicsObject extends Renderable {
 		}
 	} // L: 46
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = VarcInt.SpotAnimationDefinition_get(this.id); // L: 49
+		SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 49
 		Model var2;
 		if (!this.isFinished) { // L: 51
 			var2 = var1.getModel(this.frame);
@@ -126,304 +128,20 @@ public final class GraphicsObject extends Renderable {
 		return var2 == null ? null : var2; // L: 53
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("ha")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-1841267567"
+		descriptor = "(I)V",
+		garbageValue = "-651642471"
 	)
-	@Export("hashString")
-	public static int hashString(CharSequence var0) {
-		int var1 = var0.length(); // L: 127
-		int var2 = 0; // L: 128
-
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 129
-			var2 = (var2 << 5) - var2 + ServerPacket.charToByteCp1252(var0.charAt(var3));
-		}
-
-		return var2; // L: 130
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lbg;",
-		garbageValue = "503233534"
-	)
-	@Export("getNextWorldListWorld")
-	static World getNextWorldListWorld() {
-		return World.World_listCount < World.World_count ? Tiles.World_worlds[++World.World_listCount - 1] : null; // L: 252 253
-	}
-
-	@ObfuscatedName("av")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-510374773"
-	)
-	static int method1892(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3591
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = SoundSystem.loadWorlds() ? 1 : 0; // L: 3592
-			return 1; // L: 3593
-		} else {
-			World var9;
-			if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3595
-				var9 = SpotAnimationDefinition.worldListStart(); // L: 3596
-				if (var9 != null) { // L: 3597
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.id; // L: 3598
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.properties; // L: 3599
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3600
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.location; // L: 3601
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.population; // L: 3602
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3603
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3606
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3607
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3608
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3609
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3610
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3611
-				}
-
-				return 1; // L: 3613
-			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3615
-				var9 = getNextWorldListWorld(); // L: 3616
-				if (var9 != null) { // L: 3617
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.id; // L: 3618
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.properties; // L: 3619
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.activity; // L: 3620
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.location; // L: 3621
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var9.population; // L: 3622
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9.host; // L: 3623
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3626
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3627
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3628
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3629
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3630
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3631
-				}
-
-				return 1; // L: 3633
+	static final void method2014() {
+		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7319 7320 7326
+			if (var0.hitpoints == -1) { // L: 7321
+				var0.delay = 0; // L: 7322
+				FriendSystem.method1875(var0); // L: 7323
 			} else {
-				int var3;
-				World var7;
-				int var8;
-				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3635
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3636
-					var7 = null; // L: 3637
-
-					for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3638
-						if (var3 == Tiles.World_worlds[var8].id) { // L: 3639
-							var7 = Tiles.World_worlds[var8]; // L: 3640
-							break;
-						}
-					}
-
-					if (var7 != null) { // L: 3644
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.id; // L: 3645
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.properties; // L: 3646
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3647
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.location; // L: 3648
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.population; // L: 3649
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3650
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3653
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3654
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3655
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3656
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3657
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3658
-					}
-
-					return 1; // L: 3660
-				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3662
-					class44.Interpreter_intStackSize -= 4; // L: 3663
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3664
-					boolean var10 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 3665
-					var8 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 3666
-					boolean var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3] == 1; // L: 3667
-					DirectByteArrayCopier.sortWorldList(var3, var10, var8, var6); // L: 3668
-					return 1; // L: 3669
-				} else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3671
-					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3692
-						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 3693
-						return 1; // L: 3694
-					} else {
-						int var4;
-						ParamComposition var5;
-						if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3696
-							class44.Interpreter_intStackSize -= 2; // L: 3697
-							var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3698
-							var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3699
-							var5 = Varcs.getParamDefinition(var4); // L: 3700
-							if (var5.isString()) { // L: 3701
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = StructComposition.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3702
-							} else {
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = StructComposition.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3705
-							}
-
-							return 1; // L: 3707
-						} else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3709
-							class44.Interpreter_intStackSize -= 2; // L: 3710
-							var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3711
-							var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3712
-							var5 = Varcs.getParamDefinition(var4); // L: 3713
-							if (var5.isString()) { // L: 3714
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class23.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3715
-							} else {
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class23.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3718
-							}
-
-							return 1; // L: 3720
-						} else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3722
-							class44.Interpreter_intStackSize -= 2; // L: 3723
-							var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3724
-							var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3725
-							var5 = Varcs.getParamDefinition(var4); // L: 3726
-							if (var5.isString()) { // L: 3727
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class260.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3728
-							} else {
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3731
-							}
-
-							return 1; // L: 3733
-						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3735
-							class44.Interpreter_intStackSize -= 2; // L: 3736
-							var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3737
-							var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3738
-							var5 = Varcs.getParamDefinition(var4); // L: 3739
-							if (var5.isString()) { // L: 3740
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ArchiveLoader.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3741
-							} else {
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3744
-							}
-
-							return 1; // L: 3746
-						} else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3748
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3749
-							return 1; // L: 3750
-						} else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3752
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3753
-							return 1; // L: 3754
-						} else if (var0 == 6520) { // L: 3756
-							return 1; // L: 3757
-						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3759
-							return 1; // L: 3760
-						} else if (var0 == 6522) { // L: 3762
-							--Interpreter.Interpreter_stringStackSize; // L: 3763
-							--class44.Interpreter_intStackSize; // L: 3764
-							return 1; // L: 3765
-						} else if (var0 == 6523) { // L: 3767
-							--Interpreter.Interpreter_stringStackSize; // L: 3768
-							--class44.Interpreter_intStackSize; // L: 3769
-							return 1; // L: 3770
-						} else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3772
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3773
-							return 1; // L: 3774
-						} else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3776
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 3777
-							return 1; // L: 3778
-						} else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3780
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 3781
-							return 1; // L: 3782
-						} else if (var0 == 6527) { // L: 3784
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.field643; // L: 3785
-							return 1; // L: 3786
-						} else {
-							return 2; // L: 3788
-						}
-					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3672
-					if (var3 >= 0 && var3 < World.World_count) { // L: 3673
-						var7 = Tiles.World_worlds[var3]; // L: 3674
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.id; // L: 3675
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.properties; // L: 3676
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.activity; // L: 3677
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.location; // L: 3678
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.population; // L: 3679
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.host; // L: 3680
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3683
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3684
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3685
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3686
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3687
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3688
-					}
-
-					return 1; // L: 3690
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("ht")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-27"
-	)
-	@Export("createMinimapSprite")
-	static final void createMinimapSprite(int var0) {
-		int[] var1 = GameEngine.sceneMinimapSprite.pixels; // L: 5569
-		int var2 = var1.length; // L: 5570
-
-		int var3;
-		for (var3 = 0; var3 < var2; ++var3) { // L: 5571
-			var1[var3] = 0;
-		}
-
-		int var4;
-		int var5;
-		for (var3 = 1; var3 < 103; ++var3) { // L: 5572
-			var4 = (103 - var3) * 2048 + 24628; // L: 5573
-
-			for (var5 = 1; var5 < 103; ++var5) { // L: 5574
-				if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 5575
-					AbstractSocket.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
-				}
-
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 5576
-					AbstractSocket.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
-				}
-
-				var4 += 4; // L: 5577
+				var0.remove(); // L: 7325
 			}
 		}
 
-		var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 5580
-		var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 5581
-		GameEngine.sceneMinimapSprite.setRaster(); // L: 5582
-
-		int var6;
-		for (var5 = 1; var5 < 103; ++var5) { // L: 5583
-			for (var6 = 1; var6 < 103; ++var6) { // L: 5584
-				if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 5585
-					Coord.drawObject(var0, var6, var5, var3, var4);
-				}
-
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 5586
-					Coord.drawObject(var0 + 1, var6, var5, var3, var4);
-				}
-			}
-		}
-
-		Client.mapIconCount = 0; // L: 5589
-
-		for (var5 = 0; var5 < 104; ++var5) { // L: 5590
-			for (var6 = 0; var6 < 104; ++var6) { // L: 5591
-				long var7 = AbstractSocket.scene.getFloorDecorationTag(class22.Client_plane, var5, var6); // L: 5592
-				if (var7 != 0L) { // L: 5593
-					int var9 = class93.Entity_unpackID(var7); // L: 5594
-					int var10 = class23.getObjectDefinition(var9).mapIconId; // L: 5595
-					if (var10 >= 0 && class6.WorldMapElement_get(var10).field1561) { // L: 5596 5597
-						Client.mapIcons[Client.mapIconCount] = class6.WorldMapElement_get(var10).getSpriteBool(false); // L: 5600
-						Client.mapIconXs[Client.mapIconCount] = var5; // L: 5601
-						Client.mapIconYs[Client.mapIconCount] = var6; // L: 5602
-						++Client.mapIconCount; // L: 5603
-					}
-				}
-			}
-		}
-
-		class26.rasterProvider.apply(); // L: 5608
-	} // L: 5609
+	} // L: 7328
 }
diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java
index 90d8e04657..ba8610065e 100644
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -3,34 +3,34 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cw")
+@ObfuscatedName("ch")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Let;"
+		descriptor = "Ley;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lki;"
+		descriptor = "Lkz;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		descriptor = "(Let;)V"
+		descriptor = "(Ley;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque(); // L: 12
 		this.definition = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-2108595638"
+		descriptor = "(IIIIB)V",
+		garbageValue = "-45"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -44,8 +44,8 @@ public class HealthBar extends Node {
 				return; // L: 25
 			}
 
-			if (var7.cycle <= var1) { // L: 27
-				var5 = var7;
+			if (var7.cycle <= var1) {
+				var5 = var7; // L: 27
 			}
 		}
 
@@ -63,10 +63,10 @@ public class HealthBar extends Node {
 		}
 	} // L: 31 35
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lcx;",
-		garbageValue = "-3"
+		descriptor = "(II)Lcw;",
+		garbageValue = "-1561739593"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -88,13 +88,13 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1762138493"
+		descriptor = "(B)Z",
+		garbageValue = "1"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method5236(); // L: 55
+		return this.updates.method5364(); // L: 55
 	}
 }
diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java
index 00d6faf2d5..80ad80a0a6 100644
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/runescape-client/src/main/java/HealthBarDefinition.java
@@ -3,92 +3,83 @@ 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("et")
+@ObfuscatedName("ey")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("HealthBarDefinition_archive")
-	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("HitSplatDefinition_spritesArchive")
-	public static AbstractArchive HitSplatDefinition_spritesArchive;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Ljp;"
+	)
+	@Export("HealthBarDefinition_archive")
+	static AbstractArchive HealthBarDefinition_archive;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lht;"
 	)
 	@Export("HealthBarDefinition_cached")
 	static EvictingDualNodeHashTable HealthBarDefinition_cached;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("eq")
-	static int[] field1603;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1268318299
+		intValue = -1611863233
 	)
-	public int field1596;
-	@ObfuscatedName("b")
+	public int field1602;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -786020391
+		intValue = 765111099
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1840545813
+		intValue = -448867717
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 2113389855
+		intValue = 608050033
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -490506125
+		intValue = 277480779
 	)
-	public int field1608;
-	@ObfuscatedName("l")
+	public int field1607;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 181606605
+		intValue = -891708783
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -714777503
+		intValue = 1488754817
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1753833631
+		intValue = 1162639959
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -567773935
+		intValue = 1514706787
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1691333321
+		intValue = -320308869
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -102,7 +93,7 @@ public class HealthBarDefinition extends DualNode {
 		this.int1 = 255; // L: 19
 		this.int2 = 255; // L: 20
 		this.int3 = -1; // L: 21
-		this.field1608 = 1; // L: 22
+		this.field1607 = 1; // L: 22
 		this.int5 = 70; // L: 23
 		this.frontSpriteID = -1; // L: 24
 		this.backSpriteID = -1; // L: 25
@@ -110,152 +101,143 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0; // L: 27
 	} // L: 29
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1613150424"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1015511162"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 43
-			if (var2 == 0) { // L: 44
-				return; // L: 47
+			int var2 = var1.readUnsignedByte(); // L: 48
+			if (var2 == 0) { // L: 49
+				return; // L: 52
 			}
 
-			this.decodeNext(var1, var2); // L: 45
+			this.decodeNext(var1, var2); // L: 50
 		}
 	}
 
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "98"
-	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 50
-			var1.readUnsignedShort(); // L: 51
-		} else if (var2 == 2) { // L: 53
-			this.int1 = var1.readUnsignedByte();
-		} else if (var2 == 3) { // L: 54
-			this.int2 = var1.readUnsignedByte();
-		} else if (var2 == 4) { // L: 55
-			this.int3 = 0;
-		} else if (var2 == 5) {
-			this.int5 = var1.readUnsignedShort();
-		} else if (var2 == 6) { // L: 57
-			var1.readUnsignedByte(); // L: 58
-		} else if (var2 == 7) { // L: 60
-			this.frontSpriteID = var1.method6583();
-		} else if (var2 == 8) { // L: 61
-			this.backSpriteID = var1.method6583();
-		} else if (var2 == 11) {
-			this.int3 = var1.readUnsignedShort(); // L: 62
-		} else if (var2 == 14) { // L: 63
-			this.width = var1.readUnsignedByte();
-		} else if (var2 == 15) { // L: 64
-			this.widthPadding = var1.readUnsignedByte();
-		}
-
-	} // L: 66
-
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)Loh;",
-		garbageValue = "-48"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-1870101408"
+	)
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2) {
+		if (var2 == 1) { // L: 55
+			var1.readUnsignedShort(); // L: 56
+		} else if (var2 == 2) { // L: 58
+			this.int1 = var1.readUnsignedByte();
+		} else if (var2 == 3) { // L: 59
+			this.int2 = var1.readUnsignedByte();
+		} else if (var2 == 4) { // L: 60
+			this.int3 = 0;
+		} else if (var2 == 5) { // L: 61
+			this.int5 = var1.readUnsignedShort();
+		} else if (var2 == 6) { // L: 62
+			var1.readUnsignedByte(); // L: 63
+		} else if (var2 == 7) { // L: 65
+			this.frontSpriteID = var1.method6630();
+		} else if (var2 == 8) { // L: 66
+			this.backSpriteID = var1.method6630();
+		} else if (var2 == 11) {
+			this.int3 = var1.readUnsignedShort(); // L: 67
+		} else if (var2 == 14) { // L: 68
+			this.width = var1.readUnsignedByte();
+		} else if (var2 == 15) { // L: 69
+			this.widthPadding = var1.readUnsignedByte();
+		}
+
+	} // L: 71
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)Loa;",
+		garbageValue = "-1342831199"
 	)
 	@Export("getFrontSprite")
 	public SpritePixels getFrontSprite() {
-		if (this.frontSpriteID < 0) { // L: 69
+		if (this.frontSpriteID < 0) { // L: 74
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70
+			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 75
 			if (var1 != null) {
-				return var1; // L: 71
+				return var1; // L: 76
 			} else {
-				var1 = ClientPacket.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 72
-				if (var1 != null) { // L: 73
+				var1 = Tile.SpriteBuffer_getSprite(class378.HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 77
+				if (var1 != null) { // L: 78
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
 
-				return var1; // L: 75
+				return var1; // L: 80
 			}
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(S)Loh;",
-		garbageValue = "-6435"
+		descriptor = "(I)Loa;",
+		garbageValue = "1938378988"
 	)
 	@Export("getBackSprite")
 	public SpritePixels getBackSprite() {
-		if (this.backSpriteID < 0) { // L: 79
+		if (this.backSpriteID < 0) { // L: 84
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80
+			SpritePixels var1 = (SpritePixels)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 85
 			if (var1 != null) {
-				return var1; // L: 81
+				return var1; // L: 86
 			} else {
-				var1 = ClientPacket.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 82
-				if (var1 != null) {
-					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); // L: 83
+				var1 = Tile.SpriteBuffer_getSprite(class378.HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 87
+				if (var1 != null) { // L: 88
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
 
-				return var1; // L: 85
+				return var1; // L: 90
 			}
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(II)J",
-		garbageValue = "459943946"
+		descriptor = "(IZS)Ljava/lang/String;",
+		garbageValue = "-25961"
 	)
-	public static long method2720(int var0) {
-		return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 56
-	}
+	@Export("intToString")
+	public static String intToString(int var0, boolean var1) {
+		if (var1 && var0 >= 0) { // L: 114
+			int var3 = var0; // L: 116
+			String var2;
+			if (var1 && var0 >= 0) { // L: 119
+				int var4 = 2; // L: 123
 
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "42"
-	)
-	static final int method2728(int var0, int var1) {
-		if (var0 == -1) { // L: 847
-			return 12345678;
-		} else {
-			var1 = (var0 & 127) * var1 / 128; // L: 848
-			if (var1 < 2) { // L: 849
-				var1 = 2;
-			} else if (var1 > 126) { // L: 850
-				var1 = 126;
-			}
+				for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 124 125 127
+					var5 /= 10; // L: 126
+				}
 
-			return (var0 & 65408) + var1; // L: 851
-		}
-	}
+				char[] var6 = new char[var4]; // L: 129
+				var6[0] = '+'; // L: 130
 
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-849038542"
-	)
-	static int method2727(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.LOGOUT) { // L: 3495
-			Client.logoutTimer = 250; // L: 3496
-			return 1; // L: 3497
-		} else if (var0 != 5631 && var0 != 5633) { // L: 3499
-			if (var0 == 5632) { // L: 3503
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 26; // L: 3504
-				return 1; // L: 3505
+				for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 131
+					int var8 = var3; // L: 132
+					var3 /= 10; // L: 133
+					int var9 = var8 - var3 * 10; // L: 134
+					if (var9 >= 10) { // L: 135
+						var6[var7] = (char)(var9 + 87);
+					} else {
+						var6[var7] = (char)(var9 + 48); // L: 136
+					}
+				}
+
+				var2 = new String(var6); // L: 138
 			} else {
-				return 2; // L: 3507
+				var2 = Integer.toString(var0, 10); // L: 120
 			}
+
+			return var2; // L: 140
 		} else {
-			Interpreter.Interpreter_stringStackSize -= 2; // L: 3500
-			return 1; // L: 3501
+			return Integer.toString(var0);
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java
index eda1d9ea48..c72cfc23df 100644
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -1,39 +1,36 @@
+import java.applet.Applet;
+import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import netscape.javascript.JSObject;
 
-@ObfuscatedName("cx")
+@ObfuscatedName("cw")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("Widget_archive")
-	public static AbstractArchive Widget_archive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -859723449
+		intValue = -1899211573
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 36021957
+		intValue = -1533499455
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1070199867
+		intValue = -1222578815
 	)
 	@Export("health2")
 	int health2;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 687360175
+		intValue = 266860217
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -45,10 +42,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-629620630"
+		garbageValue = "-672501131"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -58,230 +55,72 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4; // L: 22
 	} // L: 23
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-1591"
+		descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z",
+		garbageValue = "-2088910415"
 	)
-	public static void method2197() {
-		VarbitComposition.VarbitDefinition_cached.clear(); // L: 57
-	} // L: 58
+	static boolean method2284(String var0, int var1, String var2) {
+		if (var1 == 0) { // L: 59
+			try {
+				if (!class44.field309.startsWith("win")) { // L: 61
+					throw new Exception();
+				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 62
+					throw new Exception();
+				} else {
+					String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 63
 
-	@ObfuscatedName("ey")
-	@ObfuscatedSignature(
-		descriptor = "(B)Lmc;",
-		garbageValue = "7"
-	)
-	@Export("getWorldMap")
-	static WorldMap getWorldMap() {
-		return class243.worldMap; // L: 686
-	}
-
-	@ObfuscatedName("fi")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1808857292"
-	)
-	@Export("playPcmPlayers")
-	static final void playPcmPlayers() {
-		if (MouseRecorder.pcmPlayer1 != null) { // L: 3353
-			MouseRecorder.pcmPlayer1.run();
-		}
-
-		if (DesktopPlatformInfoProvider.pcmPlayer0 != null) { // L: 3354
-			DesktopPlatformInfoProvider.pcmPlayer0.run();
-		}
-
-	} // L: 3355
-
-	@ObfuscatedName("jy")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;III)V",
-		garbageValue = "-190288118"
-	)
-	@Export("Widget_addToMenu")
-	static final void Widget_addToMenu(Widget var0, int var1, int var2) {
-		if (var0.buttonType == 1) { // L: 9993
-			Occluder.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 9994
-		}
-
-		String var3;
-		if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 9997
-			var3 = BoundaryObject.Widget_getSpellActionName(var0); // L: 9998
-			if (var3 != null) { // L: 9999
-				Occluder.insertMenuItemNoShift(var3, class44.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10000
-			}
-		}
-
-		if (var0.buttonType == 3) { // L: 10004
-			Occluder.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10005
-		}
-
-		if (var0.buttonType == 4) { // L: 10008
-			Occluder.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10009
-		}
-
-		if (var0.buttonType == 5) { // L: 10012
-			Occluder.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10013
-		}
-
-		if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10016
-			Occluder.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10017
-		}
-
-		int var4;
-		int var5;
-		int var13;
-		if (var0.type == 2) { // L: 10020
-			var13 = 0; // L: 10021
-
-			for (var4 = 0; var4 < var0.height; ++var4) { // L: 10022
-				for (var5 = 0; var5 < var0.width; ++var5) { // L: 10023
-					int var16 = (var0.paddingX + 32) * var5; // L: 10024
-					int var7 = (var0.paddingY + 32) * var4; // L: 10025
-					if (var13 < 20) { // L: 10026
-						var16 += var0.inventoryXOffsets[var13]; // L: 10027
-						var7 += var0.inventoryYOffsets[var13]; // L: 10028
-					}
-
-					if (var1 >= var16 && var2 >= var7 && var1 < var16 + 32 && var2 < var7 + 32) { // L: 10030
-						Client.dragItemSlotDestination = var13; // L: 10031
-						class18.hoveredItemContainer = var0; // L: 10032
-						if (var0.itemIds[var13] > 0) { // L: 10033
-							ItemComposition var8 = class260.ItemDefinition_get(var0.itemIds[var13] - 1); // L: 10034
-							if (Client.isItemSelected == 1 && World.method1663(class21.getWidgetFlags(var0))) { // L: 10035
-								if (var0.id != Player.selectedItemWidget || var13 != ClanChannelMember.selectedItemSlot) { // L: 10036
-									Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); // L: 10037
-								}
-							} else if (Client.isSpellSelected && World.method1663(class21.getWidgetFlags(var0))) { // L: 10041
-								if ((class4.selectedSpellFlags & 16) == 16) { // L: 10042
-									Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); // L: 10043
-								}
-							} else {
-								String[] var9 = var8.inventoryActions; // L: 10048
-								int var10 = -1; // L: 10049
-								if (Client.shiftClickDrop) { // L: 10050
-									boolean var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10053
-									if (var11) { // L: 10055
-										var10 = var8.getShiftClickIndex(); // L: 10056
-									}
-								}
-
-								int var18;
-								if (World.method1663(class21.getWidgetFlags(var0))) { // L: 10059
-									for (var18 = 4; var18 >= 3; --var18) { // L: 10060
-										if (var10 != var18) { // L: 10061
-											class125.addWidgetItemMenuItem(var0, var8, var13, var18, false); // L: 10062
-										}
-									}
-								}
-
-								if (StructComposition.method2908(class21.getWidgetFlags(var0))) { // L: 10065
-									Occluder.insertMenuItemNoShift("Use", class44.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); // L: 10066
-								}
-
-								if (World.method1663(class21.getWidgetFlags(var0))) { // L: 10069
-									for (var18 = 2; var18 >= 0; --var18) { // L: 10070
-										if (var18 != var10) { // L: 10071
-											class125.addWidgetItemMenuItem(var0, var8, var13, var18, false); // L: 10072
-										}
-									}
-
-									if (var10 >= 0) { // L: 10074
-										class125.addWidgetItemMenuItem(var0, var8, var13, var10, true); // L: 10075
-									}
-								}
-
-								var9 = var0.itemActions; // L: 10078
-								if (var9 != null) { // L: 10079
-									for (var18 = 4; var18 >= 0; --var18) { // L: 10080
-										if (var9[var18] != null) { // L: 10081
-											byte var12 = 0; // L: 10082
-											if (var18 == 0) { // L: 10083
-												var12 = 39;
-											}
-
-											if (var18 == 1) { // L: 10084
-												var12 = 40;
-											}
-
-											if (var18 == 2) { // L: 10085
-												var12 = 41;
-											}
-
-											if (var18 == 3) { // L: 10086
-												var12 = 42;
-											}
-
-											if (var18 == 4) { // L: 10087
-												var12 = 43;
-											}
-
-											Occluder.insertMenuItemNoShift(var9[var18], class44.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); // L: 10088
-										}
-									}
-								}
-
-								Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); // L: 10093
-							}
+					for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 64
+						if (var13.indexOf(var0.charAt(var4)) == -1) { // L: 65
+							throw new Exception();
 						}
 					}
 
-					++var13; // L: 10098
+					Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 67
+					return true; // L: 68
 				}
+			} catch (Throwable var8) { // L: 70
+				return false; // L: 71
 			}
-		}
-
-		if (var0.isIf3) { // L: 10102
-			if (Client.isSpellSelected) { // L: 10103
-				var4 = class21.getWidgetFlags(var0); // L: 10105
-				boolean var19 = (var4 >> 21 & 1) != 0; // L: 10107
-				if (var19 && (class4.selectedSpellFlags & 32) == 32) { // L: 10109
-					Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10110
-				}
-			} else {
-				for (var13 = 9; var13 >= 5; --var13) { // L: 10115
-					String var15;
-					if (!TextureProvider.method4141(class21.getWidgetFlags(var0), var13) && var0.onOp == null) { // L: 10118
-						var15 = null; // L: 10119
-					} else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { // L: 10122
-						var15 = var0.actions[var13]; // L: 10126
-					} else {
-						var15 = null; // L: 10123
-					}
-
-					if (var15 != null) { // L: 10129
-						Occluder.insertMenuItemNoShift(var15, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); // L: 10130
-					}
-				}
-
-				var3 = BoundaryObject.Widget_getSpellActionName(var0); // L: 10134
-				if (var3 != null) { // L: 10135
-					Occluder.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10136
-				}
-
-				for (var4 = 4; var4 >= 0; --var4) { // L: 10139
-					String var14;
-					if (!TextureProvider.method4141(class21.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10142
-						var14 = null; // L: 10143
-					} else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10146
-						var14 = var0.actions[var4]; // L: 10150
-					} else {
-						var14 = null; // L: 10147
-					}
-
-					if (var14 != null) { // L: 10153
-						BoundaryObject.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10154
-					}
-				}
-
-				var5 = class21.getWidgetFlags(var0); // L: 10159
-				boolean var17 = (var5 & 1) != 0; // L: 10161
-				if (var17) { // L: 10163
-					Occluder.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10164
-				}
+		} else if (var1 == 1) { // L: 74
+			try {
+				Applet var7 = class44.applet; // L: 77
+				Object[] var5 = new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}; // L: 78
+				Object var3 = JSObject.getWindow(var7).call(var2, var5); // L: 81
+				return var3 != null; // L: 84
+			} catch (Throwable var9) { // L: 86
+				return false; // L: 87
+			}
+		} else if (var1 == 2) { // L: 90
+			try {
+				class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 92
+				return true; // L: 93
+			} catch (Exception var10) { // L: 95
+				return false; // L: 96
+			}
+		} else if (var1 == 3) { // L: 99
+			try {
+				class42.method521(class44.applet, "loggedout"); // L: 101
+			} catch (Throwable var12) { // L: 103
 			}
-		}
 
-	} // L: 10169
+			try {
+				class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 105
+				return true; // L: 106
+			} catch (Exception var11) { // L: 108
+				return false; // L: 109
+			}
+		} else {
+			throw new IllegalArgumentException(); // L: 112
+		}
+	}
+
+	@ObfuscatedName("ii")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "2083004569"
+	)
+	static final int method2283() {
+		return Client.menuOptionsCount - 1; // L: 8968
+	}
 }
diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java
index abbcf30c0d..9c424dbabe 100644
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -4,126 +4,120 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ev")
+@ObfuscatedName("es")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("HitSplatDefinition_archive")
-	public static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	public static AbstractArchive field1734;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
+	)
+	@Export("HitSplatDefinition_archive")
+	static AbstractArchive HitSplatDefinition_archive;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	static AbstractArchive field1741;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
 	)
 	@Export("HitSplatDefinition_fontsArchive")
-	public static AbstractArchive HitSplatDefinition_fontsArchive;
+	static AbstractArchive HitSplatDefinition_fontsArchive;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("HitSplatDefinition_cached")
 	static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("bs")
-	@ObfuscatedSignature(
-		descriptor = "[Lop;"
-	)
-	@Export("worldSelectArrows")
-	static IndexedSprite[] worldSelectArrows;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -418995629
+		intValue = -723534111
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -131436485
+		intValue = -1591266189
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -1784798067
-	)
-	public int field1731;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = 444689543
-	)
-	int field1735;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 311873853
-	)
-	int field1736;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 592944735
-	)
-	int field1737;
 	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1479453361
+		intValue = -1859530029
 	)
-	int field1738;
-	@ObfuscatedName("m")
+	public int field1738;
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -264775369
+		intValue = -1375425207
 	)
-	public int field1739;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 1703061619
-	)
-	public int field1740;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 154309501
-	)
-	public int field1749;
-	@ObfuscatedName("w")
-	String field1742;
+	int field1739;
 	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1751658075
+		intValue = -1428779523
 	)
-	public int field1743;
-	@ObfuscatedName("h")
+	int field1736;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -942409287
+		intValue = -1020786297
+	)
+	int field1730;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 106928431
+	)
+	int field1754;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = 561650227
+	)
+	public int field1733;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -492190243
 	)
 	public int field1744;
-	@ObfuscatedName("q")
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 2037036053
+	)
+	public int field1745;
+	@ObfuscatedName("c")
+	String field1746;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -1791772153
+	)
+	public int field1747;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -1747683339
+	)
+	public int field1748;
+	@ObfuscatedName("w")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1819526357
+		intValue = -911835177
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 1097710595
+		intValue = 486037971
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -137,394 +131,282 @@ public class HitSplatDefinition extends DualNode {
 	HitSplatDefinition() {
 		this.fontId = -1; // L: 26
 		this.textColor = 16777215; // L: 27
-		this.field1731 = 70; // L: 28
-		this.field1735 = -1; // L: 29
+		this.field1738 = 70; // L: 28
+		this.field1739 = -1; // L: 29
 		this.field1736 = -1; // L: 30
-		this.field1737 = -1; // L: 31
-		this.field1738 = -1; // L: 32
-		this.field1739 = 0; // L: 33
-		this.field1740 = 0; // L: 34
-		this.field1749 = -1; // L: 35
-		this.field1742 = ""; // L: 36
-		this.field1743 = -1; // L: 37
-		this.field1744 = 0; // L: 38
+		this.field1730 = -1; // L: 31
+		this.field1754 = -1; // L: 32
+		this.field1733 = 0; // L: 33
+		this.field1744 = 0; // L: 34
+		this.field1745 = -1; // L: 35
+		this.field1746 = ""; // L: 36
+		this.field1747 = -1; // L: 37
+		this.field1748 = 0; // L: 38
 		this.transformVarbit = -1; // L: 40
 		this.transformVarp = -1; // L: 41
 	} // L: 43
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1040710174"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1789586115"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 57
-			if (var2 == 0) { // L: 58
-				return; // L: 61
+			int var2 = var1.readUnsignedByte(); // L: 63
+			if (var2 == 0) { // L: 64
+				return; // L: 67
 			}
 
-			this.decodeNext(var1, var2); // L: 59
+			this.decodeNext(var1, var2); // L: 65
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "1647125333"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-1884352839"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 64
-			this.fontId = var1.method6583();
-		} else if (var2 == 2) { // L: 65
+		if (var2 == 1) { // L: 70
+			this.fontId = var1.method6630();
+		} else if (var2 == 2) { // L: 71
 			this.textColor = var1.readMedium();
-		} else if (var2 == 3) { // L: 66
-			this.field1735 = var1.method6583();
-		} else if (var2 == 4) { // L: 67
-			this.field1737 = var1.method6583();
-		} else if (var2 == 5) { // L: 68
-			this.field1736 = var1.method6583();
-		} else if (var2 == 6) { // L: 69
-			this.field1738 = var1.method6583();
-		} else if (var2 == 7) { // L: 70
-			this.field1739 = var1.readShort();
-		} else if (var2 == 8) { // L: 71
-			this.field1742 = var1.readStringCp1252NullCircumfixed();
-		} else if (var2 == 9) { // L: 72
-			this.field1731 = var1.readUnsignedShort();
-		} else if (var2 == 10) { // L: 73
-			this.field1740 = var1.readShort();
-		} else if (var2 == 11) { // L: 74
-			this.field1749 = 0;
-		} else if (var2 == 12) { // L: 75
-			this.field1743 = var1.readUnsignedByte();
-		} else if (var2 == 13) { // L: 76
+		} else if (var2 == 3) { // L: 72
+			this.field1739 = var1.method6630();
+		} else if (var2 == 4) { // L: 73
+			this.field1730 = var1.method6630();
+		} else if (var2 == 5) { // L: 74
+			this.field1736 = var1.method6630();
+		} else if (var2 == 6) { // L: 75
+			this.field1754 = var1.method6630();
+		} else if (var2 == 7) { // L: 76
+			this.field1733 = var1.readShort();
+		} else if (var2 == 8) { // L: 77
+			this.field1746 = var1.readStringCp1252NullCircumfixed();
+		} else if (var2 == 9) { // L: 78
+			this.field1738 = var1.readUnsignedShort();
+		} else if (var2 == 10) {
 			this.field1744 = var1.readShort();
+		} else if (var2 == 11) {
+			this.field1745 = 0;
+		} else if (var2 == 12) { // L: 81
+			this.field1747 = var1.readUnsignedByte();
+		} else if (var2 == 13) { // L: 82
+			this.field1748 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field1749 = var1.readUnsignedShort(); // L: 77
-		} else if (var2 == 17 || var2 == 18) { // L: 78
-			this.transformVarbit = var1.readUnsignedShort(); // L: 79
-			if (this.transformVarbit == 65535) { // L: 80
+			this.field1745 = var1.readUnsignedShort(); // L: 83
+		} else if (var2 == 17 || var2 == 18) { // L: 84
+			this.transformVarbit = var1.readUnsignedShort(); // L: 85
+			if (this.transformVarbit == 65535) { // L: 86
 				this.transformVarbit = -1;
 			}
 
-			this.transformVarp = var1.readUnsignedShort(); // L: 81
-			if (this.transformVarp == 65535) { // L: 82
+			this.transformVarp = var1.readUnsignedShort(); // L: 87
+			if (this.transformVarp == 65535) { // L: 88
 				this.transformVarp = -1;
 			}
 
-			int var3 = -1; // L: 83
-			if (var2 == 18) { // L: 84
-				var3 = var1.readUnsignedShort(); // L: 85
-				if (var3 == 65535) { // L: 86
+			int var3 = -1; // L: 89
+			if (var2 == 18) { // L: 90
+				var3 = var1.readUnsignedShort(); // L: 91
+				if (var3 == 65535) { // L: 92
 					var3 = -1;
 				}
 			}
 
-			int var4 = var1.readUnsignedByte(); // L: 88
-			this.transforms = new int[var4 + 2]; // L: 89
+			int var4 = var1.readUnsignedByte(); // L: 94
+			this.transforms = new int[var4 + 2]; // L: 95
 
-			for (int var5 = 0; var5 <= var4; ++var5) { // L: 90
-				this.transforms[var5] = var1.readUnsignedShort(); // L: 91
-				if (this.transforms[var5] == 65535) { // L: 92
+			for (int var5 = 0; var5 <= var4; ++var5) { // L: 96
+				this.transforms[var5] = var1.readUnsignedShort(); // L: 97
+				if (this.transforms[var5] == 65535) { // L: 98
 					this.transforms[var5] = -1;
 				}
 			}
 
-			this.transforms[var4 + 1] = var3; // L: 94
+			this.transforms[var4 + 1] = var3; // L: 100
 		}
 
-	} // L: 97
+	} // L: 103
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lev;",
-		garbageValue = "-1025207361"
+		descriptor = "(B)Les;",
+		garbageValue = "0"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
-		int var1 = -1; // L: 100
-		if (this.transformVarbit != -1) { // L: 101
-			var1 = Skeleton.getVarbit(this.transformVarbit);
-		} else if (this.transformVarp != -1) { // L: 102
+		int var1 = -1; // L: 106
+		if (this.transformVarbit != -1) { // L: 107
+			var1 = ScriptFrame.getVarbit(this.transformVarbit);
+		} else if (this.transformVarp != -1) { // L: 108
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
 
 		int var2;
-		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 104
-			var2 = this.transforms[var1]; // L: 105
+		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 110
+			var2 = this.transforms[var1]; // L: 111
 		} else {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? Projectile.method1966(var2) : null; // L: 106 107
+		return var2 != -1 ? Decimator.method1171(var2) : null; // L: 112 113
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-1622557292"
+		garbageValue = "-47892003"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field1742; // L: 111
+		String var2 = this.field1746; // L: 117
 
 		while (true) {
-			int var3 = var2.indexOf("%1"); // L: 113
-			if (var3 < 0) { // L: 114
-				return var2; // L: 117
+			int var3 = var2.indexOf("%1"); // L: 119
+			if (var3 < 0) { // L: 120
+				return var2; // L: 123
 			}
 
-			var2 = var2.substring(0, var3) + class80.intToString(var1, false) + var2.substring(var3 + 2); // L: 115
+			var2 = var2.substring(0, var3) + HealthBarDefinition.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)Loh;",
-		garbageValue = "-1594808435"
+		descriptor = "(B)Loa;",
+		garbageValue = "80"
 	)
-	public SpritePixels method2916() {
-		if (this.field1735 < 0) { // L: 121
+	public SpritePixels method2978() {
+		if (this.field1739 < 0) { // L: 127
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1735); // L: 122
-			if (var1 != null) { // L: 123
-				return var1;
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1739); // L: 128
+			if (var1 != null) {
+				return var1; // L: 129
 			} else {
-				var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1735, 0); // L: 124
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1735); // L: 125
+				var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1739, 0); // L: 130
+				if (var1 != null) { // L: 131
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1739);
 				}
 
-				return var1; // L: 127
+				return var1; // L: 133
 			}
 		}
 	}
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)Loh;",
-		garbageValue = "1804785923"
+		descriptor = "(B)Loa;",
+		garbageValue = "-85"
 	)
-	public SpritePixels method2931() {
-		if (this.field1736 < 0) { // L: 131
+	public SpritePixels method3005() {
+		if (this.field1736 < 0) { // L: 137
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1736); // L: 132
-			if (var1 != null) { // L: 133
-				return var1;
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1736); // L: 138
+			if (var1 != null) {
+				return var1; // L: 139
 			} else {
-				var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1736, 0); // L: 134
-				if (var1 != null) { // L: 135
+				var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1736, 0); // L: 140
+				if (var1 != null) { // L: 141
 					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1736);
 				}
 
-				return var1; // L: 137
+				return var1; // L: 143
 			}
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(I)Loh;",
-		garbageValue = "-2095016456"
+		descriptor = "(I)Loa;",
+		garbageValue = "-905077857"
 	)
-	public SpritePixels method2951() {
-		if (this.field1737 < 0) { // L: 141
+	public SpritePixels method2980() {
+		if (this.field1730 < 0) { // L: 147
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1737); // L: 142
-			if (var1 != null) { // L: 143
-				return var1;
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1730); // L: 148
+			if (var1 != null) {
+				return var1; // L: 149
 			} else {
-				var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1737, 0); // L: 144
-				if (var1 != null) { // L: 145
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1737);
+				var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1730, 0); // L: 150
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1730); // L: 151
 				}
 
-				return var1; // L: 147
+				return var1; // L: 153
 			}
 		}
 	}
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(B)Loh;",
-		garbageValue = "-1"
+		descriptor = "(B)Loa;",
+		garbageValue = "86"
 	)
-	public SpritePixels method2945() {
-		if (this.field1738 < 0) { // L: 151
+	public SpritePixels method2981() {
+		if (this.field1754 < 0) { // L: 157
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1738); // L: 152
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field1754);
 			if (var1 != null) {
-				return var1; // L: 153
+				return var1; // L: 159
 			} else {
-				var1 = ClientPacket.SpriteBuffer_getSprite(field1734, this.field1738, 0); // L: 154
-				if (var1 != null) { // L: 155
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1738);
+				var1 = Tile.SpriteBuffer_getSprite(field1741, this.field1754, 0); // L: 160
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1754); // L: 161
 				}
 
-				return var1; // L: 157
+				return var1; // L: 163
 			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lkt;",
-		garbageValue = "2065112934"
+		descriptor = "(I)Lkj;",
+		garbageValue = "-548642853"
 	)
 	@Export("getFont")
 	public Font getFont() {
-		if (this.fontId == -1) { // L: 161
+		if (this.fontId == -1) { // L: 167
 			return null;
 		} else {
-			Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 162
-			if (var1 != null) { // L: 163
+			Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 168
+			if (var1 != null) { // L: 169
 				return var1;
 			} else {
-				AbstractArchive var3 = field1734; // L: 165
-				AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 166
-				int var5 = this.fontId; // L: 167
-				byte[] var7 = var3.takeFile(var5, 0); // L: 171
-				boolean var6;
-				if (var7 == null) { // L: 172
-					var6 = false; // L: 173
-				} else {
-					ItemLayer.SpriteBuffer_decode(var7); // L: 176
-					var6 = true; // L: 177
+				var1 = Bounds.method6034(field1741, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170
+				if (var1 != null) {
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171
 				}
 
-				Font var2;
-				if (!var6) { // L: 179
-					var2 = null; // L: 180
-				} else {
-					byte[] var8 = var4.takeFile(var5, 0); // L: 184
-					Font var10;
-					if (var8 == null) { // L: 186
-						var10 = null; // L: 187
-					} else {
-						Font var9 = new Font(var8, WorldMapDecoration.SpriteBuffer_xOffsets, Calendar.SpriteBuffer_yOffsets, class396.SpriteBuffer_spriteWidths, class302.SpriteBuffer_spriteHeights, MilliClock.SpriteBuffer_spritePalette, class396.SpriteBuffer_pixels); // L: 190
-						MilliClock.method2587(); // L: 191
-						var10 = var9; // L: 192
-					}
-
-					var2 = var10; // L: 194
-				}
-
-				if (var2 != null) { // L: 197
-					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
-				}
-
-				return var2; // L: 199
+				return var1; // L: 173
 			}
 		}
 	}
 
-	@ObfuscatedName("if")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lce;IIII)V",
-		garbageValue = "65535"
+		descriptor = "(CB)C",
+		garbageValue = "20"
 	)
-	@Export("addPlayerToMenu")
-	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-		if (class93.localPlayer != var0) { // L: 9102
-			if (Client.menuOptionsCount < 400) { // L: 9103
-				String var4;
-				int var7;
-				if (var0.skillLevel == 0) { // L: 9105
-					String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 9106
-					var7 = var0.combatLevel; // L: 9108
-					int var8 = class93.localPlayer.combatLevel; // L: 9109
-					int var9 = var8 - var7; // L: 9111
-					String var6;
-					if (var9 < -9) { // L: 9112
-						var6 = class44.colorStartTag(16711680); // L: 9113
-					} else if (var9 < -6) { // L: 9116
-						var6 = class44.colorStartTag(16723968); // L: 9117
-					} else if (var9 < -3) { // L: 9120
-						var6 = class44.colorStartTag(16740352); // L: 9121
-					} else if (var9 < 0) { // L: 9124
-						var6 = class44.colorStartTag(16756736); // L: 9125
-					} else if (var9 > 9) { // L: 9128
-						var6 = class44.colorStartTag(65280); // L: 9129
-					} else if (var9 > 6) { // L: 9132
-						var6 = class44.colorStartTag(4259584); // L: 9133
-					} else if (var9 > 3) { // L: 9136
-						var6 = class44.colorStartTag(8453888); // L: 9137
-					} else if (var9 > 0) { // L: 9140
-						var6 = class44.colorStartTag(12648192); // L: 9141
-					} else {
-						var6 = class44.colorStartTag(16776960); // L: 9144
-					}
+	static char method3013(char var0) {
+		return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 79 80
+	}
 
-					var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 9146
-				} else {
-					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 9148
-				}
-
-				int var10;
-				if (Client.isItemSelected == 1) { // L: 9149
-					Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 9150
-				} else if (Client.isSpellSelected) { // L: 9153
-					if ((class4.selectedSpellFlags & 8) == 8) { // L: 9154
-						Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 9155
-					}
-				} else {
-					for (var10 = 7; var10 >= 0; --var10) { // L: 9160
-						if (Client.playerMenuActions[var10] != null) { // L: 9161
-							short var11 = 0; // L: 9162
-							if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 9163
-								if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 9164
-									continue;
-								}
-
-								if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class93.localPlayer.combatLevel) { // L: 9165
-									var11 = 2000; // L: 9166
-								}
-
-								if (class93.localPlayer.team != 0 && var0.team != 0) { // L: 9168
-									if (var0.team == class93.localPlayer.team) { // L: 9169
-										var11 = 2000;
-									} else {
-										var11 = 0; // L: 9170
-									}
-								} else if (var0.isClanMember()) { // L: 9172
-									var11 = 2000; // L: 9173
-								}
-							} else if (Client.playerOptionsPriorities[var10]) { // L: 9176
-								var11 = 2000;
-							}
-
-							boolean var12 = false; // L: 9177
-							var7 = Client.playerMenuOpcodes[var10] + var11; // L: 9178
-							Occluder.insertMenuItemNoShift(Client.playerMenuActions[var10], class44.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 9179
-						}
-					}
-				}
-
-				for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 9184
-					if (Client.menuOpcodes[var10] == 23) { // L: 9185
-						Client.menuTargets[var10] = class44.colorStartTag(16777215) + var4; // L: 9186
-						break;
-					}
-				}
-
-			}
-		}
-	} // L: 9190
-
-	@ObfuscatedName("lk")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;I)Z",
-		garbageValue = "2130552221"
+		descriptor = "(CI)Z",
+		garbageValue = "-1542178595"
 	)
-	@Export("isComponentHidden")
-	static boolean isComponentHidden(Widget var0) {
-		return var0.isHidden; // L: 11373
+	@Export("isCharAlphabetic")
+	public static boolean isCharAlphabetic(char var0) {
+		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 158
 	}
 }
diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java
index 35060c2f18..e97b1373d4 100644
--- a/runescape-client/src/main/java/HorizontalAlignment.java
+++ b/runescape-client/src/main/java/HorizontalAlignment.java
@@ -1,40 +1,39 @@
-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("en")
+@ObfuscatedName("eq")
 @Implements("HorizontalAlignment")
-public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Len;"
-	)
-	field1628(1, 0),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Len;"
-	)
-	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(0, 1),
+public enum HorizontalAlignment implements Enumerated
+{
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Len;"
+		descriptor = "Leq;"
 	)
-	field1624(2, 2);
+	field1630(1, 0),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Leq;"
+	)
+	@Export("HorizontalAlignment_centered")
+	HorizontalAlignment_centered(2, 1),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Leq;"
+	)
+	field1632(0, 2);
 
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -161686761
+		intValue = -1337520325
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1344358763
+		intValue = 1920193363
 	)
 	@Export("id")
 	final int id;
@@ -44,60 +43,88 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id; // L: 23
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ldp;IIB)Lbd;",
-		garbageValue = "1"
+		descriptor = "(Ljava/lang/CharSequence;II[BII)I",
+		garbageValue = "537873753"
 	)
-	public static final PcmPlayer method2762(TaskHandler var0, int var1, int var2) {
-		if (PcmPlayer.field428 == 0) { // L: 49
-			throw new IllegalStateException();
-		} else if (var1 >= 0 && var1 < 2) { // L: 50
-			if (var2 < 256) { // L: 51
-				var2 = 256;
+	@Export("encodeStringCp1252")
+	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
+		int var5 = var2 - var1; // L: 84
+
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 85
+			char var7 = var0.charAt(var6 + var1); // L: 86
+			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 87
+				var3[var6 + var4] = (byte)var7;
+			} else if (var7 == 8364) { // L: 88
+				var3[var6 + var4] = -128;
+			} else if (var7 == 8218) { // L: 89
+				var3[var6 + var4] = -126;
+			} else if (var7 == 402) { // L: 90
+				var3[var6 + var4] = -125;
+			} else if (var7 == 8222) { // L: 91
+				var3[var6 + var4] = -124;
+			} else if (var7 == 8230) { // L: 92
+				var3[var6 + var4] = -123;
+			} else if (var7 == 8224) { // L: 93
+				var3[var6 + var4] = -122;
+			} else if (var7 == 8225) { // L: 94
+				var3[var6 + var4] = -121;
+			} else if (var7 == 710) { // L: 95
+				var3[var6 + var4] = -120;
+			} else if (var7 == 8240) { // L: 96
+				var3[var6 + var4] = -119;
+			} else if (var7 == 352) { // L: 97
+				var3[var6 + var4] = -118;
+			} else if (var7 == 8249) { // L: 98
+				var3[var6 + var4] = -117;
+			} else if (var7 == 338) { // L: 99
+				var3[var6 + var4] = -116;
+			} else if (var7 == 381) { // L: 100
+				var3[var6 + var4] = -114;
+			} else if (var7 == 8216) { // L: 101
+				var3[var6 + var4] = -111;
+			} else if (var7 == 8217) { // L: 102
+				var3[var6 + var4] = -110;
+			} else if (var7 == 8220) { // L: 103
+				var3[var6 + var4] = -109;
+			} else if (var7 == 8221) { // L: 104
+				var3[var6 + var4] = -108;
+			} else if (var7 == 8226) { // L: 105
+				var3[var6 + var4] = -107;
+			} else if (var7 == 8211) { // L: 106
+				var3[var6 + var4] = -106;
+			} else if (var7 == 8212) { // L: 107
+				var3[var6 + var4] = -105;
+			} else if (var7 == 732) { // L: 108
+				var3[var6 + var4] = -104;
+			} else if (var7 == 8482) { // L: 109
+				var3[var6 + var4] = -103;
+			} else if (var7 == 353) { // L: 110
+				var3[var6 + var4] = -102;
+			} else if (var7 == 8250) { // L: 111
+				var3[var6 + var4] = -101;
+			} else if (var7 == 339) { // L: 112
+				var3[var6 + var4] = -100;
+			} else if (var7 == 382) { // L: 113
+				var3[var6 + var4] = -98;
+			} else if (var7 == 376) { // L: 114
+				var3[var6 + var4] = -97;
+			} else {
+				var3[var6 + var4] = 63; // L: 115
 			}
-
-			try {
-				PcmPlayer var3 = class26.pcmPlayerProvider.player(); // L: 53
-				var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 54
-				var3.field425 = var2; // L: 55
-				var3.init(); // L: 56
-				var3.capacity = (var2 & -1024) + 1024; // L: 57
-				if (var3.capacity > 16384) { // L: 58
-					var3.capacity = 16384;
-				}
-
-				var3.open(var3.capacity); // L: 59
-				if (PcmPlayer.field418 > 0 && Message.soundSystem == null) { // L: 60
-					Message.soundSystem = new SoundSystem(); // L: 61
-					Huffman.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 62
-					Huffman.soundSystemExecutor.scheduleAtFixedRate(Message.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 63
-				}
-
-				if (Message.soundSystem != null) { // L: 65
-					if (Message.soundSystem.players[var1] != null) { // L: 66
-						throw new IllegalArgumentException();
-					}
-
-					Message.soundSystem.players[var1] = var3; // L: 67
-				}
-
-				return var3; // L: 69
-			} catch (Throwable var4) { // L: 71
-				return new PcmPlayer(); // L: 72
-			}
-		} else {
-			throw new IllegalArgumentException();
 		}
+
+		return var5; // L: 117
 	}
 }
diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java
index 673e360cc0..c2e100d4ce 100644
--- a/runescape-client/src/main/java/Huffman.java
+++ b/runescape-client/src/main/java/Huffman.java
@@ -1,22 +1,24 @@
-import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("id")
+@ObfuscatedName("ix")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("b")
-	@Export("soundSystemExecutor")
-	static ScheduledExecutorService soundSystemExecutor;
-	@ObfuscatedName("v")
+	@ObfuscatedName("br")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
+	)
+	@Export("worldSelectStars")
+	static IndexedSprite[] worldSelectStars;
+	@ObfuscatedName("f")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("keys")
 	int[] keys;
 
@@ -45,7 +47,7 @@ public class Huffman {
 
 					for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25
 						var11 = var3[var10]; // L: 26
-						if (var8 != var11) { // L: 27
+						if (var11 != var8) { // L: 27
 							break;
 						}
 
@@ -103,10 +105,10 @@ public class Huffman {
 
 	} // L: 60
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "([BII[BII)I",
-		garbageValue = "-1771956050"
+		garbageValue = "-1958410774"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -124,44 +126,44 @@ public class Huffman {
 			int var11 = var7 >> 3; // L: 71
 			int var12 = var7 & 7; // L: 72
 			var6 &= -var12 >> 31; // L: 73
-			int var13 = (var10 + var12 - 1 >> 3) + var11; // L: 74
+			int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74
 			var12 += 24; // L: 76
 			var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77
 			if (var11 < var13) { // L: 78
 				++var11; // L: 79
 				var12 -= 8; // L: 80
-				var4[var11] = (byte)(var6 = var9 >>> var12); // L: 81
-				if (var11 < var13) { // L: 82
+				var4[var11] = (byte)(var6 = var9 >>> var12);
+				if (var11 < var13) {
 					++var11; // L: 83
-					var12 -= 8; // L: 84
-					var4[var11] = (byte)(var6 = var9 >>> var12); // L: 85
-					if (var11 < var13) { // L: 86
-						++var11; // L: 87
+					var12 -= 8;
+					var4[var11] = (byte)(var6 = var9 >>> var12);
+					if (var11 < var13) {
+						++var11;
 						var12 -= 8; // L: 88
 						var4[var11] = (byte)(var6 = var9 >>> var12); // L: 89
-						if (var11 < var13) { // L: 90
-							++var11; // L: 91
+						if (var11 < var13) {
+							++var11;
 							var12 -= 8; // L: 92
-							var4[var11] = (byte)(var6 = var9 << -var12); // L: 93
+							var4[var11] = (byte)(var6 = var9 << -var12);
 						}
 					}
 				}
 			}
 
-			var7 += var10; // L: 95
+			var7 += var10;
 		}
 
 		return (var7 + 7 >> 3) - var5; // L: 97
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "([BI[BIII)I",
-		garbageValue = "2146568122"
+		garbageValue = "1331615778"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
-		if (var5 == 0) { // L: 101
+		if (var5 == 0) {
 			return 0;
 		} else {
 			int var6 = 0; // L: 102
@@ -169,8 +171,8 @@ public class Huffman {
 			int var7 = var2;
 
 			while (true) {
-				byte var8 = var1[var7]; // L: 106
-				if (var8 < 0) { // L: 108
+				byte var8 = var1[var7];
+				if (var8 < 0) {
 					var6 = this.keys[var6];
 				} else {
 					++var6; // L: 109
@@ -178,12 +180,12 @@ public class Huffman {
 
 				int var9;
 				if ((var9 = this.keys[var6]) < 0) { // L: 110
-					var3[var4++] = (byte)(~var9); // L: 111
-					if (var4 >= var5) { // L: 112
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
 						break;
 					}
 
-					var6 = 0; // L: 113
+					var6 = 0;
 				}
 
 				if ((var8 & 64) != 0) { // L: 115
@@ -192,8 +194,8 @@ public class Huffman {
 					++var6; // L: 116
 				}
 
-				if ((var9 = this.keys[var6]) < 0) { // L: 117
-					var3[var4++] = (byte)(~var9); // L: 118
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
 					if (var4 >= var5) { // L: 119
 						break;
 					}
@@ -209,21 +211,21 @@ public class Huffman {
 
 				if ((var9 = this.keys[var6]) < 0) { // L: 124
 					var3[var4++] = (byte)(~var9); // L: 125
-					if (var4 >= var5) { // L: 126
+					if (var4 >= var5) {
 						break;
 					}
 
-					var6 = 0; // L: 127
+					var6 = 0;
 				}
 
-				if ((var8 & 16) != 0) { // L: 129
+				if ((var8 & 16) != 0) {
 					var6 = this.keys[var6];
 				} else {
 					++var6; // L: 130
 				}
 
 				if ((var9 = this.keys[var6]) < 0) { // L: 131
-					var3[var4++] = (byte)(~var9); // L: 132
+					var3[var4++] = (byte)(~var9);
 					if (var4 >= var5) { // L: 133
 						break;
 					}
@@ -291,10 +293,87 @@ public class Huffman {
 					var6 = 0; // L: 162
 				}
 
-				++var7; // L: 105
+				++var7;
 			}
 
 			return var7 + 1 - var2; // L: 165
 		}
 	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;IIIIIII)V",
+		garbageValue = "1430130968"
+	)
+	@Export("loadTerrain")
+	static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var7;
+		if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 81
+			Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 82
+
+			while (true) {
+				var7 = var0.readUnsignedByte(); // L: 84
+				if (var7 == 0) { // L: 85
+					if (var1 == 0) { // L: 86
+						int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 87
+						int var11 = var2 + var4 + 932731; // L: 90
+						int var12 = var3 + var5 + 556238; // L: 91
+						int var13 = AttackOption.method2382(var11 + 45365, var12 + 91923, 4) - 128 + (AttackOption.method2382(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (AttackOption.method2382(var11, var12, 1) - 128 >> 2); // L: 93
+						var13 = (int)(0.3D * (double)var13) + 35; // L: 94
+						if (var13 < 10) { // L: 95
+							var13 = 10;
+						} else if (var13 > 60) { // L: 96
+							var13 = 60;
+						}
+
+						var14[var3] = -var13 * 8; // L: 99
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 101
+					}
+					break;
+				}
+
+				if (var7 == 1) { // L: 104
+					int var8 = var0.readUnsignedByte(); // L: 105
+					if (var8 == 1) { // L: 106
+						var8 = 0;
+					}
+
+					if (var1 == 0) { // L: 107
+						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
+					} else {
+						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 108
+					}
+					break;
+				}
+
+				if (var7 <= 49) { // L: 111
+					Tiles.field1111[var1][var2][var3] = var0.readByte(); // L: 112
+					class22.field186[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 113
+					class16.field132[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 114
+				} else if (var7 <= 81) { // L: 117
+					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 118
+				} else {
+					AccessFile.field4098[var1][var2][var3] = (byte)(var7 - 81); // L: 121
+				}
+			}
+		} else {
+			while (true) {
+				var7 = var0.readUnsignedByte(); // L: 126
+				if (var7 == 0) { // L: 127
+					break;
+				}
+
+				if (var7 == 1) { // L: 128
+					var0.readUnsignedByte(); // L: 129
+					break;
+				}
+
+				if (var7 <= 49) { // L: 132
+					var0.readUnsignedByte();
+				}
+			}
+		}
+
+	} // L: 135
 }
diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java
index 3a5081a83c..861be32442 100644
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -3,48 +3,48 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lo")
+@ObfuscatedName("li")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnc;)V"
+		descriptor = "(Lnb;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400); // L: 12
 		this.loginType = var1; // L: 13
 	} // L: 14
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llx;",
-		garbageValue = "126"
+		descriptor = "(I)Llf;",
+		garbageValue = "1590299985"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored(); // L: 17
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llx;",
-		garbageValue = "1924184817"
+		descriptor = "(II)[Llf;",
+		garbageValue = "-1320557093"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1]; // L: 21
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IS)V",
-		garbageValue = "-13688"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "89"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -87,103 +87,4 @@ public class IgnoreList extends UserList {
 			return; // L: 54
 		}
 	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "369567526"
-	)
-	static int method5628(int var0, Script var1, boolean var2) {
-		if (var0 < 1000) { // L: 423
-			return WorldMapDecorationType.method4833(var0, var1, var2);
-		} else if (var0 < 1100) { // L: 424
-			return class312.method5616(var0, var1, var2);
-		} else if (var0 < 1200) { // L: 425
-			return InvDefinition.method2619(var0, var1, var2);
-		} else if (var0 < 1300) { // L: 426
-			return class43.method435(var0, var1, var2);
-		} else if (var0 < 1400) { // L: 427
-			return ChatChannel.method2009(var0, var1, var2);
-		} else if (var0 < 1500) { // L: 428
-			return class135.method2600(var0, var1, var2);
-		} else if (var0 < 1600) { // L: 429
-			return SceneTilePaint.method4258(var0, var1, var2);
-		} else if (var0 < 1700) { // L: 430
-			return Timer.method5600(var0, var1, var2);
-		} else if (var0 < 1800) { // L: 431
-			return GrandExchangeOfferAgeComparator.method5064(var0, var1, var2);
-		} else if (var0 < 1900) { // L: 432
-			return ScriptEvent.method2093(var0, var1, var2);
-		} else if (var0 < 2000) { // L: 433
-			return class26.method274(var0, var1, var2);
-		} else if (var0 < 2100) { // L: 434
-			return class312.method5616(var0, var1, var2);
-		} else if (var0 < 2200) { // L: 435
-			return InvDefinition.method2619(var0, var1, var2);
-		} else if (var0 < 2300) { // L: 436
-			return class43.method435(var0, var1, var2);
-		} else if (var0 < 2400) { // L: 437
-			return ChatChannel.method2009(var0, var1, var2);
-		} else if (var0 < 2500) {
-			return class135.method2600(var0, var1, var2); // L: 438
-		} else if (var0 < 2600) { // L: 439
-			return VarpDefinition.method2629(var0, var1, var2);
-		} else if (var0 < 2700) { // L: 440
-			return FontName.method6298(var0, var1, var2);
-		} else if (var0 < 2800) { // L: 441
-			return class93.method2080(var0, var1, var2);
-		} else if (var0 < 2900) { // L: 442
-			return Occluder.method4110(var0, var1, var2);
-		} else if (var0 < 3000) { // L: 443
-			return class26.method274(var0, var1, var2);
-		} else if (var0 < 3200) { // L: 444
-			return UserComparator9.method2466(var0, var1, var2);
-		} else if (var0 < 3300) { // L: 445
-			return ObjectComposition.method2964(var0, var1, var2);
-		} else if (var0 < 3400) { // L: 446
-			return WorldMapSection2.method3257(var0, var1, var2);
-		} else if (var0 < 3500) { // L: 447
-			return WorldMapLabelSize.method3217(var0, var1, var2);
-		} else if (var0 < 3700) { // L: 448
-			return class26.method273(var0, var1, var2);
-		} else if (var0 < 3800) { // L: 449
-			return ClanChannel.method41(var0, var1, var2);
-		} else if (var0 < 3900) { // L: 450
-			return WorldMapLabelSize.method3219(var0, var1, var2);
-		} else if (var0 < 4000) { // L: 451
-			return class304.method5528(var0, var1, var2);
-		} else if (var0 < 4100) { // L: 452
-			return FriendsList.method5647(var0, var1, var2);
-		} else if (var0 < 4200) { // L: 453
-			return class80.method1902(var0, var1, var2);
-		} else if (var0 < 4300) {
-			return WorldMapLabelSize.method3209(var0, var1, var2); // L: 454
-		} else if (var0 < 5100) { // L: 455
-			return class24.method261(var0, var1, var2);
-		} else if (var0 < 5400) { // L: 456
-			return class7.method74(var0, var1, var2);
-		} else if (var0 < 5600) { // L: 457
-			return class12.method173(var0, var1, var2);
-		} else if (var0 < 5700) { // L: 458
-			return HealthBarDefinition.method2727(var0, var1, var2);
-		} else if (var0 < 6300) { // L: 459
-			return UrlRequester.method2420(var0, var1, var2);
-		} else if (var0 < 6600) { // L: 460
-			return GraphicsObject.method1892(var0, var1, var2);
-		} else if (var0 < 6700) { // L: 461
-			return GameBuild.method4843(var0, var1, var2);
-		} else if (var0 < 6800) { // L: 462
-			return class27.method280(var0, var1, var2);
-		} else if (var0 < 6900) { // L: 463
-			return class214.method4280(var0, var1, var2);
-		} else if (var0 < 7000) { // L: 464
-			return Login.method1937(var0, var1, var2);
-		} else if (var0 < 7100) { // L: 465
-			return SceneTilePaint.method4260(var0, var1, var2);
-		} else if (var0 < 7200) { // L: 466
-			return class8.method82(var0, var1, var2);
-		} else {
-			return var0 < 7300 ? KeyHandler.method364(var0, var1, var2) : 2; // L: 467 468
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java
index 79c8687b1f..0a1b142ea0 100644
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -4,17 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("la")
+@ObfuscatedName("lq")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("rl")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -114974043
-	)
-	static int field3847;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -792451577
+		intValue = -1770922261
 	)
 	@Export("id")
 	int id;
@@ -22,20 +17,20 @@ public class Ignored extends User {
 	Ignored() {
 	} // L: 6
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lla;I)I",
-		garbageValue = "-208555214"
+		descriptor = "(Llq;I)I",
+		garbageValue = "163760748"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id; // L: 9
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)I",
-		garbageValue = "539732409"
+		descriptor = "(Llf;I)I",
+		garbageValue = "-1545273649"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -45,611 +40,4 @@ public class Ignored extends User {
 	public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1); // L: 17
 	}
-
-	@ObfuscatedName("gy")
-	@ObfuscatedSignature(
-		descriptor = "(Lcy;IIIIII)V",
-		garbageValue = "-82802445"
-	)
-	@Export("drawActor2d")
-	static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
-		if (var0 != null && var0.isVisible()) { // L: 4450
-			if (var0 instanceof NPC) { // L: 4451
-				NPCComposition var6 = ((NPC)var0).definition; // L: 4452
-				if (var6.transforms != null) { // L: 4453
-					var6 = var6.transform();
-				}
-
-				if (var6 == null) { // L: 4454
-					return;
-				}
-			}
-
-			int var76 = Players.Players_count; // L: 4456
-			int[] var7 = Players.Players_indices; // L: 4457
-			byte var8 = 0; // L: 4458
-			int var10;
-			if (var1 < var76 && var0.playerCycle == Client.cycle && WorldMapIcon_1.method3232((Player)var0)) { // L: 4459
-				Player var9 = (Player)var0; // L: 4460
-				if (var1 < var76) { // L: 4461
-					var10 = var0.defaultHeight + 15; // L: 4462
-					GrandExchangeEvents.worldToScreen(var0.x, var0.y, var10); // L: 4464
-					AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4466
-					byte var12 = 9; // L: 4467
-					var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); // L: 4468
-					var8 = 18; // L: 4469
-				}
-			}
-
-			int var77 = -2; // L: 4472
-			int var17;
-			int var23;
-			int var24;
-			if (!var0.healthBars.method5236()) { // L: 4473
-				var10 = var0.defaultHeight + 15; // L: 4474
-				GrandExchangeEvents.worldToScreen(var0.x, var0.y, var10); // L: 4476
-
-				for (HealthBar var89 = (HealthBar)var0.healthBars.last(); var89 != null; var89 = (HealthBar)var0.healthBars.previous()) { // L: 4478
-					HealthBarUpdate var81 = var89.get(Client.cycle); // L: 4479
-					if (var81 == null) { // L: 4480
-						if (var89.isEmpty()) { // L: 4538
-							var89.remove();
-						}
-					} else {
-						HealthBarDefinition var13 = var89.definition; // L: 4481
-						SpritePixels var82 = var13.getBackSprite(); // L: 4482
-						SpritePixels var83 = var13.getFrontSprite(); // L: 4483
-						var17 = 0; // L: 4485
-						int var84;
-						if (var82 != null && var83 != null) { // L: 4486
-							if (var13.widthPadding * 2 < var83.subWidth) { // L: 4487
-								var17 = var13.widthPadding;
-							}
-
-							var84 = var83.subWidth - var17 * 2; // L: 4488
-						} else {
-							var84 = var13.width; // L: 4490
-						}
-
-						int var18 = 255; // L: 4491
-						boolean var85 = true; // L: 4492
-						int var86 = Client.cycle - var81.cycle; // L: 4493
-						int var87 = var84 * var81.health2 / var13.width; // L: 4494
-						int var88;
-						int var94;
-						if (var81.cycleOffset > var86) { // L: 4495
-							var88 = var13.field1608 == 0 ? 0 : var13.field1608 * (var86 / var13.field1608); // L: 4496
-							var23 = var84 * var81.health / var13.width; // L: 4497
-							var94 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 4498
-						} else {
-							var94 = var87; // L: 4501
-							var88 = var13.int5 + var81.cycleOffset - var86; // L: 4502
-							if (var13.int3 >= 0) { // L: 4503
-								var18 = (var88 << 8) / (var13.int5 - var13.int3);
-							}
-						}
-
-						if (var81.health2 > 0 && var94 < 1) { // L: 4505
-							var94 = 1;
-						}
-
-						if (var82 != null && var83 != null) { // L: 4506
-							if (var94 == var84) { // L: 4507
-								var94 += var17 * 2;
-							} else {
-								var94 += var17; // L: 4508
-							}
-
-							var88 = var82.subHeight; // L: 4509
-							var77 += var88; // L: 4510
-							var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4511
-							var24 = var3 + Client.viewportTempY - var77; // L: 4512
-							var23 -= var17; // L: 4513
-							if (var18 >= 0 && var18 < 255) { // L: 4514
-								var82.drawTransAt(var23, var24, var18); // L: 4515
-								Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var94 + var23, var24 + var88); // L: 4516
-								var83.drawTransAt(var23, var24, var18); // L: 4517
-							} else {
-								var82.drawTransBgAt(var23, var24); // L: 4520
-								Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var24 + var88); // L: 4521
-								var83.drawTransBgAt(var23, var24); // L: 4522
-							}
-
-							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4524
-							var77 += 2; // L: 4525
-						} else {
-							var77 += 5; // L: 4528
-							if (Client.viewportTempX > -1) { // L: 4529
-								var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4530
-								var23 = var3 + Client.viewportTempY - var77; // L: 4531
-								Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var94, 5, 65280); // L: 4532
-								Rasterizer2D.Rasterizer2D_fillRectangle(var88 + var94, var23, var84 - var94, 5, 16711680); // L: 4533
-							}
-
-							var77 += 2; // L: 4535
-						}
-					}
-				}
-			}
-
-			if (var77 == -2) { // L: 4541
-				var77 += 7;
-			}
-
-			var77 += var8; // L: 4542
-			int var79;
-			if (var1 < var76) { // L: 4543
-				Player var78 = (Player)var0; // L: 4544
-				if (var78.isHidden) { // L: 4545
-					return;
-				}
-
-				if (var78.headIconPk != -1 || var78.headIconPrayer != -1) { // L: 4546
-					var79 = var0.defaultHeight + 15; // L: 4547
-					GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4549
-					if (Client.viewportTempX > -1) { // L: 4551
-						if (var78.headIconPk != -1) { // L: 4552
-							var77 += 25; // L: 4553
-							class35.headIconPkSprites[var78.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4554
-						}
-
-						if (var78.headIconPrayer != -1) { // L: 4556
-							var77 += 25; // L: 4557
-							TextureProvider.headIconPrayerSprites[var78.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4558
-						}
-					}
-				}
-
-				if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4562
-					var79 = var0.defaultHeight + 15; // L: 4563
-					GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4565
-					if (Client.viewportTempX > -1) { // L: 4567
-						var77 += PacketBufferNode.headIconHintSprites[1].subHeight; // L: 4568
-						PacketBufferNode.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4569
-					}
-				}
-			} else {
-				NPCComposition var93 = ((NPC)var0).definition; // L: 4574
-				if (var93.transforms != null) { // L: 4575
-					var93 = var93.transform();
-				}
-
-				if (var93.headIconPrayer >= 0 && var93.headIconPrayer < TextureProvider.headIconPrayerSprites.length) { // L: 4576
-					var79 = var0.defaultHeight + 15; // L: 4577
-					GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4579
-					if (Client.viewportTempX > -1) { // L: 4581
-						TextureProvider.headIconPrayerSprites[var93.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4582
-					}
-				}
-
-				if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4585
-					var79 = var0.defaultHeight + 15; // L: 4586
-					GrandExchangeEvents.worldToScreen(var0.x, var0.y, var79); // L: 4588
-					if (Client.viewportTempX > -1) { // L: 4590
-						PacketBufferNode.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
-					}
-				}
-			}
-
-			if (var0.overheadText != null && (var1 >= var76 || !var0.field1248 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4593 4594
-				var10 = var0.defaultHeight; // L: 4595
-				GrandExchangeEvents.worldToScreen(var0.x, var0.y, var10); // L: 4597
-				if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4599
-					Client.overheadTextXOffsets[Client.overheadTextCount] = Widget.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4600
-					Client.overheadTextAscents[Client.overheadTextCount] = Widget.fontBold12.ascent; // L: 4601
-					Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4602
-					Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4603
-					Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4604
-					Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4605
-					Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4606
-					Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4607
-					++Client.overheadTextCount; // L: 4608
-				}
-			}
-
-			for (var10 = 0; var10 < 4; ++var10) { // L: 4612
-				var79 = var0.hitSplatCycles[var10]; // L: 4613
-				int var90 = var0.hitSplatTypes[var10]; // L: 4614
-				HitSplatDefinition var91 = null; // L: 4615
-				int var14 = 0; // L: 4616
-				if (var90 >= 0) { // L: 4617
-					if (var79 <= Client.cycle) { // L: 4618
-						continue;
-					}
-
-					var91 = Projectile.method1966(var0.hitSplatTypes[var10]); // L: 4619
-					var14 = var91.field1731; // L: 4620
-					if (var91 != null && var91.transforms != null) { // L: 4621
-						var91 = var91.transform(); // L: 4622
-						if (var91 == null) { // L: 4623
-							var0.hitSplatCycles[var10] = -1; // L: 4624
-							continue; // L: 4625
-						}
-					}
-				} else if (var79 < 0) { // L: 4629
-					continue;
-				}
-
-				int var15 = var0.hitSplatTypes2[var10]; // L: 4630
-				HitSplatDefinition var16 = null; // L: 4631
-				if (var15 >= 0) { // L: 4632
-					var16 = Projectile.method1966(var15); // L: 4633
-					if (var16 != null && var16.transforms != null) { // L: 4634
-						var16 = var16.transform();
-					}
-				}
-
-				if (var79 - var14 <= Client.cycle) { // L: 4636
-					if (var91 == null) { // L: 4637
-						var0.hitSplatCycles[var10] = -1; // L: 4638
-					} else {
-						var17 = var0.defaultHeight / 2; // L: 4641
-						GrandExchangeEvents.worldToScreen(var0.x, var0.y, var17); // L: 4643
-						if (Client.viewportTempX > -1) { // L: 4645
-							if (var10 == 1) { // L: 4647
-								Client.viewportTempY -= 20; // L: 4648
-							}
-
-							if (var10 == 2) { // L: 4650
-								Client.viewportTempX -= 15; // L: 4651
-								Client.viewportTempY -= 10; // L: 4652
-							}
-
-							if (var10 == 3) { // L: 4654
-								Client.viewportTempX += 15; // L: 4655
-								Client.viewportTempY -= 10; // L: 4656
-							}
-
-							SpritePixels var19 = null; // L: 4658
-							SpritePixels var20 = null; // L: 4659
-							SpritePixels var21 = null; // L: 4660
-							SpritePixels var22 = null; // L: 4661
-							var23 = 0; // L: 4662
-							var24 = 0; // L: 4663
-							int var25 = 0; // L: 4664
-							int var26 = 0; // L: 4665
-							int var27 = 0; // L: 4666
-							int var28 = 0; // L: 4667
-							int var29 = 0; // L: 4668
-							int var30 = 0; // L: 4669
-							SpritePixels var31 = null; // L: 4670
-							SpritePixels var32 = null; // L: 4671
-							SpritePixels var33 = null; // L: 4672
-							SpritePixels var34 = null; // L: 4673
-							int var35 = 0; // L: 4674
-							int var36 = 0; // L: 4675
-							int var37 = 0; // L: 4676
-							int var38 = 0; // L: 4677
-							int var39 = 0; // L: 4678
-							int var40 = 0; // L: 4679
-							int var41 = 0; // L: 4680
-							int var42 = 0; // L: 4681
-							int var43 = 0; // L: 4682
-							var19 = var91.method2916(); // L: 4683
-							int var44;
-							if (var19 != null) { // L: 4684
-								var23 = var19.subWidth; // L: 4685
-								var44 = var19.subHeight; // L: 4686
-								if (var44 > var43) { // L: 4687
-									var43 = var44;
-								}
-
-								var27 = var19.xOffset; // L: 4688
-							}
-
-							var20 = var91.method2931(); // L: 4690
-							if (var20 != null) { // L: 4691
-								var24 = var20.subWidth; // L: 4692
-								var44 = var20.subHeight; // L: 4693
-								if (var44 > var43) { // L: 4694
-									var43 = var44;
-								}
-
-								var28 = var20.xOffset; // L: 4695
-							}
-
-							var21 = var91.method2951(); // L: 4697
-							if (var21 != null) { // L: 4698
-								var25 = var21.subWidth; // L: 4699
-								var44 = var21.subHeight; // L: 4700
-								if (var44 > var43) { // L: 4701
-									var43 = var44;
-								}
-
-								var29 = var21.xOffset; // L: 4702
-							}
-
-							var22 = var91.method2945(); // L: 4704
-							if (var22 != null) { // L: 4705
-								var26 = var22.subWidth; // L: 4706
-								var44 = var22.subHeight; // L: 4707
-								if (var44 > var43) { // L: 4708
-									var43 = var44;
-								}
-
-								var30 = var22.xOffset; // L: 4709
-							}
-
-							if (var16 != null) { // L: 4711
-								var31 = var16.method2916(); // L: 4712
-								if (var31 != null) { // L: 4713
-									var35 = var31.subWidth; // L: 4714
-									var44 = var31.subHeight; // L: 4715
-									if (var44 > var43) { // L: 4716
-										var43 = var44;
-									}
-
-									var39 = var31.xOffset; // L: 4717
-								}
-
-								var32 = var16.method2931(); // L: 4719
-								if (var32 != null) { // L: 4720
-									var36 = var32.subWidth; // L: 4721
-									var44 = var32.subHeight; // L: 4722
-									if (var44 > var43) { // L: 4723
-										var43 = var44;
-									}
-
-									var40 = var32.xOffset; // L: 4724
-								}
-
-								var33 = var16.method2951(); // L: 4726
-								if (var33 != null) { // L: 4727
-									var37 = var33.subWidth; // L: 4728
-									var44 = var33.subHeight; // L: 4729
-									if (var44 > var43) { // L: 4730
-										var43 = var44;
-									}
-
-									var41 = var33.xOffset; // L: 4731
-								}
-
-								var34 = var16.method2945(); // L: 4733
-								if (var34 != null) { // L: 4734
-									var38 = var34.subWidth; // L: 4735
-									var44 = var34.subHeight; // L: 4736
-									if (var44 > var43) { // L: 4737
-										var43 = var44;
-									}
-
-									var42 = var34.xOffset; // L: 4738
-								}
-							}
-
-							Font var80 = var91.getFont(); // L: 4743
-							if (var80 == null) { // L: 4744
-								var80 = Actor.fontPlain11;
-							}
-
-							Font var45;
-							if (var16 != null) { // L: 4745
-								var45 = var16.getFont(); // L: 4746
-								if (var45 == null) { // L: 4747
-									var45 = Actor.fontPlain11;
-								}
-							} else {
-								var45 = Actor.fontPlain11; // L: 4749
-							}
-
-							String var46 = null; // L: 4750
-							String var47 = null; // L: 4751
-							boolean var48 = false; // L: 4752
-							int var49 = 0; // L: 4753
-							var46 = var91.getString(var0.hitSplatValues[var10]); // L: 4754
-							int var92 = var80.stringWidth(var46); // L: 4755
-							if (var16 != null) { // L: 4756
-								var47 = var16.getString(var0.hitSplatValues2[var10]); // L: 4757
-								var49 = var45.stringWidth(var47); // L: 4758
-							}
-
-							int var50 = 0; // L: 4760
-							int var51 = 0; // L: 4761
-							if (var24 > 0) { // L: 4762
-								if (var21 == null && var22 == null) { // L: 4763
-									var50 = 1; // L: 4764
-								} else {
-									var50 = var92 / var24 + 1;
-								}
-							}
-
-							if (var16 != null && var36 > 0) { // L: 4766 4767
-								if (var33 == null && var34 == null) { // L: 4768
-									var51 = 1; // L: 4769
-								} else {
-									var51 = var49 / var36 + 1;
-								}
-							}
-
-							int var52 = 0; // L: 4772
-							int var53 = var52; // L: 4773
-							if (var23 > 0) { // L: 4774
-								var52 += var23;
-							}
-
-							var52 += 2; // L: 4775
-							int var54 = var52; // L: 4776
-							if (var25 > 0) { // L: 4777
-								var52 += var25;
-							}
-
-							int var55 = var52; // L: 4778
-							int var56 = var52; // L: 4779
-							int var57;
-							if (var24 > 0) { // L: 4780
-								var57 = var24 * var50; // L: 4781
-								var52 += var57; // L: 4782
-								var56 += (var57 - var92) / 2; // L: 4783
-							} else {
-								var52 += var92; // L: 4786
-							}
-
-							var57 = var52; // L: 4788
-							if (var26 > 0) { // L: 4789
-								var52 += var26;
-							}
-
-							int var58 = 0; // L: 4790
-							int var59 = 0; // L: 4791
-							int var60 = 0; // L: 4792
-							int var61 = 0; // L: 4793
-							int var62 = 0; // L: 4794
-							int var63;
-							if (var16 != null) { // L: 4795
-								var52 += 2; // L: 4796
-								var58 = var52; // L: 4797
-								if (var35 > 0) { // L: 4798
-									var52 += var35;
-								}
-
-								var52 += 2; // L: 4799
-								var59 = var52; // L: 4800
-								if (var37 > 0) { // L: 4801
-									var52 += var37;
-								}
-
-								var60 = var52; // L: 4802
-								var62 = var52; // L: 4803
-								if (var36 > 0) { // L: 4804
-									var63 = var36 * var51; // L: 4805
-									var52 += var63; // L: 4806
-									var62 += (var63 - var49) / 2; // L: 4807
-								} else {
-									var52 += var49; // L: 4810
-								}
-
-								var61 = var52; // L: 4812
-								if (var38 > 0) { // L: 4813
-									var52 += var38;
-								}
-							}
-
-							var63 = var0.hitSplatCycles[var10] - Client.cycle; // L: 4815
-							int var64 = var91.field1739 - var63 * var91.field1739 / var91.field1731; // L: 4816
-							int var65 = var63 * var91.field1740 / var91.field1731 + -var91.field1740; // L: 4817
-							int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 4818
-							int var67 = var3 + Client.viewportTempY - 12 + var65; // L: 4819
-							int var68 = var67; // L: 4820
-							int var69 = var67 + var43; // L: 4821
-							int var70 = var67 + var91.field1744 + 15; // L: 4822
-							int var71 = var70 - var80.maxAscent; // L: 4823
-							int var72 = var70 + var80.maxDescent; // L: 4824
-							if (var71 < var67) { // L: 4825
-								var68 = var71;
-							}
-
-							if (var72 > var69) { // L: 4826
-								var69 = var72;
-							}
-
-							int var73 = 0; // L: 4827
-							int var74;
-							int var75;
-							if (var16 != null) { // L: 4828
-								var73 = var67 + var16.field1744 + 15; // L: 4829
-								var74 = var73 - var45.maxAscent; // L: 4830
-								var75 = var73 + var45.maxDescent; // L: 4831
-								if (var74 < var68) { // L: 4832
-									;
-								}
-
-								if (var75 > var69) { // L: 4833
-									;
-								}
-							}
-
-							var74 = 255; // L: 4835
-							if (var91.field1749 >= 0) { // L: 4836
-								var74 = (var63 << 8) / (var91.field1731 - var91.field1749);
-							}
-
-							if (var74 >= 0 && var74 < 255) { // L: 4837
-								if (var19 != null) { // L: 4838
-									var19.drawTransAt(var53 + var66 - var27, var67, var74);
-								}
-
-								if (var21 != null) { // L: 4839
-									var21.drawTransAt(var66 + var54 - var29, var67, var74);
-								}
-
-								if (var20 != null) { // L: 4840
-									for (var75 = 0; var75 < var50; ++var75) { // L: 4841
-										var20.drawTransAt(var24 * var75 + (var66 + var55 - var28), var67, var74); // L: 4842
-									}
-								}
-
-								if (var22 != null) { // L: 4845
-									var22.drawTransAt(var66 + var57 - var30, var67, var74);
-								}
-
-								var80.drawAlpha(var46, var66 + var56, var70, var91.textColor, 0, var74); // L: 4846
-								if (var16 != null) { // L: 4847
-									if (var31 != null) { // L: 4848
-										var31.drawTransAt(var58 + var66 - var39, var67, var74);
-									}
-
-									if (var33 != null) { // L: 4849
-										var33.drawTransAt(var66 + var59 - var41, var67, var74);
-									}
-
-									if (var32 != null) { // L: 4850
-										for (var75 = 0; var75 < var51; ++var75) { // L: 4851
-											var32.drawTransAt(var36 * var75 + (var60 + var66 - var40), var67, var74); // L: 4852
-										}
-									}
-
-									if (var34 != null) { // L: 4855
-										var34.drawTransAt(var66 + var61 - var42, var67, var74);
-									}
-
-									var45.drawAlpha(var47, var62 + var66, var73, var16.textColor, 0, var74); // L: 4856
-								}
-							} else {
-								if (var19 != null) { // L: 4860
-									var19.drawTransBgAt(var66 + var53 - var27, var67);
-								}
-
-								if (var21 != null) { // L: 4861
-									var21.drawTransBgAt(var54 + var66 - var29, var67);
-								}
-
-								if (var20 != null) { // L: 4862
-									for (var75 = 0; var75 < var50; ++var75) { // L: 4863
-										var20.drawTransBgAt(var24 * var75 + (var55 + var66 - var28), var67); // L: 4864
-									}
-								}
-
-								if (var22 != null) { // L: 4867
-									var22.drawTransBgAt(var57 + var66 - var30, var67);
-								}
-
-								var80.draw(var46, var66 + var56, var70, var91.textColor | -16777216, 0); // L: 4868
-								if (var16 != null) { // L: 4869
-									if (var31 != null) { // L: 4870
-										var31.drawTransBgAt(var58 + var66 - var39, var67);
-									}
-
-									if (var33 != null) { // L: 4871
-										var33.drawTransBgAt(var59 + var66 - var41, var67);
-									}
-
-									if (var32 != null) { // L: 4872
-										for (var75 = 0; var75 < var51; ++var75) { // L: 4873
-											var32.drawTransBgAt(var36 * var75 + (var60 + var66 - var40), var67); // L: 4874
-										}
-									}
-
-									if (var34 != null) { // L: 4877
-										var34.drawTransBgAt(var61 + var66 - var42, var67);
-									}
-
-									var45.draw(var47, var66 + var62, var73, var16.textColor | -16777216, 0); // L: 4878
-								}
-							}
-						}
-					}
-				}
-			}
-
-		}
-	} // L: 4883
 }
diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java
index 81a99af35a..9dc39803c7 100644
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/runescape-client/src/main/java/IndexedSprite.java
@@ -2,38 +2,35 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("op")
+@ObfuscatedName("of")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("subWidth")
 	public int subWidth;
 	@ObfuscatedName("y")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("height")
 	public int height;
 
-	IndexedSprite() {
-	} // L: 15
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18
@@ -54,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	} // L: 31
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34
@@ -87,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	} // L: 49
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 52
@@ -133,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	} // L: 85
 
-	@ObfuscatedName("p")
-	public void method6958(int var1, int var2, int var3, int var4) {
+	@ObfuscatedName("j")
+	public void method6997(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth; // L: 116
 		int var6 = this.subHeight; // L: 117
 		int var7 = 0; // L: 118
@@ -249,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	} // L: 113
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("IndexedSprite_something")
 	static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
 		int var12 = var3; // L: 161
diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java
index 1c52c5a903..fddc3c0a02 100644
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -4,112 +4,112 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bx")
+@ObfuscatedName("bm")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lbj;"
+		descriptor = "Lbg;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lbt;"
+		descriptor = "Lbx;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("offset")
 	int offset;
 
@@ -146,10 +146,10 @@ public class Instrument {
 		this.offset = 0; // L: 25
 	} // L: 50
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
-		class306.clearIntArray(Instrument_samples, 0, var1); // L: 53
+		class307.clearIntArray(Instrument_samples, 0, var1); // L: 53
 		if (var2 < 10) { // L: 54
 			return Instrument_samples;
 		} else {
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) { // L: 179
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -421,6 +421,6 @@ public class Instrument {
 		this.offset = var1.readUnsignedShort(); // L: 228
 		this.filter = new AudioFilter(); // L: 229
 		this.filterEnvelope = new SoundEnvelope(); // L: 230
-		this.filter.method1080(var1, this.filterEnvelope); // L: 231
+		this.filter.method1176(var1, this.filterEnvelope); // L: 231
 	} // L: 232
 }
diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java
index fd7d451632..e8cc397d26 100644
--- a/runescape-client/src/main/java/IntHashTable.java
+++ b/runescape-client/src/main/java/IntHashTable.java
@@ -3,10 +3,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ou")
+@ObfuscatedName("ox")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("array")
 	int[] array;
 
@@ -32,10 +32,10 @@ public class IntHashTable {
 
 	} // L: 17
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-2076070335"
+		garbageValue = "354978778"
 	)
 	@Export("get")
 	public int get(int var1) {
diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java
index e5a01aef3f..fba2956c63 100644
--- a/runescape-client/src/main/java/IntegerNode.java
+++ b/runescape-client/src/main/java/IntegerNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("mo")
+@ObfuscatedName("mc")
 @Implements("IntegerNode")
 public class IntegerNode extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("integer")
 	public int integer;
 
diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java
index f5c451c5bc..ad9280212a 100644
--- a/runescape-client/src/main/java/InterfaceParent.java
+++ b/runescape-client/src/main/java/InterfaceParent.java
@@ -4,220 +4,59 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cu")
+@ObfuscatedName("ci")
 @Implements("InterfaceParent")
 public class InterfaceParent extends Node {
-	@ObfuscatedName("a")
-	@Export("cacheParentPaths")
-	public static String[] cacheParentPaths;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 897280301
+		intValue = 1079839403
 	)
 	@Export("group")
 	int group;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1329352515
+		intValue = 1640096453
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("f")
-	boolean field1165;
+	@ObfuscatedName("v")
+	boolean field1148;
 
 	InterfaceParent() {
-		this.field1165 = false; // L: 8
+		this.field1148 = false; // L: 8
 	} // L: 10
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)Ler;",
-		garbageValue = "-647978763"
+		descriptor = "(Lhw;Lod;I)Lhg;",
+		garbageValue = "-1864429367"
 	)
-	@Export("getEnum")
-	public static EnumComposition getEnum(int var0) {
-		EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29
-		if (var1 != null) { // L: 30
-			return var1;
+	@Export("getPacketBufferNode")
+	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
+		PacketBufferNode var2;
+		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 29
+			var2 = new PacketBufferNode(); // L: 30
 		} else {
-			byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31
-			var1 = new EnumComposition(); // L: 32
-			if (var2 != null) { // L: 33
-				var1.decode(new Buffer(var2));
-			}
-
-			EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34
-			return var1; // L: 35
+			var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 33
 		}
+
+		var2.clientPacket = var0; // L: 36
+		var2.clientPacketLength = var0.length; // L: 37
+		if (var2.clientPacketLength == -1) {
+			var2.packetBuffer = new PacketBuffer(260); // L: 38
+		} else if (var2.clientPacketLength == -2) { // L: 39
+			var2.packetBuffer = new PacketBuffer(10000);
+		} else if (var2.clientPacketLength <= 18) { // L: 40
+			var2.packetBuffer = new PacketBuffer(20);
+		} else if (var2.clientPacketLength <= 98) { // L: 41
+			var2.packetBuffer = new PacketBuffer(100);
+		} else {
+			var2.packetBuffer = new PacketBuffer(260); // L: 42
+		}
+
+		var2.packetBuffer.setIsaacCipher(var1); // L: 43
+		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 44
+		var2.index = 0; // L: 45
+		return var2; // L: 46
 	}
-
-	@ObfuscatedName("gq")
-	@ObfuscatedSignature(
-		descriptor = "(Lcy;I)V",
-		garbageValue = "-1452736307"
-	)
-	static final void method2083(Actor var0) {
-		var0.movementSequence = var0.idleSequence; // L: 3663
-		if (var0.pathLength == 0) { // L: 3664
-			var0.field1294 = 0; // L: 3665
-		} else {
-			if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3668
-				SequenceDefinition var1 = LoginScreenAnimation.SequenceDefinition_get(var0.sequence); // L: 3669
-				if (var0.field1274 > 0 && var1.field1883 == 0) { // L: 3670
-					++var0.field1294; // L: 3671
-					return; // L: 3672
-				}
-
-				if (var0.field1274 <= 0 && var1.field1890 == 0) { // L: 3674
-					++var0.field1294; // L: 3675
-					return; // L: 3676
-				}
-			}
-
-			int var10 = var0.x; // L: 3679
-			int var2 = var0.y; // L: 3680
-			int var3 = var0.field1239 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3681
-			int var4 = var0.field1239 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3682
-			if (var10 < var3) { // L: 3683
-				if (var2 < var4) { // L: 3684
-					var0.orientation = 1280;
-				} else if (var2 > var4) { // L: 3685
-					var0.orientation = 1792;
-				} else {
-					var0.orientation = 1536; // L: 3686
-				}
-			} else if (var10 > var3) { // L: 3688
-				if (var2 < var4) { // L: 3689
-					var0.orientation = 768;
-				} else if (var2 > var4) { // L: 3690
-					var0.orientation = 256;
-				} else {
-					var0.orientation = 512; // L: 3691
-				}
-			} else if (var2 < var4) { // L: 3693
-				var0.orientation = 1024;
-			} else if (var2 > var4) { // L: 3694
-				var0.orientation = 0;
-			}
-
-			byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 3695
-			if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 3696
-				int var6 = var0.orientation - var0.rotation & 2047; // L: 3703
-				if (var6 > 1024) { // L: 3704
-					var6 -= 2048;
-				}
-
-				int var7 = var0.walkBackSequence; // L: 3705
-				if (var6 >= -256 && var6 <= 256) { // L: 3706
-					var7 = var0.walkSequence;
-				} else if (var6 >= 256 && var6 < 768) { // L: 3707
-					var7 = var0.walkRightSequence;
-				} else if (var6 >= -768 && var6 <= -256) { // L: 3708
-					var7 = var0.walkLeftSequence;
-				}
-
-				if (var7 == -1) { // L: 3709
-					var7 = var0.walkSequence;
-				}
-
-				var0.movementSequence = var7; // L: 3710
-				int var8 = 4; // L: 3711
-				boolean var9 = true; // L: 3712
-				if (var0 instanceof NPC) { // L: 3713
-					var9 = ((NPC)var0).definition.isClickable;
-				}
-
-				if (var9) { // L: 3714
-					if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1289 != 0) { // L: 3715
-						var8 = 2;
-					}
-
-					if (var0.pathLength > 2) { // L: 3716
-						var8 = 6;
-					}
-
-					if (var0.pathLength > 3) { // L: 3717
-						var8 = 8;
-					}
-
-					if (var0.field1294 > 0 && var0.pathLength > 1) { // L: 3718
-						var8 = 8; // L: 3719
-						--var0.field1294; // L: 3720
-					}
-				} else {
-					if (var0.pathLength > 1) { // L: 3724
-						var8 = 6;
-					}
-
-					if (var0.pathLength > 2) { // L: 3725
-						var8 = 8;
-					}
-
-					if (var0.field1294 > 0 && var0.pathLength > 1) { // L: 3726
-						var8 = 8; // L: 3727
-						--var0.field1294; // L: 3728
-					}
-				}
-
-				if (var5 == 2) { // L: 3731
-					var8 <<= 1;
-				}
-
-				if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3732
-					var0.movementSequence = var0.runSequence;
-				}
-
-				if (var3 != var10 || var4 != var2) { // L: 3733
-					if (var10 < var3) { // L: 3734
-						var0.x += var8; // L: 3735
-						if (var0.x > var3) { // L: 3736
-							var0.x = var3;
-						}
-					} else if (var10 > var3) { // L: 3738
-						var0.x -= var8; // L: 3739
-						if (var0.x < var3) { // L: 3740
-							var0.x = var3;
-						}
-					}
-
-					if (var2 < var4) { // L: 3742
-						var0.y += var8; // L: 3743
-						if (var0.y > var4) { // L: 3744
-							var0.y = var4;
-						}
-					} else if (var2 > var4) { // L: 3746
-						var0.y -= var8; // L: 3747
-						if (var0.y < var4) { // L: 3748
-							var0.y = var4;
-						}
-					}
-				}
-
-				if (var3 == var0.x && var4 == var0.y) { // L: 3751
-					--var0.pathLength; // L: 3752
-					if (var0.field1274 > 0) { // L: 3753
-						--var0.field1274;
-					}
-				}
-
-			} else {
-				var0.x = var3; // L: 3697
-				var0.y = var4; // L: 3698
-				--var0.pathLength; // L: 3699
-				if (var0.field1274 > 0) { // L: 3700
-					--var0.field1274;
-				}
-
-			}
-		}
-	} // L: 3666 3701 3755
-
-	@ObfuscatedName("je")
-	static final void method2082(double var0) {
-		Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 10888
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 10889
-		Decimator.method1073(); // L: 10890
-		ObjectComposition.clientPreferences.field1337 = var0; // L: 10891
-		TileItem.savePreferences(); // L: 10892
-	} // L: 10893
 }
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index 1ebdde5b02..bfac75b6ac 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -1,170 +1,165 @@
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.util.ArrayList;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cd")
+@ObfuscatedName("cm")
 @Implements("Interpreter")
 public class Interpreter {
 	@ObfuscatedName("r")
-	@Export("Interpreter_stringLocals")
-	static String[] Interpreter_stringLocals;
-	@ObfuscatedName("b")
 	@Export("Interpreter_arrayLengths")
 	static int[] Interpreter_arrayLengths;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("Interpreter_arrays")
 	static int[][] Interpreter_arrays;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("Interpreter_intStack")
 	static int[] Interpreter_intStack;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("Interpreter_stringStack")
 	static String[] Interpreter_stringStack;
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1824375293
-	)
-	@Export("Interpreter_stringStackSize")
-	static int Interpreter_stringStackSize;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = 114758639
+		intValue = 546325367
 	)
 	@Export("Interpreter_frameDepth")
 	static int Interpreter_frameDepth;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Lbw;"
+		descriptor = "[Lbu;"
 	)
 	@Export("Interpreter_frames")
 	static ScriptFrame[] Interpreter_frames;
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("scriptActiveWidget")
-	static Widget scriptActiveWidget;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -1830375703
-	)
-	static int field982;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("Interpreter_calendar")
 	static java.util.Calendar Interpreter_calendar;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("Interpreter_MONTHS")
 	static final String[] Interpreter_MONTHS;
-	@ObfuscatedName("h")
-	static boolean field973;
-	@ObfuscatedName("q")
-	static boolean field986;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
+	static boolean field963;
+	@ObfuscatedName("w")
+	static boolean field951;
+	@ObfuscatedName("a")
+	static ArrayList field965;
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 606273051
+		intValue = 1747930903
 	)
-	static int field987;
-	@ObfuscatedName("al")
-	static final double field989;
-	@ObfuscatedName("gy")
-	@ObfuscatedSignature(
-		descriptor = "Loh;"
-	)
-	@Export("redHintArrowSprite")
-	static SpritePixels redHintArrowSprite;
+	static int field966;
+	@ObfuscatedName("ah")
+	static final double field959;
 
 	static {
-		Interpreter_arrayLengths = new int[5];
-		Interpreter_arrays = new int[5][5000];
-		Interpreter_intStack = new int[1000];
-		Interpreter_stringStack = new String[1000]; // L: 78
-		Interpreter_frameDepth = 0;
-		Interpreter_frames = new ScriptFrame[50];
-		Interpreter_calendar = java.util.Calendar.getInstance();
-		Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-		field973 = false;
-		field986 = false; // L: 94
-		field987 = 0;
-		field989 = Math.log(2.0D); // L: 99
+		Interpreter_arrayLengths = new int[5]; // L: 76
+		Interpreter_arrays = new int[5][5000]; // L: 77
+		Interpreter_intStack = new int[1000]; // L: 78
+		Interpreter_stringStack = new String[1000]; // L: 80
+		Interpreter_frameDepth = 0; // L: 82
+		Interpreter_frames = new ScriptFrame[50]; // L: 83
+		Interpreter_calendar = java.util.Calendar.getInstance(); // L: 89
+		Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 92
+		field963 = false; // L: 95
+		field951 = false; // L: 96
+		field965 = new ArrayList(); // L: 97
+		field966 = 0; // L: 98
+		field959 = Math.log(2.0D); // L: 102
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)Z",
-		garbageValue = "-3"
+		descriptor = "(II)Lem;",
+		garbageValue = "-1531306565"
 	)
-	static boolean method1848(String var0) {
-		if (var0 == null) { // L: 35
-			return false;
+	public static VarcInt method2009(int var0) {
+		VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 17
+		if (var1 != null) { // L: 18
+			return var1;
 		} else {
-			try {
-				new URL(var0);
-				return true; // L: 42
-			} catch (MalformedURLException var2) { // L: 39
-				return false; // L: 40
+			byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 19
+			var1 = new VarcInt(); // L: 20
+			if (var2 != null) { // L: 21
+				var1.method2745(new Buffer(var2));
 			}
+
+			VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 22
+			return var1; // L: 23
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("gy")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1954289740"
+		descriptor = "(IIIIZB)V",
+		garbageValue = "90"
 	)
-	public static void method1870() {
-		try {
-			if (class232.musicPlayerStatus == 1) { // L: 71
-				int var0 = class124.midiPcmStream.method4410(); // L: 72
-				if (var0 > 0 && class124.midiPcmStream.isReady()) { // L: 73
-					var0 -= class232.pcmSampleLength; // L: 74
-					if (var0 < 0) { // L: 75
-						var0 = 0;
-					}
+	@Export("setViewportShape")
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) { // L: 4715
+			var2 = 1;
+		}
 
-					class124.midiPcmStream.setPcmStreamVolume(var0); // L: 76
-					return; // L: 77
+		if (var3 < 1) { // L: 4716
+			var3 = 1;
+		}
+
+		int var5 = var3 - 334; // L: 4717
+		int var6;
+		if (var5 < 0) { // L: 4719
+			var6 = Client.field876;
+		} else if (var5 >= 100) { // L: 4720
+			var6 = Client.field877;
+		} else {
+			var6 = (Client.field877 - Client.field876) * var5 / 100 + Client.field876; // L: 4721
+		}
+
+		int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4722
+		int var8;
+		int var9;
+		short var10;
+		if (var7 < Client.field881) { // L: 4723
+			var10 = Client.field881; // L: 4724
+			var6 = var10 * var2 * 334 / (var3 * 512); // L: 4725
+			if (var6 > Client.field864) { // L: 4726
+				var6 = Client.field864; // L: 4727
+				var8 = var3 * var6 * 512 / (var10 * 334); // L: 4728
+				var9 = (var2 - var8) / 2; // L: 4729
+				if (var4) { // L: 4730
+					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4731
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4732
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4733
 				}
 
-				class124.midiPcmStream.clear(); // L: 79
-				class124.midiPcmStream.removeAll(); // L: 80
-				if (ModelData0.musicTrackArchive != null) { // L: 81
-					class232.musicPlayerStatus = 2;
-				} else {
-					class232.musicPlayerStatus = 0; // L: 82
-				}
-
-				class2.musicTrack = null; // L: 83
-				Messages.soundCache = null; // L: 84
+				var0 += var9; // L: 4735
+				var2 -= var9 * 2; // L: 4736
+			}
+		} else if (var7 > Client.field690) { // L: 4739
+			var10 = Client.field690; // L: 4740
+			var6 = var10 * var2 * 334 / (var3 * 512); // L: 4741
+			if (var6 < Client.field880) { // L: 4742
+				var6 = Client.field880; // L: 4743
+				var8 = var10 * var2 * 334 / (var6 * 512); // L: 4744
+				var9 = (var3 - var8) / 2; // L: 4745
+				if (var4) { // L: 4746
+					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4747
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4748
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4749
+				}
+
+				var1 += var9; // L: 4751
+				var3 -= var9 * 2; // L: 4752
 			}
-		} catch (Exception var2) { // L: 87
-			var2.printStackTrace(); // L: 88
-			class124.midiPcmStream.clear(); // L: 89
-			class232.musicPlayerStatus = 0; // L: 90
-			class2.musicTrack = null; // L: 91
-			Messages.soundCache = null; // L: 92
-			ModelData0.musicTrackArchive = null; // L: 93
 		}
 
-	} // L: 95
-
-	@ObfuscatedName("ie")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1390224792"
-	)
-	static final void method1888(int var0) {
-		if (var0 >= 0) { // L: 7774
-			int var1 = Client.menuArguments1[var0]; // L: 7775
-			int var2 = Client.menuArguments2[var0]; // L: 7776
-			int var3 = Client.menuOpcodes[var0]; // L: 7777
-			int var4 = Client.menuIdentifiers[var0]; // L: 7778
-			String var5 = Client.menuActions[var0]; // L: 7779
-			String var6 = Client.menuTargets[var0]; // L: 7780
-			Script.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7781
+		Client.viewportZoom = var3 * var6 / 334; // L: 4755
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4756
+			class12.method209(var2, var3); // L: 4757
 		}
-	} // L: 7782
+
+		Client.viewportOffsetX = var0; // L: 4759
+		Client.viewportOffsetY = var1; // L: 4760
+		Client.viewportWidth = var2; // L: 4761
+		Client.viewportHeight = var3; // L: 4762
+	} // L: 4763
 }
diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java
index 13c294b0d2..4ef90bc514 100644
--- a/runescape-client/src/main/java/InvDefinition.java
+++ b/runescape-client/src/main/java/InvDefinition.java
@@ -5,24 +5,33 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ep")
+@ObfuscatedName("ex")
 @Implements("InvDefinition")
 public class InvDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("InvDefinition_archive")
-	static AbstractArchive InvDefinition_archive;
-	@ObfuscatedName("n")
+	public static AbstractArchive InvDefinition_archive;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("InvDefinition_cached")
 	static EvictingDualNodeHashTable InvDefinition_cached;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("musicTrackArchive")
+	static AbstractArchive musicTrackArchive;
+	@ObfuscatedName("al")
+	@Export("null_string")
+	protected static String null_string;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1820336081
+		intValue = -1449643111
 	)
 	@Export("size")
 	public int size;
@@ -35,269 +44,252 @@ public class InvDefinition extends DualNode {
 		this.size = 0; // L: 12
 	} // L: 14
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1433861399"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1281514365"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 32
-			if (var2 == 0) { // L: 33
-				return; // L: 36
+			int var2 = var1.readUnsignedByte(); // L: 28
+			if (var2 == 0) { // L: 29
+				return; // L: 32
 			}
 
-			this.decodeNext(var1, var2); // L: 34
+			this.decodeNext(var1, var2); // L: 30
 		}
 	}
 
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1191086190"
-	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 2) { // L: 39
-			this.size = var1.readUnsignedShort();
-		}
-
-	} // L: 41
-
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;II)Lin;",
-		garbageValue = "-1662391635"
+		descriptor = "(Lnt;IS)V",
+		garbageValue = "-25465"
 	)
-	static MusicPatch method2609(AbstractArchive var0, int var1) {
-		byte[] var2 = var0.takeFileFlat(var1); // L: 21
-		return var2 == null ? null : new MusicPatch(var2); // L: 22
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1464061704"
-	)
-	static int method2619(int var0, Script var1, boolean var2) {
-		int var4 = -1; // L: 606
-		Widget var3;
-		if (var0 >= 2000) { // L: 607
-			var0 -= 1000; // L: 608
-			var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 609
-			var3 = Frames.getWidget(var4); // L: 610
-		} else {
-			var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 612
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2) {
+		if (var2 == 2) { // L: 35
+			this.size = var1.readUnsignedShort();
 		}
 
-		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 613
-			class44.Interpreter_intStackSize -= 2; // L: 614
-			var3.scrollX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 615
-			if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 616
+	} // L: 37
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1727698961"
+	)
+	static int method2699(int var0, Script var1, boolean var2) {
+		int var4 = -1; // L: 616
+		Widget var3;
+		if (var0 >= 2000) { // L: 617
+			var0 -= 1000; // L: 618
+			var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 619
+			var3 = WorldMapData_1.getWidget(var4); // L: 620
+		} else {
+			var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 622
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 623
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 624
+			var3.scrollX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 625
+			if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 626
 				var3.scrollX = var3.scrollWidth - var3.width;
 			}
 
-			if (var3.scrollX < 0) { // L: 617
+			if (var3.scrollX < 0) { // L: 627
 				var3.scrollX = 0;
 			}
 
-			var3.scrollY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 618
-			if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 619
+			var3.scrollY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 628
+			if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 629
 				var3.scrollY = var3.scrollHeight - var3.height;
 			}
 
-			if (var3.scrollY < 0) { // L: 620
+			if (var3.scrollY < 0) { // L: 630
 				var3.scrollY = 0;
 			}
 
-			WorldMapCacheName.invalidateWidget(var3); // L: 621
-			return 1; // L: 622
-		} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 624
-			var3.color = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 625
-			WorldMapCacheName.invalidateWidget(var3); // L: 626
-			return 1; // L: 627
-		} else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 629
-			var3.fill = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 630
-			WorldMapCacheName.invalidateWidget(var3); // L: 631
+			Script.invalidateWidget(var3); // L: 631
 			return 1; // L: 632
-		} else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 634
-			var3.transparencyTop = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 635
-			WorldMapCacheName.invalidateWidget(var3); // L: 636
+		} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 634
+			var3.color = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 635
+			Script.invalidateWidget(var3); // L: 636
 			return 1; // L: 637
-		} else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 639
-			var3.lineWid = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 640
-			WorldMapCacheName.invalidateWidget(var3); // L: 641
+		} else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 639
+			var3.fill = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 640
+			Script.invalidateWidget(var3); // L: 641
 			return 1; // L: 642
-		} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 644
-			var3.spriteId2 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 645
-			WorldMapCacheName.invalidateWidget(var3); // L: 646
+		} else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 644
+			var3.transparencyTop = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 645
+			Script.invalidateWidget(var3); // L: 646
 			return 1; // L: 647
-		} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 649
-			var3.spriteAngle = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 650
-			WorldMapCacheName.invalidateWidget(var3); // L: 651
+		} else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 649
+			var3.lineWid = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 650
+			Script.invalidateWidget(var3); // L: 651
 			return 1; // L: 652
-		} else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 654
-			var3.spriteTiling = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 655
-			WorldMapCacheName.invalidateWidget(var3); // L: 656
+		} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 654
+			var3.spriteId2 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 655
+			Script.invalidateWidget(var3); // L: 656
 			return 1; // L: 657
-		} else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 659
-			var3.modelType = 1; // L: 660
-			var3.modelId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 661
-			WorldMapCacheName.invalidateWidget(var3); // L: 662
-			return 1; // L: 663
-		} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 665
-			class44.Interpreter_intStackSize -= 6; // L: 666
-			var3.modelOffsetX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 667
-			var3.modelOffsetY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 668
-			var3.modelAngleX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 669
-			var3.modelAngleY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 670
-			var3.modelAngleZ = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 4]; // L: 671
-			var3.modelZoom = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 5]; // L: 672
-			WorldMapCacheName.invalidateWidget(var3); // L: 673
-			return 1; // L: 674
+		} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 659
+			var3.spriteAngle = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 660
+			Script.invalidateWidget(var3); // L: 661
+			return 1; // L: 662
+		} else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 664
+			var3.spriteTiling = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 665
+			Script.invalidateWidget(var3); // L: 666
+			return 1; // L: 667
+		} else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 669
+			var3.modelType = 1; // L: 670
+			var3.modelId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 671
+			Script.invalidateWidget(var3); // L: 672
+			return 1; // L: 673
+		} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 675
+			ChatChannel.Interpreter_intStackSize -= 6; // L: 676
+			var3.modelOffsetX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 677
+			var3.modelOffsetY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 678
+			var3.modelAngleX = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 679
+			var3.modelAngleY = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 680
+			var3.modelAngleZ = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 4]; // L: 681
+			var3.modelZoom = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 5]; // L: 682
+			Script.invalidateWidget(var3); // L: 683
+			return 1; // L: 684
 		} else {
 			int var8;
-			if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 676
-				var8 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 677
-				if (var8 != var3.sequenceId) { // L: 678
-					var3.sequenceId = var8; // L: 679
-					var3.modelFrame = 0; // L: 680
-					var3.modelFrameCycle = 0; // L: 681
-					WorldMapCacheName.invalidateWidget(var3); // L: 682
+			if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 686
+				var8 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 687
+				if (var8 != var3.sequenceId) { // L: 688
+					var3.sequenceId = var8; // L: 689
+					var3.modelFrame = 0; // L: 690
+					var3.modelFrameCycle = 0; // L: 691
+					Script.invalidateWidget(var3); // L: 692
 				}
 
-				return 1; // L: 684
-			} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 686
-				var3.modelOrthog = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 687
-				WorldMapCacheName.invalidateWidget(var3); // L: 688
-				return 1; // L: 689
-			} else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 691
-				String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 692
-				if (!var7.equals(var3.text)) { // L: 693
-					var3.text = var7; // L: 694
-					WorldMapCacheName.invalidateWidget(var3); // L: 695
+				return 1; // L: 694
+			} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 696
+				var3.modelOrthog = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 697
+				Script.invalidateWidget(var3); // L: 698
+				return 1; // L: 699
+			} else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 701
+				String var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 702
+				if (!var7.equals(var3.text)) { // L: 703
+					var3.text = var7; // L: 704
+					Script.invalidateWidget(var3); // L: 705
 				}
 
-				return 1; // L: 697
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 699
-				var3.fontId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 700
-				WorldMapCacheName.invalidateWidget(var3); // L: 701
-				return 1; // L: 702
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 704
-				class44.Interpreter_intStackSize -= 3; // L: 705
-				var3.textXAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 706
-				var3.textYAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 707
-				var3.textLineHeight = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 708
-				WorldMapCacheName.invalidateWidget(var3); // L: 709
-				return 1; // L: 710
-			} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 712
-				var3.textShadowed = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 713
-				WorldMapCacheName.invalidateWidget(var3); // L: 714
-				return 1; // L: 715
-			} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 717
-				var3.outline = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 718
-				WorldMapCacheName.invalidateWidget(var3); // L: 719
+				return 1; // L: 707
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 709
+				var3.fontId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 710
+				Script.invalidateWidget(var3); // L: 711
+				return 1; // L: 712
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 714
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 715
+				var3.textXAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 716
+				var3.textYAlignment = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 717
+				var3.textLineHeight = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 718
+				Script.invalidateWidget(var3); // L: 719
 				return 1; // L: 720
-			} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 722
-				var3.spriteShadow = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 723
-				WorldMapCacheName.invalidateWidget(var3); // L: 724
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 722
+				var3.textShadowed = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 723
+				Script.invalidateWidget(var3); // L: 724
 				return 1; // L: 725
-			} else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 727
-				var3.spriteFlipV = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 728
-				WorldMapCacheName.invalidateWidget(var3); // L: 729
+			} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 727
+				var3.outline = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 728
+				Script.invalidateWidget(var3); // L: 729
 				return 1; // L: 730
-			} else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 732
-				var3.spriteFlipH = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 733
-				WorldMapCacheName.invalidateWidget(var3); // L: 734
+			} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 732
+				var3.spriteShadow = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 733
+				Script.invalidateWidget(var3); // L: 734
 				return 1; // L: 735
-			} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 737
-				class44.Interpreter_intStackSize -= 2; // L: 738
-				var3.scrollWidth = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 739
-				var3.scrollHeight = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 740
-				WorldMapCacheName.invalidateWidget(var3); // L: 741
-				if (var4 != -1 && var3.type == 0) { // L: 742
-					class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false);
+			} else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 737
+				var3.spriteFlipV = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 738
+				Script.invalidateWidget(var3); // L: 739
+				return 1; // L: 740
+			} else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 742
+				var3.spriteFlipH = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 743
+				Script.invalidateWidget(var3); // L: 744
+				return 1; // L: 745
+			} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 747
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 748
+				var3.scrollWidth = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 749
+				var3.scrollHeight = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 750
+				Script.invalidateWidget(var3); // L: 751
+				if (var4 != -1 && var3.type == 0) { // L: 752
+					WorldMapLabelSize.revalidateWidgetScroll(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var4 >> 16], var3, false);
 				}
 
-				return 1; // L: 743
-			} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 745
-				class22.resumePauseWidget(var3.id, var3.childIndex); // L: 746
-				Client.meslayerContinueWidget = var3; // L: 747
-				WorldMapCacheName.invalidateWidget(var3); // L: 748
-				return 1; // L: 749
-			} else if (var0 == 1122) { // L: 751
-				var3.spriteId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 752
-				WorldMapCacheName.invalidateWidget(var3); // L: 753
-				return 1; // L: 754
-			} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 756
-				var3.color2 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 757
-				WorldMapCacheName.invalidateWidget(var3); // L: 758
+				return 1; // L: 753
+			} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 755
+				ClanChannelMember.resumePauseWidget(var3.id, var3.childIndex); // L: 756
+				Client.meslayerContinueWidget = var3; // L: 757
+				Script.invalidateWidget(var3); // L: 758
 				return 1; // L: 759
-			} else if (var0 == 1124) { // L: 761
-				var3.transparencyBot = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 762
-				WorldMapCacheName.invalidateWidget(var3); // L: 763
+			} else if (var0 == 1122) { // L: 761
+				var3.spriteId = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 762
+				Script.invalidateWidget(var3); // L: 763
 				return 1; // L: 764
-			} else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 766
-				var8 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 767
-				FillMode var6 = (FillMode)Messages.findEnumerated(VertexNormal.FillMode_values(), var8); // L: 768
-				if (var6 != null) { // L: 769
-					var3.fillMode = var6; // L: 770
-					WorldMapCacheName.invalidateWidget(var3); // L: 771
+			} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 766
+				var3.color2 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 767
+				Script.invalidateWidget(var3); // L: 768
+				return 1; // L: 769
+			} else if (var0 == 1124) { // L: 771
+				var3.transparencyBot = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 772
+				Script.invalidateWidget(var3); // L: 773
+				return 1; // L: 774
+			} else if (var0 == 1125) { // L: 776
+				var8 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 777
+				FillMode var6 = (FillMode)Clock.findEnumerated(GrandExchangeEvent.FillMode_values(), var8); // L: 778
+				if (var6 != null) { // L: 779
+					var3.fillMode = var6; // L: 780
+					Script.invalidateWidget(var3); // L: 781
 				}
 
-				return 1; // L: 773
+				return 1; // L: 783
 			} else {
 				boolean var5;
-				if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 775
-					var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 776
-					var3.field2992 = var5; // L: 777
-					return 1; // L: 778
-				} else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 780
-					var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 781
-					var3.modelTransparency = var5; // L: 782
-					return 1; // L: 783
-				} else if (var0 == 1128) { // L: 785
-					class44.Interpreter_intStackSize -= 2; // L: 786
-					return 1; // L: 787
+				if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 785
+					var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 786
+					var3.field2994 = var5; // L: 787
+					return 1; // L: 788
+				} else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 790
+					var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 791
+					var3.modelTransparency = var5; // L: 792
+					return 1; // L: 793
+				} else if (var0 == 1128) { // L: 795
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 796
+					return 1; // L: 797
 				} else {
-					return 2; // L: 789
+					return 2; // L: 799
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("jo")
+	@ObfuscatedName("ks")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;I)Z",
-		garbageValue = "-1051636424"
+		descriptor = "(Lci;ZB)V",
+		garbageValue = "16"
 	)
-	@Export("runCs1")
-	static final boolean runCs1(Widget var0) {
-		if (var0.cs1Comparisons == null) { // L: 9871
-			return false;
-		} else {
-			for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 9872
-				int var2 = ModeWhere.method5160(var0, var1); // L: 9873
-				int var3 = var0.cs1ComparisonValues[var1]; // L: 9874
-				if (var0.cs1Comparisons[var1] == 2) { // L: 9875
-					if (var2 >= var3) { // L: 9876
-						return false;
-					}
-				} else if (var0.cs1Comparisons[var1] == 3) { // L: 9878
-					if (var2 <= var3) { // L: 9879
-						return false;
-					}
-				} else if (var0.cs1Comparisons[var1] == 4) { // L: 9881
-					if (var3 == var2) { // L: 9882
-						return false;
-					}
-				} else if (var2 != var3) { // L: 9884
-					return false;
-				}
-			}
-
-			return true; // L: 9886
+	@Export("closeInterface")
+	static final void closeInterface(InterfaceParent var0, boolean var1) {
+		int var2 = var0.group; // L: 11273
+		int var3 = (int)var0.key; // L: 11274
+		var0.remove(); // L: 11275
+		if (var1) { // L: 11276
+			class44.method540(var2);
 		}
-	}
+
+		class10.method113(var2); // L: 11277
+		Widget var4 = WorldMapData_1.getWidget(var3); // L: 11278
+		if (var4 != null) { // L: 11279
+			Script.invalidateWidget(var4);
+		}
+
+		WorldMapScaleHandler.method3856(); // L: 11280
+		if (Client.rootInterface != -1) { // L: 11281
+			class8.runIntfCloseListeners(Client.rootInterface, 1);
+		}
+
+	} // L: 11282
 }
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index 8f090bf714..4ceedb5692 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oy")
+@ObfuscatedName("od")
 @Implements("IsaacCipher")
 public final class IsaacCipher {
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -21857667
+		intValue = 52014609
 	)
 	@Export("valuesRemaining")
 	int valuesRemaining;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("results")
 	int[] results;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("mm")
 	int[] mm;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 2044871249
+		intValue = 125685661
 	)
 	@Export("aa")
 	int aa;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1090157991
+		intValue = 1381780371
 	)
 	@Export("bb")
 	int bb;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1872182579
+		intValue = 2057052317
 	)
 	@Export("cc")
 	int cc;
@@ -46,13 +46,13 @@ public final class IsaacCipher {
 			this.results[var2] = var1[var2]; // L: 18
 		}
 
-		this.method7098(); // L: 20
+		this.method7180(); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "81"
+		descriptor = "(S)I",
+		garbageValue = "24118"
 	)
 	@Export("nextInt")
 	public final int nextInt() {
@@ -64,12 +64,12 @@ public final class IsaacCipher {
 		return this.results[--this.valuesRemaining]; // L: 28
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-58"
+		descriptor = "(I)I",
+		garbageValue = "1910986529"
 	)
-	public final int method7096() {
+	public final int method7168() {
 		if (this.valuesRemaining == 0) { // L: 32
 			this.generateMoreResults(); // L: 33
 			this.valuesRemaining = 256; // L: 34
@@ -78,10 +78,10 @@ public final class IsaacCipher {
 		return this.results[this.valuesRemaining - 1]; // L: 36
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2083438988"
+		garbageValue = "1295369465"
 	)
 	@Export("generateMoreResults")
 	final void generateMoreResults() {
@@ -103,7 +103,7 @@ public final class IsaacCipher {
 
 			this.aa += this.mm[128 + var1 & 255]; // L: 54
 			int var3;
-			this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55
+			this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; // L: 55
 			this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56
 		}
 
@@ -111,10 +111,10 @@ public final class IsaacCipher {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "128"
+		descriptor = "(I)V",
+		garbageValue = "1132518043"
 	)
-	final void method7098() {
+	final void method7180() {
 		int var9 = -1640531527; // L: 70
 		int var8 = -1640531527; // L: 71
 		int var7 = -1640531527; // L: 72
@@ -242,18 +242,21 @@ public final class IsaacCipher {
 		this.valuesRemaining = 256; // L: 189
 	} // L: 190
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("ko")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;IIIB)V",
-		garbageValue = "-43"
+		descriptor = "(Liv;IIII)V",
+		garbageValue = "-719453937"
 	)
-	@Export("Widget_setKeyRate")
-	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
-		if (var0.field3035 == null) { // L: 988
-			throw new RuntimeException(); // L: 989
-		} else {
-			var0.field3035[var1] = var2; // L: 991
-			var0.field3079[var1] = var3; // L: 992
+	@Export("drawCompass")
+	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
+		SpriteMask var4 = var0.getSpriteMask(false); // L: 11398
+		if (var4 != null) { // L: 11399
+			if (Client.minimapState < 3) { // L: 11400
+				Friend.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+			} else {
+				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11401
+			}
+
 		}
-	} // L: 993
+	} // L: 11402
 }
diff --git a/runescape-client/src/main/java/ItemComposition.java b/runescape-client/src/main/java/ItemComposition.java
index bce7f98445..b761fa9e4e 100644
--- a/runescape-client/src/main/java/ItemComposition.java
+++ b/runescape-client/src/main/java/ItemComposition.java
@@ -4,284 +4,294 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eq")
+@ObfuscatedName("ef")
 @Implements("ItemComposition")
 public class ItemComposition extends DualNode {
-	@ObfuscatedName("d")
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("ItemDefinition_archive")
+	public static AbstractArchive ItemDefinition_archive;
+	@ObfuscatedName("r")
+	@Export("ItemDefinition_inMembersWorld")
+	public static boolean ItemDefinition_inMembersWorld;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 251127981
+		intValue = 852203709
 	)
 	@Export("ItemDefinition_fileCount")
 	public static int ItemDefinition_fileCount;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ItemDefinition_cached")
 	static EvictingDualNodeHashTable ItemDefinition_cached;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ItemDefinition_cachedModels")
 	static EvictingDualNodeHashTable ItemDefinition_cachedModels;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ItemDefinition_cachedSprites")
-	static EvictingDualNodeHashTable ItemDefinition_cachedSprites;
-	@ObfuscatedName("cg")
-	@ObfuscatedGetter(
-		intValue = 644081785
+	public static EvictingDualNodeHashTable ItemDefinition_cachedSprites;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lkj;"
 	)
-	public static int field1859;
-	@ObfuscatedName("c")
+	@Export("ItemDefinition_fontPlain11")
+	public static Font ItemDefinition_fontPlain11;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -882422617
+		intValue = 864003523
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1212146295
+		intValue = -82092197
 	)
 	@Export("model")
 	int model;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("recolorFrom")
 	public short[] recolorFrom;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("recolorTo")
 	public short[] recolorTo;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("retextureFrom")
 	public short[] retextureFrom;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("retextureTo")
 	public short[] retextureTo;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1180916267
+		intValue = -1197095781
 	)
 	@Export("zoom2d")
 	public int zoom2d;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 143465415
+		intValue = 1477199059
 	)
 	@Export("xan2d")
 	public int xan2d;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 10451221
+		intValue = 1947804351
 	)
 	@Export("yan2d")
 	public int yan2d;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1707042663
+		intValue = 963136523
 	)
 	@Export("zan2d")
 	public int zan2d;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -538415603
+		intValue = 1965704601
 	)
 	@Export("offsetX2d")
 	public int offsetX2d;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1515805085
+		intValue = 1159411923
 	)
 	@Export("offsetY2d")
 	public int offsetY2d;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = -1049731853
+		intValue = -950532785
 	)
 	@Export("isStackable")
 	public int isStackable;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -407851249
+		intValue = -1201231959
 	)
 	@Export("price")
 	public int price;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("isMembersOnly")
 	public boolean isMembersOnly;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("groundActions")
 	public String[] groundActions;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@Export("inventoryActions")
 	public String[] inventoryActions;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -1244064173
+		intValue = -1740445573
 	)
 	@Export("shiftClickIndex")
 	int shiftClickIndex;
 	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 461761185
+		intValue = -637515031
 	)
 	@Export("maleModel")
 	int maleModel;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -2090621981
+		intValue = 1731429003
 	)
 	@Export("maleModel1")
 	int maleModel1;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 2017655331
+		intValue = -1393379957
 	)
 	@Export("maleOffset")
 	int maleOffset;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1881995837
+		intValue = 666917083
 	)
 	@Export("femaleModel")
 	int femaleModel;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 264233001
+		intValue = -1064602939
 	)
 	@Export("femaleModel1")
 	int femaleModel1;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 237060879
+		intValue = 164223345
 	)
 	@Export("femaleOffset")
 	int femaleOffset;
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 1265781663
+		intValue = 508356555
 	)
 	@Export("maleModel2")
 	int maleModel2;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -459952191
+		intValue = 1276393651
 	)
 	@Export("femaleModel2")
 	int femaleModel2;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 2115221939
+		intValue = -388318419
 	)
 	@Export("maleHeadModel")
 	int maleHeadModel;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 1899720535
+		intValue = -1136192221
 	)
 	@Export("maleHeadModel2")
 	int maleHeadModel2;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = 1556168093
+		intValue = 1993766353
 	)
 	@Export("femaleHeadModel")
 	int femaleHeadModel;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = 586976285
+		intValue = -592852933
 	)
 	@Export("femaleHeadModel2")
 	int femaleHeadModel2;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("am")
 	@Export("countobj")
 	int[] countobj;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@Export("countco")
 	int[] countco;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 1027633359
+		intValue = -1686572351
 	)
 	@Export("note")
 	public int note;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 168192755
+		intValue = -2019053745
 	)
 	@Export("noteTemplate")
 	public int noteTemplate;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 1366362761
+		intValue = 1896796711
 	)
 	@Export("resizeX")
 	int resizeX;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1651193245
+		intValue = -55547161
 	)
 	@Export("resizeY")
 	int resizeY;
-	@ObfuscatedName("an")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -867000627
+		intValue = -1335073571
 	)
 	@Export("resizeZ")
 	int resizeZ;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = -333382647
+		intValue = -1227258885
 	)
 	@Export("ambient")
 	public int ambient;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = -512843981
+		intValue = -991965775
 	)
 	@Export("contrast")
 	public int contrast;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = 1898498591
+		intValue = -319582403
 	)
 	@Export("team")
 	public int team;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@Export("isTradable")
 	public boolean isTradable;
 	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = -1249308017
+		intValue = -688029981
 	)
 	@Export("unnotedId")
 	int unnotedId;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = -1893254845
+		intValue = -162075829
 	)
 	@Export("notedId")
 	int notedId;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = 1563500305
+		intValue = 1046778855
 	)
 	@Export("placeholder")
 	public int placeholder;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 1689317723
+		intValue = -411820485
 	)
 	@Export("placeholderTemplate")
 	public int placeholderTemplate;
@@ -299,11 +309,11 @@ public class ItemComposition extends DualNode {
 		this.yan2d = 0; // L: 41
 		this.zan2d = 0; // L: 42
 		this.offsetX2d = 0; // L: 43
-		this.offsetY2d = 0;
+		this.offsetY2d = 0; // L: 44
 		this.isStackable = 0; // L: 45
 		this.price = 1; // L: 46
-		this.isMembersOnly = false;
-		this.groundActions = new String[]{null, null, "Take", null, null};
+		this.isMembersOnly = false; // L: 47
+		this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48
 		this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49
 		this.shiftClickIndex = -2; // L: 51
 		this.maleModel = -1; // L: 52
@@ -330,850 +340,634 @@ public class ItemComposition extends DualNode {
 		this.unnotedId = -1; // L: 76
 		this.notedId = -1; // L: 77
 		this.placeholder = -1; // L: 78
-		this.placeholderTemplate = -1;
-	}
+		this.placeholderTemplate = -1; // L: 79
+	} // L: 81
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1352174221"
+		garbageValue = "-1428524327"
 	)
 	@Export("post")
 	void post() {
-	} // L: 115
+	} // L: 121
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "2116753290"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-139066670"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 119
-			if (var2 == 0) { // L: 120
-				return; // L: 123
+			int var2 = var1.readUnsignedByte(); // L: 125
+			if (var2 == 0) { // L: 126
+				return; // L: 129
 			}
 
-			this.decodeNext(var1, var2); // L: 121
+			this.decodeNext(var1, var2); // L: 127
 		}
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-610453643"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "127788107"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 126
+		if (var2 == 1) { // L: 132
 			this.model = var1.readUnsignedShort();
-		} else if (var2 == 2) { // L: 127
+		} else if (var2 == 2) { // L: 133
 			this.name = var1.readStringCp1252NullTerminated();
-		} else if (var2 == 4) { // L: 128
+		} else if (var2 == 4) { // L: 134
 			this.zoom2d = var1.readUnsignedShort();
-		} else if (var2 == 5) { // L: 129
+		} else if (var2 == 5) { // L: 135
 			this.xan2d = var1.readUnsignedShort();
-		} else if (var2 == 6) { // L: 130
+		} else if (var2 == 6) { // L: 136
 			this.yan2d = var1.readUnsignedShort();
-		} else if (var2 == 7) { // L: 131
-			this.offsetX2d = var1.readUnsignedShort(); // L: 132
-			if (this.offsetX2d > 32767) { // L: 133
+		} else if (var2 == 7) { // L: 137
+			this.offsetX2d = var1.readUnsignedShort(); // L: 138
+			if (this.offsetX2d > 32767) { // L: 139
 				this.offsetX2d -= 65536;
 			}
-		} else if (var2 == 8) { // L: 135
-			this.offsetY2d = var1.readUnsignedShort(); // L: 136
-			if (this.offsetY2d > 32767) {
-				this.offsetY2d -= 65536; // L: 137
+		} else if (var2 == 8) { // L: 141
+			this.offsetY2d = var1.readUnsignedShort(); // L: 142
+			if (this.offsetY2d > 32767) { // L: 143
+				this.offsetY2d -= 65536;
 			}
-		} else if (var2 == 11) { // L: 139
+		} else if (var2 == 9) { // L: 145
+			var1.readStringCp1252NullTerminated(); // L: 146
+		} else if (var2 == 11) { // L: 148
 			this.isStackable = 1;
-		} else if (var2 == 12) { // L: 140
+		} else if (var2 == 12) { // L: 149
 			this.price = var1.readInt();
-		} else if (var2 == 16) { // L: 141
+		} else if (var2 == 16) { // L: 150
 			this.isMembersOnly = true;
-		} else if (var2 == 23) { // L: 142
-			this.maleModel = var1.readUnsignedShort(); // L: 143
-			this.maleOffset = var1.readUnsignedByte(); // L: 144
-		} else if (var2 == 24) { // L: 146
+		} else if (var2 == 23) { // L: 151
+			this.maleModel = var1.readUnsignedShort(); // L: 152
+			this.maleOffset = var1.readUnsignedByte(); // L: 153
+		} else if (var2 == 24) { // L: 155
 			this.maleModel1 = var1.readUnsignedShort();
-		} else if (var2 == 25) { // L: 147
-			this.femaleModel = var1.readUnsignedShort(); // L: 148
-			this.femaleOffset = var1.readUnsignedByte(); // L: 149
-		} else if (var2 == 26) { // L: 151
+		} else if (var2 == 25) { // L: 156
+			this.femaleModel = var1.readUnsignedShort(); // L: 157
+			this.femaleOffset = var1.readUnsignedByte(); // L: 158
+		} else if (var2 == 26) { // L: 160
 			this.femaleModel1 = var1.readUnsignedShort();
-		} else if (var2 >= 30 && var2 < 35) { // L: 152
-			this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 153
-			if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 154
+		} else if (var2 >= 30 && var2 < 35) { // L: 161
+			this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 162
+			if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 163
 				this.groundActions[var2 - 30] = null;
 			}
-		} else if (var2 >= 35 && var2 < 40) { // L: 156
+		} else if (var2 >= 35 && var2 < 40) { // L: 165
 			this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated();
 		} else {
 			int var3;
 			int var4;
-			if (var2 == 40) { // L: 157
-				var3 = var1.readUnsignedByte(); // L: 158
-				this.recolorFrom = new short[var3]; // L: 159
-				this.recolorTo = new short[var3]; // L: 160
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 161
-					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 162
-					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 163
-				}
-			} else if (var2 == 41) { // L: 166
+			if (var2 == 40) { // L: 166
 				var3 = var1.readUnsignedByte(); // L: 167
-				this.retextureFrom = new short[var3]; // L: 168
-				this.retextureTo = new short[var3]; // L: 169
+				this.recolorFrom = new short[var3]; // L: 168
+				this.recolorTo = new short[var3]; // L: 169
 
 				for (var4 = 0; var4 < var3; ++var4) { // L: 170
-					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 171
-					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 172
+					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 171
+					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 172
 				}
-			} else if (var2 == 42) { // L: 175
-				this.shiftClickIndex = var1.readByte(); // L: 176
-			} else if (var2 == 65) { // L: 178
+			} else if (var2 == 41) { // L: 175
+				var3 = var1.readUnsignedByte(); // L: 176
+				this.retextureFrom = new short[var3]; // L: 177
+				this.retextureTo = new short[var3]; // L: 178
+
+				for (var4 = 0; var4 < var3; ++var4) { // L: 179
+					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 180
+					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 181
+				}
+			} else if (var2 == 42) { // L: 184
+				this.shiftClickIndex = var1.readByte(); // L: 185
+			} else if (var2 == 65) { // L: 187
 				this.isTradable = true;
-			} else if (var2 == 78) { // L: 179
+			} else if (var2 == 78) { // L: 188
 				this.maleModel2 = var1.readUnsignedShort();
-			} else if (var2 == 79) { // L: 180
+			} else if (var2 == 79) { // L: 189
 				this.femaleModel2 = var1.readUnsignedShort();
-			} else if (var2 == 90) { // L: 181
+			} else if (var2 == 90) { // L: 190
 				this.maleHeadModel = var1.readUnsignedShort();
-			} else if (var2 == 91) { // L: 182
+			} else if (var2 == 91) { // L: 191
 				this.femaleHeadModel = var1.readUnsignedShort();
-			} else if (var2 == 92) { // L: 183
+			} else if (var2 == 92) { // L: 192
 				this.maleHeadModel2 = var1.readUnsignedShort();
-			} else if (var2 == 93) { // L: 184
+			} else if (var2 == 93) { // L: 193
 				this.femaleHeadModel2 = var1.readUnsignedShort();
-			} else if (var2 == 95) { // L: 185
+			} else if (var2 == 94) { // L: 194
+				var1.readUnsignedShort(); // L: 195
+			} else if (var2 == 95) { // L: 197
 				this.zan2d = var1.readUnsignedShort();
-			} else if (var2 == 97) { // L: 186
+			} else if (var2 == 97) { // L: 198
 				this.note = var1.readUnsignedShort();
-			} else if (var2 == 98) {
-				this.noteTemplate = var1.readUnsignedShort(); // L: 187
-			} else if (var2 >= 100 && var2 < 110) { // L: 188
-				if (this.countobj == null) { // L: 189
-					this.countobj = new int[10]; // L: 190
-					this.countco = new int[10]; // L: 191
+			} else if (var2 == 98) { // L: 199
+				this.noteTemplate = var1.readUnsignedShort();
+			} else if (var2 >= 100 && var2 < 110) { // L: 200
+				if (this.countobj == null) { // L: 201
+					this.countobj = new int[10]; // L: 202
+					this.countco = new int[10]; // L: 203
 				}
 
-				this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 193
-				this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 194
-			} else if (var2 == 110) { // L: 196
+				this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 205
+				this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 206
+			} else if (var2 == 110) { // L: 208
 				this.resizeX = var1.readUnsignedShort();
-			} else if (var2 == 111) { // L: 197
+			} else if (var2 == 111) { // L: 209
 				this.resizeY = var1.readUnsignedShort();
-			} else if (var2 == 112) { // L: 198
+			} else if (var2 == 112) { // L: 210
 				this.resizeZ = var1.readUnsignedShort();
-			} else if (var2 == 113) { // L: 199
+			} else if (var2 == 113) { // L: 211
 				this.ambient = var1.readByte();
-			} else if (var2 == 114) { // L: 200
+			} else if (var2 == 114) { // L: 212
 				this.contrast = var1.readByte() * 5;
-			} else if (var2 == 115) { // L: 201
+			} else if (var2 == 115) { // L: 213
 				this.team = var1.readUnsignedByte();
-			} else if (var2 == 139) { // L: 202
+			} else if (var2 == 139) { // L: 214
 				this.unnotedId = var1.readUnsignedShort();
-			} else if (var2 == 140) { // L: 203
+			} else if (var2 == 140) { // L: 215
 				this.notedId = var1.readUnsignedShort();
-			} else if (var2 == 148) { // L: 204
+			} else if (var2 == 148) { // L: 216
 				this.placeholder = var1.readUnsignedShort();
-			} else if (var2 == 149) { // L: 205
+			} else if (var2 == 149) { // L: 217
 				this.placeholderTemplate = var1.readUnsignedShort();
-			} else if (var2 == 249) { // L: 206
-				this.params = ModeWhere.readStringIntParameters(var1, this.params);
+			} else if (var2 == 249) { // L: 218
+				this.params = class19.readStringIntParameters(var1, this.params);
 			}
 		}
 
-	} // L: 208
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Leq;Leq;B)V",
-		garbageValue = "107"
-	)
-	@Export("genCert")
-	void genCert(ItemComposition var1, ItemComposition var2) {
-		this.model = var1.model; // L: 211
-		this.zoom2d = var1.zoom2d; // L: 212
-		this.xan2d = var1.xan2d; // L: 213
-		this.yan2d = var1.yan2d; // L: 214
-		this.zan2d = var1.zan2d; // L: 215
-		this.offsetX2d = var1.offsetX2d; // L: 216
-		this.offsetY2d = var1.offsetY2d; // L: 217
-		this.recolorFrom = var1.recolorFrom; // L: 218
-		this.recolorTo = var1.recolorTo; // L: 219
-		this.retextureFrom = var1.retextureFrom; // L: 220
-		this.retextureTo = var1.retextureTo; // L: 221
-		this.name = var2.name; // L: 222
-		this.isMembersOnly = var2.isMembersOnly; // L: 223
-		this.price = var2.price; // L: 224
-		this.isStackable = 1; // L: 225
-	} // L: 226
+	} // L: 220
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Leq;Leq;I)V",
-		garbageValue = "2093027907"
+		descriptor = "(Lef;Lef;I)V",
+		garbageValue = "-368534972"
+	)
+	@Export("genCert")
+	void genCert(ItemComposition var1, ItemComposition var2) {
+		this.model = var1.model; // L: 223
+		this.zoom2d = var1.zoom2d; // L: 224
+		this.xan2d = var1.xan2d; // L: 225
+		this.yan2d = var1.yan2d; // L: 226
+		this.zan2d = var1.zan2d; // L: 227
+		this.offsetX2d = var1.offsetX2d; // L: 228
+		this.offsetY2d = var1.offsetY2d; // L: 229
+		this.recolorFrom = var1.recolorFrom; // L: 230
+		this.recolorTo = var1.recolorTo; // L: 231
+		this.retextureFrom = var1.retextureFrom; // L: 232
+		this.retextureTo = var1.retextureTo; // L: 233
+		this.name = var2.name; // L: 234
+		this.isMembersOnly = var2.isMembersOnly; // L: 235
+		this.price = var2.price; // L: 236
+		this.isStackable = 1; // L: 237
+	} // L: 238
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lef;Lef;I)V",
+		garbageValue = "-1437013277"
 	)
 	@Export("genBought")
 	void genBought(ItemComposition var1, ItemComposition var2) {
-		this.model = var1.model; // L: 229
-		this.zoom2d = var1.zoom2d; // L: 230
-		this.xan2d = var1.xan2d; // L: 231
-		this.yan2d = var1.yan2d; // L: 232
-		this.zan2d = var1.zan2d; // L: 233
-		this.offsetX2d = var1.offsetX2d; // L: 234
-		this.offsetY2d = var1.offsetY2d; // L: 235
-		this.recolorFrom = var2.recolorFrom; // L: 236
-		this.recolorTo = var2.recolorTo; // L: 237
-		this.retextureFrom = var2.retextureFrom; // L: 238
-		this.retextureTo = var2.retextureTo; // L: 239
-		this.name = var2.name; // L: 240
-		this.isMembersOnly = var2.isMembersOnly; // L: 241
-		this.isStackable = var2.isStackable; // L: 242
-		this.maleModel = var2.maleModel; // L: 243
-		this.maleModel1 = var2.maleModel1; // L: 244
-		this.maleModel2 = var2.maleModel2; // L: 245
-		this.femaleModel = var2.femaleModel; // L: 246
-		this.femaleModel1 = var2.femaleModel1; // L: 247
-		this.femaleModel2 = var2.femaleModel2; // L: 248
-		this.maleHeadModel = var2.maleHeadModel; // L: 249
-		this.maleHeadModel2 = var2.maleHeadModel2; // L: 250
-		this.femaleHeadModel = var2.femaleHeadModel; // L: 251
-		this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 252
-		this.team = var2.team; // L: 253
-		this.groundActions = var2.groundActions; // L: 254
-		this.inventoryActions = new String[5]; // L: 255
-		if (var2.inventoryActions != null) { // L: 256
+		this.model = var1.model; // L: 241
+		this.zoom2d = var1.zoom2d; // L: 242
+		this.xan2d = var1.xan2d; // L: 243
+		this.yan2d = var1.yan2d; // L: 244
+		this.zan2d = var1.zan2d; // L: 245
+		this.offsetX2d = var1.offsetX2d; // L: 246
+		this.offsetY2d = var1.offsetY2d; // L: 247
+		this.recolorFrom = var2.recolorFrom; // L: 248
+		this.recolorTo = var2.recolorTo; // L: 249
+		this.retextureFrom = var2.retextureFrom; // L: 250
+		this.retextureTo = var2.retextureTo; // L: 251
+		this.name = var2.name; // L: 252
+		this.isMembersOnly = var2.isMembersOnly; // L: 253
+		this.isStackable = var2.isStackable; // L: 254
+		this.maleModel = var2.maleModel; // L: 255
+		this.maleModel1 = var2.maleModel1; // L: 256
+		this.maleModel2 = var2.maleModel2; // L: 257
+		this.femaleModel = var2.femaleModel; // L: 258
+		this.femaleModel1 = var2.femaleModel1; // L: 259
+		this.femaleModel2 = var2.femaleModel2; // L: 260
+		this.maleHeadModel = var2.maleHeadModel; // L: 261
+		this.maleHeadModel2 = var2.maleHeadModel2; // L: 262
+		this.femaleHeadModel = var2.femaleHeadModel; // L: 263
+		this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 264
+		this.team = var2.team; // L: 265
+		this.groundActions = var2.groundActions; // L: 266
+		this.inventoryActions = new String[5]; // L: 267
+		if (var2.inventoryActions != null) { // L: 268
 			for (int var3 = 0; var3 < 4; ++var3) {
 				this.inventoryActions[var3] = var2.inventoryActions[var3];
 			}
 		}
 
-		this.inventoryActions[4] = "Discard"; // L: 257
-		this.price = 0; // L: 258
-	} // L: 259
+		this.inventoryActions[4] = "Discard"; // L: 269
+		this.price = 0; // L: 270
+	} // L: 271
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Leq;Leq;I)V",
-		garbageValue = "555956610"
+		descriptor = "(Lef;Lef;I)V",
+		garbageValue = "-825669250"
 	)
 	@Export("genPlaceholder")
 	void genPlaceholder(ItemComposition var1, ItemComposition var2) {
-		this.model = var1.model; // L: 262
-		this.zoom2d = var1.zoom2d; // L: 263
-		this.xan2d = var1.xan2d; // L: 264
-		this.yan2d = var1.yan2d; // L: 265
-		this.zan2d = var1.zan2d; // L: 266
-		this.offsetX2d = var1.offsetX2d; // L: 267
-		this.offsetY2d = var1.offsetY2d; // L: 268
-		this.recolorFrom = var1.recolorFrom; // L: 269
-		this.recolorTo = var1.recolorTo; // L: 270
-		this.retextureFrom = var1.retextureFrom; // L: 271
-		this.retextureTo = var1.retextureTo; // L: 272
-		this.isStackable = var1.isStackable; // L: 273
-		this.name = var2.name; // L: 274
-		this.price = 0; // L: 275
-		this.isMembersOnly = false; // L: 276
-		this.isTradable = false; // L: 277
-	} // L: 278
+		this.model = var1.model; // L: 274
+		this.zoom2d = var1.zoom2d; // L: 275
+		this.xan2d = var1.xan2d; // L: 276
+		this.yan2d = var1.yan2d; // L: 277
+		this.zan2d = var1.zan2d; // L: 278
+		this.offsetX2d = var1.offsetX2d; // L: 279
+		this.offsetY2d = var1.offsetY2d; // L: 280
+		this.recolorFrom = var1.recolorFrom; // L: 281
+		this.recolorTo = var1.recolorTo; // L: 282
+		this.retextureFrom = var1.retextureFrom; // L: 283
+		this.retextureTo = var1.retextureTo; // L: 284
+		this.isStackable = var1.isStackable; // L: 285
+		this.name = var2.name; // L: 286
+		this.price = 0; // L: 287
+		this.isMembersOnly = false; // L: 288
+		this.isTradable = false; // L: 289
+	} // L: 290
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lgm;",
-		garbageValue = "594500425"
+		descriptor = "(IB)Lga;",
+		garbageValue = "-76"
 	)
 	@Export("getModelData")
 	public final ModelData getModelData(int var1) {
 		int var3;
-		if (this.countobj != null && var1 > 1) { // L: 281
-			int var2 = -1; // L: 282
+		if (this.countobj != null && var1 > 1) { // L: 293
+			int var2 = -1; // L: 294
 
-			for (var3 = 0; var3 < 10; ++var3) { // L: 283
-				if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 284
+			for (var3 = 0; var3 < 10; ++var3) { // L: 295
+				if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 296
 					var2 = this.countobj[var3];
 				}
 			}
 
-			if (var2 != -1) { // L: 286
-				return class260.ItemDefinition_get(var2).getModelData(1);
+			if (var2 != -1) { // L: 298
+				return class250.ItemDefinition_get(var2).getModelData(1);
 			}
 		}
 
-		ModelData var4 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, this.model, 0); // L: 288
-		if (var4 == null) { // L: 289
+		ModelData var4 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, this.model, 0); // L: 300
+		if (var4 == null) { // L: 301
 			return null;
 		} else {
-			if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 290
+			if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 302
 				var4.resize(this.resizeX, this.resizeY, this.resizeZ);
 			}
 
-			if (this.recolorFrom != null) { // L: 291
-				for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 292
-					var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 293
+			if (this.recolorFrom != null) { // L: 303
+				for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 304
+					var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 305
 				}
 			}
 
-			if (this.retextureFrom != null) { // L: 296
-				for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 297
-					var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 298
+			if (this.retextureFrom != null) { // L: 308
+				for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 309
+					var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 310
 				}
 			}
 
-			return var4; // L: 301
+			return var4; // L: 313
+		}
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lgd;",
+		garbageValue = "12"
+	)
+	@Export("getModel")
+	public final Model getModel(int var1) {
+		if (this.countobj != null && var1 > 1) { // L: 317
+			int var2 = -1; // L: 318
+
+			for (int var3 = 0; var3 < 10; ++var3) { // L: 319
+				if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 320
+					var2 = this.countobj[var3];
+				}
+			}
+
+			if (var2 != -1) { // L: 322
+				return class250.ItemDefinition_get(var2).getModel(1);
+			}
+		}
+
+		Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 324
+		if (var5 != null) { // L: 325
+			return var5;
+		} else {
+			ModelData var6 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, this.model, 0); // L: 326
+			if (var6 == null) { // L: 327
+				return null;
+			} else {
+				if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 328
+					var6.resize(this.resizeX, this.resizeY, this.resizeZ);
+				}
+
+				int var4;
+				if (this.recolorFrom != null) { // L: 329
+					for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 330
+						var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 331
+					}
+				}
+
+				if (this.retextureFrom != null) { // L: 334
+					for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 335
+						var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 336
+					}
+				}
+
+				var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 339
+				var5.isSingleTile = true; // L: 340
+				ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 341
+				return var5; // L: 342
+			}
 		}
 	}
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lgr;",
-		garbageValue = "-1748661120"
-	)
-	@Export("getModel")
-	public final Model getModel(int var1) {
-		if (this.countobj != null && var1 > 1) { // L: 305
-			int var2 = -1; // L: 306
-
-			for (int var3 = 0; var3 < 10; ++var3) { // L: 307
-				if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 308
-					var2 = this.countobj[var3];
-				}
-			}
-
-			if (var2 != -1) { // L: 310
-				return class260.ItemDefinition_get(var2).getModel(1);
-			}
-		}
-
-		Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 312
-		if (var5 != null) { // L: 313
-			return var5;
-		} else {
-			ModelData var6 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, this.model, 0); // L: 314
-			if (var6 == null) { // L: 315
-				return null;
-			} else {
-				if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 316
-					var6.resize(this.resizeX, this.resizeY, this.resizeZ);
-				}
-
-				int var4;
-				if (this.recolorFrom != null) { // L: 317
-					for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 318
-						var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 319
-					}
-				}
-
-				if (this.retextureFrom != null) { // L: 322
-					for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 323
-						var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 324
-					}
-				}
-
-				var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 327
-				var5.isSingleTile = true; // L: 328
-				ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 329
-				return var5; // L: 330
-			}
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(IS)Leq;",
-		garbageValue = "312"
+		descriptor = "(II)Lef;",
+		garbageValue = "1042392759"
 	)
 	@Export("getCountObj")
 	public ItemComposition getCountObj(int var1) {
-		if (this.countobj != null && var1 > 1) { // L: 334
-			int var2 = -1; // L: 335
+		if (this.countobj != null && var1 > 1) { // L: 346
+			int var2 = -1; // L: 347
 
-			for (int var3 = 0; var3 < 10; ++var3) { // L: 336
+			for (int var3 = 0; var3 < 10; ++var3) { // L: 348
 				if (var1 >= this.countco[var3] && this.countco[var3] != 0) {
-					var2 = this.countobj[var3]; // L: 337
+					var2 = this.countobj[var3]; // L: 349
 				}
 			}
 
-			if (var2 != -1) { // L: 339
-				return class260.ItemDefinition_get(var2);
+			if (var2 != -1) { // L: 351
+				return class250.ItemDefinition_get(var2);
 			}
 		}
 
-		return this; // L: 341
+		return this; // L: 353
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)Z",
-		garbageValue = "-46"
+		descriptor = "(ZI)Z",
+		garbageValue = "1790528710"
 	)
 	@Export("hasNoValidModel")
 	public final boolean hasNoValidModel(boolean var1) {
-		int var2 = this.maleModel;
-		int var3 = this.maleModel1;
-		int var4 = this.maleModel2; // L: 428
-		if (var1) {
-			var2 = this.femaleModel;
-			var3 = this.femaleModel1;
-			var4 = this.femaleModel2;
+		int var2 = this.maleModel; // L: 431
+		int var3 = this.maleModel1; // L: 432
+		int var4 = this.maleModel2; // L: 433
+		if (var1) { // L: 434
+			var2 = this.femaleModel; // L: 435
+			var3 = this.femaleModel1; // L: 436
+			var4 = this.femaleModel2; // L: 437
 		}
 
-		if (var2 == -1) {
+		if (var2 == -1) { // L: 439
 			return true;
 		} else {
-			boolean var5 = true;
-			if (!class311.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
+			boolean var5 = true; // L: 440
+			if (!SoundCache.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 441
 				var5 = false;
 			}
 
-			if (var3 != -1 && !class311.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 437
+			if (var3 != -1 && !SoundCache.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 442
 				var5 = false;
 			}
 
-			if (var4 != -1 && !class311.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) {
+			if (var4 != -1 && !SoundCache.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 443
 				var5 = false;
 			}
 
-			return var5;
+			return var5; // L: 444
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)Lgm;",
-		garbageValue = "-1178156518"
+		descriptor = "(ZI)Lga;",
+		garbageValue = "-1389763858"
 	)
-	public final ModelData method3018(boolean var1) {
-		int var2 = this.maleModel; // L: 443
-		int var3 = this.maleModel1;
-		int var4 = this.maleModel2;
-		if (var1) { // L: 446
-			var2 = this.femaleModel;
-			var3 = this.femaleModel1; // L: 448
-			var4 = this.femaleModel2;
+	public final ModelData method3070(boolean var1) {
+		int var2 = this.maleModel; // L: 448
+		int var3 = this.maleModel1; // L: 449
+		int var4 = this.maleModel2; // L: 450
+		if (var1) { // L: 451
+			var2 = this.femaleModel; // L: 452
+			var3 = this.femaleModel1; // L: 453
+			var4 = this.femaleModel2; // L: 454
 		}
 
-		if (var2 == -1) {
+		if (var2 == -1) { // L: 456
 			return null;
 		} else {
-			ModelData var5 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var2, 0);
-			if (var3 != -1) {
-				ModelData var6 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var3, 0);
-				if (var4 != -1) {
-					ModelData var7 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var4, 0); // L: 456
-					ModelData[] var8 = new ModelData[]{var5, var6, var7};
-					var5 = new ModelData(var8, 3);
+			ModelData var5 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var2, 0); // L: 457
+			if (var3 != -1) { // L: 458
+				ModelData var6 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var3, 0); // L: 459
+				if (var4 != -1) { // L: 460
+					ModelData var7 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var4, 0); // L: 461
+					ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 462
+					var5 = new ModelData(var8, 3); // L: 463
 				} else {
-					ModelData[] var10 = new ModelData[]{var5, var6};
-					var5 = new ModelData(var10, 2);
+					ModelData[] var10 = new ModelData[]{var5, var6}; // L: 466
+					var5 = new ModelData(var10, 2); // L: 467
 				}
 			}
 
-			if (!var1 && this.maleOffset != 0) { // L: 465
+			if (!var1 && this.maleOffset != 0) { // L: 470
 				var5.changeOffset(0, this.maleOffset, 0);
 			}
 
-			if (var1 && this.femaleOffset != 0) {
+			if (var1 && this.femaleOffset != 0) { // L: 471
 				var5.changeOffset(0, this.femaleOffset, 0);
 			}
 
 			int var9;
-			if (this.recolorFrom != null) {
-				for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
-					var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 469
+			if (this.recolorFrom != null) { // L: 472
+				for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 473
+					var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 474
 				}
 			}
 
-			if (this.retextureFrom != null) {
-				for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 473
-					var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
+			if (this.retextureFrom != null) { // L: 477
+				for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 478
+					var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 479
 				}
 			}
 
-			return var5; // L: 477
-		}
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)Z",
-		garbageValue = "673638768"
-	)
-	public final boolean method3019(boolean var1) {
-		int var2 = this.maleHeadModel;
-		int var3 = this.maleHeadModel2;
-		if (var1) { // L: 483
-			var2 = this.femaleHeadModel;
-			var3 = this.femaleHeadModel2;
-		}
-
-		if (var2 == -1) { // L: 487
-			return true;
-		} else {
-			boolean var4 = true;
-			if (!class311.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
-				var4 = false;
-			}
-
-			if (var3 != -1 && !class311.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
-				var4 = false;
-			}
-
-			return var4; // L: 491
-		}
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(ZB)Lgm;",
-		garbageValue = "10"
-	)
-	public final ModelData method3020(boolean var1) {
-		int var2 = this.maleHeadModel; // L: 495
-		int var3 = this.maleHeadModel2;
-		if (var1) {
-			var2 = this.femaleHeadModel;
-			var3 = this.femaleHeadModel2;
-		}
-
-		if (var2 == -1) {
-			return null;
-		} else {
-			ModelData var4 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var2, 0);
-			if (var3 != -1) {
-				ModelData var5 = ModelData.ModelData_get(class311.ItemDefinition_modelArchive, var3, 0); // L: 504
-				ModelData[] var6 = new ModelData[]{var4, var5};
-				var4 = new ModelData(var6, 2);
-			}
-
-			int var7;
-			if (this.recolorFrom != null) { // L: 508
-				for (var7 = 0; var7 < this.recolorFrom.length; ++var7) {
-					var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
-				}
-			}
-
-			if (this.retextureFrom != null) { // L: 513
-				for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 514
-					var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
-				}
-			}
-
-			return var4;
+			return var5; // L: 482
 		}
 	}
 
 	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "117"
+		descriptor = "(ZI)Z",
+		garbageValue = "2105188267"
+	)
+	public final boolean method3102(boolean var1) {
+		int var2 = this.maleHeadModel; // L: 486
+		int var3 = this.maleHeadModel2; // L: 487
+		if (var1) { // L: 488
+			var2 = this.femaleHeadModel; // L: 489
+			var3 = this.femaleHeadModel2; // L: 490
+		}
+
+		if (var2 == -1) { // L: 492
+			return true;
+		} else {
+			boolean var4 = true; // L: 493
+			if (!SoundCache.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 494
+				var4 = false;
+			}
+
+			if (var3 != -1 && !SoundCache.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 495
+				var4 = false;
+			}
+
+			return var4; // L: 496
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)Lga;",
+		garbageValue = "-838789106"
+	)
+	public final ModelData method3082(boolean var1) {
+		int var2 = this.maleHeadModel; // L: 500
+		int var3 = this.maleHeadModel2; // L: 501
+		if (var1) { // L: 502
+			var2 = this.femaleHeadModel; // L: 503
+			var3 = this.femaleHeadModel2; // L: 504
+		}
+
+		if (var2 == -1) { // L: 506
+			return null;
+		} else {
+			ModelData var4 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var2, 0); // L: 507
+			if (var3 != -1) { // L: 508
+				ModelData var5 = ModelData.ModelData_get(SoundCache.ItemDefinition_modelArchive, var3, 0); // L: 509
+				ModelData[] var6 = new ModelData[]{var4, var5}; // L: 510
+				var4 = new ModelData(var6, 2); // L: 511
+			}
+
+			int var7;
+			if (this.recolorFrom != null) { // L: 513
+				for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 514
+					var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 515
+				}
+			}
+
+			if (this.retextureFrom != null) { // L: 518
+				for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 519
+					var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 520
+				}
+			}
+
+			return var4; // L: 523
+		}
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-201410584"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return SecureRandomFuture.method1977(this.params, var1, var2);
+		IterableNodeHashTable var4 = this.params; // L: 528
+		int var3;
+		if (var4 == null) { // L: 530
+			var3 = var2; // L: 531
+		} else {
+			IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 534
+			if (var5 == null) { // L: 535
+				var3 = var2; // L: 536
+			} else {
+				var3 = var5.integer; // L: 539
+			}
+		}
+
+		return var3; // L: 541
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;S)Ljava/lang/String;",
-		garbageValue = "239"
+		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1584498919"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return FriendsList.method5650(this.params, var1, var2);
+		return WorldMapElement.method2742(this.params, var1, var2); // L: 545
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1596135449"
+		garbageValue = "138320975"
 	)
 	@Export("getShiftClickIndex")
 	public int getShiftClickIndex() {
-		if (this.shiftClickIndex != -1 && this.inventoryActions != null) {
-			if (this.shiftClickIndex >= 0) {
-				return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -1244064173 * 1541643739 : -1;
+		if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 549
+			if (this.shiftClickIndex >= 0) { // L: 550
+				return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * -53430605 * -1740445573 : -1;
 			} else {
-				return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1;
+				return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 551
 			}
 		} else {
 			return -1;
 		}
 	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "-14386"
-	)
-	boolean method3024() {
-		return this.recolorTo != null;
-	}
-
-	@ObfuscatedName("t")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "604113686"
+		garbageValue = "-1120346347"
 	)
-	boolean method3025() {
-		return this.retextureTo != null;
+	boolean method3086() {
+		return this.recolorTo != null; // L: 561
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-378975040"
+		descriptor = "(B)Z",
+		garbageValue = "-30"
 	)
-	public static int method3084() {
-		return ViewportMouse.ViewportMouse_entityCount; // L: 44
+	boolean method3139() {
+		return this.retextureTo != null; // L: 565
 	}
 
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;III)[Loh;",
-		garbageValue = "-1264314377"
-	)
-	public static SpritePixels[] method3087(AbstractArchive var0, int var1, int var2) {
-		return !class339.method6015(var0, var1, var2) ? null : class142.method2739(); // L: 47 48
-	}
-
-	@ObfuscatedName("f")
+	@ObfuscatedName("ip")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "-919320059"
+		garbageValue = "-604596177"
 	)
-	static final void method3085(int var0, int var1, int var2, int var3) {
-		for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79
-			for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80
-				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81
-					class372.field4123[0][var5][var4] = 127; // L: 82
-					if (var0 == var5 && var5 > 0) { // L: 83
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
-					}
-
-					if (var0 + var2 == var5 && var5 < 103) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; // L: 84
-					}
-
-					if (var4 == var1 && var4 > 0) { // L: 85
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
-					}
-
-					if (var4 == var3 + var1 && var4 < 103) { // L: 86
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
-					}
-				}
-			}
+	@Export("selectSpell")
+	static void selectSpell(int var0, int var1, int var2, int var3) {
+		Widget var4 = class17.getWidgetChild(var0, var1); // L: 8780
+		if (var4 != null && var4.onTargetEnter != null) { // L: 8781
+			ScriptEvent var5 = new ScriptEvent(); // L: 8782
+			var5.widget = var4; // L: 8783
+			var5.args = var4.onTargetEnter; // L: 8784
+			WorldMapSection1.runScriptEvent(var5); // L: 8785
 		}
 
-	} // L: 90
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lnb;IB)V",
-		garbageValue = "100"
-	)
-	@Export("readPlayerUpdate")
-	static void readPlayerUpdate(PacketBuffer var0, int var1) {
-		boolean var2 = var0.readBits(1) == 1; // L: 392
-		if (var2) { // L: 393
-			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
-		}
-
-		int var3 = var0.readBits(2); // L: 394
-		Player var4 = Client.players[var1]; // L: 395
-		if (var3 == 0) { // L: 396
-			if (var2) { // L: 397
-				var4.field1218 = false; // L: 398
-			} else if (Client.localPlayerIndex == var1) { // L: 401
-				throw new RuntimeException();
-			} else {
-				Players.Players_regions[var1] = (var4.plane << 28) + (VertexNormal.baseX + var4.pathX[0] >> 13 << 14) + (SoundSystem.baseY + var4.pathY[0] >> 13); // L: 402
-				if (var4.field1264 != -1) { // L: 403
-					Players.Players_orientations[var1] = var4.field1264;
-				} else {
-					Players.Players_orientations[var1] = var4.orientation; // L: 404
-				}
-
-				Players.Players_targetIndices[var1] = var4.targetIndex; // L: 405
-				Client.players[var1] = null; // L: 406
-				if (var0.readBits(1) != 0) { // L: 407
-					ParamComposition.updateExternalPlayer(var0, var1);
-				}
-
-			}
-		} else {
-			int var5;
-			int var6;
-			int var7;
-			if (var3 == 1) { // L: 410
-				var5 = var0.readBits(3); // L: 411
-				var6 = var4.pathX[0]; // L: 412
-				var7 = var4.pathY[0]; // L: 413
-				if (var5 == 0) { // L: 414
-					--var6; // L: 415
-					--var7; // L: 416
-				} else if (var5 == 1) { // L: 418
-					--var7;
-				} else if (var5 == 2) { // L: 419
-					++var6; // L: 420
-					--var7; // L: 421
-				} else if (var5 == 3) { // L: 423
-					--var6;
-				} else if (var5 == 4) { // L: 424
-					++var6;
-				} else if (var5 == 5) { // L: 425
-					--var6; // L: 426
-					++var7; // L: 427
-				} else if (var5 == 6) { // L: 429
-					++var7;
-				} else if (var5 == 7) { // L: 430
-					++var6; // L: 431
-					++var7; // L: 432
-				}
-
-				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 434
-					var4.resetPath(var6, var7); // L: 435
-					var4.field1218 = false; // L: 436
-				} else if (var2) { // L: 438
-					var4.field1218 = true; // L: 439
-					var4.tileX = var6; // L: 440
-					var4.tileY = var7; // L: 441
-				} else {
-					var4.field1218 = false; // L: 444
-					var4.method2129(var6, var7, Players.field1373[var1]); // L: 445
-				}
-
-			} else if (var3 == 2) { // L: 449
-				var5 = var0.readBits(4); // L: 450
-				var6 = var4.pathX[0]; // L: 451
-				var7 = var4.pathY[0]; // L: 452
-				if (var5 == 0) { // L: 453
-					var6 -= 2; // L: 454
-					var7 -= 2; // L: 455
-				} else if (var5 == 1) { // L: 457
-					--var6; // L: 458
-					var7 -= 2; // L: 459
-				} else if (var5 == 2) { // L: 461
-					var7 -= 2;
-				} else if (var5 == 3) { // L: 462
-					++var6; // L: 463
-					var7 -= 2; // L: 464
-				} else if (var5 == 4) { // L: 466
-					var6 += 2; // L: 467
-					var7 -= 2; // L: 468
-				} else if (var5 == 5) { // L: 470
-					var6 -= 2; // L: 471
-					--var7; // L: 472
-				} else if (var5 == 6) { // L: 474
-					var6 += 2; // L: 475
-					--var7; // L: 476
-				} else if (var5 == 7) { // L: 478
-					var6 -= 2;
-				} else if (var5 == 8) { // L: 479
-					var6 += 2;
-				} else if (var5 == 9) { // L: 480
-					var6 -= 2; // L: 481
-					++var7; // L: 482
-				} else if (var5 == 10) { // L: 484
-					var6 += 2; // L: 485
-					++var7; // L: 486
-				} else if (var5 == 11) { // L: 488
-					var6 -= 2; // L: 489
-					var7 += 2; // L: 490
-				} else if (var5 == 12) { // L: 492
-					--var6; // L: 493
-					var7 += 2; // L: 494
-				} else if (var5 == 13) { // L: 496
-					var7 += 2;
-				} else if (var5 == 14) { // L: 497
-					++var6; // L: 498
-					var7 += 2; // L: 499
-				} else if (var5 == 15) { // L: 501
-					var6 += 2; // L: 502
-					var7 += 2; // L: 503
-				}
-
-				if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 505
-					if (var2) { // L: 509
-						var4.field1218 = true; // L: 510
-						var4.tileX = var6; // L: 511
-						var4.tileY = var7; // L: 512
-					} else {
-						var4.field1218 = false; // L: 515
-						var4.method2129(var6, var7, Players.field1373[var1]); // L: 516
-					}
-				} else {
-					var4.resetPath(var6, var7); // L: 506
-					var4.field1218 = false; // L: 507
-				}
-
-			} else {
-				var5 = var0.readBits(1); // L: 520
-				int var8;
-				int var9;
-				int var10;
-				int var11;
-				if (var5 == 0) { // L: 521
-					var6 = var0.readBits(12); // L: 522
-					var7 = var6 >> 10; // L: 523
-					var8 = var6 >> 5 & 31; // L: 524
-					if (var8 > 15) { // L: 525
-						var8 -= 32;
-					}
-
-					var9 = var6 & 31; // L: 526
-					if (var9 > 15) { // L: 527
-						var9 -= 32;
-					}
-
-					var10 = var8 + var4.pathX[0]; // L: 528
-					var11 = var9 + var4.pathY[0]; // L: 529
-					if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 530
-						var4.resetPath(var10, var11); // L: 531
-						var4.field1218 = false; // L: 532
-					} else if (var2) { // L: 534
-						var4.field1218 = true; // L: 535
-						var4.tileX = var10; // L: 536
-						var4.tileY = var11; // L: 537
-					} else {
-						var4.field1218 = false; // L: 540
-						var4.method2129(var10, var11, Players.field1373[var1]); // L: 541
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3); // L: 543
-					if (Client.localPlayerIndex == var1) { // L: 544
-						class22.Client_plane = var4.plane;
-					}
-
-				} else {
-					var6 = var0.readBits(30); // L: 547
-					var7 = var6 >> 28; // L: 548
-					var8 = var6 >> 14 & 16383; // L: 549
-					var9 = var6 & 16383; // L: 550
-					var10 = (var8 + VertexNormal.baseX + var4.pathX[0] & 16383) - VertexNormal.baseX; // L: 551
-					var11 = (var9 + SoundSystem.baseY + var4.pathY[0] & 16383) - SoundSystem.baseY; // L: 552
-					if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 553
-						var4.resetPath(var10, var11); // L: 554
-						var4.field1218 = false; // L: 555
-					} else if (var2) { // L: 557
-						var4.field1218 = true; // L: 558
-						var4.tileX = var10; // L: 559
-						var4.tileY = var11; // L: 560
-					} else {
-						var4.field1218 = false; // L: 563
-						var4.method2129(var10, var11, Players.field1373[var1]); // L: 564
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3); // L: 566
-					if (Client.localPlayerIndex == var1) { // L: 567
-						class22.Client_plane = var4.plane;
-					}
-
-				}
-			}
-		}
-	} // L: 399 408 447 518 545 568
+		Client.field634 = var3; // L: 8787
+		Client.isSpellSelected = true; // L: 8788
+		class15.selectedSpellWidget = var0; // L: 8789
+		Client.selectedSpellChildIndex = var1; // L: 8790
+		LoginPacket.selectedSpellFlags = var2; // L: 8791
+		Script.invalidateWidget(var4); // L: 8792
+	} // L: 8793
 }
diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java
index a14892d516..f9b9b6cecc 100644
--- a/runescape-client/src/main/java/ItemContainer.java
+++ b/runescape-client/src/main/java/ItemContainer.java
@@ -3,22 +3,19 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cj")
+@ObfuscatedName("cy")
 @Implements("ItemContainer")
 public class ItemContainer extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("itemContainers")
 	static NodeHashTable itemContainers;
-	@ObfuscatedName("b")
-	@Export("ItemDefinition_inMembersWorld")
-	public static boolean ItemDefinition_inMembersWorld;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("ids")
 	int[] ids;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("quantities")
 	int[] quantities;
 
@@ -30,4 +27,93 @@ public class ItemContainer extends Node {
 		this.ids = new int[]{-1}; // L: 8
 		this.quantities = new int[]{0}; // L: 9
 	} // L: 11
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(CB)Z",
+		garbageValue = "0"
+	)
+	public static boolean method2181(char var0) {
+		if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { // L: 61
+			return true;
+		} else {
+			if (var0 != 0) { // L: 62
+				char[] var1 = class302.cp1252AsciiExtension; // L: 64
+
+				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 65
+					char var3 = var1[var2]; // L: 66
+					if (var0 == var3) { // L: 68
+						return true; // L: 69
+					}
+				}
+			}
+
+			return false; // L: 75
+		}
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;II)I",
+		garbageValue = "-1214579938"
+	)
+	public static int method2183(CharSequence var0, int var1) {
+		return class8.method105(var0, var1, true); // L: 80
+	}
+
+	@ObfuscatedName("hi")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)I",
+		garbageValue = "2"
+	)
+	@Export("getTileHeight")
+	static final int getTileHeight(int var0, int var1, int var2) {
+		int var3 = var0 >> 7; // L: 5461
+		int var4 = var1 >> 7; // L: 5462
+		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5463
+			int var5 = var2; // L: 5464
+			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5465
+				var5 = var2 + 1;
+			}
+
+			int var6 = var0 & 127; // L: 5466
+			int var7 = var1 & 127; // L: 5467
+			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; // L: 5468
+			int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; // L: 5469
+			return var8 * (128 - var7) + var7 * var9 >> 7; // L: 5470
+		} else {
+			return 0;
+		}
+	}
+
+	@ObfuscatedName("jj")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Liv;I)Ljava/lang/String;",
+		garbageValue = "2065897018"
+	)
+	static String method2184(String var0, Widget var1) {
+		if (var0.indexOf("%") != -1) { // L: 9883
+			for (int var2 = 1; var2 <= 5; ++var2) { // L: 9884
+				while (true) {
+					int var3 = var0.indexOf("%" + var2); // L: 9886
+					if (var3 == -1) { // L: 9887
+						break;
+					}
+
+					String var4 = var0.substring(0, var3); // L: 9888
+					int var6 = class27.method355(var1, var2 - 1); // L: 9890
+					String var5;
+					if (var6 < 999999999) { // L: 9892
+						var5 = Integer.toString(var6); // L: 9893
+					} else {
+						var5 = "*"; // L: 9896
+					}
+
+					var0 = var4 + var5 + var0.substring(var3 + 2); // L: 9898
+				}
+			}
+		}
+
+		return var0; // L: 9902
+	}
 }
diff --git a/runescape-client/src/main/java/ItemLayer.java b/runescape-client/src/main/java/ItemLayer.java
index e4ea96006f..ebe9f1fa0d 100644
--- a/runescape-client/src/main/java/ItemLayer.java
+++ b/runescape-client/src/main/java/ItemLayer.java
@@ -4,54 +4,57 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gv")
+@ObfuscatedName("gw")
 @Implements("ItemLayer")
 public final class ItemLayer {
-	@ObfuscatedName("v")
+	@ObfuscatedName("bq")
+	@Export("otp")
+	static String otp;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1950267115
+		intValue = -193076461
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -840082071
+		intValue = 314356507
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1958043433
+		intValue = -695126527
 	)
 	@Export("y")
 	int y;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("first")
 	Renderable first;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("second")
 	Renderable second;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("third")
 	Renderable third;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 8707211480451132889L
+		longValue = 5487494310770586269L
 	)
 	@Export("tag")
 	long tag;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1688818251
+		intValue = 400175677
 	)
 	@Export("height")
 	int height;
@@ -59,101 +62,94 @@ public final class ItemLayer {
 	ItemLayer() {
 	} // L: 13
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "([BI)V",
-		garbageValue = "-830600929"
+		descriptor = "(Ljp;Ljp;Ljp;Lie;B)Z",
+		garbageValue = "0"
 	)
-	@Export("ByteArrayPool_release")
-	public static synchronized void ByteArrayPool_release(byte[] var0) {
-		if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76
-			ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77
-		} else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80
-			ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81
-		} else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84
-			ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85
+	public static boolean method3860(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
+		class233.musicPatchesArchive = var0; // L: 26
+		class233.musicSamplesArchive = var1; // L: 27
+		class230.soundEffectsArchive = var2; // L: 28
+		class233.midiPcmStream = var3; // L: 29
+		return true; // L: 30
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(CI)Z",
+		garbageValue = "-395066972"
+	)
+	public static boolean method3861(char var0) {
+		if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45
+			if (var0 != 0) { // L: 46
+				char[] var1 = class302.cp1252AsciiExtension;
+
+				for (int var2 = 0; var2 < var1.length; ++var2) {
+					char var3 = var1[var2]; // L: 50
+					if (var0 == var3) {
+						return true; // L: 52
+					}
+				}
+			}
+
+			return false; // L: 57
 		} else {
-			if (class20.ByteArrayPool_arrays != null) { // L: 88
-				for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89
-					if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < class20.ByteArrayPool_arrays[var1].length) { // L: 90
-						class20.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91
-						return; // L: 92
-					}
-				}
-			}
-
+			return true;
 		}
-	} // L: 78 82 86 96
+	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "([BB)V",
-		garbageValue = "1"
+		descriptor = "([BII)I",
+		garbageValue = "-1419386207"
 	)
-	@Export("SpriteBuffer_decode")
-	public static void SpriteBuffer_decode(byte[] var0) {
-		Buffer var1 = new Buffer(var0); // L: 196
-		var1.offset = var0.length - 2; // L: 197
-		class396.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 198
-		WorldMapDecoration.SpriteBuffer_xOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 199
-		Calendar.SpriteBuffer_yOffsets = new int[class396.SpriteBuffer_spriteCount]; // L: 200
-		class396.SpriteBuffer_spriteWidths = new int[class396.SpriteBuffer_spriteCount]; // L: 201
-		class302.SpriteBuffer_spriteHeights = new int[class396.SpriteBuffer_spriteCount]; // L: 202
-		class396.SpriteBuffer_pixels = new byte[class396.SpriteBuffer_spriteCount][]; // L: 203
-		var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8; // L: 204
-		class396.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 205
-		UserComparator2.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 206
-		int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 207
+	public static int method3863(byte[] var0, int var1) {
+		int var3 = -1; // L: 47
 
-		int var3;
-		for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 208
-			WorldMapDecoration.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
+		for (int var4 = 0; var4 < var1; ++var4) { // L: 48
+			var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49
 		}
 
-		for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 209
-			Calendar.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
-		}
+		var3 = ~var3; // L: 51
+		return var3; // L: 54
+	}
 
-		for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 210
-			class396.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
-		}
-
-		for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 211
-			class302.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
-		}
-
-		var1.offset = var0.length - 7 - class396.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 212
-		MilliClock.SpriteBuffer_spritePalette = new int[var2]; // L: 213
-
-		for (var3 = 1; var3 < var2; ++var3) { // L: 214
-			MilliClock.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 215
-			if (MilliClock.SpriteBuffer_spritePalette[var3] == 0) { // L: 216
-				MilliClock.SpriteBuffer_spritePalette[var3] = 1;
-			}
-		}
-
-		var1.offset = 0; // L: 218
-
-		for (var3 = 0; var3 < class396.SpriteBuffer_spriteCount; ++var3) { // L: 219
-			int var4 = class396.SpriteBuffer_spriteWidths[var3]; // L: 220
-			int var5 = class302.SpriteBuffer_spriteHeights[var3]; // L: 221
-			int var6 = var4 * var5; // L: 222
-			byte[] var7 = new byte[var6]; // L: 223
-			class396.SpriteBuffer_pixels[var3] = var7; // L: 224
-			int var8 = var1.readUnsignedByte(); // L: 225
-			int var9;
-			if (var8 == 0) { // L: 226
-				for (var9 = 0; var9 < var6; ++var9) { // L: 227
-					var7[var9] = var1.readByte();
+	@ObfuscatedName("jt")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;III)V",
+		garbageValue = "-1678262366"
+	)
+	@Export("clickWidget")
+	static final void clickWidget(Widget var0, int var1, int var2) {
+		if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10899
+			if (var0 != null) { // L: 10901
+				Widget var4 = PlayerComposition.method4851(var0); // L: 10904
+				if (var4 == null) { // L: 10905
+					var4 = var0.parent;
 				}
-			} else if (var8 == 1) { // L: 229
-				for (var9 = 0; var9 < var4; ++var9) { // L: 230
-					for (int var10 = 0; var10 < var5; ++var10) { // L: 231
-						var7[var9 + var4 * var10] = var1.readByte(); // L: 232
+
+				if (var4 != null) { // L: 10908
+					Client.clickedWidget = var0; // L: 10912
+					var4 = PlayerComposition.method4851(var0); // L: 10915
+					if (var4 == null) {
+						var4 = var0.parent; // L: 10916
 					}
+
+					Client.clickedWidgetParent = var4; // L: 10919
+					Client.widgetClickX = var1; // L: 10920
+					Client.widgetClickY = var2; // L: 10921
+					UserComparator7.widgetDragDuration = 0; // L: 10922
+					Client.isDraggingWidget = false; // L: 10923
+					int var5 = HealthBarUpdate.method2283(); // L: 10924
+					if (var5 != -1) { // L: 10925
+						WorldMapIcon_1.method3305(var5);
+					}
+
+					return; // L: 10926
 				}
 			}
-		}
 
-	} // L: 237
+		}
+	} // L: 10910
 }
diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java
index 636c7a5659..79206a4c20 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueue.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueue.java
@@ -4,18 +4,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ko")
+@ObfuscatedName("ks")
 @Implements("IterableDualNodeQueue")
 public class IterableDualNodeQueue implements Iterable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("sentinel")
 	public DualNode sentinel;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("head")
 	DualNode head;
@@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable {
 		this.sentinel.nextDual = this.sentinel; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("clear")
 	public void clear() {
 		while (this.sentinel.previousDual != this.sentinel) { // L: 16
@@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable {
 
 	} // L: 19
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lmf;)V"
+		descriptor = "(Lmm;)V"
 	)
 	@Export("add")
 	public void add(DualNode var1) {
@@ -53,7 +53,7 @@ public class IterableDualNodeQueue implements Iterable {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "()Lmf;"
+		descriptor = "()Lmm;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {
@@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lmf;"
+		descriptor = "()Lmm;"
 	)
 	@Export("last")
 	public DualNode last() {
 		return this.previousOrLast((DualNode)null); // L: 45
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lmf;)Lmf;"
+		descriptor = "(Lmm;)Lmm;"
 	)
 	@Export("previousOrLast")
 	DualNode previousOrLast(DualNode var1) {
@@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lmf;"
+		descriptor = "()Lmm;"
 	)
 	@Export("previous")
 	public DualNode previous() {
@@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable {
 		return new IterableDualNodeQueueIterator(this); // L: 71
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lmf;Lmf;)V"
+		descriptor = "(Lmm;Lmm;)V"
 	)
 	@Export("DualNodeDeque_addBefore")
 	public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) {
diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
index 434be55036..015e10b2e1 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kg")
+@ObfuscatedName("kl")
 @Implements("IterableDualNodeQueueIterator")
 public class IterableDualNodeQueueIterator implements Iterator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lks;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("head")
 	DualNode head;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmf;"
+		descriptor = "Lmm;"
 	)
 	@Export("last")
 	DualNode last;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lko;)V"
+		descriptor = "(Lks;)V"
 	)
 	IterableDualNodeQueueIterator(IterableDualNodeQueue var1) {
 		this.last = null; // L: 9
diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java
index 4fe2faeba1..3a207d6ff9 100644
--- a/runescape-client/src/main/java/IterableNodeDeque.java
+++ b/runescape-client/src/main/java/IterableNodeDeque.java
@@ -5,20 +5,20 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ki")
+@ObfuscatedName("kz")
 @Implements("IterableNodeDeque")
 public class IterableNodeDeque implements Iterable, Collection {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("sentinel")
 	Node sentinel;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
-	Node field3709;
+	Node field3712;
 
 	public IterableNodeDeque() {
 		this.sentinel = new Node(); // L: 7
@@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection {
 		this.sentinel.next = this.sentinel; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("rsClear")
 	public void rsClear() {
 		while (this.sentinel.previous != this.sentinel) { // L: 16
@@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection {
 
 	} // L: 19
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)V"
+		descriptor = "(Lmf;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(Node var1) {
@@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection {
 		var1.previous.next = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)V"
+		descriptor = "(Lmf;)V"
 	)
 	@Export("addLast")
 	public void addLast(Node var1) {
@@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection {
 		var1.previous.next = var1; // L: 34
 	} // L: 35
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("last")
 	public Node last() {
-		return this.method5233((Node)null); // L: 46
+		return this.method5361((Node)null); // L: 46
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)Lmw;"
+		descriptor = "(Lmf;)Lmf;"
 	)
-	Node method5233(Node var1) {
+	Node method5361(Node var1) {
 		Node var2;
 		if (var1 == null) { // L: 51
 			var2 = this.sentinel.previous;
@@ -89,32 +89,32 @@ public class IterableNodeDeque implements Iterable, Collection {
 		}
 
 		if (var2 == this.sentinel) { // L: 53
-			this.field3709 = null; // L: 54
+			this.field3712 = null; // L: 54
 			return null; // L: 55
 		} else {
-			this.field3709 = var2.previous; // L: 57
+			this.field3712 = var2.previous; // L: 57
 			return var2; // L: 58
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("previous")
 	public Node previous() {
-		Node var1 = this.field3709; // L: 62
+		Node var1 = this.field3712; // L: 62
 		if (var1 == this.sentinel) { // L: 63
-			this.field3709 = null; // L: 64
+			this.field3712 = null; // L: 64
 			return null; // L: 65
 		} else {
-			this.field3709 = var1.previous; // L: 67
+			this.field3712 = var1.previous; // L: 67
 			return var1; // L: 68
 		}
 	}
 
-	@ObfuscatedName("b")
-	int method5235() {
+	@ObfuscatedName("r")
+	int method5363() {
 		int var1 = 0; // L: 72
 
 		for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76
@@ -124,17 +124,17 @@ public class IterableNodeDeque implements Iterable, Collection {
 		return var1; // L: 78
 	}
 
-	@ObfuscatedName("d")
-	public boolean method5236() {
+	@ObfuscatedName("h")
+	public boolean method5364() {
 		return this.sentinel.previous == this.sentinel; // L: 82
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "()[Lmw;"
+		descriptor = "()[Lmf;"
 	)
-	Node[] method5240() {
-		Node[] var1 = new Node[this.method5235()]; // L: 86
+	Node[] method5370() {
+		Node[] var1 = new Node[this.method5363()]; // L: 86
 		int var2 = 0; // L: 87
 
 		for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91
@@ -144,29 +144,25 @@ public class IterableNodeDeque implements Iterable, Collection {
 		return var1; // L: 93
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)Z"
+		descriptor = "(Lmf;)Z"
 	)
-	boolean method5239(Node var1) {
+	boolean method5384(Node var1) {
 		this.addFirst(var1); // L: 127
 		return true; // L: 128
 	}
 
-	public boolean removeAll(Collection var1) {
-		throw new RuntimeException(); // L: 144
-	}
-
 	public Iterator iterator() {
 		return new IterableNodeDequeDescendingIterator(this); // L: 97
 	}
 
-	public boolean isEmpty() {
-		return this.method5236(); // L: 105
+	public boolean contains(Object var1) {
+		throw new RuntimeException(); // L: 109
 	}
 
-	public Object[] toArray() {
-		return this.method5240(); // L: 113
+	public boolean isEmpty() {
+		return this.method5364(); // L: 105
 	}
 
 	public Object[] toArray(Object[] var1) {
@@ -179,6 +175,10 @@ public class IterableNodeDeque implements Iterable, Collection {
 		return var1; // L: 123
 	}
 
+	public void clear() {
+		this.rsClear(); // L: 152
+	} // L: 153
+
 	public boolean remove(Object var1) {
 		throw new RuntimeException(); // L: 132
 	}
@@ -187,14 +187,10 @@ public class IterableNodeDeque implements Iterable, Collection {
 		throw new RuntimeException(); // L: 136
 	}
 
-	public boolean retainAll(Collection var1) {
-		throw new RuntimeException(); // L: 148
+	public boolean addAll(Collection var1) {
+		throw new RuntimeException(); // L: 140
 	}
 
-	public void clear() {
-		this.rsClear(); // L: 152
-	} // L: 153
-
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 160
 	}
@@ -203,25 +199,29 @@ public class IterableNodeDeque implements Iterable, Collection {
 		return super.hashCode(); // L: 164
 	}
 
-	public boolean add(Object var1) {
-		return this.method5239((Node)var1); // L: 156
+	public boolean removeAll(Collection var1) {
+		throw new RuntimeException(); // L: 144
+	}
+
+	public Object[] toArray() {
+		return this.method5370(); // L: 113
 	}
 
 	public int size() {
-		return this.method5235(); // L: 101
+		return this.method5363(); // L: 101
 	}
 
-	public boolean contains(Object var1) {
-		throw new RuntimeException(); // L: 109
+	public boolean add(Object var1) {
+		return this.method5384((Node)var1); // L: 156
 	}
 
-	public boolean addAll(Collection var1) {
-		throw new RuntimeException(); // L: 140
+	public boolean retainAll(Collection var1) {
+		throw new RuntimeException(); // L: 148
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;Lmw;)V"
+		descriptor = "(Lmf;Lmf;)V"
 	)
 	@Export("IterableNodeDeque_addBefore")
 	public static void IterableNodeDeque_addBefore(Node var0, Node var1) {
diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
index fb51c7328f..6e87aca7f4 100644
--- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
+++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
@@ -4,38 +4,38 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kq")
+@ObfuscatedName("kk")
 @Implements("IterableNodeDequeDescendingIterator")
 public class IterableNodeDequeDescendingIterator implements Iterator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lki;"
+		descriptor = "Lkz;"
 	)
 	@Export("deque")
 	IterableNodeDeque deque;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
-	Node field3706;
-	@ObfuscatedName("f")
+	Node field3711;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("last")
 	Node last;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lki;)V"
+		descriptor = "(Lkz;)V"
 	)
 	IterableNodeDequeDescendingIterator(IterableNodeDeque var1) {
 		this.last = null; // L: 9
 		this.setDeque(var1); // L: 12
 	} // L: 13
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lki;)V"
+		descriptor = "(Lkz;)V"
 	)
 	@Export("setDeque")
 	void setDeque(IterableNodeDeque var1) {
@@ -43,36 +43,32 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
 		this.start(); // L: 17
 	} // L: 18
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("start")
 	void start() {
-		this.field3706 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21
+		this.field3711 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21
 		this.last = null; // L: 22
 	} // L: 23
 
-	public void remove() {
-		if (this.last == null) { // L: 41
-			throw new IllegalStateException();
-		} else {
-			this.last.remove(); // L: 42
-			this.last = null; // L: 43
-		}
-	} // L: 44
-
-	public boolean hasNext() {
-		return this.deque.sentinel != this.field3706; // L: 37
-	}
-
 	public Object next() {
-		Node var1 = this.field3706; // L: 26
+		Node var1 = this.field3711; // L: 26
 		if (var1 == this.deque.sentinel) { // L: 27
 			var1 = null; // L: 28
-			this.field3706 = null; // L: 29
+			this.field3711 = null; // L: 29
 		} else {
-			this.field3706 = var1.previous; // L: 31
+			this.field3711 = var1.previous; // L: 31
 		}
 
 		this.last = var1; // L: 32
 		return var1; // L: 33
 	}
+
+	public boolean hasNext() {
+		return this.deque.sentinel != this.field3711; // L: 37
+	}
+
+	public void remove() {
+		this.last.remove(); // L: 42
+		this.last = null; // L: 43
+	} // L: 44
 }
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index f96ae707d6..66ebcdb0f9 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -4,31 +4,31 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mr")
+@ObfuscatedName("mo")
 @Implements("IterableNodeHashTable")
 public final class IterableNodeHashTable implements Iterable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("size")
 	int size;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "[Lmw;"
+		descriptor = "[Lmf;"
 	)
 	@Export("buckets")
 	Node[] buckets;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("currentGet")
 	Node currentGet;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("current")
 	Node current;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("index")
 	int index;
 
@@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable {
 
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lmw;"
+		descriptor = "(J)Lmf;"
 	)
 	@Export("get")
 	public Node get(long var1) {
@@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable {
 		return null; // L: 35
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;J)V"
+		descriptor = "(Lmf;J)V"
 	)
 	@Export("put")
 	public void put(Node var1, long var2) {
@@ -83,7 +83,7 @@ public final class IterableNodeHashTable implements Iterable {
 		var1.key = var2; // L: 45
 	} // L: 46
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("clear")
 	public void clear() {
 		for (int var1 = 0; var1 < this.size; ++var1) { // L: 49
@@ -105,7 +105,7 @@ public final class IterableNodeHashTable implements Iterable {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("first")
 	public Node first() {
@@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable {
 		return this.next(); // L: 63
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("next")
 	public Node next() {
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index 5abcca84df..5dae5b2933 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -4,33 +4,33 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mj")
+@ObfuscatedName("mp")
 @Implements("IterableNodeHashTableIterator")
 public class IterableNodeHashTableIterator implements Iterator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("head")
 	Node head;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("index")
 	int index;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("last")
 	Node last;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lmr;)V"
+		descriptor = "(Lmo;)V"
 	)
 	IterableNodeHashTableIterator(IterableNodeHashTable var1) {
 		this.last = null; // L: 10
@@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator {
 		this.start(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("start")
 	void start() {
 		this.head = this.hashTable.buckets[0].previous; // L: 18
@@ -46,32 +46,6 @@ public class IterableNodeHashTableIterator implements Iterator {
 		this.last = null; // L: 20
 	} // L: 21
 
-	public boolean hasNext() {
-		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42
-			return true;
-		} else {
-			while (this.index < this.hashTable.size) { // L: 43
-				if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44
-					this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45
-					return true; // L: 46
-				}
-
-				this.head = this.hashTable.buckets[this.index - 1]; // L: 49
-			}
-
-			return false; // L: 52
-		}
-	}
-
-	public void remove() {
-		if (this.last == null) { // L: 56
-			throw new IllegalStateException();
-		} else {
-			this.last.remove(); // L: 57
-			this.last = null; // L: 58
-		}
-	} // L: 59
-
 	public Object next() {
 		Node var1;
 		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24
@@ -93,4 +67,30 @@ public class IterableNodeHashTableIterator implements Iterator {
 			return var1; // L: 35
 		}
 	}
+
+	public void remove() {
+		if (this.last == null) { // L: 56
+			throw new IllegalStateException();
+		} else {
+			this.last.remove(); // L: 57
+			this.last = null; // L: 58
+		}
+	} // L: 59
+
+	public boolean hasNext() {
+		if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42
+			return true;
+		} else {
+			while (this.index < this.hashTable.size) { // L: 43
+				if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44
+					this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45
+					return true; // L: 46
+				}
+
+				this.head = this.hashTable.buckets[this.index - 1]; // L: 49
+			}
+
+			return false; // L: 52
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java
index 39f64c17de..c33c9553d4 100644
--- a/runescape-client/src/main/java/JagexCache.java
+++ b/runescape-client/src/main/java/JagexCache.java
@@ -3,27 +3,39 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dm")
+@ObfuscatedName("dn")
 @Implements("JagexCache")
 public class JagexCache {
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Lna;"
 	)
 	@Export("JagexCache_randomDat")
 	public static BufferedFile JagexCache_randomDat;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Lna;"
 	)
 	@Export("JagexCache_dat2File")
 	public static BufferedFile JagexCache_dat2File;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lnf;"
+		descriptor = "Lna;"
 	)
 	@Export("JagexCache_idx255File")
 	public static BufferedFile JagexCache_idx255File;
+	@ObfuscatedName("u")
+	@Export("cacheSubPaths")
+	public static String[] cacheSubPaths;
+	@ObfuscatedName("n")
+	@Export("userHomeDirectory")
+	public static String userHomeDirectory;
+	@ObfuscatedName("dv")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive10")
+	static Archive archive10;
 
 	static {
 		JagexCache_randomDat = null; // L: 22
@@ -31,34 +43,61 @@ public class JagexCache {
 		JagexCache_idx255File = null; // L: 24
 	}
 
-	@ObfuscatedName("iw")
+	@ObfuscatedName("jm")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Lio;B)Ljava/lang/String;",
-		garbageValue = "109"
+		descriptor = "(IIIZI)V",
+		garbageValue = "-1038546340"
 	)
-	static String method2540(String var0, Widget var1) {
-		if (var0.indexOf("%") != -1) { // L: 9703
-			for (int var2 = 1; var2 <= 5; ++var2) { // L: 9704
-				while (true) {
-					int var3 = var0.indexOf("%" + var2); // L: 9706
-					if (var3 == -1) { // L: 9707
-						break;
+	static final void method2637(int var0, int var1, int var2, boolean var3) {
+		if (class20.loadInterface(var0)) { // L: 9946
+			DynamicObject.resizeInterface(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9947
+		}
+	} // L: 9948
+
+	@ObfuscatedName("jz")
+	@ObfuscatedSignature(
+		descriptor = "([Liv;II)V",
+		garbageValue = "1856599832"
+	)
+	@Export("runComponentCloseListeners")
+	static final void runComponentCloseListeners(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10869
+			Widget var3 = var0[var2]; // L: 10870
+			if (var3 != null) { // L: 10871
+				if (var3.type == 0) { // L: 10872
+					if (var3.children != null) { // L: 10873
+						runComponentCloseListeners(var3.children, var1);
 					}
 
-					String var4 = var0.substring(0, var3); // L: 9708
-					int var6 = ModeWhere.method5160(var1, var2 - 1); // L: 9710
-					String var5;
-					if (var6 < 999999999) { // L: 9712
-						var5 = Integer.toString(var6); // L: 9713
-					} else {
-						var5 = "*"; // L: 9716
+					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10874
+					if (var4 != null) { // L: 10875
+						class8.runIntfCloseListeners(var4.group, var1);
+					}
+				}
+
+				ScriptEvent var5;
+				if (var1 == 0 && var3.onDialogAbort != null) { // L: 10877
+					var5 = new ScriptEvent(); // L: 10878
+					var5.widget = var3; // L: 10879
+					var5.args = var3.onDialogAbort; // L: 10880
+					WorldMapSection1.runScriptEvent(var5); // L: 10881
+				}
+
+				if (var1 == 1 && var3.onSubChange != null) { // L: 10883
+					if (var3.childIndex >= 0) { // L: 10884
+						Widget var6 = WorldMapData_1.getWidget(var3.id); // L: 10885
+						if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10886
+							continue;
+						}
 					}
 
-					var0 = var4 + var5 + var0.substring(var3 + 2); // L: 9718
+					var5 = new ScriptEvent(); // L: 10890
+					var5.widget = var3; // L: 10891
+					var5.args = var3.onSubChange; // L: 10892
+					WorldMapSection1.runScriptEvent(var5); // L: 10893
 				}
 			}
 		}
 
-		return var0; // L: 9722
-	}
+	} // L: 10896
 }
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index 68f535b497..3ab052ae98 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -8,210 +8,524 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("az")
+@ObfuscatedName("an")
 @Implements("KeyHandler")
 public final class KeyHandler implements KeyListener, FocusListener {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Laz;"
+		descriptor = "Lan;"
 	)
 	@Export("KeyHandler_instance")
 	public static KeyHandler KeyHandler_instance;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cb")
 	@Export("KeyHandler_pressedKeys")
 	public static boolean[] KeyHandler_pressedKeys;
+	@ObfuscatedName("cg")
+	public static boolean[] field264;
+	@ObfuscatedName("ca")
+	public static boolean[] field265;
+	@ObfuscatedName("cy")
+	public static int[] field283;
+	@ObfuscatedName("ct")
+	@ObfuscatedGetter(
+		intValue = 2097317257
+	)
+	public static int field267;
+	@ObfuscatedName("ci")
+	@ObfuscatedGetter(
+		intValue = -1162064339
+	)
+	public static int field268;
+	@ObfuscatedName("cs")
+	static char[] field269;
 	@ObfuscatedName("co")
-	public static int[] field287;
+	static int[] field270;
+	@ObfuscatedName("cj")
+	public static int[] field257;
+	@ObfuscatedName("cr")
+	@ObfuscatedGetter(
+		intValue = 1885523729
+	)
+	public static int field271;
+	@ObfuscatedName("cl")
+	public static int[] field273;
+	@ObfuscatedName("cw")
+	@ObfuscatedGetter(
+		intValue = 227302155
+	)
+	public static int field274;
 	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = -961604687
+		intValue = 490430437
 	)
-	public static int field296;
-	@ObfuscatedName("cj")
+	public static int field276;
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1243891281
+		intValue = 1780430541
 	)
-	public static int field288;
-	@ObfuscatedName("cc")
-	static char[] field286;
-	@ObfuscatedName("cu")
-	static int[] field289;
-	@ObfuscatedName("cz")
-	public static int[] field274;
-	@ObfuscatedName("cb")
-	@ObfuscatedGetter(
-		intValue = -402048791
-	)
-	public static int field292;
-	@ObfuscatedName("ce")
-	@ObfuscatedGetter(
-		intValue = 924382931
-	)
-	public static int field293;
+	public static int field255;
 	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = -1003990119
+		intValue = -35185769
 	)
-	public static int field294;
-	@ObfuscatedName("cy")
+	public static int field277;
+	@ObfuscatedName("du")
 	@ObfuscatedGetter(
-		intValue = 300307947
-	)
-	public static int field295;
-	@ObfuscatedName("cx")
-	@ObfuscatedGetter(
-		intValue = 1384960375
+		intValue = -1652881761
 	)
 	@Export("KeyHandler_idleCycles")
 	public static volatile int KeyHandler_idleCycles;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("db")
 	@Export("KeyHandler_keyCodes")
 	static int[] KeyHandler_keyCodes;
 
 	static {
-		KeyHandler_instance = new KeyHandler(); // L: 13
-		KeyHandler_pressedKeys = new boolean[112]; // L: 100
-		field287 = new int[128]; // L: 103
-		field296 = 0; // L: 104
-		field288 = 0; // L: 105
-		field286 = new char[128]; // L: 106
-		field289 = new int[128]; // L: 107
-		field274 = new int[128]; // L: 108
-		field292 = 0; // L: 109
-		field293 = 0; // L: 110
-		field294 = 0; // L: 111
-		field295 = 0; // L: 112
-		KeyHandler_idleCycles = 0; // L: 113
-		KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 114
+		KeyHandler_instance = new KeyHandler(); // L: 14
+		KeyHandler_pressedKeys = new boolean[112]; // L: 101
+		field264 = new boolean[112]; // L: 102
+		field265 = new boolean[112]; // L: 103
+		field283 = new int[128]; // L: 106
+		field267 = 0; // L: 107
+		field268 = 0; // L: 108
+		field269 = new char[128]; // L: 109
+		field270 = new int[128]; // L: 110
+		field257 = new int[128];
+		field271 = 0;
+		field273 = new int[128];
+		field274 = 0;
+		field276 = 0;
+		field255 = 0;
+		field277 = 0;
+		KeyHandler_idleCycles = 0;
+		KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 	}
 
 	KeyHandler() {
-	} // L: 116
+	}
 
 	public final synchronized void keyPressed(KeyEvent var1) {
-		if (KeyHandler_instance != null) { // L: 176
-			int var2 = var1.getKeyCode(); // L: 177
-			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 178
-				var2 = KeyHandler_keyCodes[var2]; // L: 179
-				if ((var2 & 128) != 0) { // L: 180
+		if (KeyHandler_instance != null) {
+			int var2 = var1.getKeyCode();
+			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
+				var2 = KeyHandler_keyCodes[var2];
+				if ((var2 & 128) != 0) {
 					var2 = -1;
 				}
 			} else {
-				var2 = -1; // L: 182
+				var2 = -1; // L: 183
 			}
 
-			if (field288 >= 0 && var2 >= 0) { // L: 183
-				field287[field288] = var2; // L: 184
-				field288 = field288 + 1 & 127; // L: 185
-				if (field288 == field296) { // L: 186
-					field288 = -1;
+			if (field268 >= 0 && var2 >= 0) {
+				field283[field268] = var2;
+				field268 = field268 + 1 & 127;
+				if (field268 == field267) {
+					field268 = -1;
 				}
 			}
 
 			int var3;
-			if (var2 >= 0) { // L: 188
-				var3 = field294 + 1 & 127; // L: 189
-				if (var3 != field293) { // L: 190
-					field289[field294] = var2; // L: 191
-					field286[field294] = 0; // L: 192
-					field294 = var3; // L: 193
+			if (var2 >= 0) { // L: 189
+				var3 = field255 + 1 & 127;
+				if (var3 != field276) {
+					field270[field255] = var2;
+					field269[field255] = 0;
+					field255 = var3;
 				}
 			}
 
-			var3 = var1.getModifiers(); // L: 196
-			if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 197
-				var1.consume(); // L: 198
+			var3 = var1.getModifiers();
+			if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) {
+				var1.consume();
 			}
 		}
 
-	} // L: 201
+	} // L: 202
 
 	public final synchronized void keyReleased(KeyEvent var1) {
-		if (KeyHandler_instance != null) { // L: 204
-			int var2 = var1.getKeyCode(); // L: 205
-			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 206
+		if (KeyHandler_instance != null) {
+			int var2 = var1.getKeyCode();
+			if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
 				var2 = KeyHandler_keyCodes[var2] & -129;
 			} else {
-				var2 = -1; // L: 207
+				var2 = -1;
 			}
 
-			if (field288 >= 0 && var2 >= 0) { // L: 208
-				field287[field288] = ~var2; // L: 209
-				field288 = field288 + 1 & 127; // L: 210
-				if (field296 == field288) { // L: 211
-					field288 = -1;
+			if (field268 >= 0 && var2 >= 0) { // L: 209
+				field283[field268] = ~var2;
+				field268 = field268 + 1 & 127;
+				if (field268 == field267) {
+					field268 = -1;
 				}
 			}
 		}
 
-		var1.consume(); // L: 214
-	} // L: 215
-
-	public final synchronized void focusLost(FocusEvent var1) {
-		if (KeyHandler_instance != null) { // L: 235
-			field288 = -1; // L: 236
-		}
-
-	} // L: 238
+		var1.consume(); // L: 215
+	}
 
 	public final void keyTyped(KeyEvent var1) {
-		if (KeyHandler_instance != null) { // L: 218
-			char var2 = var1.getKeyChar(); // L: 219
-			if (var2 != 0 && var2 != '\uffff' && Timer.method5614(var2)) { // L: 220
-				int var3 = field294 + 1 & 127; // L: 221
-				if (var3 != field293) { // L: 222
-					field289[field294] = -1; // L: 223
-					field286[field294] = var2; // L: 224
-					field294 = var3; // L: 225
+		if (KeyHandler_instance != null) {
+			char var2 = var1.getKeyChar();
+			if (var2 != 0 && var2 != '\uffff' && ItemLayer.method3861(var2)) {
+				int var3 = field255 + 1 & 127; // L: 222
+				if (var3 != field276) {
+					field270[field255] = -1;
+					field269[field255] = var2;
+					field255 = var3;
 				}
 			}
 		}
 
-		var1.consume(); // L: 229
-	} // L: 230
+		var1.consume();
+	}
 
 	public final void focusGained(FocusEvent var1) {
-	} // L: 232
+	} // L: 264
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1154026076"
-	)
-	public static void method378() {
-		HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 89
-		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 90
-	} // L: 91
+	public final synchronized void focusLost(FocusEvent var1) {
+		if (KeyHandler_instance != null) { // L: 267
+			field268 = -1; // L: 268
+		}
 
-	@ObfuscatedName("af")
+	} // L: 270
+
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "946272501"
+		descriptor = "(IIILfv;Lfl;B)Z",
+		garbageValue = "30"
 	)
-	static int method364(int var0, Script var1, boolean var2) {
-		if (var0 >= 7200 && var0 < 7204) { // L: 4290
-			class44.Interpreter_intStackSize -= 5; // L: 4291
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4292
-			return 1; // L: 4293
-		} else if (var0 == 7204) { // L: 4295
-			class44.Interpreter_intStackSize -= 6; // L: 4296
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4297
-			return 1; // L: 4298
-		} else if (var0 >= 7205 && var0 < 7209) { // L: 4300
-			Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1] = -1; // L: 4301
-			return 1; // L: 4302
-		} else if (var0 == 7209) { // L: 4304
-			class44.Interpreter_intStackSize -= 2; // L: 4305
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 4306
-			return 1; // L: 4307
-		} else if (var0 >= 7210 && var0 < 7214) { // L: 4309
-			--class44.Interpreter_intStackSize; // L: 4310
-			return 1; // L: 4311
-		} else if (var0 == 7214) { // L: 4313
-			class44.Interpreter_intStackSize -= 2; // L: 4314
-			return 1; // L: 4315
-		} else {
-			return 2; // L: 4317
+	public static final boolean method475(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) {
+		int var5 = var0; // L: 111
+		int var6 = var1; // L: 112
+		byte var7 = 64; // L: 113
+		byte var8 = 64; // L: 114
+		int var9 = var0 - var7; // L: 115
+		int var10 = var1 - var8; // L: 116
+		class160.directions[var7][var8] = 99; // L: 117
+		class160.distances[var7][var8] = 0; // L: 118
+		byte var11 = 0; // L: 119
+		int var12 = 0; // L: 120
+		class160.bufferX[var11] = var0; // L: 121
+		int var20 = var11 + 1;
+		class160.bufferY[var11] = var1; // L: 122
+		int[][] var13 = var4.flags; // L: 123
+
+		while (true) {
+			label307:
+			while (true) {
+				int var14;
+				int var15;
+				int var16;
+				int var17;
+				int var18;
+				int var19;
+				do {
+					do {
+						do {
+							label284:
+							do {
+								if (var20 == var12) { // L: 124
+									Login.field1033 = var5; // L: 243
+									GrandExchangeOfferOwnWorldComparator.field608 = var6; // L: 244
+									return false; // L: 245
+								}
+
+								var5 = class160.bufferX[var12]; // L: 125
+								var6 = class160.bufferY[var12]; // L: 126
+								var12 = var12 + 1 & 4095; // L: 127
+								var18 = var5 - var9; // L: 128
+								var19 = var6 - var10; // L: 129
+								var14 = var5 - var4.xInset; // L: 130
+								var15 = var6 - var4.yInset; // L: 131
+								if (var3.hasArrived(var2, var5, var6, var4)) { // L: 132
+									Login.field1033 = var5; // L: 133
+									GrandExchangeOfferOwnWorldComparator.field608 = var6; // L: 134
+									return true; // L: 135
+								}
+
+								var16 = class160.distances[var18][var19] + 1; // L: 137
+								if (var18 > 0 && class160.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 138 139 140 141
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class160.bufferX[var20] = var5 - 1; // L: 145
+											class160.bufferY[var20] = var6; // L: 146
+											var20 = var20 + 1 & 4095; // L: 147
+											class160.directions[var18 - 1][var19] = 2; // L: 148
+											class160.distances[var18 - 1][var19] = var16; // L: 149
+											break;
+										}
+
+										if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { // L: 143
+											break;
+										}
+
+										++var17; // L: 142
+									}
+								}
+
+								if (var18 < 128 - var2 && class160.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 151 152 153 154
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class160.bufferX[var20] = var5 + 1; // L: 158
+											class160.bufferY[var20] = var6; // L: 159
+											var20 = var20 + 1 & 4095; // L: 160
+											class160.directions[var18 + 1][var19] = 8; // L: 161
+											class160.distances[var18 + 1][var19] = var16; // L: 162
+											break;
+										}
+
+										if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 156
+											break;
+										}
+
+										++var17; // L: 155
+									}
+								}
+
+								if (var19 > 0 && class160.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 164 165 166 167
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class160.bufferX[var20] = var5; // L: 171
+											class160.bufferY[var20] = var6 - 1; // L: 172
+											var20 = var20 + 1 & 4095; // L: 173
+											class160.directions[var18][var19 - 1] = 1; // L: 174
+											class160.distances[var18][var19 - 1] = var16; // L: 175
+											break;
+										}
+
+										if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 169
+											break;
+										}
+
+										++var17; // L: 168
+									}
+								}
+
+								if (var19 < 128 - var2 && class160.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 177 178 179 180
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2 - 1) {
+											class160.bufferX[var20] = var5; // L: 184
+											class160.bufferY[var20] = var6 + 1; // L: 185
+											var20 = var20 + 1 & 4095; // L: 186
+											class160.directions[var18][var19 + 1] = 4; // L: 187
+											class160.distances[var18][var19 + 1] = var16; // L: 188
+											break;
+										}
+
+										if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { // L: 182
+											break;
+										}
+
+										++var17; // L: 181
+									}
+								}
+
+								if (var18 > 0 && var19 > 0 && class160.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 190 191 192
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2) {
+											class160.bufferX[var20] = var5 - 1; // L: 197
+											class160.bufferY[var20] = var6 - 1; // L: 198
+											var20 = var20 + 1 & 4095; // L: 199
+											class160.directions[var18 - 1][var19 - 1] = 3; // L: 200
+											class160.distances[var18 - 1][var19 - 1] = var16; // L: 201
+											break;
+										}
+
+										if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 194 195
+											break;
+										}
+
+										++var17; // L: 193
+									}
+								}
+
+								if (var18 < 128 - var2 && var19 > 0 && class160.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 203 204 205
+									var17 = 1;
+
+									while (true) {
+										if (var17 >= var2) {
+											class160.bufferX[var20] = var5 + 1; // L: 210
+											class160.bufferY[var20] = var6 - 1; // L: 211
+											var20 = var20 + 1 & 4095; // L: 212
+											class160.directions[var18 + 1][var19 - 1] = 9; // L: 213
+											class160.distances[var18 + 1][var19 - 1] = var16; // L: 214
+											break;
+										}
+
+										if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 207 208
+											break;
+										}
+
+										++var17; // L: 206
+									}
+								}
+
+								if (var18 > 0 && var19 < 128 - var2 && class160.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 216 217 218
+									for (var17 = 1; var17 < var2; ++var17) { // L: 219
+										if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 220 221
+											continue label284;
+										}
+									}
+
+									class160.bufferX[var20] = var5 - 1; // L: 223
+									class160.bufferY[var20] = var6 + 1; // L: 224
+									var20 = var20 + 1 & 4095; // L: 225
+									class160.directions[var18 - 1][var19 + 1] = 6; // L: 226
+									class160.distances[var18 - 1][var19 + 1] = var16; // L: 227
+								}
+							} while(var18 >= 128 - var2); // L: 229
+						} while(var19 >= 128 - var2);
+					} while(class160.directions[var18 + 1][var19 + 1] != 0); // L: 230
+				} while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 231
+
+				for (var17 = 1; var17 < var2; ++var17) { // L: 232
+					if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var15 + var17] & 19136995) != 0) { // L: 233 234
+						continue label307;
+					}
+				}
+
+				class160.bufferX[var20] = var5 + 1; // L: 236
+				class160.bufferY[var20] = var6 + 1; // L: 237
+				var20 = var20 + 1 & 4095; // L: 238
+				class160.directions[var18 + 1][var19 + 1] = 12; // L: 239
+				class160.distances[var18 + 1][var19 + 1] = var16; // L: 240
+			}
 		}
 	}
+
+	@ObfuscatedName("hx")
+	@ObfuscatedSignature(
+		descriptor = "(ZLns;I)V",
+		garbageValue = "-739552124"
+	)
+	@Export("loadRegions")
+	static final void loadRegions(boolean var0, PacketBuffer var1) {
+		Client.isInInstance = var0; // L: 5526
+		int var2;
+		int var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		if (!Client.isInInstance) { // L: 5527
+			var2 = var1.method6651(); // L: 5528
+			int var3 = var1.readUnsignedShort(); // L: 5529
+			var4 = var1.readUnsignedShort(); // L: 5530
+			class7.xteaKeys = new int[var4][4]; // L: 5531
+
+			for (var5 = 0; var5 < var4; ++var5) { // L: 5532
+				for (var6 = 0; var6 < 4; ++var6) { // L: 5533
+					class7.xteaKeys[var5][var6] = var1.readInt(); // L: 5534
+				}
+			}
+
+			UserComparator4.regions = new int[var4]; // L: 5537
+			UrlRequester.regionMapArchiveIds = new int[var4]; // L: 5538
+			class286.regionLandArchiveIds = new int[var4]; // L: 5539
+			UrlRequest.regionLandArchives = new byte[var4][]; // L: 5540
+			WorldMapDecorationType.regionMapArchives = new byte[var4][]; // L: 5541
+			boolean var16 = false; // L: 5542
+			if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5543
+				var16 = true;
+			}
+
+			if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5544
+				var16 = true;
+			}
+
+			var4 = 0; // L: 5545
+
+			for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5546
+				for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5547
+					var8 = var7 + (var6 << 8); // L: 5548
+					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5549
+						UserComparator4.regions[var4] = var8; // L: 5550
+						UrlRequester.regionMapArchiveIds[var4] = class4.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5551
+						class286.regionLandArchiveIds[var4] = class4.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5552
+						++var4; // L: 5553
+					}
+				}
+			}
+
+			class265.method4984(var2, var3, true); // L: 5556
+		} else {
+			var2 = var1.method6651(); // L: 5559
+			boolean var15 = var1.readUnsignedByte() == 1; // L: 5560
+			var4 = var1.method6651(); // L: 5561
+			var5 = var1.readUnsignedShort(); // L: 5562
+			var1.importIndex(); // L: 5563
+
+			int var9;
+			for (var6 = 0; var6 < 4; ++var6) { // L: 5564
+				for (var7 = 0; var7 < 13; ++var7) { // L: 5565
+					for (var8 = 0; var8 < 13; ++var8) { // L: 5566
+						var9 = var1.readBits(1); // L: 5567
+						if (var9 == 1) {
+							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5568
+						} else {
+							Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5569
+						}
+					}
+				}
+			}
+
+			var1.exportIndex(); // L: 5573
+			class7.xteaKeys = new int[var5][4]; // L: 5574
+
+			for (var6 = 0; var6 < var5; ++var6) { // L: 5575
+				for (var7 = 0; var7 < 4; ++var7) { // L: 5576
+					class7.xteaKeys[var6][var7] = var1.readInt(); // L: 5577
+				}
+			}
+
+			UserComparator4.regions = new int[var5]; // L: 5580
+			UrlRequester.regionMapArchiveIds = new int[var5]; // L: 5581
+			class286.regionLandArchiveIds = new int[var5]; // L: 5582
+			UrlRequest.regionLandArchives = new byte[var5][]; // L: 5583
+			WorldMapDecorationType.regionMapArchives = new byte[var5][]; // L: 5584
+			var5 = 0; // L: 5585
+
+			for (var6 = 0; var6 < 4; ++var6) { // L: 5586
+				for (var7 = 0; var7 < 13; ++var7) { // L: 5587
+					for (var8 = 0; var8 < 13; ++var8) { // L: 5588
+						var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5589
+						if (var9 != -1) { // L: 5590
+							int var10 = var9 >> 14 & 1023; // L: 5591
+							int var11 = var9 >> 3 & 2047; // L: 5592
+							int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5593
+
+							int var13;
+							for (var13 = 0; var13 < var5; ++var13) { // L: 5594
+								if (UserComparator4.regions[var13] == var12) {
+									var12 = -1; // L: 5595
+									break; // L: 5596
+								}
+							}
+
+							if (var12 != -1) { // L: 5598
+								UserComparator4.regions[var5] = var12; // L: 5599
+								var13 = var12 >> 8 & 255; // L: 5600
+								int var14 = var12 & 255; // L: 5601
+								UrlRequester.regionMapArchiveIds[var5] = class4.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5602
+								class286.regionLandArchiveIds[var5] = class4.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5603
+								++var5; // L: 5604
+							}
+						}
+					}
+				}
+			}
+
+			class265.method4984(var4, var2, !var15); // L: 5610
+		}
+
+	} // L: 5612
 }
diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java
index e7cb36a0d4..9ebff1279b 100644
--- a/runescape-client/src/main/java/KitDefinition.java
+++ b/runescape-client/src/main/java/KitDefinition.java
@@ -4,49 +4,52 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("el")
+@ObfuscatedName("er")
 @Implements("KitDefinition")
 public class KitDefinition extends DualNode {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("KitDefinition_modelsArchive")
-	static AbstractArchive KitDefinition_modelsArchive;
+	public static AbstractArchive KitDefinition_modelsArchive;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("KitDefinition_cached")
 	static EvictingDualNodeHashTable KitDefinition_cached;
-	@ObfuscatedName("al")
-	@Export("fontHelvetica13")
-	static java.awt.Font fontHelvetica13;
-	@ObfuscatedName("p")
+	@ObfuscatedName("do")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive1")
+	static Archive archive1;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2136524687
+		intValue = -1389060673
 	)
 	@Export("bodypartID")
 	public int bodypartID;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("models2")
 	int[] models2;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("models")
 	int[] models;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("nonSelectable")
 	public boolean nonSelectable;
 
@@ -60,219 +63,187 @@ public class KitDefinition extends DualNode {
 		this.nonSelectable = false; // L: 22
 	} // L: 24
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "76297691"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "82"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 44
-			if (var2 == 0) { // L: 45
-				return; // L: 48
+			int var2 = var1.readUnsignedByte(); // L: 38
+			if (var2 == 0) { // L: 39
+				return; // L: 42
 			}
 
-			this.decodeNext(var1, var2); // L: 46
+			this.decodeNext(var1, var2); // L: 40
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-662659008"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-1096590760"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 51
+		if (var2 == 1) { // L: 45
 			this.bodypartID = var1.readUnsignedByte();
 		} else {
 			int var3;
 			int var4;
-			if (var2 == 2) { // L: 52
-				var3 = var1.readUnsignedByte(); // L: 53
-				this.models2 = new int[var3]; // L: 54
+			if (var2 == 2) { // L: 46
+				var3 = var1.readUnsignedByte(); // L: 47
+				this.models2 = new int[var3]; // L: 48
 
-				for (var4 = 0; var4 < var3; ++var4) { // L: 55
+				for (var4 = 0; var4 < var3; ++var4) { // L: 49
 					this.models2[var4] = var1.readUnsignedShort();
 				}
-			} else if (var2 == 3) { // L: 57
+			} else if (var2 == 3) { // L: 51
 				this.nonSelectable = true;
-			} else if (var2 == 40) { // L: 58
-				var3 = var1.readUnsignedByte(); // L: 59
-				this.recolorFrom = new short[var3]; // L: 60
-				this.recolorTo = new short[var3]; // L: 61
+			} else if (var2 == 40) { // L: 52
+				var3 = var1.readUnsignedByte(); // L: 53
+				this.recolorFrom = new short[var3]; // L: 54
+				this.recolorTo = new short[var3]; // L: 55
 
-				for (var4 = 0; var4 < var3; ++var4) { // L: 62
-					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63
-					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64
+				for (var4 = 0; var4 < var3; ++var4) { // L: 56
+					this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 57
+					this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 58
 				}
-			} else if (var2 == 41) { // L: 67
-				var3 = var1.readUnsignedByte(); // L: 68
-				this.retextureFrom = new short[var3]; // L: 69
-				this.retextureTo = new short[var3]; // L: 70
+			} else if (var2 == 41) { // L: 61
+				var3 = var1.readUnsignedByte(); // L: 62
+				this.retextureFrom = new short[var3]; // L: 63
+				this.retextureTo = new short[var3]; // L: 64
 
-				for (var4 = 0; var4 < var3; ++var4) { // L: 71
-					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72
-					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73
+				for (var4 = 0; var4 < var3; ++var4) { // L: 65
+					this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 66
+					this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 67
 				}
-			} else if (var2 >= 60 && var2 < 70) { // L: 76
+			} else if (var2 >= 60 && var2 < 70) { // L: 70
 				this.models[var2 - 60] = var1.readUnsignedShort();
 			}
 		}
 
-	} // L: 78
+	} // L: 72
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-2100349999"
+		descriptor = "(S)Z",
+		garbageValue = "31141"
 	)
 	@Export("ready")
 	public boolean ready() {
-		if (this.models2 == null) { // L: 81
+		if (this.models2 == null) { // L: 75
 			return true;
 		} else {
-			boolean var1 = true; // L: 82
+			boolean var1 = true; // L: 76
 
-			for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83
+			for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 77
 				if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) {
 					var1 = false;
 				}
 			}
 
-			return var1; // L: 84
+			return var1; // L: 78
 		}
 	}
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgm;",
-		garbageValue = "218525675"
+		descriptor = "(B)Lga;",
+		garbageValue = "-55"
 	)
 	@Export("getModelData")
 	public ModelData getModelData() {
-		if (this.models2 == null) { // L: 88
+		if (this.models2 == null) { // L: 82
 			return null;
 		} else {
-			ModelData[] var1 = new ModelData[this.models2.length]; // L: 89
+			ModelData[] var1 = new ModelData[this.models2.length]; // L: 83
 
-			for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90
+			for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 84
 				var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0);
 			}
 
 			ModelData var4;
-			if (var1.length == 1) { // L: 92
+			if (var1.length == 1) { // L: 86
 				var4 = var1[0];
 			} else {
-				var4 = new ModelData(var1, var1.length); // L: 93
+				var4 = new ModelData(var1, var1.length); // L: 87
 			}
 
 			int var3;
-			if (this.recolorFrom != null) { // L: 94
-				for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95
-					var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96
+			if (this.recolorFrom != null) { // L: 88
+				for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 89
+					var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 90
 				}
 			}
 
-			if (this.retextureFrom != null) { // L: 99
-				for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100
-					var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101
+			if (this.retextureFrom != null) { // L: 93
+				for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 94
+					var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 95
 				}
 			}
 
-			return var4; // L: 104
+			return var4; // L: 98
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1717732165"
+		descriptor = "(B)Z",
+		garbageValue = "0"
 	)
-	public boolean method2684() {
-		boolean var1 = true; // L: 108
+	public boolean method2754() {
+		boolean var1 = true; // L: 102
 
-		for (int var2 = 0; var2 < 5; ++var2) { // L: 109
-			if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110
+		for (int var2 = 0; var2 < 5; ++var2) { // L: 103
+			if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 104
 				var1 = false;
 			}
 		}
 
-		return var1; // L: 112
+		return var1; // L: 106
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgm;",
-		garbageValue = "787356684"
+		descriptor = "(S)Lga;",
+		garbageValue = "4207"
 	)
 	@Export("getKitDefinitionModels")
 	public ModelData getKitDefinitionModels() {
-		ModelData[] var1 = new ModelData[5]; // L: 116
-		int var2 = 0; // L: 117
+		ModelData[] var1 = new ModelData[5]; // L: 110
+		int var2 = 0; // L: 111
 
-		for (int var3 = 0; var3 < 5; ++var3) { // L: 118
-			if (this.models[var3] != -1) { // L: 119
+		for (int var3 = 0; var3 < 5; ++var3) { // L: 112
+			if (this.models[var3] != -1) { // L: 113
 				var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0);
 			}
 		}
 
-		ModelData var5 = new ModelData(var1, var2); // L: 121
+		ModelData var5 = new ModelData(var1, var2); // L: 115
 		int var4;
-		if (this.recolorFrom != null) { // L: 122
-			for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123
-				var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124
+		if (this.recolorFrom != null) { // L: 116
+			for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 117
+				var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 118
 			}
 		}
 
-		if (this.retextureFrom != null) { // L: 127
-			for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128
-				var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129
+		if (this.retextureFrom != null) { // L: 121
+			for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 122
+				var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 123
 			}
 		}
 
-		return var5; // L: 132
+		return var5; // L: 126
 	}
 
-	@ObfuscatedName("lc")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;",
-		garbageValue = "-1936080360"
+		descriptor = "(II)Z",
+		garbageValue = "383487932"
 	)
-	static String method2705(String var0, boolean var1) {
-		String var2 = var1 ? "https://" : "http://"; // L: 11385
-		if (Client.gameBuild == 1) { // L: 11386
-			var0 = var0 + "-wtrc";
-		} else if (Client.gameBuild == 2) { // L: 11387
-			var0 = var0 + "-wtqa";
-		} else if (Client.gameBuild == 3) { // L: 11388
-			var0 = var0 + "-wtwip";
-		} else if (Client.gameBuild == 5) { // L: 11389
-			var0 = var0 + "-wti";
-		} else if (Client.gameBuild == 4) { // L: 11390
-			var0 = "local";
-		}
-
-		String var3 = ""; // L: 11391
-		if (class363.field4079 != null) { // L: 11392
-			var3 = "/p=" + class363.field4079;
-		}
-
-		String var4 = "runescape.com"; // L: 11393
-		return var2 + var0 + "." + var4 + "/l=" + class378.clientLanguage + "/a=" + Script.field1094 + var3 + "/"; // L: 11394
+	public static boolean method2778(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.field265[var0] : false; // L: 244 245
 	}
-
-	@ObfuscatedName("lp")
-	@ObfuscatedSignature(
-		descriptor = "([BII)V",
-		garbageValue = "-1641732404"
-	)
-	static void method2687(byte[] var0, int var1) {
-		if (Client.randomDatData == null) { // L: 11459
-			Client.randomDatData = new byte[24];
-		}
-
-		class306.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); // L: 11460
-	} // L: 11461
 }
diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java
index 31ef9f256c..804ffd9c86 100644
--- a/runescape-client/src/main/java/Language.java
+++ b/runescape-client/src/main/java/Language.java
@@ -5,97 +5,98 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kk")
+@ObfuscatedName("kn")
 @Implements("Language")
-public class Language implements Enumerated {
-	@ObfuscatedName("v")
+public class Language implements Enumerated
+{
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_EN")
 	public static final Language Language_EN;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_DE")
 	static final Language Language_DE;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_FR")
 	public static final Language Language_FR;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_PT")
 	static final Language Language_PT;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_NL")
 	static final Language Language_NL;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_ES")
 	public static final Language Language_ES;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Lkn;"
 	)
 	@Export("Language_ES_MX")
 	static final Language Language_ES_MX;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "[Lkk;"
+		descriptor = "[Lkn;"
 	)
 	@Export("Language_valuesOrdered")
 	static final Language[] Language_valuesOrdered;
-	@ObfuscatedName("b")
-	final String field3680;
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
+	final String field3679;
+	@ObfuscatedName("h")
 	@Export("language")
 	final String language;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 2108172383
+		intValue = -569331417
 	)
 	@Export("id")
 	final int id;
 
 	static {
-		Language_EN = new Language("EN", "en", "English", ModeWhere.field3686, 0, "GB"); // L: 10
-		Language_DE = new Language("DE", "de", "German", ModeWhere.field3686, 1, "DE"); // L: 11
-		Language_FR = new Language("FR", "fr", "French", ModeWhere.field3686, 2, "FR"); // L: 12
-		Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3686, 3, "BR"); // L: 13
-		Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3698, 4, "NL"); // L: 14
-		Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3698, 5, "ES"); // L: 15
-		Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3686, 6, "MX"); // L: 16
-		Language[] var0 = method5145(); // L: 23
-		Language_valuesOrdered = new Language[var0.length]; // L: 24
-		Language[] var1 = var0; // L: 26
+		Language_EN = new Language("EN", "en", "English", ModeWhere.field3701, 0, "GB"); // L: 10
+		Language_DE = new Language("DE", "de", "German", ModeWhere.field3701, 1, "DE"); // L: 11
+		Language_FR = new Language("FR", "fr", "French", ModeWhere.field3701, 2, "FR"); // L: 12
+		Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field3701, 3, "BR"); // L: 13
+		Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field3692, 4, "NL"); // L: 14
+		Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field3692, 5, "ES"); // L: 15
+		Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field3701, 6, "MX"); // L: 16
+		Language[] var0 = new Language[]{Language_EN, Language_ES, Language_ES_MX, Language_PT, Language_FR, Language_DE, Language_NL}; // L: 25
+		Language_valuesOrdered = new Language[var0.length]; // L: 28
+		Language[] var2 = var0; // L: 30
 
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 27
-			Language var3 = var1[var2]; // L: 28
-			if (Language_valuesOrdered[var3.id] != null) { // L: 30
-				throw new IllegalStateException(); // L: 31
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31
+			Language var4 = var2[var3]; // L: 32
+			if (Language_valuesOrdered[var4.id] != null) { // L: 34
+				throw new IllegalStateException(); // L: 35
 			}
 
-			Language_valuesOrdered[var3.id] = var3; // L: 33
+			Language_valuesOrdered[var4.id] = var4; // L: 37
 		}
 
-	} // L: 37
+	} // L: 41
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkl;ILjava/lang/String;)V"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkg;ILjava/lang/String;)V"
 	)
 	Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) {
-		this.field3680 = var1; // L: 44
+		this.field3679 = var1; // L: 44
 		this.language = var2; // L: 45
 		this.id = var5; // L: 46
 		if (var6 != null) { // L: 47
@@ -106,20 +107,20 @@ public class Language implements Enumerated {
 
 	} // L: 53
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id; // L: 60
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "91"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "536714658"
 	)
 	@Export("getLanguage")
 	String getLanguage() {
@@ -130,21 +131,21 @@ public class Language implements Enumerated {
 		return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 69
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)[Lkk;",
-		garbageValue = "123"
+		descriptor = "(II)Lkn;",
+		garbageValue = "727376217"
 	)
-	static Language[] method5145() {
-		return new Language[]{Language_FR, Language_DE, Language_ES_MX, Language_ES, Language_EN, Language_NL, Language_PT}; // L: 40
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lkk;",
-		garbageValue = "-17"
-	)
-	public static Language method5151(int var0) {
+	public static Language method5269(int var0) {
 		return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; // L: 64 65
 	}
+
+	@ObfuscatedName("ib")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "42"
+	)
+	static void method5270() {
+		GrandExchangeEvent.method5222(UserComparator3.menuWidth / 2 + StructComposition.menuX, class143.menuY); // L: 7906
+	} // L: 7907
 }
diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java
index b0aee490a4..6e6e7f92f3 100644
--- a/runescape-client/src/main/java/Link.java
+++ b/runescape-client/src/main/java/Link.java
@@ -3,23 +3,23 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mz")
+@ObfuscatedName("mr")
 @Implements("Link")
 public class Link {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmz;"
+		descriptor = "Lmr;"
 	)
 	@Export("previous")
 	public Link previous;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lmz;"
+		descriptor = "Lmr;"
 	)
 	@Export("next")
 	public Link next;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("remove")
 	public void remove() {
 		if (this.next != null) { // L: 8
diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java
index 86a46b0cf7..957c1fe904 100644
--- a/runescape-client/src/main/java/LinkDeque.java
+++ b/runescape-client/src/main/java/LinkDeque.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("km")
+@ObfuscatedName("kd")
 @Implements("LinkDeque")
 public class LinkDeque {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmz;"
+		descriptor = "Lmr;"
 	)
 	@Export("sentinel")
 	Link sentinel;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmz;"
+		descriptor = "Lmr;"
 	)
 	@Export("current")
 	Link current;
@@ -25,9 +25,9 @@ public class LinkDeque {
 		this.sentinel.next = this.sentinel; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lmz;)V"
+		descriptor = "(Lmr;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(Link var1) {
@@ -41,9 +41,9 @@ public class LinkDeque {
 		var1.previous.next = var1; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "()Lmz;"
+		descriptor = "()Lmr;"
 	)
 	@Export("last")
 	public Link last() {
@@ -57,9 +57,9 @@ public class LinkDeque {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "()Lmz;"
+		descriptor = "()Lmr;"
 	)
 	@Export("previous")
 	public Link previous() {
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index 588b4c6a6a..f1e245a616 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -5,238 +5,178 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ct")
+@ObfuscatedName("cu")
 @Implements("Login")
 public class Login {
-	@ObfuscatedName("n")
-	@Export("clearLoginScreen")
-	static boolean clearLoginScreen;
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
+	@Export("localPlayerName")
+	public static String localPlayerName;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 751544539
+		intValue = -1349734719
 	)
 	@Export("xPadding")
 	static int xPadding;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "[Lof;"
 	)
 	@Export("runesSprite")
 	static IndexedSprite[] runesSprite;
 	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	@Export("titlebuttonSprite")
-	static IndexedSprite titlebuttonSprite;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Loh;"
-	)
-	@Export("leftTitleSprite")
-	static SpritePixels leftTitleSprite;
-	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2130552221
+		intValue = -1462370461
+	)
+	public static int field1033;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Lbi;"
+	)
+	@Export("soundSystem")
+	static SoundSystem soundSystem;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "Lof;"
+	)
+	@Export("options_buttons_0Sprite")
+	static IndexedSprite options_buttons_0Sprite;
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "Lof;"
+	)
+	static IndexedSprite field1005;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -49273179
 	)
 	@Export("loginBoxX")
 	static int loginBoxX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -564105319
+		intValue = -1645328707
 	)
 	@Export("Login_loadingPercent")
 	static int Login_loadingPercent;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("Login_loadingText")
 	static String Login_loadingText;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -162991545
+		intValue = 1442132519
 	)
-	static int field1032;
-	@ObfuscatedName("ar")
+	static int field1011;
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -519325819
+		intValue = -1846708661
 	)
-	static int field1039;
-	@ObfuscatedName("aj")
+	static int field1012;
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -677995589
+		intValue = 1473378055
 	)
 	@Export("loginIndex")
 	static int loginIndex;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("Login_response0")
 	static String Login_response0;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@Export("Login_response1")
 	static String Login_response1;
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@Export("Login_response2")
 	static String Login_response2;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aj")
 	@Export("Login_response3")
 	static String Login_response3;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@Export("Login_username")
 	static String Login_username;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@Export("Login_password")
 	static String Login_password;
-	@ObfuscatedName("aa")
-	static boolean field1041;
-	@ObfuscatedName("au")
-	static boolean field1047;
-	@ObfuscatedName("bt")
-	static boolean field1043;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("ax")
+	static boolean field1006;
+	@ObfuscatedName("ar")
+	static boolean field1021;
+	@ObfuscatedName("bx")
+	static boolean field1022;
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -1482820819
+		intValue = -1921798817
 	)
 	@Export("currentLoginField")
 	static int currentLoginField;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@Export("worldSelectOpen")
 	static boolean worldSelectOpen;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = 1383104493
+		intValue = -1331628685
 	)
 	@Export("hoveredWorldIndex")
 	static int hoveredWorldIndex;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -1580902995
+		intValue = 1559013153
 	)
 	@Export("worldSelectPage")
 	static int worldSelectPage;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = -386301875
+		intValue = 1727886511
 	)
 	@Export("worldSelectPagesCount")
 	static int worldSelectPagesCount;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		longValue = -6552387078387254053L
+		longValue = -504065340158642831L
 	)
-	static long field1050;
-	@ObfuscatedName("bw")
+	static long field1019;
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		longValue = 6302773758436356871L
+		longValue = -731103145365599943L
 	)
-	static long field1022;
+	static long field1031;
+	@ObfuscatedName("jn")
+	@ObfuscatedSignature(
+		descriptor = "Liv;"
+	)
+	static Widget field1034;
 
 	static {
 		xPadding = 0; // L: 38
 		loginBoxX = xPadding + 202; // L: 55
 		Login_loadingPercent = 10; // L: 57
 		Login_loadingText = ""; // L: 58
-		field1032 = -1; // L: 65
-		field1039 = 1; // L: 68
-		loginIndex = 0;
-		Login_response0 = "";
-		Login_response1 = "";
-		Login_response2 = "";
+		field1011 = -1; // L: 65
+		field1012 = 1; // L: 68
+		loginIndex = 0; // L: 72
+		Login_response0 = ""; // L: 73
+		Login_response1 = ""; // L: 74
+		Login_response2 = ""; // L: 75
 		Login_response3 = ""; // L: 76
 		Login_username = ""; // L: 77
 		Login_password = ""; // L: 78
-		field1041 = false; // L: 85
-		field1047 = false; // L: 86
-		field1043 = true; // L: 89
+		field1006 = false; // L: 85
+		field1021 = false; // L: 86
+		field1022 = true; // L: 89
 		currentLoginField = 0; // L: 90
 		worldSelectOpen = false; // L: 94
 		hoveredWorldIndex = -1; // L: 102
 		worldSelectPage = 0; // L: 103
 		worldSelectPagesCount = 0; // L: 104
 		new DecimalFormat("##0.00"); // L: 107
-		new class124();
-		field1050 = -1L; // L: 115
-		field1022 = -1L; // L: 116
+		new class125();
+		field1019 = -1L; // L: 115
+		field1031 = -1L; // L: 116
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-179599940"
+		descriptor = "(II)Z",
+		garbageValue = "-461506193"
 	)
-	public static void method1951(int var0, int var1) {
-		VarbitComposition var3 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 35
-		VarbitComposition var2;
-		if (var3 != null) { // L: 36
-			var2 = var3; // L: 37
-		} else {
-			byte[] var4 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 40
-			var3 = new VarbitComposition(); // L: 41
-			if (var4 != null) { // L: 42
-				var3.decode(new Buffer(var4));
-			}
-
-			VarbitComposition.VarbitDefinition_cached.put(var3, (long)var0); // L: 43
-			var2 = var3; // L: 44
-		}
-
-		int var8 = var2.baseVar; // L: 47
-		int var5 = var2.startBit; // L: 48
-		int var6 = var2.endBit; // L: 49
-		int var7 = Varps.Varps_masks[var6 - var5]; // L: 50
-		if (var1 < 0 || var1 > var7) { // L: 51
-			var1 = 0;
-		}
-
-		var7 <<= var5; // L: 52
-		Varps.Varps_main[var8] = Varps.Varps_main[var8] & ~var7 | var1 << var5 & var7; // L: 53
-	} // L: 54
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
-	)
-	static void method1941(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72
-		if (var1 != null) {
-			var1.remove(); // L: 74
-		}
-	} // L: 73 75
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "1338737271"
-	)
-	@Export("isAlphaNumeric")
-	public static boolean isAlphaNumeric(char var0) {
-		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 142
+	public static boolean method2058(int var0) {
+		return var0 >= WorldMapDecorationType.field3160.id && var0 <= WorldMapDecorationType.field3170.id || var0 == WorldMapDecorationType.field3150.id; // L: 42
 	}
-
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-1087727229"
-	)
-	static int method1937(int var0, Script var1, boolean var2) {
-		if (var0 == 6900) { // L: 4205
-			++Interpreter.Interpreter_stringStackSize; // L: 4206
-			return 1; // L: 4207
-		} else if (var0 == 6950) { // L: 4209
-			++class44.Interpreter_intStackSize; // L: 4210
-			return 1; // L: 4211
-		} else {
-			return 2; // L: 4213
-		}
-	}
-
-	@ObfuscatedName("jm")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "684555967"
-	)
-	@Export("runIntfCloseListeners")
-	static final void runIntfCloseListeners(int var0, int var1) {
-		if (Clock.loadInterface(var0)) { // L: 10659
-			ReflectionCheck.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10660
-		}
-	} // L: 10661
 }
diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java
index 3186ed7b66..2f66af0152 100644
--- a/runescape-client/src/main/java/LoginPacket.java
+++ b/runescape-client/src/main/java/LoginPacket.java
@@ -4,68 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hv")
+@ObfuscatedName("hl")
 @Implements("LoginPacket")
-public class LoginPacket implements class223 {
-	@ObfuscatedName("v")
+public class LoginPacket implements class224 {
+	@ObfuscatedName("te")
 	@ObfuscatedSignature(
-		descriptor = "Lhv;"
+		descriptor = "Lku;"
 	)
-	public static final LoginPacket field2806;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lhv;"
-	)
-	static final LoginPacket field2800;
+	public static class286 field2800;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lhv;"
+		descriptor = "Lhl;"
+	)
+	public static final LoginPacket field2806;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lhl;"
+	)
+	static final LoginPacket field2801;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lhl;"
 	)
 	public static final LoginPacket field2802;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhv;"
-	)
-	public static final LoginPacket field2799;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lhv;"
+		descriptor = "Lhl;"
 	)
 	public static final LoginPacket field2803;
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhv;"
+		descriptor = "Lhl;"
 	)
-	static final LoginPacket field2804;
-	@ObfuscatedName("b")
+	public static final LoginPacket field2804;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[Lhv;"
+		descriptor = "Lhl;"
+	)
+	static final LoginPacket field2809;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "[Lhl;"
 	)
 	@Export("LoginPacket_indexedValues")
 	static final LoginPacket[] LoginPacket_indexedValues;
-	@ObfuscatedName("r")
+	@ObfuscatedName("mr")
 	@ObfuscatedGetter(
-		intValue = -2104818809
+		intValue = 159099217
+	)
+	@Export("selectedSpellFlags")
+	static int selectedSpellFlags;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1348026381
 	)
 	@Export("id")
 	public final int id;
 
 	static {
 		field2806 = new LoginPacket(14, 0); // L: 5
-		field2800 = new LoginPacket(15, 4); // L: 6
+		field2801 = new LoginPacket(15, 4); // L: 6
 		field2802 = new LoginPacket(16, -2); // L: 7
-		field2799 = new LoginPacket(18, -2); // L: 8
-		field2803 = new LoginPacket(19, -2); // L: 9
-		field2804 = new LoginPacket(27, 0); // L: 10
+		field2803 = new LoginPacket(18, -2); // L: 8
+		field2804 = new LoginPacket(19, -2); // L: 9
+		field2809 = new LoginPacket(27, 0); // L: 10
 		LoginPacket_indexedValues = new LoginPacket[32]; // L: 12
-		LoginPacket[] var0 = new LoginPacket[]{field2804, field2806, field2803, field2799, field2800, field2802}; // L: 17
-		LoginPacket[] var1 = var0; // L: 19
+		LoginPacket[] var0 = class23.method318();
 
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20
-			LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21
+		for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16
+			LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17
 		}
 
-	} // L: 23
+	} // L: 19
 
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
@@ -75,14 +85,12 @@ public class LoginPacket implements class223 {
 		this.id = var1; // L: 26
 	} // L: 27
 
-	@ObfuscatedName("kh")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1030853503"
+		descriptor = "(S)[Ljo;",
+		garbageValue = "3316"
 	)
-	static final void method4373(int var0) {
-		var0 = Math.min(Math.max(var0, 0), 127); // L: 10926
-		ObjectComposition.clientPreferences.areaSoundEffectsVolume = var0; // L: 10927
-		TileItem.savePreferences(); // L: 10928
-	} // L: 10929
+	public static class269[] method4510() {
+		return new class269[]{class269.field3532, class269.field3533, class269.field3535, class269.field3534}; // L: 15
+	}
 }
diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java
index d7f6afc996..04b84d97f0 100644
--- a/runescape-client/src/main/java/LoginScreenAnimation.java
+++ b/runescape-client/src/main/java/LoginScreenAnimation.java
@@ -1,212 +1,218 @@
-import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ca")
+@ObfuscatedName("ck")
 @Implements("LoginScreenAnimation")
 public class LoginScreenAnimation {
-	@ObfuscatedName("v")
+	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "Lnb;"
+	)
+	@Export("loginType")
+	static LoginType loginType;
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
 	)
 	@Export("sprites")
 	IndexedSprite[] sprites;
+	@ObfuscatedName("m")
+	int[] field1300;
 	@ObfuscatedName("r")
-	int[] field1308;
-	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1934818705
+		intValue = -1518059987
+	)
+	int field1304;
+	@ObfuscatedName("h")
+	int[] field1294;
+	@ObfuscatedName("d")
+	int[] field1295;
+	@ObfuscatedName("z")
+	int[] field1296;
+	@ObfuscatedName("b")
+	int[] field1297;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = 1626037151
+	)
+	int field1298;
+	@ObfuscatedName("k")
+	@ObfuscatedGetter(
+		intValue = -970523767
+	)
+	int field1299;
+	@ObfuscatedName("g")
+	int[] field1305;
+	@ObfuscatedName("t")
+	int[] field1301;
+	@ObfuscatedName("x")
+	int[] field1302;
+	@ObfuscatedName("u")
+	int[] field1303;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = -1812898479
+	)
+	int field1290;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = 1570701257
 	)
 	int field1309;
-	@ObfuscatedName("d")
-	int[] field1310;
-	@ObfuscatedName("s")
-	int[] field1311;
-	@ObfuscatedName("u")
-	int[] field1304;
-	@ObfuscatedName("l")
-	int[] field1315;
-	@ObfuscatedName("o")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1784020073
+		intValue = -1310128613
 	)
-	int field1318;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -962717377
-	)
-	int field1313;
-	@ObfuscatedName("e")
-	int[] field1316;
-	@ObfuscatedName("g")
-	int[] field1317;
-	@ObfuscatedName("a")
-	int[] field1319;
-	@ObfuscatedName("k")
-	int[] field1312;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 348893403
-	)
-	int field1320;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -1953512307
-	)
-	int field1321;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = -453028953
-	)
-	int field1322;
+	int field1306;
 
 	@ObfuscatedSignature(
-		descriptor = "([Lop;)V"
+		descriptor = "([Lof;)V"
 	)
 	LoginScreenAnimation(IndexedSprite[] var1) {
-		this.field1308 = new int[256]; // L: 13
-		this.field1309 = 0; // L: 14
-		this.field1318 = 0; // L: 19
-		this.field1313 = 0; // L: 20
-		this.field1320 = 0; // L: 25
-		this.field1321 = 0; // L: 26
-		this.field1322 = 0; // L: 27
-		this.sprites = var1;
-		this.initColors();
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "41"
-	)
-	@Export("initColors")
-	void initColors() {
-		this.field1311 = new int[256];
-
-		int var1;
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1311[var1] = var1 * 262144;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1311[var1 + 64] = var1 * 1024 + 16711680;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1311[var1 + 128] = var1 * 4 + 16776960;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1311[var1 + 192] = 16777215;
-		}
-
-		this.field1304 = new int[256];
-
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1304[var1] = var1 * 1024;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) {
-			this.field1304[var1 + 64] = var1 * 4 + 65280;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) { // L: 43
-			this.field1304[var1 + 128] = var1 * 262144 + 65535;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) { // L: 44
-			this.field1304[var1 + 192] = 16777215;
-		}
-
-		this.field1315 = new int[256]; // L: 45
-
-		for (var1 = 0; var1 < 64; ++var1) { // L: 46
-			this.field1315[var1] = var1 * 4;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) { // L: 47
-			this.field1315[var1 + 64] = var1 * 262144 + 255;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) { // L: 48
-			this.field1315[var1 + 128] = var1 * 1024 + 16711935;
-		}
-
-		for (var1 = 0; var1 < 64; ++var1) { // L: 49
-			this.field1315[var1 + 192] = 16777215;
-		}
-
-		this.field1310 = new int[256]; // L: 50
-		this.field1320 = 0; // L: 51
-		this.field1319 = new int[32768]; // L: 52
-		this.field1312 = new int[32768]; // L: 53
-		this.method2232((IndexedSprite)null); // L: 54
-		this.field1316 = new int[32768]; // L: 55
-		this.field1317 = new int[32768]; // L: 56
-	} // L: 57
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "7298"
-	)
-	void method2202() {
-		this.field1311 = null; // L: 60
-		this.field1304 = null; // L: 61
-		this.field1315 = null; // L: 62
-		this.field1310 = null; // L: 63
-		this.field1319 = null; // L: 64
-		this.field1312 = null; // L: 65
-		this.field1316 = null; // L: 66
-		this.field1317 = null; // L: 67
-		this.field1320 = 0; // L: 68
-		this.field1321 = 0; // L: 69
-	} // L: 70
+		this.field1300 = new int[256]; // L: 13
+		this.field1304 = 0; // L: 14
+		this.field1298 = 0; // L: 19
+		this.field1299 = 0; // L: 20
+		this.field1290 = 0; // L: 25
+		this.field1309 = 0; // L: 26
+		this.field1306 = 0; // L: 27
+		this.sprites = var1; // L: 30
+		this.initColors(); // L: 31
+	} // L: 32
 
 	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "73"
+	)
+	@Export("initColors")
+	void initColors() {
+		this.field1295 = new int[256]; // L: 35
+
+		int var1;
+		for (var1 = 0; var1 < 64; ++var1) { // L: 36
+			this.field1295[var1] = var1 * 262144;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 37
+			this.field1295[var1 + 64] = var1 * 1024 + 16711680;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 38
+			this.field1295[var1 + 128] = var1 * 4 + 16776960;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 39
+			this.field1295[var1 + 192] = 16777215;
+		}
+
+		this.field1296 = new int[256]; // L: 40
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 41
+			this.field1296[var1] = var1 * 1024;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 42
+			this.field1296[var1 + 64] = var1 * 4 + 65280;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 43
+			this.field1296[var1 + 128] = var1 * 262144 + 65535;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) { // L: 44
+			this.field1296[var1 + 192] = 16777215;
+		}
+
+		this.field1297 = new int[256]; // L: 45
+
+		for (var1 = 0; var1 < 64; ++var1) {
+			this.field1297[var1] = var1 * 4;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) {
+			this.field1297[var1 + 64] = var1 * 262144 + 255;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) {
+			this.field1297[var1 + 128] = var1 * 1024 + 16711935;
+		}
+
+		for (var1 = 0; var1 < 64; ++var1) {
+			this.field1297[var1 + 192] = 16777215;
+		}
+
+		this.field1294 = new int[256]; // L: 50
+		this.field1290 = 0; // L: 51
+		this.field1302 = new int[32768]; // L: 52
+		this.field1303 = new int[32768]; // L: 53
+		this.method2294((IndexedSprite)null); // L: 54
+		this.field1305 = new int[32768]; // L: 55
+		this.field1301 = new int[32768]; // L: 56
+	} // L: 57
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1890255909"
+	)
+	void method2296() {
+		this.field1295 = null; // L: 60
+		this.field1296 = null; // L: 61
+		this.field1297 = null; // L: 62
+		this.field1294 = null; // L: 63
+		this.field1302 = null; // L: 64
+		this.field1303 = null; // L: 65
+		this.field1305 = null; // L: 66
+		this.field1301 = null; // L: 67
+		this.field1290 = 0; // L: 68
+		this.field1309 = 0; // L: 69
+	} // L: 70
+
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-2082612852"
+		garbageValue = "657526565"
 	)
 	@Export("draw")
 	void draw(int var1, int var2) {
-		if (this.field1316 == null) { // L: 73
+		if (this.field1305 == null) { // L: 73
 			this.initColors(); // L: 74
 		}
 
-		if (this.field1322 == 0) { // L: 76
-			this.field1322 = var2; // L: 77
+		if (this.field1306 == 0) { // L: 76
+			this.field1306 = var2; // L: 77
 		}
 
-		int var3 = var2 - this.field1322; // L: 79
+		int var3 = var2 - this.field1306; // L: 79
 		if (var3 >= 256) { // L: 80
 			var3 = 0;
 		}
 
-		this.field1322 = var2; // L: 81
+		this.field1306 = var2; // L: 81
 		if (var3 > 0) { // L: 82
-			this.method2204(var3); // L: 83
+			this.method2293(var3); // L: 83
 		}
 
-		this.method2206(var1); // L: 85
+		this.method2290(var1); // L: 85
 	} // L: 86
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IS)V",
-		garbageValue = "12943"
+		descriptor = "(II)V",
+		garbageValue = "-960429455"
 	)
-	final void method2204(int var1) {
-		this.field1320 += 128 * var1; // L: 89
+	final void method2293(int var1) {
+		this.field1290 += var1 * 128; // L: 89
 		int var2;
-		if (this.field1320 > this.field1319.length) { // L: 90
-			this.field1320 -= this.field1319.length; // L: 91
+		if (this.field1290 > this.field1302.length) { // L: 90
+			this.field1290 -= this.field1302.length; // L: 91
 			var2 = (int)(Math.random() * 12.0D); // L: 92
-			this.method2232(this.sprites[var2]); // L: 93
+			this.method2294(this.sprites[var2]); // L: 93
 		}
 
 		var2 = 0; // L: 95
@@ -215,12 +221,12 @@ public class LoginScreenAnimation {
 
 		int var6;
 		for (int var5 = 0; var5 < var4; ++var5) { // L: 98
-			var6 = this.field1316[var2 + var3] - this.field1319[var2 + this.field1320 & this.field1319.length - 1] * var1 / 6; // L: 99
+			var6 = this.field1305[var2 + var3] - this.field1302[var2 + this.field1290 & this.field1302.length - 1] * var1 / 6; // L: 99
 			if (var6 < 0) { // L: 100
 				var6 = 0;
 			}
 
-			this.field1316[var2++] = var6; // L: 101
+			this.field1305[var2++] = var6; // L: 101
 		}
 
 		byte var15 = 10; // L: 103
@@ -234,42 +240,42 @@ public class LoginScreenAnimation {
 			for (int var9 = 0; var9 < 128; ++var9) { // L: 107
 				var10 = (int)(Math.random() * 100.0D); // L: 108
 				if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109
-					this.field1316[var8 + var9] = 255;
+					this.field1305[var9 + var8] = 255;
 				} else {
-					this.field1316[var9 + var8] = 0; // L: 110
+					this.field1305[var8 + var9] = 0; // L: 110
 				}
 			}
 		}
 
-		if (this.field1318 > 0) { // L: 113
-			this.field1318 -= var1 * 4;
+		if (this.field1298 > 0) { // L: 113
+			this.field1298 -= var1 * 4;
 		}
 
-		if (this.field1313 > 0) { // L: 114
-			this.field1313 -= var1 * 4;
+		if (this.field1299 > 0) { // L: 114
+			this.field1299 -= var1 * 4;
 		}
 
-		if (this.field1318 == 0 && this.field1313 == 0) { // L: 115
+		if (this.field1298 == 0 && this.field1299 == 0) { // L: 115
 			var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116
 			if (var7 == 0) { // L: 117
-				this.field1318 = 1024;
+				this.field1298 = 1024;
 			}
 
 			if (var7 == 1) { // L: 118
-				this.field1313 = 1024;
+				this.field1299 = 1024;
 			}
 		}
 
 		for (var7 = 0; var7 < 256 - var1; ++var7) { // L: 120
-			this.field1308[var7] = this.field1308[var7 + var1];
+			this.field1300[var7] = this.field1300[var7 + var1];
 		}
 
 		for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 121
-			this.field1308[var7] = (int)(Math.sin((double)this.field1309 / 14.0D) * 16.0D + Math.sin((double)this.field1309 / 15.0D) * 14.0D + Math.sin((double)this.field1309 / 16.0D) * 12.0D); // L: 122
-			++this.field1309; // L: 123
+			this.field1300[var7] = (int)(Math.sin((double)this.field1304 / 14.0D) * 16.0D + Math.sin((double)this.field1304 / 15.0D) * 14.0D + Math.sin((double)this.field1304 / 16.0D) * 12.0D); // L: 122
+			++this.field1304; // L: 123
 		}
 
-		this.field1321 += var1; // L: 125
+		this.field1309 += var1; // L: 125
 		var7 = ((Client.cycle & 1) + var1) / 2; // L: 126
 		if (var7 > 0) { // L: 127
 			short var16 = 128; // L: 128
@@ -279,13 +285,13 @@ public class LoginScreenAnimation {
 			int var11;
 			int var12;
 			int var13;
-			for (var11 = 0; var11 < this.field1321 * 100; ++var11) { // L: 131
+			for (var11 = 0; var11 < this.field1309 * 100; ++var11) { // L: 131
 				var12 = (int)(Math.random() * (double)var10) + var17; // L: 132
 				var13 = (int)(Math.random() * (double)var16) + var16; // L: 133
-				this.field1316[var12 + (var13 << 7)] = 192; // L: 134
+				this.field1305[var12 + (var13 << 7)] = 192; // L: 134
 			}
 
-			this.field1321 = 0; // L: 136
+			this.field1309 = 0; // L: 136
 
 			int var14;
 			for (var11 = 0; var11 < 256; ++var11) { // L: 137
@@ -294,15 +300,15 @@ public class LoginScreenAnimation {
 
 				for (var14 = -var7; var14 < 128; ++var14) { // L: 140
 					if (var14 + var7 < 128) { // L: 141
-						var12 += this.field1316[var7 + var13 + var14];
+						var12 += this.field1305[var7 + var14 + var13];
 					}
 
 					if (var14 - (var7 + 1) >= 0) { // L: 142
-						var12 -= this.field1316[var13 + var14 - (var7 + 1)];
+						var12 -= this.field1305[var14 + var13 - (var7 + 1)];
 					}
 
 					if (var14 >= 0) { // L: 143
-						this.field1317[var13 + var14] = var12 / (var7 * 2 + 1);
+						this.field1301[var13 + var14] = var12 / (var7 * 2 + 1);
 					}
 				}
 			}
@@ -312,16 +318,16 @@ public class LoginScreenAnimation {
 
 				for (var13 = -var7; var13 < 256; ++var13) { // L: 148
 					var14 = var13 * 128; // L: 149
-					if (var7 + var13 < 256) {
-						var12 += this.field1317[var7 * 128 + var14 + var11];
+					if (var7 + var13 < 256) { // L: 150
+						var12 += this.field1301[var11 + var14 + var7 * 128];
 					}
 
-					if (var13 - (var7 + 1) >= 0) {
-						var12 -= this.field1317[var11 + var14 - (var7 + 1) * 128];
+					if (var13 - (var7 + 1) >= 0) { // L: 151
+						var12 -= this.field1301[var11 + var14 - (var7 + 1) * 128];
 					}
 
-					if (var13 >= 0) {
-						this.field1316[var14 + var11] = var12 / (var7 * 2 + 1);
+					if (var13 >= 0) { // L: 152
+						this.field1305[var14 + var11] = var12 / (var7 * 2 + 1);
 					}
 				}
 			}
@@ -329,66 +335,66 @@ public class LoginScreenAnimation {
 
 	} // L: 156
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)I",
-		garbageValue = "-67"
-	)
-	final int method2205(int var1, int var2, int var3) {
-		int var4 = 256 - var3; // L: 159
-		return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; // L: 160
-	}
-
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "2071342179"
+		descriptor = "(IIII)I",
+		garbageValue = "-1318648994"
 	)
-	final void method2206(int var1) {
-		int var2 = this.field1310.length; // L: 164
-		if (this.field1318 > 0) { // L: 165
-			this.method2201(this.field1318, this.field1304); // L: 166
-		} else if (this.field1313 > 0) { // L: 168
-			this.method2201(this.field1313, this.field1315); // L: 169
+	final int method2297(int var1, int var2, int var3) {
+		int var4 = 256 - var3; // L: 159
+		return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-739412709"
+	)
+	final void method2290(int var1) {
+		int var2 = this.field1294.length; // L: 164
+		if (this.field1298 > 0) { // L: 165
+			this.method2291(this.field1298, this.field1296); // L: 166
+		} else if (this.field1299 > 0) { // L: 168
+			this.method2291(this.field1299, this.field1297); // L: 169
 		} else {
 			for (int var3 = 0; var3 < var2; ++var3) { // L: 172
-				this.field1310[var3] = this.field1311[var3];
+				this.field1294[var3] = this.field1295[var3];
 			}
 		}
 
-		this.method2208(var1); // L: 174
+		this.method2292(var1); // L: 174
 	} // L: 175
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I[II)V",
-		garbageValue = "889214650"
+		garbageValue = "-1814814478"
 	)
-	final void method2201(int var1, int[] var2) {
-		int var3 = this.field1310.length; // L: 178
+	final void method2291(int var1, int[] var2) {
+		int var3 = this.field1294.length; // L: 178
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 179
 			if (var1 > 768) { // L: 180
-				this.field1310[var4] = this.method2205(this.field1311[var4], var2[var4], 1024 - var1);
+				this.field1294[var4] = this.method2297(this.field1295[var4], var2[var4], 1024 - var1);
 			} else if (var1 > 256) {
-				this.field1310[var4] = var2[var4]; // L: 181
+				this.field1294[var4] = var2[var4]; // L: 181
 			} else {
-				this.field1310[var4] = this.method2205(var2[var4], this.field1311[var4], 256 - var1); // L: 182
+				this.field1294[var4] = this.method2297(var2[var4], this.field1295[var4], 256 - var1); // L: 182
 			}
 		}
 
 	} // L: 184
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "366284227"
+		descriptor = "(IB)V",
+		garbageValue = "16"
 	)
-	final void method2208(int var1) {
+	final void method2292(int var1) {
 		int var2 = 0; // L: 187
 
 		for (int var3 = 1; var3 < 255; ++var3) { // L: 188
-			int var4 = (256 - var3) * this.field1308[var3] / 256; // L: 189
+			int var4 = (256 - var3) * this.field1300[var3] / 256; // L: 189
 			int var5 = var4 + var1; // L: 190
 			int var6 = 0; // L: 191
 			int var7 = 128; // L: 192
@@ -397,22 +403,22 @@ public class LoginScreenAnimation {
 				var5 = 0; // L: 195
 			}
 
-			if (var5 + 128 >= class26.rasterProvider.width) { // L: 197
-				var7 = class26.rasterProvider.width - var5; // L: 198
+			if (var5 + 128 >= AbstractWorldMapData.rasterProvider.width) { // L: 197
+				var7 = AbstractWorldMapData.rasterProvider.width - var5; // L: 198
 			}
 
-			int var8 = var5 + (var3 + 8) * class26.rasterProvider.width; // L: 200
+			int var8 = var5 + (var3 + 8) * AbstractWorldMapData.rasterProvider.width; // L: 200
 			var2 += var6; // L: 201
 
 			for (int var9 = var6; var9 < var7; ++var9) { // L: 202
-				int var10 = this.field1316[var2++]; // L: 203
+				int var10 = this.field1305[var2++]; // L: 203
 				int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204
 				if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205
 					int var12 = var10; // L: 206
 					int var13 = 256 - var10; // L: 207
-					var10 = this.field1310[var10]; // L: 208
-					int var14 = class26.rasterProvider.pixels[var8]; // L: 209
-					class26.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; // L: 210
+					var10 = this.field1294[var10]; // L: 208
+					int var14 = AbstractWorldMapData.rasterProvider.pixels[var8]; // L: 209
+					AbstractWorldMapData.rasterProvider.pixels[var8++] = -16777216 | ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; // L: 210
 				} else {
 					++var8; // L: 212
 				}
@@ -423,21 +429,21 @@ public class LoginScreenAnimation {
 
 	} // L: 216
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lop;B)V",
-		garbageValue = "-54"
+		descriptor = "(Lof;B)V",
+		garbageValue = "-36"
 	)
-	final void method2232(IndexedSprite var1) {
+	final void method2294(IndexedSprite var1) {
 		int var2;
-		for (var2 = 0; var2 < this.field1319.length; ++var2) { // L: 219
-			this.field1319[var2] = 0;
+		for (var2 = 0; var2 < this.field1302.length; ++var2) { // L: 219
+			this.field1302[var2] = 0;
 		}
 
 		int var3;
 		for (var2 = 0; var2 < 5000; ++var2) { // L: 220
 			var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221
-			this.field1319[var3] = (int)(Math.random() * 256.0D); // L: 222
+			this.field1302[var3] = (int)(Math.random() * 256.0D); // L: 222
 		}
 
 		int var4;
@@ -446,13 +452,13 @@ public class LoginScreenAnimation {
 			for (var3 = 1; var3 < 255; ++var3) { // L: 225
 				for (var4 = 1; var4 < 127; ++var4) { // L: 226
 					var5 = var4 + (var3 << 7); // L: 227
-					this.field1312[var5] = (this.field1319[var5 + 128] + this.field1319[var5 - 128] + this.field1319[var5 + 1] + this.field1319[var5 - 1]) / 4; // L: 228
+					this.field1303[var5] = (this.field1302[var5 + 1] + this.field1302[var5 + 128] + this.field1302[var5 - 128] + this.field1302[var5 - 1]) / 4; // L: 228
 				}
 			}
 
-			int[] var8 = this.field1319; // L: 231
-			this.field1319 = this.field1312; // L: 232
-			this.field1312 = var8; // L: 233
+			int[] var8 = this.field1302; // L: 231
+			this.field1302 = this.field1303; // L: 232
+			this.field1303 = var8; // L: 233
 		}
 
 		if (var1 != null) { // L: 235
@@ -464,7 +470,7 @@ public class LoginScreenAnimation {
 						var5 = var4 + var1.xOffset + 16; // L: 240
 						int var6 = var3 + var1.yOffset + 16; // L: 241
 						int var7 = var5 + (var6 << 7); // L: 242
-						this.field1319[var7] = 0; // L: 243
+						this.field1302[var7] = 0; // L: 243
 					}
 				}
 			}
@@ -472,108 +478,414 @@ public class LoginScreenAnimation {
 
 	} // L: 248
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lfl;",
-		garbageValue = "-77736406"
-	)
-	@Export("SequenceDefinition_get")
-	public static SequenceDefinition SequenceDefinition_get(int var0) {
-		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
-			var1 = new SequenceDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode();
-			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
-			return var1; // L: 42
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;I)V",
-		garbageValue = "1926363806"
-	)
-	public static void method2210(AbstractArchive var0) {
-		InvDefinition.InvDefinition_archive = var0; // L: 17
-	} // L: 18
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "-1738532871"
-	)
-	static void method2236(Component var0) {
-		var0.setFocusTraversalKeysEnabled(false); // L: 150
-		var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 151
-		var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 152
-	} // L: 153
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;IIIZI)V",
-		garbageValue = "1103817184"
-	)
-	public static void method2219(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
-		class232.musicPlayerStatus = 1; // L: 34
-		ModelData0.musicTrackArchive = var0;
-		class32.musicTrackGroupId = var1; // L: 36
-		class18.musicTrackFileId = var2; // L: 37
-		class232.musicTrackVolume = var3; // L: 38
-		class232.musicTrackBoolean = var4; // L: 39
-		class232.pcmSampleLength = 10000; // L: 40
-	} // L: 41
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-2048658082"
+		descriptor = "(Ljp;Ljp;Ljp;B)V",
+		garbageValue = "4"
 	)
-	static int method2235(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28
-		if (var2 == null) { // L: 29
-			return 0;
-		} else if (var1 == -1) { // L: 30
-			return 0;
-		} else {
-			int var3 = 0; // L: 31
+	public static void method2312(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+		HitSplatDefinition.HitSplatDefinition_archive = var0; // L: 46
+		HitSplatDefinition.field1741 = var1; // L: 47
+		HitSplatDefinition.HitSplatDefinition_fontsArchive = var2; // L: 48
+	} // L: 49
 
-			for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32
-				if (var2.ids[var4] == var1) {
-					var3 += var2.quantities[var4]; // L: 33
-				}
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1215148892"
+	)
+	static int method2314(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2086
+			if (DevicePcmPlayerProvider.friendSystem.field928 == 0) { // L: 2087
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -2;
+			} else if (DevicePcmPlayerProvider.friendSystem.field928 == 1) { // L: 2088
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1;
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.friendsList.getSize(); // L: 2089
 			}
 
-			return var3; // L: 35
+			return 1; // L: 2090
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2093
+				if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.friendsList.getSize()) { // L: 2094
+					Friend var8 = (Friend)DevicePcmPlayerProvider.friendSystem.friendsList.get(var3); // L: 2095
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2096
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2097
+				} else {
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2100
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2101
+				}
+
+				return 1; // L: 2103
+			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2106
+				if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.friendsList.getSize()) { // L: 2107
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.friendSystem.friendsList.get(var3)).world; // L: 2108
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2110
+				}
+
+				return 1; // L: 2111
+			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2114
+				if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.friendsList.getSize()) { // L: 2115
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.friendSystem.friendsList.get(var3)).rank; // L: 2116
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2118
+				}
+
+				return 1; // L: 2119
+			} else {
+				String var5;
+				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2122
+					int var6 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2123
+					class14.method229(var5, var6); // L: 2124
+					return 1; // L: 2125
+				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2128
+					DevicePcmPlayerProvider.friendSystem.addFriend(var5); // L: 2129
+					return 1; // L: 2130
+				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2133
+					DevicePcmPlayerProvider.friendSystem.removeFriend(var5); // L: 2134
+					return 1; // L: 2135
+				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2138
+					DevicePcmPlayerProvider.friendSystem.addIgnore(var5); // L: 2139
+					return 1; // L: 2140
+				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2143
+					DevicePcmPlayerProvider.friendSystem.removeIgnore(var5); // L: 2144
+					return 1; // L: 2145
+				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2148
+					var5 = ScriptFrame.method1232(var5); // L: 2149
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.isFriended(new Username(var5, loginType), false) ? 1 : 0; // L: 2150
+					return 1; // L: 2151
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
+					if (class289.friendsChat != null) { // L: 2154
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class289.friendsChat.name; // L: 2155
+					} else {
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2157
+					}
+
+					return 1; // L: 2158
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
+					if (class289.friendsChat != null) { // L: 2161
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class289.friendsChat.getSize(); // L: 2162
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2164
+					}
+
+					return 1; // L: 2165
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2168
+					if (class289.friendsChat != null && var3 < class289.friendsChat.getSize()) { // L: 2169
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class289.friendsChat.get(var3).getUsername().getName(); // L: 2170
+					} else {
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2172
+					}
+
+					return 1; // L: 2173
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2176
+					if (class289.friendsChat != null && var3 < class289.friendsChat.getSize()) { // L: 2177
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)class289.friendsChat.get(var3)).getWorld(); // L: 2178
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2180
+					}
+
+					return 1; // L: 2181
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2184
+					if (class289.friendsChat != null && var3 < class289.friendsChat.getSize()) { // L: 2185
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((Buddy)class289.friendsChat.get(var3)).rank; // L: 2186
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2188
+					}
+
+					return 1; // L: 2189
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class289.friendsChat != null ? class289.friendsChat.minKick : 0; // L: 2192
+					return 1; // L: 2193
+				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2196
+					class1.clanKickUser(var5); // L: 2197
+					return 1; // L: 2198
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class289.friendsChat != null ? class289.friendsChat.rank * 1745656179 * 1281242043 : 0; // L: 2201
+					return 1; // L: 2202
+				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2205
+					Coord.Clan_joinChat(var5); // L: 2206
+					return 1; // L: 2207
+				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
+					WorldMapIcon_0.Clan_leaveChat(); // L: 2210
+					return 1; // L: 2211
+				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
+					if (!DevicePcmPlayerProvider.friendSystem.method1804()) { // L: 2214
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.ignoreList.getSize(); // L: 2215
+					}
+
+					return 1; // L: 2216
+				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2219
+					if (DevicePcmPlayerProvider.friendSystem.method1804() && var3 >= 0 && var3 < DevicePcmPlayerProvider.friendSystem.ignoreList.getSize()) { // L: 2220
+						Ignored var4 = (Ignored)DevicePcmPlayerProvider.friendSystem.ignoreList.get(var3); // L: 2221
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2222
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2223
+					} else {
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2226
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2227
+					}
+
+					return 1; // L: 2229
+				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
+					var5 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2232
+					var5 = ScriptFrame.method1232(var5); // L: 2233
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.friendSystem.isIgnored(new Username(var5, loginType)) ? 1 : 0; // L: 2234
+					return 1; // L: 2235
+				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2238
+					if (class289.friendsChat != null && var3 < class289.friendsChat.getSize() && class289.friendsChat.get(var3).getUsername().equals(class262.localPlayer.username)) { // L: 2239
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2240
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2242
+					}
+
+					return 1; // L: 2243
+				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
+					if (class289.friendsChat != null && class289.friendsChat.owner != null) { // L: 2246
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class289.friendsChat.owner; // L: 2247
+					} else {
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 2249
+					}
+
+					return 1; // L: 2250
+				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2253
+					if (class289.friendsChat != null && var3 < class289.friendsChat.getSize() && ((ClanMate)class289.friendsChat.get(var3)).isFriend()) { // L: 2254
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2255
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2257
+					}
+
+					return 1; // L: 2258
+				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
+					if (var0 == 3628) {
+						DevicePcmPlayerProvider.friendSystem.friendsList.removeComparator(); // L: 2269
+						return 1; // L: 2270
+					} else {
+						boolean var7;
+						if (var0 == 3629) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2273
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2274
+							return 1; // L: 2275
+						} else if (var0 == 3630) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2278
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2279
+							return 1; // L: 2280
+						} else if (var0 == 3631) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2283
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2284
+							return 1; // L: 2285
+						} else if (var0 == 3632) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2288
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2289
+							return 1; // L: 2290
+						} else if (var0 == 3633) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2293
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2294
+							return 1; // L: 2295
+						} else if (var0 == 3634) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2298
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2299
+							return 1; // L: 2300
+						} else if (var0 == 3635) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2303
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2304
+							return 1; // L: 2305
+						} else if (var0 == 3636) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2308
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2309
+							return 1; // L: 2310
+						} else if (var0 == 3637) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2313
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2314
+							return 1; // L: 2315
+						} else if (var0 == 3638) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2318
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2319
+							return 1; // L: 2320
+						} else if (var0 == 3639) {
+							DevicePcmPlayerProvider.friendSystem.friendsList.sort(); // L: 2323
+							return 1; // L: 2324
+						} else if (var0 == 3640) {
+							DevicePcmPlayerProvider.friendSystem.ignoreList.removeComparator(); // L: 2327
+							return 1; // L: 2328
+						} else if (var0 == 3641) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2331
+							DevicePcmPlayerProvider.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2332
+							return 1; // L: 2333
+						} else if (var0 == 3642) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2336
+							DevicePcmPlayerProvider.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2337
+							return 1; // L: 2338
+						} else if (var0 == 3643) {
+							DevicePcmPlayerProvider.friendSystem.ignoreList.sort(); // L: 2341
+							return 1; // L: 2342
+						} else if (var0 == 3644) {
+							if (class289.friendsChat != null) { // L: 2345
+								class289.friendsChat.removeComparator(); // L: 2346
+							}
+
+							return 1; // L: 2348
+						} else if (var0 == 3645) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2351
+							if (class289.friendsChat != null) { // L: 2352
+								class289.friendsChat.addComparator(new UserComparator1(var7)); // L: 2353
+							}
+
+							return 1; // L: 2355
+						} else if (var0 == 3646) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2358
+							if (class289.friendsChat != null) { // L: 2359
+								class289.friendsChat.addComparator(new UserComparator2(var7)); // L: 2360
+							}
+
+							return 1; // L: 2362
+						} else if (var0 == 3647) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2365
+							if (class289.friendsChat != null) { // L: 2366
+								class289.friendsChat.addComparator(new UserComparator3(var7)); // L: 2367
+							}
+
+							return 1; // L: 2369
+						} else if (var0 == 3648) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2372
+							if (class289.friendsChat != null) { // L: 2373
+								class289.friendsChat.addComparator(new UserComparator4(var7)); // L: 2374
+							}
+
+							return 1; // L: 2376
+						} else if (var0 == 3649) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2379
+							if (class289.friendsChat != null) { // L: 2380
+								class289.friendsChat.addComparator(new UserComparator5(var7)); // L: 2381
+							}
+
+							return 1; // L: 2383
+						} else if (var0 == 3650) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2386
+							if (class289.friendsChat != null) { // L: 2387
+								class289.friendsChat.addComparator(new UserComparator6(var7)); // L: 2388
+							}
+
+							return 1; // L: 2390
+						} else if (var0 == 3651) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2393
+							if (class289.friendsChat != null) { // L: 2394
+								class289.friendsChat.addComparator(new UserComparator7(var7)); // L: 2395
+							}
+
+							return 1; // L: 2397
+						} else if (var0 == 3652) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2400
+							if (class289.friendsChat != null) { // L: 2401
+								class289.friendsChat.addComparator(new UserComparator8(var7)); // L: 2402
+							}
+
+							return 1; // L: 2404
+						} else if (var0 == 3653) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2407
+							if (class289.friendsChat != null) { // L: 2408
+								class289.friendsChat.addComparator(new UserComparator9(var7)); // L: 2409
+							}
+
+							return 1; // L: 2411
+						} else if (var0 == 3654) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2414
+							if (class289.friendsChat != null) { // L: 2415
+								class289.friendsChat.addComparator(new UserComparator10(var7)); // L: 2416
+							}
+
+							return 1; // L: 2418
+						} else if (var0 == 3655) {
+							if (class289.friendsChat != null) { // L: 2421
+								class289.friendsChat.sort(); // L: 2422
+							}
+
+							return 1; // L: 2424
+						} else if (var0 == 3656) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2427
+							DevicePcmPlayerProvider.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2428
+							return 1; // L: 2429
+						} else if (var0 == 3657) {
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2432
+							if (class289.friendsChat != null) { // L: 2433
+								class289.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2434
+							}
+
+							return 1; // L: 2436
+						} else {
+							return 2; // L: 2438
+						}
+					}
+				} else {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2261
+					if (class289.friendsChat != null && var3 < class289.friendsChat.getSize() && ((ClanMate)class289.friendsChat.get(var3)).isIgnored()) { // L: 2262
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2263
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2265
+					}
+
+					return 1; // L: 2266
+				}
+			}
 		}
 	}
 
-	@ObfuscatedName("it")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-2141700582"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1312324085"
 	)
-	@Export("selectSpell")
-	static void selectSpell(int var0, int var1, int var2, int var3) {
-		Widget var4 = ModeWhere.getWidgetChild(var0, var1); // L: 8631
-		if (var4 != null && var4.onTargetEnter != null) { // L: 8632
-			ScriptEvent var5 = new ScriptEvent(); // L: 8633
-			var5.widget = var4; // L: 8634
-			var5.args = var4.onTargetEnter; // L: 8635
-			PacketWriter.runScriptEvent(var5); // L: 8636
-		}
+	static int method2285(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3515
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 3516
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3517
+			int var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3518
+			if (!Client.isCameraLocked) { // L: 3519
+				Client.camAngleX = var3; // L: 3520
+				Client.camAngleY = var4; // L: 3521
+			}
 
-		Client.field788 = var3; // L: 8638
-		Client.isSpellSelected = true; // L: 8639
-		Decimator.selectedSpellWidget = var0; // L: 8640
-		Client.selectedSpellChildIndex = var1; // L: 8641
-		class4.selectedSpellFlags = var2; // L: 8642
-		WorldMapCacheName.invalidateWidget(var4); // L: 8643
-	} // L: 8644
+			return 1; // L: 3523
+		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3525
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3526
+			return 1; // L: 3527
+		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3529
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3530
+			return 1; // L: 3531
+		} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3533
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3534
+			if (var3 < 0) { // L: 3535
+				var3 = 0;
+			}
+
+			Client.camFollowHeight = var3; // L: 3536
+			return 1; // L: 3537
+		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3539
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3540
+			return 1; // L: 3541
+		} else {
+			return 2; // L: 3543
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index f6cf6a4d3c..e89bdac941 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nc")
+@ObfuscatedName("nb")
 @Implements("LoginType")
 public class LoginType {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	@Export("oldscape")
 	public static final LoginType oldscape;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
-	)
-	static final LoginType field4084;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lnc;"
-	)
-	static final LoginType field4085;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lnc;"
-	)
-	static final LoginType field4086;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	static final LoginType field4088;
-	@ObfuscatedName("j")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
 	static final LoginType field4083;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
-	static final LoginType field4089;
-	@ObfuscatedName("b")
+	static final LoginType field4084;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
+	)
+	static final LoginType field4082;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lnb;"
+	)
+	static final LoginType field4086;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lnb;"
 	)
 	static final LoginType field4087;
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lnc;"
+		descriptor = "Lnb;"
 	)
-	public static final LoginType field4091;
-	@ObfuscatedName("s")
+	static final LoginType field4081;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lnb;"
+	)
+	public static final LoginType field4089;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1440229409
+		intValue = -695543887
 	)
-	public final int field4092;
-	@ObfuscatedName("u")
-	final String field4093;
+	final int field4090;
+	@ObfuscatedName("z")
+	final String field4091;
 
 	static {
-		oldscape = new LoginType(5, 0, "", ""); // L: 5
-		field4084 = new LoginType(0, 1, "", ""); // L: 6
-		field4085 = new LoginType(7, 2, "", ""); // L: 7
-		field4086 = new LoginType(3, 3, "", ""); // L: 8
-		field4088 = new LoginType(2, 4, "", ""); // L: 9
-		field4083 = new LoginType(8, 5, "", ""); // L: 10
-		field4089 = new LoginType(1, 6, "", ""); // L: 11
-		field4087 = new LoginType(4, 7, "", ""); // L: 12
-		field4091 = new LoginType(6, -1, "", "", true, new LoginType[]{oldscape, field4084, field4085, field4088, field4086}); // L: 13
+		oldscape = new LoginType(6, 0, "", ""); // L: 5
+		field4088 = new LoginType(1, 1, "", ""); // L: 6
+		field4083 = new LoginType(3, 2, "", ""); // L: 7
+		field4084 = new LoginType(5, 3, "", ""); // L: 8
+		field4082 = new LoginType(8, 4, "", ""); // L: 9
+		field4086 = new LoginType(7, 5, "", ""); // L: 10
+		field4087 = new LoginType(0, 6, "", ""); // L: 11
+		field4081 = new LoginType(2, 7, "", ""); // L: 12
+		field4089 = new LoginType(4, -1, "", "", true, new LoginType[]{oldscape, field4088, field4083, field4082, field4084}); // L: 13
 	}
 
 	LoginType(int var1, int var2, String var3, String var4) {
-		this.field4092 = var1; // L: 18
-		this.field4093 = var4; // L: 19
+		this.field4090 = var1; // L: 18
+		this.field4091 = var4; // L: 19
 	} // L: 20
 
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnc;)V"
+		descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lnb;)V"
 	)
 	LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) {
-		this.field4092 = var1; // L: 23
-		this.field4093 = var4; // L: 24
+		this.field4090 = var1; // L: 23
+		this.field4091 = var4; // L: 24
 	} // L: 25
 
 	public String toString() {
-		return this.field4093; // L: 28
+		return this.field4091; // L: 28
 	}
 }
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index ee2ac1c27b..4274cb77cd 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -4,63 +4,746 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cp")
+@ObfuscatedName("cz")
 @Implements("MenuAction")
 public class MenuAction {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1908566839
+		intValue = 1773344917
 	)
 	@Export("param0")
 	int param0;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 213019407
+		intValue = 2064070335
 	)
 	@Export("param1")
 	int param1;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -187586953
+		intValue = 519860607
 	)
 	@Export("opcode")
 	int opcode;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 651752445
+		intValue = 1059226483
 	)
 	@Export("identifier")
 	int identifier;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("action")
 	String action;
 
 	MenuAction() {
-	} // L: 11577
+	} // L: 11738
 
-	@ObfuscatedName("kg")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILoh;Lit;I)V",
-		garbageValue = "836097385"
+		descriptor = "(ILnt;S)Let;",
+		garbageValue = "256"
 	)
-	@Export("worldToMinimap")
-	static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
-		int var6 = var3 * var3 + var2 * var2; // L: 11213
-		if (var6 > 4225 && var6 < 90000) { // L: 11214
-			int var7 = Client.camAngleY & 2047; // L: 11215
-			int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11216
-			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11217
-			int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11218
-			int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11219
-			double var12 = Math.atan2((double)var10, (double)var11); // L: 11220
-			int var14 = var5.width / 2 - 25; // L: 11221
-			int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11222
-			int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11223
-			byte var17 = 20; // L: 11224
-			Interpreter.redHintArrowSprite.method6990(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11225
-		} else {
-			ObjectComposition.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11227
+	public static class136 method2027(int var0, Buffer var1) {
+		int var2 = var1.readUnsignedByte(); // L: 24
+		boolean var3 = (var2 & 1) != 0; // L: 25
+		boolean var4 = (var2 & 2) != 0; // L: 26
+		class136 var5 = new class136(var0); // L: 27
+		int var6;
+		int[] var7;
+		boolean var8;
+		int var9;
+		short var10;
+		if (var3) { // L: 28
+			var6 = var1.readUnsignedByte(); // L: 29
+			var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 30 31 32
+			var8 = var5.field1542 != null && var7.length == var5.field1542.length; // L: 33
+
+			for (var9 = 0; var9 < 2; ++var9) { // L: 34
+				if (var7[var9] != 15) { // L: 35
+					var10 = (short)var1.readUnsignedShort(); // L: 36
+					if (var8) { // L: 37
+						var5.field1542[var7[var9]] = var10; // L: 38
+					}
+				}
+			}
 		}
 
-	} // L: 11228
+		if (var4) { // L: 43
+			var6 = var1.readUnsignedByte(); // L: 44
+			var7 = new int[]{var6 & 15, var6 >> 4 & 15}; // L: 45 46 47
+			var8 = var5.field1541 != null && var7.length == var5.field1541.length; // L: 48
+
+			for (var9 = 0; var9 < 2; ++var9) { // L: 49
+				if (var7[var9] != 15) { // L: 50
+					var10 = (short)var1.readUnsignedShort(); // L: 51
+					if (var8) { // L: 52
+						var5.field1541[var7[var9]] = var10; // L: 53
+					}
+				}
+			}
+		}
+
+		return var5; // L: 58
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Ljf;IIIBZI)V",
+		garbageValue = "-1474960108"
+	)
+	@Export("requestNetFile")
+	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
+		long var6 = (long)((var1 << 16) + var2); // L: 110
+		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 111
+		if (var8 == null) { // L: 112
+			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 113
+			if (var8 == null) { // L: 114
+				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 115
+				if (var8 != null) { // L: 116
+					if (var5) { // L: 117
+						var8.removeDual(); // L: 118
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 119
+						--NetCache.NetCache_pendingWritesCount; // L: 120
+						++NetCache.NetCache_pendingPriorityWritesCount; // L: 121
+					}
+
+				} else {
+					if (!var5) { // L: 125
+						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 126
+						if (var8 != null) { // L: 127
+							return;
+						}
+					}
+
+					var8 = new NetFileRequest(); // L: 129
+					var8.archive = var0; // L: 130
+					var8.crc = var3; // L: 131
+					var8.padding = var4; // L: 132
+					if (var5) { // L: 133
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 134
+						++NetCache.NetCache_pendingPriorityWritesCount; // L: 135
+					} else {
+						NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 138
+						NetCache.NetCache_pendingWrites.put(var8, var6); // L: 139
+						++NetCache.NetCache_pendingWritesCount; // L: 140
+					}
+
+				}
+			}
+		}
+	} // L: 142
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1466042172"
+	)
+	public static void method2028() {
+		SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 122
+		SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 123
+	} // L: 124
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(II)Ljava/lang/String;",
+		garbageValue = "871195420"
+	)
+	static final String method2026(int var0) {
+		if (var0 < 100000) { // L: 425
+			return "<col=ffff00>" + var0 + "</col>";
+		} else {
+			return var0 < 10000000 ? "<col=ffffff>" + var0 / 1000 + "K" + "</col>" : "<col=00ff80>" + var0 / 1000000 + "M" + "</col>"; // L: 426 427
+		}
+	}
+
+	@ObfuscatedName("je")
+	@ObfuscatedSignature(
+		descriptor = "([Liv;IIIIIIII)V",
+		garbageValue = "1325285933"
+	)
+	@Export("updateInterface")
+	static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		for (int var8 = 0; var8 < var0.length; ++var8) { // L: 10371
+			Widget var9 = var0[var8]; // L: 10372
+			if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class22.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10373 10374 10375
+				if (var9.isIf3) { // L: 10376
+					if (class35.isComponentHidden(var9)) { // L: 10377
+						continue;
+					}
+				} else if (var9.type == 0 && var9 != MusicPatchNode.mousedOverWidgetIf1 && class35.isComponentHidden(var9)) { // L: 10380
+					continue;
+				}
+
+				int var10 = var9.x + var6; // L: 10382
+				int var11 = var7 + var9.y; // L: 10383
+				int var12;
+				int var13;
+				int var14;
+				int var15;
+				int var17;
+				int var18;
+				if (var9.type == 2) { // L: 10388
+					var12 = var2; // L: 10389
+					var13 = var3; // L: 10390
+					var14 = var4; // L: 10391
+					var15 = var5; // L: 10392
+				} else {
+					int var16;
+					if (var9.type == 9) { // L: 10394
+						var16 = var10; // L: 10395
+						var17 = var11; // L: 10396
+						var18 = var10 + var9.width; // L: 10397
+						int var19 = var11 + var9.height; // L: 10398
+						if (var18 < var10) { // L: 10399
+							var16 = var18; // L: 10401
+							var18 = var10; // L: 10402
+						}
+
+						if (var19 < var11) { // L: 10404
+							var17 = var19; // L: 10406
+							var19 = var11; // L: 10407
+						}
+
+						++var18; // L: 10409
+						++var19; // L: 10410
+						var12 = var16 > var2 ? var16 : var2; // L: 10411
+						var13 = var17 > var3 ? var17 : var3; // L: 10412
+						var14 = var18 < var4 ? var18 : var4; // L: 10413
+						var15 = var19 < var5 ? var19 : var5; // L: 10414
+					} else {
+						var16 = var10 + var9.width; // L: 10417
+						var17 = var11 + var9.height; // L: 10418
+						var12 = var10 > var2 ? var10 : var2; // L: 10419
+						var13 = var11 > var3 ? var11 : var3; // L: 10420
+						var14 = var16 < var4 ? var16 : var4; // L: 10421
+						var15 = var17 < var5 ? var17 : var5; // L: 10422
+					}
+				}
+
+				if (var9 == Client.clickedWidget) { // L: 10424
+					Client.field731 = true; // L: 10425
+					Client.field804 = var10; // L: 10426
+					Client.field805 = var11; // L: 10427
+				}
+
+				boolean var33 = false; // L: 10429
+				if (var9.field3034) { // L: 10430
+					switch(Client.field784) { // L: 10431
+					case 0:
+						var33 = true; // L: 10433
+					case 1:
+					default:
+						break;
+					case 2:
+						if (Client.field694 == var9.id >>> 16) { // L: 10441
+							var33 = true; // L: 10442
+						}
+						break;
+					case 3:
+						if (var9.id == Client.field694) { // L: 10436
+							var33 = true; // L: 10437
+						}
+					}
+				}
+
+				if (var33 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10447
+					if (var9.isIf3) { // L: 10448
+						ScriptEvent var26;
+						if (var9.noClickThrough) { // L: 10449
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10450
+								for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10451
+									if (var26.isMouseInputEvent) { // L: 10452
+										var26.remove(); // L: 10453
+										var26.widget.containsMouse = false; // L: 10454
+									}
+								}
+
+								if (UserComparator7.widgetDragDuration == 0) { // L: 10457
+									Client.clickedWidget = null; // L: 10458
+									Client.clickedWidgetParent = null; // L: 10459
+								}
+
+								if (!Client.isMenuOpen) { // L: 10461
+									Script.addCancelMenuEntry(); // L: 10462
+								}
+							}
+						} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10466 10467
+							for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10468
+								if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10469
+									var26.remove(); // L: 10470
+								}
+							}
+						}
+					}
+
+					var17 = MouseHandler.MouseHandler_x; // L: 10476
+					var18 = MouseHandler.MouseHandler_y; // L: 10477
+					if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10478
+						var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10479
+						var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10480
+					}
+
+					boolean var34 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10482
+					if (var9.contentType == 1337) { // L: 10483
+						if (!Client.isLoading && !Client.isMenuOpen && var34) { // L: 10484
+							class391.addSceneMenuOptions(var17, var18, var12, var13);
+						}
+					} else if (var9.contentType == 1338) { // L: 10487
+						AbstractWorldMapIcon.checkIfMinimapClicked(var9, var10, var11); // L: 10488
+					} else {
+						if (var9.contentType == 1400) { // L: 10491
+							class80.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var34, var10, var11, var9.width, var9.height); // L: 10492
+						}
+
+						if (!Client.isMenuOpen && var34) { // L: 10494
+							if (var9.contentType == 1400) { // L: 10495
+								class80.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10496
+							} else {
+								class261.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10499
+							}
+						}
+
+						boolean var21;
+						int var23;
+						if (var33) { // L: 10502
+							for (int var20 = 0; var20 < var9.field3035.length; ++var20) { // L: 10503
+								var21 = false; // L: 10504
+								boolean var27 = false; // L: 10505
+								if (!var21 && var9.field3035[var20] != null) { // L: 10506
+									for (var23 = 0; var23 < var9.field3035[var20].length; ++var23) { // L: 10507
+										boolean var24 = false; // L: 10508
+										if (var9.field3104 != null) { // L: 10509
+											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3035[var20][var23]]; // L: 10510
+										}
+
+										if (class22.method314(var9.field3035[var20][var23]) || var24) { // L: 10512
+											var21 = true; // L: 10513
+											if (var9.field3104 != null && var9.field3104[var20] > Client.cycle) { // L: 10514
+												break;
+											}
+
+											byte var32 = var9.field3036[var20][var23]; // L: 10515
+											if (var32 == 0 || ((var32 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var32 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var32 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var32 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10516 10517 10518 10519 10520
+												var27 = true; // L: 10522
+												break;
+											}
+										}
+									}
+								}
+
+								if (var27) { // L: 10528
+									if (var20 < 10) { // L: 10529
+										MouseHandler.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
+									} else if (var20 == 10) { // L: 10530
+										class20.Widget_runOnTargetLeave(); // L: 10531
+										ItemComposition.selectSpell(var9.id, var9.childIndex, ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var9)), var9.itemId); // L: 10532
+										Client.selectedSpellActionName = SecureRandomCallable.Widget_getSpellActionName(var9); // L: 10533
+										if (Client.selectedSpellActionName == null) { // L: 10534
+											Client.selectedSpellActionName = "null";
+										}
+
+										Client.selectedSpellName = var9.dataText + SecureRandomFuture.colorStartTag(16777215); // L: 10535
+									}
+
+									var23 = var9.field3037[var20]; // L: 10537
+									if (var9.field3104 == null) { // L: 10538
+										var9.field3104 = new int[var9.field3035.length];
+									}
+
+									if (var9.field3038 == null) { // L: 10539
+										var9.field3038 = new int[var9.field3035.length];
+									}
+
+									if (var23 != 0) { // L: 10540
+										if (var9.field3104[var20] == 0) { // L: 10541
+											var9.field3104[var20] = var23 + Client.cycle + var9.field3038[var20];
+										} else {
+											var9.field3104[var20] = var23 + Client.cycle; // L: 10542
+										}
+									} else {
+										var9.field3104[var20] = Integer.MAX_VALUE; // L: 10544
+									}
+								}
+
+								if (!var21 && var9.field3104 != null) { // L: 10546 10547
+									var9.field3104[var20] = 0;
+								}
+							}
+						}
+
+						if (var9.isIf3) { // L: 10551
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10552
+								var34 = true;
+							} else {
+								var34 = false; // L: 10553
+							}
+
+							boolean var35 = false; // L: 10554
+							if ((MouseHandler.MouseHandler_currentButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var34) { // L: 10555
+								var35 = true;
+							}
+
+							var21 = false; // L: 10556
+							if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10557
+								var21 = true;
+							}
+
+							if (var21) { // L: 10558
+								ItemLayer.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
+							}
+
+							if (var9.contentType == 1400) { // L: 10559
+								class80.worldMap.method6133(var17, var18, var34 & var35, var34 & var21); // L: 10560
+							}
+
+							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var34 && class5.method73(class22.getWidgetFlags(var9))) { // L: 10562
+								Client.draggedOnWidget = var9;
+							}
+
+							if (var9 == Client.clickedWidgetParent) { // L: 10563
+								Client.field821 = true; // L: 10564
+								Client.field801 = var10; // L: 10565
+								Client.field802 = var11; // L: 10566
+							}
+
+							if (var9.hasListener) { // L: 10568
+								ScriptEvent var22;
+								if (var34 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10569
+									var22 = new ScriptEvent(); // L: 10570
+									var22.isMouseInputEvent = true; // L: 10571
+									var22.widget = var9; // L: 10572
+									var22.mouseY = Client.mouseWheelRotation; // L: 10573
+									var22.args = var9.onScroll; // L: 10574
+									Client.scriptEvents.addFirst(var22); // L: 10575
+								}
+
+								if (Client.clickedWidget != null || VerticalAlignment.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10577
+									var21 = false; // L: 10578
+									var35 = false; // L: 10579
+									var34 = false; // L: 10580
+								}
+
+								if (!var9.isClicked && var21) { // L: 10582
+									var9.isClicked = true; // L: 10583
+									if (var9.onClick != null) { // L: 10584
+										var22 = new ScriptEvent(); // L: 10585
+										var22.isMouseInputEvent = true; // L: 10586
+										var22.widget = var9; // L: 10587
+										var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10588
+										var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10589
+										var22.args = var9.onClick; // L: 10590
+										Client.scriptEvents.addFirst(var22); // L: 10591
+									}
+								}
+
+								if (var9.isClicked && var35 && var9.onClickRepeat != null) { // L: 10594 10595
+									var22 = new ScriptEvent(); // L: 10596
+									var22.isMouseInputEvent = true; // L: 10597
+									var22.widget = var9; // L: 10598
+									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10599
+									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10600
+									var22.args = var9.onClickRepeat; // L: 10601
+									Client.scriptEvents.addFirst(var22); // L: 10602
+								}
+
+								if (var9.isClicked && !var35) { // L: 10605
+									var9.isClicked = false; // L: 10606
+									if (var9.onRelease != null) { // L: 10607
+										var22 = new ScriptEvent(); // L: 10608
+										var22.isMouseInputEvent = true; // L: 10609
+										var22.widget = var9; // L: 10610
+										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10611
+										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10612
+										var22.args = var9.onRelease; // L: 10613
+										Client.field860.addFirst(var22); // L: 10614
+									}
+								}
+
+								if (var35 && var9.onHold != null) { // L: 10617 10618
+									var22 = new ScriptEvent(); // L: 10619
+									var22.isMouseInputEvent = true; // L: 10620
+									var22.widget = var9; // L: 10621
+									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10622
+									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10623
+									var22.args = var9.onHold; // L: 10624
+									Client.scriptEvents.addFirst(var22); // L: 10625
+								}
+
+								if (!var9.containsMouse && var34) { // L: 10628
+									var9.containsMouse = true; // L: 10629
+									if (var9.onMouseOver != null) { // L: 10630
+										var22 = new ScriptEvent(); // L: 10631
+										var22.isMouseInputEvent = true; // L: 10632
+										var22.widget = var9; // L: 10633
+										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10634
+										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10635
+										var22.args = var9.onMouseOver; // L: 10636
+										Client.scriptEvents.addFirst(var22); // L: 10637
+									}
+								}
+
+								if (var9.containsMouse && var34 && var9.onMouseRepeat != null) { // L: 10640 10641
+									var22 = new ScriptEvent(); // L: 10642
+									var22.isMouseInputEvent = true; // L: 10643
+									var22.widget = var9; // L: 10644
+									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10645
+									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10646
+									var22.args = var9.onMouseRepeat; // L: 10647
+									Client.scriptEvents.addFirst(var22); // L: 10648
+								}
+
+								if (var9.containsMouse && !var34) { // L: 10651
+									var9.containsMouse = false; // L: 10652
+									if (var9.onMouseLeave != null) { // L: 10653
+										var22 = new ScriptEvent(); // L: 10654
+										var22.isMouseInputEvent = true; // L: 10655
+										var22.widget = var9; // L: 10656
+										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10657
+										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10658
+										var22.args = var9.onMouseLeave; // L: 10659
+										Client.field860.addFirst(var22); // L: 10660
+									}
+								}
+
+								if (var9.onTimer != null) { // L: 10663
+									var22 = new ScriptEvent(); // L: 10664
+									var22.widget = var9; // L: 10665
+									var22.args = var9.onTimer; // L: 10666
+									Client.field812.addFirst(var22); // L: 10667
+								}
+
+								ScriptEvent var25;
+								int var36;
+								int var37;
+								if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field3089) { // L: 10669
+									if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field3089 <= 32) { // L: 10670
+										label809:
+										for (var37 = var9.field3089; var37 < Client.changedVarpCount; ++var37) { // L: 10677
+											var23 = Client.changedVarps[var37 & 31]; // L: 10678
+
+											for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { // L: 10679
+												if (var23 == var9.varTransmitTriggers[var36]) { // L: 10680
+													var25 = new ScriptEvent(); // L: 10681
+													var25.widget = var9; // L: 10682
+													var25.args = var9.onVarTransmit; // L: 10683
+													Client.scriptEvents.addFirst(var25); // L: 10684
+													break label809; // L: 10685
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent(); // L: 10671
+										var22.widget = var9; // L: 10672
+										var22.args = var9.onVarTransmit; // L: 10673
+										Client.scriptEvents.addFirst(var22); // L: 10674
+									}
+
+									var9.field3089 = Client.changedVarpCount; // L: 10690
+								}
+
+								if (var9.onInvTransmit != null && Client.field711 > var9.field3100) { // L: 10692
+									if (var9.invTransmitTriggers != null && Client.field711 - var9.field3100 <= 32) { // L: 10693
+										label785:
+										for (var37 = var9.field3100; var37 < Client.field711; ++var37) { // L: 10700
+											var23 = Client.changedItemContainers[var37 & 31]; // L: 10701
+
+											for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { // L: 10702
+												if (var23 == var9.invTransmitTriggers[var36]) { // L: 10703
+													var25 = new ScriptEvent(); // L: 10704
+													var25.widget = var9; // L: 10705
+													var25.args = var9.onInvTransmit; // L: 10706
+													Client.scriptEvents.addFirst(var25); // L: 10707
+													break label785; // L: 10708
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent(); // L: 10694
+										var22.widget = var9; // L: 10695
+										var22.args = var9.onInvTransmit; // L: 10696
+										Client.scriptEvents.addFirst(var22); // L: 10697
+									}
+
+									var9.field3100 = Client.field711; // L: 10713
+								}
+
+								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2971) { // L: 10715
+									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2971 <= 32) { // L: 10716
+										label761:
+										for (var37 = var9.field2971; var37 < Client.changedSkillsCount; ++var37) { // L: 10723
+											var23 = Client.changedSkills[var37 & 31]; // L: 10724
+
+											for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { // L: 10725
+												if (var23 == var9.statTransmitTriggers[var36]) { // L: 10726
+													var25 = new ScriptEvent(); // L: 10727
+													var25.widget = var9; // L: 10728
+													var25.args = var9.onStatTransmit; // L: 10729
+													Client.scriptEvents.addFirst(var25); // L: 10730
+													break label761; // L: 10731
+												}
+											}
+										}
+									} else {
+										var22 = new ScriptEvent(); // L: 10717
+										var22.widget = var9; // L: 10718
+										var22.args = var9.onStatTransmit; // L: 10719
+										Client.scriptEvents.addFirst(var22); // L: 10720
+									}
+
+									var9.field2971 = Client.changedSkillsCount; // L: 10736
+								}
+
+								if (Client.chatCycle > var9.field3098 && var9.onChatTransmit != null) { // L: 10738
+									var22 = new ScriptEvent(); // L: 10739
+									var22.widget = var9; // L: 10740
+									var22.args = var9.onChatTransmit; // L: 10741
+									Client.scriptEvents.addFirst(var22); // L: 10742
+								}
+
+								if (Client.field817 > var9.field3098 && var9.onFriendTransmit != null) { // L: 10744
+									var22 = new ScriptEvent(); // L: 10745
+									var22.widget = var9; // L: 10746
+									var22.args = var9.onFriendTransmit; // L: 10747
+									Client.scriptEvents.addFirst(var22); // L: 10748
+								}
+
+								if (Client.field882 > var9.field3098 && var9.onClanTransmit != null) { // L: 10750
+									var22 = new ScriptEvent(); // L: 10751
+									var22.widget = var9; // L: 10752
+									var22.args = var9.onClanTransmit; // L: 10753
+									Client.scriptEvents.addFirst(var22); // L: 10754
+								}
+
+								if (Client.field819 > var9.field3098 && var9.field3075 != null) { // L: 10756
+									var22 = new ScriptEvent(); // L: 10757
+									var22.widget = var9; // L: 10758
+									var22.args = var9.field3075; // L: 10759
+									Client.scriptEvents.addFirst(var22); // L: 10760
+								}
+
+								if (Client.field820 > var9.field3098 && var9.field3076 != null) { // L: 10762
+									var22 = new ScriptEvent(); // L: 10763
+									var22.widget = var9; // L: 10764
+									var22.args = var9.field3076; // L: 10765
+									Client.scriptEvents.addFirst(var22); // L: 10766
+								}
+
+								if (Client.field827 > var9.field3098 && var9.onStockTransmit != null) { // L: 10768
+									var22 = new ScriptEvent(); // L: 10769
+									var22.widget = var9; // L: 10770
+									var22.args = var9.onStockTransmit; // L: 10771
+									Client.scriptEvents.addFirst(var22); // L: 10772
+								}
+
+								if (Client.field822 > var9.field3098 && var9.field3082 != null) { // L: 10774
+									var22 = new ScriptEvent(); // L: 10775
+									var22.widget = var9; // L: 10776
+									var22.args = var9.field3082; // L: 10777
+									Client.scriptEvents.addFirst(var22); // L: 10778
+								}
+
+								if (Client.field823 > var9.field3098 && var9.onMiscTransmit != null) { // L: 10780
+									var22 = new ScriptEvent(); // L: 10781
+									var22.widget = var9; // L: 10782
+									var22.args = var9.onMiscTransmit; // L: 10783
+									Client.scriptEvents.addFirst(var22); // L: 10784
+								}
+
+								var9.field3098 = Client.cycleCntr; // L: 10786
+								if (var9.onKey != null) { // L: 10787
+									for (var37 = 0; var37 < Client.field847; ++var37) { // L: 10788
+										ScriptEvent var31 = new ScriptEvent(); // L: 10789
+										var31.widget = var9; // L: 10790
+										var31.keyTyped = Client.field786[var37]; // L: 10791
+										var31.keyPressed = Client.field848[var37]; // L: 10792
+										var31.args = var9.onKey; // L: 10793
+										Client.scriptEvents.addFirst(var31); // L: 10794
+									}
+								}
+
+								ScriptEvent var30;
+								int[] var38;
+								if (var9.field3071 != null) { // L: 10797
+									var38 = class171.method3615(); // L: 10798
+
+									for (var23 = 0; var23 < var38.length; ++var23) { // L: 10799
+										var30 = new ScriptEvent(); // L: 10800
+										var30.widget = var9; // L: 10801
+										var30.keyTyped = var38[var23]; // L: 10802
+										var30.args = var9.field3071; // L: 10803
+										Client.scriptEvents.addFirst(var30); // L: 10804
+									}
+								}
+
+								if (var9.field3000 != null) { // L: 10807
+									var38 = Tiles.method2154(); // L: 10808
+
+									for (var23 = 0; var23 < var38.length; ++var23) { // L: 10809
+										var30 = new ScriptEvent(); // L: 10810
+										var30.widget = var9; // L: 10811
+										var30.keyTyped = var38[var23]; // L: 10812
+										var30.args = var9.field3000; // L: 10813
+										Client.scriptEvents.addFirst(var30); // L: 10814
+									}
+								}
+							}
+						}
+
+						if (!var9.isIf3) { // L: 10819
+							if (Client.clickedWidget != null || VerticalAlignment.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10820
+								continue;
+							}
+
+							if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10821
+								if (var9.mouseOverRedirect >= 0) { // L: 10822
+									MusicPatchNode.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+								} else {
+									MusicPatchNode.mousedOverWidgetIf1 = var9; // L: 10823
+								}
+							}
+
+							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10825
+								class5.field42 = var9; // L: 10826
+							}
+
+							if (var9.scrollHeight > var9.height) { // L: 10828
+								class18.method273(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+							}
+						}
+
+						if (var9.type == 0) { // L: 10830
+							updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10831
+							if (var9.children != null) { // L: 10832
+								updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+							}
+
+							InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10833
+							if (var28 != null) { // L: 10834
+								if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10835
+									for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10836
+										if (var29.isMouseInputEvent) { // L: 10837
+											var29.remove(); // L: 10838
+											var29.widget.containsMouse = false; // L: 10839
+										}
+									}
+
+									if (UserComparator7.widgetDragDuration == 0) { // L: 10842
+										Client.clickedWidget = null; // L: 10843
+										Client.clickedWidgetParent = null; // L: 10844
+									}
+
+									if (!Client.isMenuOpen) { // L: 10846
+										Script.addCancelMenuEntry(); // L: 10847
+									}
+								}
+
+								PacketWriter.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10850
+							}
+						}
+					}
+				}
+			}
+		}
+
+	} // L: 10854
 }
diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java
index a8670b363c..92f746a04e 100644
--- a/runescape-client/src/main/java/Message.java
+++ b/runescape-client/src/main/java/Message.java
@@ -4,71 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bi")
+@ObfuscatedName("bl")
 @Implements("Message")
 public class Message extends DualNode {
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lbq;"
-	)
-	@Export("soundSystem")
-	static SoundSystem soundSystem;
-	@ObfuscatedName("v")
+	@ObfuscatedName("rf")
 	@ObfuscatedGetter(
-		intValue = 1017616665
+		intValue = -429339765
+	)
+	static int field602;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 705678755
 	)
 	@Export("count")
 	int count;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 19367569
+		intValue = -2052644927
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -330063829
+		intValue = 2003938681
 	)
 	@Export("type")
 	int type;
 	@ObfuscatedName("y")
 	@Export("sender")
 	String sender;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lly;"
+		descriptor = "Llc;"
 	)
 	@Export("senderUsername")
 	Username senderUsername;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("isFromFriend0")
 	TriBool isFromFriend0;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("isFromIgnored0")
 	TriBool isFromIgnored0;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("prefix")
 	String prefix;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("text")
 	String text;
 
 	Message(int var1, String var2, String var3, String var4) {
 		this.isFromFriend0 = TriBool.TriBool_unknown; // L: 13
 		this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 14
-		this.set(var1, var2, var3, var4); // L: 19
+		this.set(var1, var2, var3, var4);
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-449593753"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V",
+		garbageValue = "0"
 	)
 	@Export("set")
 	void set(int var1, String var2, String var3, String var4) {
@@ -84,20 +83,20 @@ public class Message extends DualNode {
 		this.clearIsFromIgnored(); // L: 35
 	} // L: 36
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1400910895"
+		descriptor = "(B)V",
+		garbageValue = "50"
 	)
 	@Export("clearIsFromFriend")
 	void clearIsFromFriend() {
 		this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39
 	} // L: 40
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1571534939"
+		descriptor = "(B)Z",
+		garbageValue = "-30"
 	)
 	@Export("isFromFriend")
 	final boolean isFromFriend() {
@@ -111,27 +110,27 @@ public class Message extends DualNode {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "118"
+		garbageValue = "-7"
 	)
 	@Export("fillIsFromFriend")
 	void fillIsFromFriend() {
-		this.isFromFriend0 = NetSocket.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50
+		this.isFromFriend0 = DevicePcmPlayerProvider.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50
 	} // L: 51
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1764151140"
+		garbageValue = "-1442748456"
 	)
 	@Export("clearIsFromIgnored")
 	void clearIsFromIgnored() {
 		this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54
 	} // L: 55
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-342072399"
+		garbageValue = "1545793879"
 	)
 	@Export("isFromIgnored")
 	final boolean isFromIgnored() {
@@ -142,28 +141,59 @@ public class Message extends DualNode {
 		return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-2"
+		descriptor = "(I)V",
+		garbageValue = "-1118682631"
 	)
 	@Export("fillIsFromIgnored")
 	void fillIsFromIgnored() {
-		this.isFromIgnored0 = NetSocket.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65
+		this.isFromIgnored0 = DevicePcmPlayerProvider.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65
 	} // L: 66
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1824375293"
+		descriptor = "(B)V",
+		garbageValue = "118"
 	)
 	@Export("fillSenderUsername")
 	final void fillSenderUsername() {
 		if (this.sender != null) { // L: 69
-			this.senderUsername = new Username(class15.method189(this.sender), WorldMapSection0.loginType);
+			this.senderUsername = new Username(ScriptFrame.method1232(this.sender), LoginScreenAnimation.loginType);
 		} else {
 			this.senderUsername = null; // L: 70
 		}
 
 	} // L: 71
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-2061677388"
+	)
+	@Export("isWorldMapEvent")
+	public static boolean isWorldMapEvent(int var0) {
+		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
+	}
+
+	@ObfuscatedName("j")
+	@Export("Entity_unpackID")
+	public static int Entity_unpackID(long var0) {
+		return (int)(var0 >>> 17 & 4294967295L); // L: 64
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(Ljp;IIB)Z",
+		garbageValue = "-2"
+	)
+	public static boolean method1263(AbstractArchive var0, int var1, int var2) {
+		byte[] var3 = var0.takeFile(var1, var2); // L: 140
+		if (var3 == null) { // L: 141
+			return false;
+		} else {
+			class29.SpriteBuffer_decode(var3); // L: 142
+			return true; // L: 143
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java
index e100c6ca93..4e1581d9e7 100644
--- a/runescape-client/src/main/java/Messages.java
+++ b/runescape-client/src/main/java/Messages.java
@@ -6,36 +6,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dk")
+@ObfuscatedName("dg")
 @Implements("Messages")
 public class Messages {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("Messages_channels")
 	static final Map Messages_channels;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("Messages_hashTable")
 	static final IterableNodeHashTable Messages_hashTable;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lko;"
+		descriptor = "Lks;"
 	)
 	@Export("Messages_queue")
 	static final IterableDualNodeQueue Messages_queue;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 543094313
+		intValue = -993232851
 	)
 	@Export("Messages_count")
 	static int Messages_count;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lbu;"
+		descriptor = "Lof;"
 	)
-	@Export("soundCache")
-	public static SoundCache soundCache;
+	@Export("logoSprite")
+	static IndexedSprite logoSprite;
+	@ObfuscatedName("br")
+	static String field1397;
 
 	static {
 		Messages_channels = new HashMap(); // L: 9
@@ -44,22 +46,18 @@ public class Messages {
 		Messages_count = 0; // L: 12
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("gg")
 	@ObfuscatedSignature(
-		descriptor = "([Lkj;II)Lkj;",
-		garbageValue = "-611336247"
+		descriptor = "(Lcl;I)V",
+		garbageValue = "2067592428"
 	)
-	@Export("findEnumerated")
-	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-		Enumerated[] var2 = var0; // L: 17
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18
-			Enumerated var4 = var2[var3]; // L: 19
-			if (var1 == var4.rsOrdinal()) {
-				return var4; // L: 21
-			}
-		}
-
-		return null; // L: 25
-	}
+	static final void method2461(Actor var0) {
+		int var1 = Math.max(1, var0.field1276 - Client.cycle); // L: 4172
+		int var2 = var0.field1225 * 64 + var0.field1264 * 128; // L: 4173
+		int var3 = var0.field1225 * 64 + var0.field1268 * 128; // L: 4174
+		var0.x += (var2 - var0.x) / var1; // L: 4175
+		var0.y += (var3 - var0.y) / var1; // L: 4176
+		var0.field1242 = 0; // L: 4177
+		var0.orientation = var0.field1270; // L: 4178
+	} // L: 4179
 }
diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java
index 318198bd2b..9c65b562d1 100644
--- a/runescape-client/src/main/java/MidiFileReader.java
+++ b/runescape-client/src/main/java/MidiFileReader.java
@@ -3,38 +3,38 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ir")
+@ObfuscatedName("il")
 @Implements("MidiFileReader")
 public class MidiFileReader {
-	@ObfuscatedName("s")
-	static final byte[] field2871;
-	@ObfuscatedName("v")
+	@ObfuscatedName("d")
+	static final byte[] field2875;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lnt;"
 	)
 	@Export("buffer")
 	Buffer buffer;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("division")
 	int division;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("trackStarts")
 	int[] trackStarts;
 	@ObfuscatedName("y")
 	@Export("trackPositions")
 	int[] trackPositions;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("trackLengths")
 	int[] trackLengths;
-	@ObfuscatedName("j")
-	int[] field2862;
-	@ObfuscatedName("r")
-	int field2867;
-	@ObfuscatedName("d")
-	long field2870;
+	@ObfuscatedName("o")
+	int[] field2870;
+	@ObfuscatedName("m")
+	int field2872;
+	@ObfuscatedName("h")
+	long field2874;
 
 	static {
-		field2871 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17
+		field2875 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17
 	}
 
 	MidiFileReader(byte[] var1) {
@@ -46,14 +46,14 @@ public class MidiFileReader {
 		this.buffer = new Buffer((byte[])null); // L: 8
 	} // L: 23
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("parse")
 	void parse(byte[] var1) {
 		this.buffer.array = var1; // L: 30
 		this.buffer.offset = 10; // L: 33
 		int var2 = this.buffer.readUnsignedShort(); // L: 34
 		this.division = this.buffer.readUnsignedShort(); // L: 36
-		this.field2867 = 500000; // L: 37
+		this.field2872 = 500000; // L: 37
 		this.trackStarts = new int[var2]; // L: 38
 
 		Buffer var10000;
@@ -70,7 +70,7 @@ public class MidiFileReader {
 			var10000 = this.buffer; // L: 46
 		}
 
-		this.field2870 = 0L; // L: 48
+		this.field2874 = 0L; // L: 48
 		this.trackPositions = new int[var2]; // L: 49
 
 		for (var3 = 0; var3 < var2; ++var3) { // L: 50
@@ -78,20 +78,20 @@ public class MidiFileReader {
 		}
 
 		this.trackLengths = new int[var2]; // L: 51
-		this.field2862 = new int[var2]; // L: 52
+		this.field2870 = new int[var2]; // L: 52
 	} // L: 53
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("clear")
 	void clear() {
 		this.buffer.array = null; // L: 56
 		this.trackStarts = null; // L: 57
 		this.trackPositions = null; // L: 58
 		this.trackLengths = null; // L: 59
-		this.field2862 = null; // L: 60
+		this.field2870 = null; // L: 60
 	} // L: 61
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("isReady")
 	boolean isReady() {
 		return this.buffer.array != null; // L: 64
@@ -103,25 +103,25 @@ public class MidiFileReader {
 		return this.trackPositions.length; // L: 68
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("gotoTrack")
 	void gotoTrack(int var1) {
 		this.buffer.offset = this.trackPositions[var1]; // L: 72
 	} // L: 73
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("markTrackPosition")
 	void markTrackPosition(int var1) {
 		this.trackPositions[var1] = this.buffer.offset; // L: 76
 	} // L: 77
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("setTrackDone")
 	void setTrackDone() {
 		this.buffer.offset = -1; // L: 80
 	} // L: 81
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("readTrackLength")
 	void readTrackLength(int var1) {
 		int var2 = this.buffer.readVarInt(); // L: 84
@@ -129,36 +129,36 @@ public class MidiFileReader {
 		var10000[var1] += var2; // L: 85
 	} // L: 86
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("readMessage")
 	int readMessage(int var1) {
 		int var2 = this.readMessage0(var1); // L: 89
 		return var2; // L: 90
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("readMessage0")
 	int readMessage0(int var1) {
 		byte var2 = this.buffer.array[this.buffer.offset]; // L: 94
 		int var5;
 		if (var2 < 0) { // L: 95
 			var5 = var2 & 255; // L: 96
-			this.field2862[var1] = var5; // L: 97
+			this.field2870[var1] = var5; // L: 97
 			++this.buffer.offset; // L: 98
 		} else {
-			var5 = this.field2862[var1]; // L: 101
+			var5 = this.field2870[var1]; // L: 101
 		}
 
 		if (var5 != 240 && var5 != 247) { // L: 103
-			return this.method4541(var1, var5); // L: 116
+			return this.method4713(var1, var5); // L: 116
 		} else {
 			int var3 = this.buffer.readVarInt(); // L: 104
 			if (var5 == 247 && var3 > 0) { // L: 105
 				int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106
 				if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107
 					++this.buffer.offset; // L: 108
-					this.field2862[var1] = var4; // L: 109
-					return this.method4541(var1, var4); // L: 110
+					this.field2870[var1] = var4; // L: 109
+					return this.method4713(var1, var4); // L: 110
 				}
 			}
 
@@ -168,8 +168,8 @@ public class MidiFileReader {
 		}
 	}
 
-	@ObfuscatedName("u")
-	int method4541(int var1, int var2) {
+	@ObfuscatedName("z")
+	int method4713(int var1, int var2) {
 		int var4;
 		if (var2 == 255) { // L: 120
 			int var7 = this.buffer.readUnsignedByte(); // L: 121
@@ -183,8 +183,8 @@ public class MidiFileReader {
 				int var5 = this.buffer.readMedium(); // L: 128
 				var4 -= 3; // L: 129
 				int var6 = this.trackLengths[var1]; // L: 130
-				this.field2870 += (long)var6 * (long)(this.field2867 - var5); // L: 131
-				this.field2867 = var5; // L: 132
+				this.field2874 += (long)var6 * (long)(this.field2872 - var5); // L: 131
+				this.field2872 = var5; // L: 132
 				var10000 = this.buffer; // L: 133
 				var10000.offset += var4;
 				return 2; // L: 134
@@ -194,7 +194,7 @@ public class MidiFileReader {
 				return 3; // L: 137
 			}
 		} else {
-			byte var3 = field2871[var2 - 128]; // L: 139
+			byte var3 = field2875[var2 - 128]; // L: 139
 			var4 = var2; // L: 140
 			if (var3 >= 1) { // L: 141
 				var4 = var2 | this.buffer.readUnsignedByte() << 8;
@@ -208,12 +208,12 @@ public class MidiFileReader {
 		}
 	}
 
-	@ObfuscatedName("l")
-	long method4552(int var1) {
-		return this.field2870 + (long)var1 * (long)this.field2867; // L: 147
+	@ObfuscatedName("b")
+	long method4710(int var1) {
+		return this.field2874 + (long)var1 * (long)this.field2872; // L: 147
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("getPrioritizedTrack")
 	int getPrioritizedTrack() {
 		int var1 = this.trackPositions.length; // L: 151
@@ -230,7 +230,7 @@ public class MidiFileReader {
 		return var2; // L: 161
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("isDone")
 	boolean isDone() {
 		int var1 = this.trackPositions.length; // L: 165
@@ -244,15 +244,15 @@ public class MidiFileReader {
 		return true; // L: 167
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("reset")
 	void reset(long var1) {
-		this.field2870 = var1; // L: 171
+		this.field2874 = var1; // L: 171
 		int var3 = this.trackPositions.length; // L: 172
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 173
 			this.trackLengths[var4] = 0; // L: 174
-			this.field2862[var4] = 0; // L: 175
+			this.field2870[var4] = 0; // L: 175
 			this.buffer.offset = this.trackStarts[var4]; // L: 176
 			this.readTrackLength(var4); // L: 177
 			this.trackPositions[var4] = this.buffer.offset; // L: 178
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index e8ed7bb82b..40a6fbfc31 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -4,161 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hp")
+@ObfuscatedName("ie")
 @Implements("MidiPcmStream")
 public class MidiPcmStream extends PcmStream {
-	@ObfuscatedName("oz")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ldw;"
-	)
-	@Export("mouseWheel")
-	static MouseWheel mouseWheel;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("musicPatches")
 	NodeHashTable musicPatches;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -386188103
+		intValue = 1826648467
 	)
-	int field2834;
-	@ObfuscatedName("f")
+	int field2840;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 759378439
+		intValue = 2141093893
 	)
-	int field2853;
+	int field2841;
 	@ObfuscatedName("y")
-	int[] field2854;
-	@ObfuscatedName("p")
-	int[] field2837;
-	@ObfuscatedName("j")
-	int[] field2835;
-	@ObfuscatedName("r")
-	int[] field2839;
-	@ObfuscatedName("b")
-	int[] field2861;
-	@ObfuscatedName("d")
-	int[] field2841;
-	@ObfuscatedName("s")
 	int[] field2842;
-	@ObfuscatedName("u")
-	int[] field2843;
-	@ObfuscatedName("l")
-	int[] field2852;
-	@ObfuscatedName("x")
+	@ObfuscatedName("j")
 	int[] field2846;
-	@ObfuscatedName("z")
-	int[] field2844;
-	@ObfuscatedName("w")
-	int[] field2848;
-	@ObfuscatedName("t")
-	int[] field2836;
+	@ObfuscatedName("o")
+	int[] field2861;
+	@ObfuscatedName("m")
+	int[] field2847;
+	@ObfuscatedName("r")
+	int[] field2845;
 	@ObfuscatedName("h")
-	int[] field2850;
-	@ObfuscatedName("q")
+	int[] field2844;
+	@ObfuscatedName("d")
+	int[] field2848;
+	@ObfuscatedName("z")
+	int[] field2849;
+	@ObfuscatedName("b")
+	int[] field2853;
+	@ObfuscatedName("s")
 	int[] field2851;
-	@ObfuscatedName("i")
+	@ObfuscatedName("p")
+	int[] field2852;
+	@ObfuscatedName("c")
+	int[] field2850;
+	@ObfuscatedName("n")
+	int[] field2854;
+	@ObfuscatedName("l")
+	int[] field2855;
+	@ObfuscatedName("w")
+	int[] field2856;
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "[[Liq;"
+		descriptor = "[[Lib;"
 	)
-	MusicPatchNode[][] field2847;
-	@ObfuscatedName("ae")
+	MusicPatchNode[][] field2857;
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "[[Liq;"
+		descriptor = "[[Lib;"
 	)
-	MusicPatchNode[][] field2849;
-	@ObfuscatedName("ap")
+	MusicPatchNode[][] field2858;
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "Lir;"
+		descriptor = "Lil;"
 	)
 	@Export("midiFile")
 	MidiFileReader midiFile;
-	@ObfuscatedName("ab")
-	boolean field2855;
-	@ObfuscatedName("al")
+	@ObfuscatedName("ad")
+	boolean field2839;
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -398624825
+		intValue = 1423807839
 	)
 	@Export("track")
 	int track;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 495959299
+		intValue = 414893157
 	)
 	@Export("trackLength")
 	int trackLength;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		longValue = 8283552259153278903L
+		longValue = 8042341810818492123L
 	)
-	long field2858;
-	@ObfuscatedName("ar")
+	long field2863;
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		longValue = 5710666307152973315L
+		longValue = 7751692967903643467L
 	)
-	long field2859;
+	long field2864;
 	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "Lih;"
+		descriptor = "Lit;"
 	)
 	@Export("patchStream")
 	MusicPatchPcmStream patchStream;
 
 	public MidiPcmStream() {
-		this.field2834 = 256; // L: 14
-		this.field2853 = 1000000; // L: 15
-		this.field2854 = new int[16]; // L: 16
-		this.field2837 = new int[16]; // L: 17
-		this.field2835 = new int[16]; // L: 18
-		this.field2839 = new int[16]; // L: 19
-		this.field2861 = new int[16]; // L: 20
-		this.field2841 = new int[16]; // L: 21
-		this.field2842 = new int[16]; // L: 22
-		this.field2843 = new int[16]; // L: 23
-		this.field2852 = new int[16]; // L: 24
-		this.field2846 = new int[16]; // L: 28
-		this.field2844 = new int[16]; // L: 29
-		this.field2848 = new int[16]; // L: 30
-		this.field2836 = new int[16]; // L: 31
-		this.field2850 = new int[16]; // L: 32
-		this.field2851 = new int[16]; // L: 33
-		this.field2847 = new MusicPatchNode[16][128]; // L: 34
-		this.field2849 = new MusicPatchNode[16][128]; // L: 35
+		this.field2840 = 256; // L: 14
+		this.field2841 = 1000000; // L: 15
+		this.field2842 = new int[16]; // L: 16
+		this.field2846 = new int[16]; // L: 17
+		this.field2861 = new int[16]; // L: 18
+		this.field2847 = new int[16]; // L: 19
+		this.field2845 = new int[16]; // L: 20
+		this.field2844 = new int[16]; // L: 21
+		this.field2848 = new int[16]; // L: 22
+		this.field2849 = new int[16]; // L: 23
+		this.field2853 = new int[16]; // L: 24
+		this.field2851 = new int[16]; // L: 28
+		this.field2852 = new int[16]; // L: 29
+		this.field2850 = new int[16]; // L: 30
+		this.field2854 = new int[16]; // L: 31
+		this.field2855 = new int[16]; // L: 32
+		this.field2856 = new int[16]; // L: 33
+		this.field2857 = new MusicPatchNode[16][128]; // L: 34
+		this.field2858 = new MusicPatchNode[16][128]; // L: 35
 		this.midiFile = new MidiFileReader(); // L: 36
 		this.patchStream = new MusicPatchPcmStream(this); // L: 42
 		this.musicPatches = new NodeHashTable(128); // L: 45
-		this.method4429(); // L: 46
+		this.method4575(); // L: 46
 	} // L: 47
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-315791633"
-	)
-	@Export("setPcmStreamVolume")
-	public synchronized void setPcmStreamVolume(int var1) {
-		this.field2834 = var1; // L: 50
-	} // L: 51
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1796230784"
-	)
-	int method4410() {
-		return this.field2834; // L: 54
-	}
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lie;Ljv;Lbu;II)Z",
-		garbageValue = "-1829332053"
+		descriptor = "(IB)V",
+		garbageValue = "56"
+	)
+	@Export("setPcmStreamVolume")
+	public synchronized void setPcmStreamVolume(int var1) {
+		this.field2840 = var1; // L: 50
+	} // L: 51
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "1"
+	)
+	int method4660() {
+		return this.field2840; // L: 54
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lio;Ljp;Lbz;II)Z",
+		garbageValue = "-673775951"
 	)
 	@Export("loadMusicTrack")
-	public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) {
-		var1.method4622(); // L: 58
+	synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) {
+		var1.method4771(); // L: 58
 		boolean var5 = true; // L: 59
 		int[] var6 = null; // L: 60
 		if (var4 > 0) { // L: 61
@@ -169,925 +163,924 @@ public class MidiPcmStream extends PcmStream {
 			int var8 = (int)var7.key; // L: 63
 			MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); // L: 64
 			if (var9 == null) { // L: 65
-				var9 = InvDefinition.method2609(var2, var8); // L: 66
-				if (var9 == null) { // L: 67
-					var5 = false; // L: 68
+				byte[] var11 = var2.takeFileFlat(var8); // L: 68
+				MusicPatch var10;
+				if (var11 == null) { // L: 69
+					var10 = null; // L: 70
+				} else {
+					var10 = new MusicPatch(var11); // L: 73
+				}
+
+				var9 = var10; // L: 75
+				if (var10 == null) { // L: 76
+					var5 = false; // L: 77
 					continue;
 				}
 
-				this.musicPatches.put(var9, (long)var8); // L: 71
+				this.musicPatches.put(var10, (long)var8); // L: 80
 			}
 
-			if (!var9.method4588(var3, var7.byteArray, var6)) { // L: 73
+			if (!var9.method4731(var3, var7.byteArray, var6)) { // L: 82
 				var5 = false;
 			}
 		}
 
-		if (var5) { // L: 75
+		if (var5) { // L: 84
 			var1.clear();
 		}
 
-		return var5; // L: 76
+		return var5; // L: 85
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "89"
+		descriptor = "(I)V",
+		garbageValue = "1280921587"
 	)
 	@Export("clearAll")
-	public synchronized void clearAll() {
-		for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 80
+	synchronized void clearAll() {
+		for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89
 			var1.clear();
 		}
 
-	} // L: 81
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1244074850"
-	)
-	@Export("removeAll")
-	synchronized void removeAll() {
-		for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 84
-			var1.remove();
-		}
-
-	} // L: 85
+	} // L: 90
 
 	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
-	)
-	@Export("firstSubStream")
-	protected synchronized PcmStream firstSubStream() {
-		return this.patchStream; // L: 460
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
-	)
-	@Export("nextSubStream")
-	protected synchronized PcmStream nextSubStream() {
-		return null; // L: 464
-	}
-
-	@ObfuscatedName("b")
-	protected synchronized int vmethod4610() {
-		return 0; // L: 468
-	}
-
-	@ObfuscatedName("d")
-	@Export("fill")
-	protected synchronized void fill(int[] var1, int var2, int var3) {
-		if (this.midiFile.isReady()) { // L: 472
-			int var4 = this.midiFile.division * this.field2853 / PcmPlayer.field428; // L: 473
-
-			do {
-				long var5 = this.field2858 + (long)var3 * (long)var4; // L: 475
-				if (this.field2859 - var5 >= 0L) { // L: 476
-					this.field2858 = var5; // L: 477
-					break;
-				}
-
-				int var7 = (int)((this.field2859 - this.field2858 + (long)var4 - 1L) / (long)var4); // L: 480
-				this.field2858 += (long)var4 * (long)var7; // L: 481
-				this.patchStream.fill(var1, var2, var7); // L: 482
-				var2 += var7; // L: 483
-				var3 -= var7; // L: 484
-				this.method4441(); // L: 485
-			} while(this.midiFile.isReady()); // L: 486
-		}
-
-		this.patchStream.fill(var1, var2, var3); // L: 489
-	} // L: 490
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(Lie;ZI)V",
-		garbageValue = "1330192797"
-	)
-	@Export("setMusicTrack")
-	public synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
-		this.clear(); // L: 88
-		this.midiFile.parse(var1.midi); // L: 89
-		this.field2855 = var2; // L: 90
-		this.field2858 = 0L; // L: 91
-		int var3 = this.midiFile.trackCount(); // L: 92
-
-		for (int var4 = 0; var4 < var3; ++var4) { // L: 93
-			this.midiFile.gotoTrack(var4); // L: 94
-			this.midiFile.readTrackLength(var4); // L: 95
-			this.midiFile.markTrackPosition(var4); // L: 96
-		}
-
-		this.track = this.midiFile.getPrioritizedTrack(); // L: 98
-		this.trackLength = this.midiFile.trackLengths[this.track]; // L: 99
-		this.field2859 = this.midiFile.method4552(this.trackLength); // L: 100
-	} // L: 101
-
-	@ObfuscatedName("u")
-	@Export("skip")
-	protected synchronized void skip(int var1) {
-		if (this.midiFile.isReady()) { // L: 493
-			int var2 = this.midiFile.division * this.field2853 / PcmPlayer.field428; // L: 494
-
-			do {
-				long var3 = this.field2858 + (long)var2 * (long)var1; // L: 496
-				if (this.field2859 - var3 >= 0L) { // L: 497
-					this.field2858 = var3; // L: 498
-					break;
-				}
-
-				int var5 = (int)(((long)var2 + (this.field2859 - this.field2858) - 1L) / (long)var2); // L: 501
-				this.field2858 += (long)var5 * (long)var2; // L: 502
-				this.patchStream.skip(var5); // L: 503
-				var1 -= var5; // L: 504
-				this.method4441(); // L: 505
-			} while(this.midiFile.isReady()); // L: 506
-		}
-
-		this.patchStream.skip(var1); // L: 509
-	} // L: 510
-
-	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1985172216"
+		garbageValue = "787769784"
 	)
-	@Export("clear")
-	public synchronized void clear() {
-		this.midiFile.clear(); // L: 104
-		this.method4429(); // L: 105
-	} // L: 106
+	@Export("removeAll")
+	synchronized void removeAll() {
+		for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93
+			var1.remove();
+		}
+
+	} // L: 94
 
 	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1892448379"
+		descriptor = "()Lbc;"
 	)
-	@Export("isReady")
-	public synchronized boolean isReady() {
-		return this.midiFile.isReady(); // L: 109
+	@Export("firstSubStream")
+	protected synchronized PcmStream firstSubStream() {
+		return this.patchStream; // L: 469
 	}
 
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "1570912029"
-	)
-	public synchronized void method4502(int var1, int var2) {
-		this.method4512(var1, var2); // L: 113
-	} // L: 114
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-75"
-	)
-	void method4512(int var1, int var2) {
-		this.field2839[var1] = var2; // L: 117
-		this.field2841[var1] = var2 & -128; // L: 118
-		this.method4419(var1, var2); // L: 119
-	} // L: 120
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-81134935"
-	)
-	void method4419(int var1, int var2) {
-		if (var2 != this.field2861[var1]) { // L: 123
-			this.field2861[var1] = var2; // L: 124
-
-			for (int var3 = 0; var3 < 128; ++var3) { // L: 125
-				this.field2849[var1][var3] = null;
-			}
-		}
-
-	} // L: 127
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "1345766655"
-	)
-	void method4420(int var1, int var2, int var3) {
-		this.method4418(var1, var2, 64); // L: 130
-		if ((this.field2846[var1] & 2) != 0) { // L: 131
-			for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 132
-				if (var4.field2905 == var1 && var4.field2895 < 0) { // L: 133
-					this.field2847[var1][var4.field2896] = null; // L: 134
-					this.field2847[var1][var2] = var4; // L: 135
-					int var8 = (var4.field2901 * var4.field2899 >> 12) + var4.field2900; // L: 136
-					var4.field2900 += var2 - var4.field2896 << 8; // L: 137
-					var4.field2899 = var8 - var4.field2900; // L: 138
-					var4.field2901 = 4096; // L: 139
-					var4.field2896 = var2; // L: 140
-					return; // L: 141
-				}
-			}
-		}
-
-		MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2861[var1]); // L: 145
-		if (var9 != null) { // L: 146
-			RawSound var5 = var9.rawSounds[var2]; // L: 147
-			if (var5 != null) { // L: 148
-				MusicPatchNode var6 = new MusicPatchNode(); // L: 149
-				var6.field2905 = var1; // L: 150
-				var6.patch = var9; // L: 151
-				var6.rawSound = var5; // L: 152
-				var6.field2894 = var9.field2876[var2]; // L: 153
-				var6.field2893 = var9.field2882[var2]; // L: 154
-				var6.field2896 = var2; // L: 155
-				var6.field2897 = var3 * var3 * var9.field2879[var2] * var9.field2881 + 1024 >> 11; // L: 156
-				var6.field2898 = var9.field2880[var2] & 255; // L: 157
-				var6.field2900 = (var2 << 8) - (var9.field2878[var2] & 32767); // L: 158
-				var6.field2902 = 0; // L: 159
-				var6.field2903 = 0; // L: 160
-				var6.field2911 = 0; // L: 161
-				var6.field2895 = -1; // L: 162
-				var6.field2906 = 0; // L: 163
-				if (this.field2836[var1] == 0) { // L: 164
-					var6.stream = RawPcmStream.method842(var5, this.method4415(var6), this.method4434(var6), this.method4435(var6)); // L: 165
-				} else {
-					var6.stream = RawPcmStream.method842(var5, this.method4415(var6), 0, this.method4435(var6)); // L: 168
-					this.method4421(var6, var9.field2878[var2] < 0); // L: 169
-				}
-
-				if (var9.field2878[var2] < 0) { // L: 171
-					var6.stream.setNumLoops(-1);
-				}
-
-				if (var6.field2893 >= 0) { // L: 172
-					MusicPatchNode var7 = this.field2849[var1][var6.field2893]; // L: 173
-					if (var7 != null && var7.field2895 < 0) { // L: 174
-						this.field2847[var1][var7.field2896] = null; // L: 175
-						var7.field2895 = 0; // L: 176
-					}
-
-					this.field2849[var1][var6.field2893] = var6; // L: 178
-				}
-
-				this.patchStream.queue.addFirst(var6); // L: 180
-				this.field2847[var1][var2] = var6; // L: 181
-			}
-		}
-	} // L: 182
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(Liq;ZB)V",
-		garbageValue = "-23"
-	)
-	void method4421(MusicPatchNode var1, boolean var2) {
-		int var3 = var1.rawSound.samples.length; // L: 185
-		int var4;
-		if (var2 && var1.rawSound.field399) { // L: 187
-			int var5 = var3 + var3 - var1.rawSound.start; // L: 188
-			var4 = (int)((long)this.field2836[var1.field2905] * (long)var5 >> 6); // L: 189
-			var3 <<= 8; // L: 190
-			if (var4 >= var3) { // L: 191
-				var4 = var3 + var3 - 1 - var4; // L: 192
-				var1.stream.method888(); // L: 193
-			}
-		} else {
-			var4 = (int)((long)var3 * (long)this.field2836[var1.field2905] >> 6); // L: 197
-		}
-
-		var1.stream.method900(var4); // L: 199
-	} // L: 200
-
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)V",
-		garbageValue = "58"
+		descriptor = "()Lbc;"
 	)
-	void method4418(int var1, int var2, int var3) {
-		MusicPatchNode var4 = this.field2847[var1][var2]; // L: 203
-		if (var4 != null) { // L: 204
-			this.field2847[var1][var2] = null; // L: 205
-			if ((this.field2846[var1] & 2) != 0) { // L: 206
-				for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 207
-					if (var5.field2905 == var4.field2905 && var5.field2895 < 0 && var4 != var5) { // L: 208
-						var4.field2895 = 0; // L: 209
-						break; // L: 210
-					}
-				}
-			} else {
-				var4.field2895 = 0; // L: 215
-			}
+	@Export("nextSubStream")
+	protected synchronized PcmStream nextSubStream() {
+		return null; // L: 473
+	}
 
+	@ObfuscatedName("r")
+	protected synchronized int vmethod4740() {
+		return 0; // L: 477
+	}
+
+	@ObfuscatedName("h")
+	@Export("fill")
+	protected synchronized void fill(int[] var1, int var2, int var3) {
+		if (this.midiFile.isReady()) { // L: 481
+			int var4 = this.midiFile.division * this.field2841 / class341.field3921; // L: 482
+
+			do {
+				long var5 = (long)var3 * (long)var4 + this.field2863; // L: 484
+				if (this.field2864 - var5 >= 0L) { // L: 485
+					this.field2863 = var5; // L: 486
+					break;
+				}
+
+				int var7 = (int)((this.field2864 - this.field2863 + (long)var4 - 1L) / (long)var4); // L: 489
+				this.field2863 += (long)var4 * (long)var7; // L: 490
+				this.patchStream.fill(var1, var2, var7); // L: 491
+				var2 += var7; // L: 492
+				var3 -= var7; // L: 493
+				this.method4588(); // L: 494
+			} while(this.midiFile.isReady()); // L: 495
 		}
-	} // L: 217
+
+		this.patchStream.fill(var1, var2, var3); // L: 498
+	} // L: 499
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(Lio;ZI)V",
+		garbageValue = "-2021811263"
+	)
+	@Export("setMusicTrack")
+	synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
+		this.clear(); // L: 97
+		this.midiFile.parse(var1.midi); // L: 98
+		this.field2839 = var2; // L: 99
+		this.field2863 = 0L; // L: 100
+		int var3 = this.midiFile.trackCount(); // L: 101
+
+		for (int var4 = 0; var4 < var3; ++var4) { // L: 102
+			this.midiFile.gotoTrack(var4); // L: 103
+			this.midiFile.readTrackLength(var4); // L: 104
+			this.midiFile.markTrackPosition(var4); // L: 105
+		}
+
+		this.track = this.midiFile.getPrioritizedTrack(); // L: 107
+		this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108
+		this.field2864 = this.midiFile.method4710(this.trackLength); // L: 109
+	} // L: 110
+
+	@ObfuscatedName("z")
+	@Export("skip")
+	protected synchronized void skip(int var1) {
+		if (this.midiFile.isReady()) { // L: 502
+			int var2 = this.midiFile.division * this.field2841 / class341.field3921; // L: 503
+
+			do {
+				long var3 = (long)var1 * (long)var2 + this.field2863; // L: 505
+				if (this.field2864 - var3 >= 0L) { // L: 506
+					this.field2863 = var3; // L: 507
+					break;
+				}
+
+				int var5 = (int)(((long)var2 + (this.field2864 - this.field2863) - 1L) / (long)var2); // L: 510
+				this.field2863 += (long)var2 * (long)var5; // L: 511
+				this.patchStream.skip(var5); // L: 512
+				var1 -= var5; // L: 513
+				this.method4588(); // L: 514
+			} while(this.midiFile.isReady()); // L: 515
+		}
+
+		this.patchStream.skip(var1); // L: 518
+	} // L: 519
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "44"
+	)
+	@Export("clear")
+	synchronized void clear() {
+		this.midiFile.clear(); // L: 113
+		this.method4575(); // L: 114
+	} // L: 115
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-1843453272"
+	)
+	@Export("isReady")
+	synchronized boolean isReady() {
+		return this.midiFile.isReady(); // L: 118
+	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "42"
+	)
+	public synchronized void method4563(int var1, int var2) {
+		this.method4564(var1, var2); // L: 122
+	} // L: 123
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "-70"
+	)
+	void method4564(int var1, int var2) {
+		this.field2847[var1] = var2; // L: 126
+		this.field2844[var1] = var2 & -128; // L: 127
+		this.method4574(var1, var2); // L: 128
+	} // L: 129
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-1581669707"
+	)
+	void method4574(int var1, int var2) {
+		if (var2 != this.field2845[var1]) { // L: 132
+			this.field2845[var1] = var2; // L: 133
+
+			for (int var3 = 0; var3 < 128; ++var3) { // L: 134
+				this.field2858[var1][var3] = null;
+			}
+		}
+
+	} // L: 136
 
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "-366047626"
+		garbageValue = "1801299833"
 	)
-	void method4423(int var1, int var2, int var3) {
-	} // L: 219
+	void method4566(int var1, int var2, int var3) {
+		this.method4666(var1, var2, 64); // L: 139
+		if ((this.field2851[var1] & 2) != 0) { // L: 140
+			for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141
+				if (var4.field2898 == var1 && var4.field2903 < 0) { // L: 142
+					this.field2857[var1][var4.field2910] = null; // L: 143
+					this.field2857[var1][var2] = var4; // L: 144
+					int var8 = (var4.field2914 * var4.field2901 >> 12) + var4.field2907; // L: 145
+					var4.field2907 += var2 - var4.field2910 << 8; // L: 146
+					var4.field2901 = var8 - var4.field2907; // L: 147
+					var4.field2914 = 4096; // L: 148
+					var4.field2910 = var2; // L: 149
+					return; // L: 150
+				}
+			}
+		}
 
-	@ObfuscatedName("z")
+		MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2845[var1]); // L: 154
+		if (var9 != null) { // L: 155
+			RawSound var5 = var9.rawSounds[var2]; // L: 156
+			if (var5 != null) { // L: 157
+				MusicPatchNode var6 = new MusicPatchNode(); // L: 158
+				var6.field2898 = var1; // L: 159
+				var6.patch = var9; // L: 160
+				var6.rawSound = var5; // L: 161
+				var6.field2904 = var9.field2884[var2]; // L: 162
+				var6.field2897 = var9.field2886[var2]; // L: 163
+				var6.field2910 = var2; // L: 164
+				var6.field2900 = var3 * var3 * var9.field2883[var2] * var9.field2885 + 1024 >> 11; // L: 165
+				var6.field2902 = var9.field2880[var2] & 255; // L: 166
+				var6.field2907 = (var2 << 8) - (var9.field2882[var2] & 32767); // L: 167
+				var6.field2894 = 0; // L: 168
+				var6.field2906 = 0; // L: 169
+				var6.field2905 = 0; // L: 170
+				var6.field2903 = -1; // L: 171
+				var6.field2909 = 0; // L: 172
+				if (this.field2854[var1] == 0) { // L: 173
+					var6.stream = RawPcmStream.method937(var5, this.method4632(var6), this.method4581(var6), this.method4650(var6)); // L: 174
+				} else {
+					var6.stream = RawPcmStream.method937(var5, this.method4632(var6), 0, this.method4650(var6)); // L: 177
+					this.method4567(var6, var9.field2882[var2] < 0); // L: 178
+				}
+
+				if (var9.field2882[var2] < 0) { // L: 180
+					var6.stream.setNumLoops(-1);
+				}
+
+				if (var6.field2897 >= 0) { // L: 181
+					MusicPatchNode var7 = this.field2858[var1][var6.field2897]; // L: 182
+					if (var7 != null && var7.field2903 < 0) { // L: 183
+						this.field2857[var1][var7.field2910] = null; // L: 184
+						var7.field2903 = 0; // L: 185
+					}
+
+					this.field2858[var1][var6.field2897] = var6; // L: 187
+				}
+
+				this.patchStream.queue.addFirst(var6); // L: 189
+				this.field2857[var1][var2] = var6; // L: 190
+			}
+		}
+	} // L: 191
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(Lib;ZI)V",
+		garbageValue = "1606151244"
+	)
+	void method4567(MusicPatchNode var1, boolean var2) {
+		int var3 = var1.rawSound.samples.length; // L: 194
+		int var4;
+		if (var2 && var1.rawSound.field380) { // L: 196
+			int var5 = var3 + var3 - var1.rawSound.start; // L: 197
+			var4 = (int)((long)var5 * (long)this.field2854[var1.field2898] >> 6); // L: 198
+			var3 <<= 8; // L: 199
+			if (var4 >= var3) { // L: 200
+				var4 = var3 + var3 - 1 - var4; // L: 201
+				var1.stream.method941(); // L: 202
+			}
+		} else {
+			var4 = (int)((long)var3 * (long)this.field2854[var1.field2898] >> 6); // L: 206
+		}
+
+		var1.stream.method950(var4); // L: 208
+	} // L: 209
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "-1927529539"
+	)
+	void method4666(int var1, int var2, int var3) {
+		MusicPatchNode var4 = this.field2857[var1][var2]; // L: 212
+		if (var4 != null) { // L: 213
+			this.field2857[var1][var2] = null; // L: 214
+			if ((this.field2851[var1] & 2) != 0) { // L: 215
+				for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216
+					if (var4.field2898 == var5.field2898 && var5.field2903 < 0 && var5 != var4) { // L: 217
+						var4.field2903 = 0; // L: 218
+						break; // L: 219
+					}
+				}
+			} else {
+				var4.field2903 = 0; // L: 224
+			}
+
+		}
+	} // L: 226
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "2002263313"
+	)
+	void method4569(int var1, int var2, int var3) {
+	} // L: 228
+
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "852353128"
+		garbageValue = "-459034632"
 	)
-	void method4501(int var1, int var2) {
-	} // L: 220
+	void method4568(int var1, int var2) {
+	} // L: 229
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-5"
+		descriptor = "(III)V",
+		garbageValue = "1249872896"
 	)
-	void method4425(int var1, int var2) {
-		this.field2842[var1] = var2; // L: 223
-	} // L: 224
+	void method4571(int var1, int var2) {
+		this.field2848[var1] = var2; // L: 232
+	} // L: 233
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "2477568"
+		garbageValue = "-353606321"
 	)
-	void method4426(int var1) {
-		for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 227
-			if (var1 < 0 || var2.field2905 == var1) { // L: 228
-				if (var2.stream != null) { // L: 229
-					var2.stream.method855(PcmPlayer.field428 / 100); // L: 230
-					if (var2.stream.method859()) { // L: 231
+	void method4572(int var1) {
+		for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236
+			if (var1 < 0 || var2.field2898 == var1) { // L: 237
+				if (var2.stream != null) { // L: 238
+					var2.stream.method955(class341.field3921 / 100); // L: 239
+					if (var2.stream.method959()) { // L: 240
 						this.patchStream.mixer.addSubStream(var2.stream);
 					}
 
-					var2.method4634(); // L: 232
+					var2.method4772(); // L: 241
 				}
 
-				if (var2.field2895 < 0) { // L: 234
-					this.field2847[var2.field2905][var2.field2896] = null;
+				if (var2.field2903 < 0) { // L: 243
+					this.field2857[var2.field2898][var2.field2910] = null;
 				}
 
-				var2.remove(); // L: 235
+				var2.remove(); // L: 244
 			}
 		}
 
-	} // L: 238
+	} // L: 247
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-1043884473"
+		garbageValue = "905785527"
 	)
-	void method4433(int var1) {
-		if (var1 >= 0) { // L: 241
-			this.field2854[var1] = 12800; // L: 245
-			this.field2837[var1] = 8192; // L: 246
-			this.field2835[var1] = 16383; // L: 247
-			this.field2842[var1] = 8192; // L: 248
-			this.field2843[var1] = 0; // L: 249
-			this.field2852[var1] = 8192; // L: 250
-			this.method4438(var1); // L: 251
-			this.method4431(var1); // L: 252
-			this.field2846[var1] = 0; // L: 253
-			this.field2844[var1] = 32767; // L: 254
-			this.field2848[var1] = 256; // L: 255
-			this.field2836[var1] = 0; // L: 256
-			this.method4474(var1, 8192); // L: 257
+	void method4573(int var1) {
+		if (var1 >= 0) { // L: 250
+			this.field2842[var1] = 12800; // L: 254
+			this.field2846[var1] = 8192; // L: 255
+			this.field2861[var1] = 16383; // L: 256
+			this.field2848[var1] = 8192; // L: 257
+			this.field2849[var1] = 0; // L: 258
+			this.field2853[var1] = 8192; // L: 259
+			this.method4649(var1); // L: 260
+			this.method4617(var1); // L: 261
+			this.field2851[var1] = 0; // L: 262
+			this.field2852[var1] = 32767; // L: 263
+			this.field2850[var1] = 256; // L: 264
+			this.field2854[var1] = 0; // L: 265
+			this.method4579(var1, 8192); // L: 266
 		} else {
-			for (var1 = 0; var1 < 16; ++var1) { // L: 242
-				this.method4433(var1);
+			for (var1 = 0; var1 < 16; ++var1) { // L: 251
+				this.method4573(var1);
 			}
 
 		}
-	} // L: 243 258
+	} // L: 252 267
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1363851317"
+		garbageValue = "133609518"
 	)
-	void method4436(int var1) {
-		for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 261
-			if ((var1 < 0 || var2.field2905 == var1) && var2.field2895 < 0) { // L: 262 263
-				this.field2847[var2.field2905][var2.field2896] = null; // L: 264
-				var2.field2895 = 0; // L: 265
+	void method4644(int var1) {
+		for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270
+			if ((var1 < 0 || var2.field2898 == var1) && var2.field2903 < 0) { // L: 271 272
+				this.field2857[var2.field2898][var2.field2910] = null; // L: 273
+				var2.field2903 = 0; // L: 274
 			}
 		}
 
-	} // L: 269
+	} // L: 278
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1017241688"
+		garbageValue = "2004654152"
 	)
-	void method4429() {
-		this.method4426(-1); // L: 272
-		this.method4433(-1); // L: 273
+	void method4575() {
+		this.method4572(-1); // L: 281
+		this.method4573(-1); // L: 282
 
 		int var1;
-		for (var1 = 0; var1 < 16; ++var1) { // L: 274
-			this.field2861[var1] = this.field2839[var1];
+		for (var1 = 0; var1 < 16; ++var1) { // L: 283
+			this.field2845[var1] = this.field2847[var1];
 		}
 
-		for (var1 = 0; var1 < 16; ++var1) { // L: 275
-			this.field2841[var1] = this.field2839[var1] & -128;
+		for (var1 = 0; var1 < 16; ++var1) { // L: 284
+			this.field2844[var1] = this.field2847[var1] & -128;
 		}
 
-	} // L: 276
+	} // L: 285
+
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "2122126750"
+	)
+	void method4649(int var1) {
+		if ((this.field2851[var1] & 2) != 0) { // L: 288
+			for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289
+				if (var2.field2898 == var1 && this.field2857[var1][var2.field2910] == null && var2.field2903 < 0) { // L: 290 291
+					var2.field2903 = 0;
+				}
+			}
+		}
+
+	} // L: 295
 
 	@ObfuscatedName("as")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "1658989122"
+		garbageValue = "1304197009"
 	)
-	void method4438(int var1) {
-		if ((this.field2846[var1] & 2) != 0) { // L: 279
-			for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 280
-				if (var2.field2905 == var1 && this.field2847[var1][var2.field2896] == null && var2.field2895 < 0) { // L: 281 282
-					var2.field2895 = 0;
+	void method4617(int var1) {
+		if ((this.field2851[var1] & 4) != 0) { // L: 298
+			for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299
+				if (var2.field2898 == var1) { // L: 300
+					var2.field2899 = 0;
 				}
 			}
 		}
 
-	} // L: 286
+	} // L: 303
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "119"
+		descriptor = "(II)V",
+		garbageValue = "-1402753770"
 	)
-	void method4431(int var1) {
-		if ((this.field2846[var1] & 4) != 0) { // L: 289
-			for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 290
-				if (var2.field2905 == var1) { // L: 291
-					var2.field2904 = 0;
-				}
-			}
-		}
-
-	} // L: 294
-
-	@ObfuscatedName("ac")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "1"
-	)
-	void method4452(int var1) {
-		int var2 = var1 & 240; // L: 297
+	void method4578(int var1) {
+		int var2 = var1 & 240; // L: 306
 		int var3;
 		int var4;
 		int var5;
-		if (var2 == 128) { // L: 298
-			var3 = var1 & 15; // L: 299
-			var4 = var1 >> 8 & 127; // L: 300
-			var5 = var1 >> 16 & 127; // L: 301
-			this.method4418(var3, var4, var5); // L: 302
-		} else if (var2 == 144) { // L: 305
-			var3 = var1 & 15; // L: 306
-			var4 = var1 >> 8 & 127; // L: 307
-			var5 = var1 >> 16 & 127; // L: 308
-			if (var5 > 0) { // L: 309
-				this.method4420(var3, var4, var5);
+		if (var2 == 128) { // L: 307
+			var3 = var1 & 15; // L: 308
+			var4 = var1 >> 8 & 127; // L: 309
+			var5 = var1 >> 16 & 127; // L: 310
+			this.method4666(var3, var4, var5); // L: 311
+		} else if (var2 == 144) { // L: 314
+			var3 = var1 & 15; // L: 315
+			var4 = var1 >> 8 & 127; // L: 316
+			var5 = var1 >> 16 & 127; // L: 317
+			if (var5 > 0) { // L: 318
+				this.method4566(var3, var4, var5);
 			} else {
-				this.method4418(var3, var4, 64); // L: 310
+				this.method4666(var3, var4, 64); // L: 319
 			}
 
-		} else if (var2 == 160) { // L: 313
-			var3 = var1 & 15; // L: 314
-			var4 = var1 >> 8 & 127; // L: 315
-			var5 = var1 >> 16 & 127; // L: 316
-			this.method4423(var3, var4, var5); // L: 317
-		} else if (var2 == 176) { // L: 320
-			var3 = var1 & 15; // L: 321
-			var4 = var1 >> 8 & 127; // L: 322
-			var5 = var1 >> 16 & 127; // L: 323
-			if (var4 == 0) { // L: 324
-				this.field2841[var3] = (var5 << 14) + (this.field2841[var3] & -2080769);
+		} else if (var2 == 160) { // L: 322
+			var3 = var1 & 15; // L: 323
+			var4 = var1 >> 8 & 127; // L: 324
+			var5 = var1 >> 16 & 127; // L: 325
+			this.method4569(var3, var4, var5); // L: 326
+		} else if (var2 == 176) { // L: 329
+			var3 = var1 & 15; // L: 330
+			var4 = var1 >> 8 & 127; // L: 331
+			var5 = var1 >> 16 & 127; // L: 332
+			if (var4 == 0) { // L: 333
+				this.field2844[var3] = (var5 << 14) + (this.field2844[var3] & -2080769);
 			}
 
-			if (var4 == 32) { // L: 325
-				this.field2841[var3] = (var5 << 7) + (this.field2841[var3] & -16257);
+			if (var4 == 32) { // L: 334
+				this.field2844[var3] = (var5 << 7) + (this.field2844[var3] & -16257);
 			}
 
-			if (var4 == 1) { // L: 326
-				this.field2843[var3] = (var5 << 7) + (this.field2843[var3] & -16257);
+			if (var4 == 1) { // L: 335
+				this.field2849[var3] = (var5 << 7) + (this.field2849[var3] & -16257);
 			}
 
-			if (var4 == 33) { // L: 327
-				this.field2843[var3] = var5 + (this.field2843[var3] & -128);
+			if (var4 == 33) { // L: 336
+				this.field2849[var3] = var5 + (this.field2849[var3] & -128);
 			}
 
-			if (var4 == 5) { // L: 328
-				this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & -16257);
+			if (var4 == 5) { // L: 337
+				this.field2853[var3] = (var5 << 7) + (this.field2853[var3] & -16257);
 			}
 
-			if (var4 == 37) { // L: 329
-				this.field2852[var3] = var5 + (this.field2852[var3] & -128);
+			if (var4 == 37) { // L: 338
+				this.field2853[var3] = var5 + (this.field2853[var3] & -128);
 			}
 
-			if (var4 == 7) { // L: 330
-				this.field2854[var3] = (var5 << 7) + (this.field2854[var3] & -16257);
+			if (var4 == 7) { // L: 339
+				this.field2842[var3] = (var5 << 7) + (this.field2842[var3] & -16257);
 			}
 
-			if (var4 == 39) { // L: 331
-				this.field2854[var3] = var5 + (this.field2854[var3] & -128);
+			if (var4 == 39) { // L: 340
+				this.field2842[var3] = var5 + (this.field2842[var3] & -128);
 			}
 
-			if (var4 == 10) { // L: 332
-				this.field2837[var3] = (var5 << 7) + (this.field2837[var3] & -16257);
+			if (var4 == 10) { // L: 341
+				this.field2846[var3] = (var5 << 7) + (this.field2846[var3] & -16257);
 			}
 
-			if (var4 == 42) { // L: 333
-				this.field2837[var3] = var5 + (this.field2837[var3] & -128);
+			if (var4 == 42) { // L: 342
+				this.field2846[var3] = var5 + (this.field2846[var3] & -128);
 			}
 
-			if (var4 == 11) { // L: 334
-				this.field2835[var3] = (var5 << 7) + (this.field2835[var3] & -16257);
+			if (var4 == 11) { // L: 343
+				this.field2861[var3] = (var5 << 7) + (this.field2861[var3] & -16257);
 			}
 
-			if (var4 == 43) { // L: 335
-				this.field2835[var3] = var5 + (this.field2835[var3] & -128);
+			if (var4 == 43) { // L: 344
+				this.field2861[var3] = var5 + (this.field2861[var3] & -128);
 			}
 
 			int[] var10000;
-			if (var4 == 64) { // L: 336
-				if (var5 >= 64) { // L: 337
-					var10000 = this.field2846;
+			if (var4 == 64) { // L: 345
+				if (var5 >= 64) { // L: 346
+					var10000 = this.field2851;
 					var10000[var3] |= 1;
 				} else {
-					var10000 = this.field2846; // L: 338
+					var10000 = this.field2851; // L: 347
 					var10000[var3] &= -2;
 				}
 			}
 
-			if (var4 == 65) { // L: 340
-				if (var5 >= 64) { // L: 341
-					var10000 = this.field2846;
+			if (var4 == 65) { // L: 349
+				if (var5 >= 64) { // L: 350
+					var10000 = this.field2851;
 					var10000[var3] |= 2;
 				} else {
-					this.method4438(var3); // L: 343
-					var10000 = this.field2846; // L: 344
+					this.method4649(var3); // L: 352
+					var10000 = this.field2851; // L: 353
 					var10000[var3] &= -3;
 				}
 			}
 
-			if (var4 == 99) { // L: 347
-				this.field2844[var3] = (var5 << 7) + (this.field2844[var3] & 127);
+			if (var4 == 99) { // L: 356
+				this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & 127);
 			}
 
-			if (var4 == 98) { // L: 348
-				this.field2844[var3] = (this.field2844[var3] & 16256) + var5;
+			if (var4 == 98) { // L: 357
+				this.field2852[var3] = (this.field2852[var3] & 16256) + var5;
 			}
 
-			if (var4 == 101) { // L: 349
-				this.field2844[var3] = (var5 << 7) + (this.field2844[var3] & 127) + 16384;
+			if (var4 == 101) { // L: 358
+				this.field2852[var3] = (var5 << 7) + (this.field2852[var3] & 127) + 16384;
 			}
 
-			if (var4 == 100) { // L: 350
-				this.field2844[var3] = (this.field2844[var3] & 16256) + var5 + 16384;
+			if (var4 == 100) { // L: 359
+				this.field2852[var3] = (this.field2852[var3] & 16256) + var5 + 16384;
 			}
 
-			if (var4 == 120) { // L: 351
-				this.method4426(var3);
+			if (var4 == 120) { // L: 360
+				this.method4572(var3);
 			}
 
-			if (var4 == 121) { // L: 352
-				this.method4433(var3);
+			if (var4 == 121) { // L: 361
+				this.method4573(var3);
 			}
 
-			if (var4 == 123) { // L: 353
-				this.method4436(var3);
+			if (var4 == 123) { // L: 362
+				this.method4644(var3);
 			}
 
 			int var6;
-			if (var4 == 6) { // L: 354
-				var6 = this.field2844[var3]; // L: 355
-				if (var6 == 16384) { // L: 356
-					this.field2848[var3] = (var5 << 7) + (this.field2848[var3] & -16257);
+			if (var4 == 6) { // L: 363
+				var6 = this.field2852[var3]; // L: 364
+				if (var6 == 16384) { // L: 365
+					this.field2850[var3] = (var5 << 7) + (this.field2850[var3] & -16257);
 				}
 			}
 
-			if (var4 == 38) { // L: 358
-				var6 = this.field2844[var3]; // L: 359
-				if (var6 == 16384) { // L: 360
-					this.field2848[var3] = var5 + (this.field2848[var3] & -128);
+			if (var4 == 38) { // L: 367
+				var6 = this.field2852[var3]; // L: 368
+				if (var6 == 16384) { // L: 369
+					this.field2850[var3] = var5 + (this.field2850[var3] & -128);
 				}
 			}
 
-			if (var4 == 16) { // L: 362
-				this.field2836[var3] = (var5 << 7) + (this.field2836[var3] & -16257);
+			if (var4 == 16) { // L: 371
+				this.field2854[var3] = (var5 << 7) + (this.field2854[var3] & -16257);
 			}
 
-			if (var4 == 48) { // L: 363
-				this.field2836[var3] = var5 + (this.field2836[var3] & -128);
+			if (var4 == 48) { // L: 372
+				this.field2854[var3] = var5 + (this.field2854[var3] & -128);
 			}
 
-			if (var4 == 81) { // L: 364
-				if (var5 >= 64) { // L: 365
-					var10000 = this.field2846;
+			if (var4 == 81) { // L: 373
+				if (var5 >= 64) { // L: 374
+					var10000 = this.field2851;
 					var10000[var3] |= 4;
 				} else {
-					this.method4431(var3); // L: 367
-					var10000 = this.field2846; // L: 368
+					this.method4617(var3); // L: 376
+					var10000 = this.field2851; // L: 377
 					var10000[var3] &= -5;
 				}
 			}
 
 			if (var4 == 17) {
-				this.method4474(var3, (var5 << 7) + (this.field2850[var3] & -16257)); // L: 371
+				this.method4579(var3, (var5 << 7) + (this.field2855[var3] & -16257)); // L: 380
 			}
 
-			if (var4 == 49) { // L: 372
-				this.method4474(var3, var5 + (this.field2850[var3] & -128));
+			if (var4 == 49) { // L: 381
+				this.method4579(var3, var5 + (this.field2855[var3] & -128));
 			}
 
-		} else if (var2 == 192) { // L: 375
-			var3 = var1 & 15; // L: 376
-			var4 = var1 >> 8 & 127; // L: 377
-			this.method4419(var3, var4 + this.field2841[var3]); // L: 378
-		} else if (var2 == 208) { // L: 381
-			var3 = var1 & 15; // L: 382
-			var4 = var1 >> 8 & 127; // L: 383
-			this.method4501(var3, var4); // L: 384
-		} else if (var2 == 224) { // L: 387
-			var3 = var1 & 15; // L: 388
-			var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 389
-			this.method4425(var3, var4); // L: 390
+		} else if (var2 == 192) { // L: 384
+			var3 = var1 & 15; // L: 385
+			var4 = var1 >> 8 & 127; // L: 386
+			this.method4574(var3, var4 + this.field2844[var3]); // L: 387
+		} else if (var2 == 208) { // L: 390
+			var3 = var1 & 15; // L: 391
+			var4 = var1 >> 8 & 127; // L: 392
+			this.method4568(var3, var4); // L: 393
+		} else if (var2 == 224) { // L: 396
+			var3 = var1 & 15; // L: 397
+			var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398
+			this.method4571(var3, var4); // L: 399
 		} else {
-			var2 = var1 & 255; // L: 393
-			if (var2 == 255) { // L: 394
-				this.method4429(); // L: 395
+			var2 = var1 & 255; // L: 402
+			if (var2 == 255) { // L: 403
+				this.method4575(); // L: 404
 			}
 		}
-	} // L: 303 311 318 373 379 385 391 396 398
+	} // L: 312 320 327 382 388 394 400 405 407
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "498737337"
+		garbageValue = "-264828177"
 	)
-	void method4474(int var1, int var2) {
-		this.field2850[var1] = var2; // L: 401
-		this.field2851[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 402
-	} // L: 403
+	void method4579(int var1, int var2) {
+		this.field2855[var1] = var2; // L: 410
+		this.field2856[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); // L: 411
+	} // L: 412
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;B)I",
-		garbageValue = "1"
+		descriptor = "(Lib;I)I",
+		garbageValue = "627320861"
 	)
-	int method4415(MusicPatchNode var1) {
-		int var2 = (var1.field2901 * var1.field2899 >> 12) + var1.field2900; // L: 406
-		var2 += (this.field2842[var1.field2905] - 8192) * this.field2848[var1.field2905] >> 12; // L: 407
-		MusicPatchNode2 var3 = var1.field2894; // L: 408
+	int method4632(MusicPatchNode var1) {
+		int var2 = (var1.field2914 * var1.field2901 >> 12) + var1.field2907; // L: 415
+		var2 += (this.field2848[var1.field2898] - 8192) * this.field2850[var1.field2898] >> 12; // L: 416
+		MusicPatchNode2 var3 = var1.field2904; // L: 417
 		int var4;
-		if (var3.field2817 > 0 && (var3.field2822 > 0 || this.field2843[var1.field2905] > 0)) { // L: 409
-			var4 = var3.field2822 << 2; // L: 410
-			int var5 = var3.field2823 << 1; // L: 411
-			if (var1.field2907 < var5) { // L: 412
-				var4 = var4 * var1.field2907 / var5;
+		if (var3.field2827 > 0 && (var3.field2826 > 0 || this.field2849[var1.field2898] > 0)) { // L: 418
+			var4 = var3.field2826 << 2; // L: 419
+			int var5 = var3.field2829 << 1; // L: 420
+			if (var1.field2908 < var5) { // L: 421
+				var4 = var4 * var1.field2908 / var5;
 			}
 
-			var4 += this.field2843[var1.field2905] >> 7; // L: 413
-			double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2908 & 511)); // L: 414
-			var2 += (int)((double)var4 * var6); // L: 415
+			var4 += this.field2849[var1.field2898] >> 7; // L: 422
+			double var6 = Math.sin((double)(var1.field2911 & 511) * 0.01227184630308513D); // L: 423
+			var2 += (int)((double)var4 * var6); // L: 424
 		}
 
-		var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)PcmPlayer.field428 + 0.5D); // L: 417
-		return var4 < 1 ? 1 : var4; // L: 418
+		var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)class341.field3921 + 0.5D); // L: 426
+		return var4 < 1 ? 1 : var4; // L: 427
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;I)I",
-		garbageValue = "-2121980978"
+		descriptor = "(Lib;I)I",
+		garbageValue = "-1286368221"
 	)
-	int method4434(MusicPatchNode var1) {
-		MusicPatchNode2 var2 = var1.field2894; // L: 422
-		int var3 = this.field2854[var1.field2905] * this.field2835[var1.field2905] + 4096 >> 13; // L: 423
-		var3 = var3 * var3 + 16384 >> 15; // L: 424
-		var3 = var3 * var1.field2897 + 16384 >> 15; // L: 425
-		var3 = var3 * this.field2834 + 128 >> 8; // L: 426
-		if (var2.field2815 > 0) { // L: 427
-			var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2815 * (double)var1.field2902 * 1.953125E-5D) + 0.5D); // L: 428
+	int method4581(MusicPatchNode var1) {
+		MusicPatchNode2 var2 = var1.field2904; // L: 431
+		int var3 = this.field2842[var1.field2898] * this.field2861[var1.field2898] + 4096 >> 13; // L: 432
+		var3 = var3 * var3 + 16384 >> 15; // L: 433
+		var3 = var3 * var1.field2900 + 16384 >> 15; // L: 434
+		var3 = var3 * this.field2840 + 128 >> 8; // L: 435
+		if (var2.field2823 > 0) { // L: 436
+			var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2823 * 1.953125E-5D * (double)var1.field2894) + 0.5D); // L: 437
 		}
 
 		int var4;
 		int var5;
 		int var6;
 		int var7;
-		if (var2.field2825 != null) { // L: 430
-			var4 = var1.field2903; // L: 431
-			var5 = var2.field2825[var1.field2911 + 1]; // L: 432
-			if (var1.field2911 < var2.field2825.length - 2) { // L: 433
-				var6 = (var2.field2825[var1.field2911] & 255) << 8; // L: 434
-				var7 = (var2.field2825[var1.field2911 + 2] & 255) << 8; // L: 435
-				var5 += (var4 - var6) * (var2.field2825[var1.field2911 + 3] - var5) / (var7 - var6); // L: 436
+		if (var2.field2821 != null) { // L: 439
+			var4 = var1.field2906; // L: 440
+			var5 = var2.field2821[var1.field2905 + 1]; // L: 441
+			if (var1.field2905 < var2.field2821.length - 2) { // L: 442
+				var6 = (var2.field2821[var1.field2905] & 255) << 8; // L: 443
+				var7 = (var2.field2821[var1.field2905 + 2] & 255) << 8; // L: 444
+				var5 += (var2.field2821[var1.field2905 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 445
 			}
 
-			var3 = var5 * var3 + 32 >> 6; // L: 438
+			var3 = var5 * var3 + 32 >> 6; // L: 447
 		}
 
-		if (var1.field2895 > 0 && var2.field2816 != null) { // L: 440
-			var4 = var1.field2895; // L: 441
-			var5 = var2.field2816[var1.field2906 + 1]; // L: 442
-			if (var1.field2906 < var2.field2816.length - 2) { // L: 443
-				var6 = (var2.field2816[var1.field2906] & 255) << 8; // L: 444
-				var7 = (var2.field2816[var1.field2906 + 2] & 255) << 8; // L: 445
-				var5 += (var2.field2816[var1.field2906 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 446
+		if (var1.field2903 > 0 && var2.field2828 != null) { // L: 449
+			var4 = var1.field2903; // L: 450
+			var5 = var2.field2828[var1.field2909 + 1]; // L: 451
+			if (var1.field2909 < var2.field2828.length - 2) { // L: 452
+				var6 = (var2.field2828[var1.field2909] & 255) << 8; // L: 453
+				var7 = (var2.field2828[var1.field2909 + 2] & 255) << 8; // L: 454
+				var5 += (var4 - var6) * (var2.field2828[var1.field2909 + 3] - var5) / (var7 - var6); // L: 455
 			}
 
-			var3 = var5 * var3 + 32 >> 6; // L: 448
+			var3 = var5 * var3 + 32 >> 6; // L: 457
 		}
 
-		return var3; // L: 450
+		return var3; // L: 459
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;I)I",
-		garbageValue = "-1483701319"
+		descriptor = "(Lib;I)I",
+		garbageValue = "2045479165"
 	)
-	int method4435(MusicPatchNode var1) {
-		int var2 = this.field2837[var1.field2905]; // L: 454
-		return var2 < 8192 ? var2 * var1.field2898 + 32 >> 6 : 16384 - ((128 - var1.field2898) * (16384 - var2) + 32 >> 6); // L: 455 456
+	int method4650(MusicPatchNode var1) {
+		int var2 = this.field2846[var1.field2898]; // L: 463
+		return var2 < 8192 ? var2 * var1.field2902 + 32 >> 6 : 16384 - ((128 - var1.field2902) * (16384 - var2) + 32 >> 6); // L: 464 465
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "981767255"
+		descriptor = "(B)V",
+		garbageValue = "-13"
 	)
-	void method4441() {
-		int var1 = this.track; // L: 513
-		int var2 = this.trackLength; // L: 514
+	void method4588() {
+		int var1 = this.track; // L: 522
+		int var2 = this.trackLength; // L: 523
 
 		long var3;
-		for (var3 = this.field2859; var2 == this.trackLength; var3 = this.midiFile.method4552(var2)) { // L: 515 516 538
-			while (var2 == this.midiFile.trackLengths[var1]) { // L: 517
-				this.midiFile.gotoTrack(var1); // L: 518
-				int var5 = this.midiFile.readMessage(var1); // L: 519
-				if (var5 == 1) { // L: 520
-					this.midiFile.setTrackDone(); // L: 521
-					this.midiFile.markTrackPosition(var1); // L: 522
-					if (this.midiFile.isDone()) { // L: 523
-						if (!this.field2855 || var2 == 0) { // L: 524
-							this.method4429(); // L: 528
-							this.midiFile.clear(); // L: 529
-							return; // L: 530
+		for (var3 = this.field2864; var2 == this.trackLength; var3 = this.midiFile.method4710(var2)) { // L: 524 525 547
+			while (var2 == this.midiFile.trackLengths[var1]) { // L: 526
+				this.midiFile.gotoTrack(var1); // L: 527
+				int var5 = this.midiFile.readMessage(var1); // L: 528
+				if (var5 == 1) { // L: 529
+					this.midiFile.setTrackDone(); // L: 530
+					this.midiFile.markTrackPosition(var1); // L: 531
+					if (this.midiFile.isDone()) { // L: 532
+						if (!this.field2839 || var2 == 0) { // L: 533
+							this.method4575(); // L: 537
+							this.midiFile.clear(); // L: 538
+							return; // L: 539
 						}
 
-						this.midiFile.reset(var3); // L: 525
+						this.midiFile.reset(var3); // L: 534
 					}
 					break;
 				}
 
-				if ((var5 & 128) != 0) { // L: 532
-					this.method4452(var5);
+				if ((var5 & 128) != 0) { // L: 541
+					this.method4578(var5);
 				}
 
-				this.midiFile.readTrackLength(var1); // L: 533
-				this.midiFile.markTrackPosition(var1); // L: 534
+				this.midiFile.readTrackLength(var1); // L: 542
+				this.midiFile.markTrackPosition(var1); // L: 543
 			}
 
-			var1 = this.midiFile.getPrioritizedTrack(); // L: 536
-			var2 = this.midiFile.trackLengths[var1]; // L: 537
+			var1 = this.midiFile.getPrioritizedTrack(); // L: 545
+			var2 = this.midiFile.trackLengths[var1]; // L: 546
 		}
 
-		this.track = var1; // L: 540
-		this.trackLength = var2; // L: 541
-		this.field2859 = var3; // L: 542
-	} // L: 543
+		this.track = var1; // L: 549
+		this.trackLength = var2; // L: 550
+		this.field2864 = var3; // L: 551
+	} // L: 552
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;B)Z",
-		garbageValue = "-21"
+		descriptor = "(Lib;I)Z",
+		garbageValue = "896454021"
 	)
-	boolean method4442(MusicPatchNode var1) {
-		if (var1.stream == null) { // L: 546
-			if (var1.field2895 >= 0) { // L: 547
-				var1.remove(); // L: 548
-				if (var1.field2893 > 0 && var1 == this.field2849[var1.field2905][var1.field2893]) { // L: 549
-					this.field2849[var1.field2905][var1.field2893] = null; // L: 550
+	boolean method4589(MusicPatchNode var1) {
+		if (var1.stream == null) { // L: 555
+			if (var1.field2903 >= 0) { // L: 556
+				var1.remove(); // L: 557
+				if (var1.field2897 > 0 && var1 == this.field2858[var1.field2898][var1.field2897]) { // L: 558
+					this.field2858[var1.field2898][var1.field2897] = null; // L: 559
 				}
 			}
 
-			return true; // L: 553
+			return true; // L: 562
 		} else {
-			return false; // L: 555
+			return false; // L: 564
 		}
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;[IIII)Z",
-		garbageValue = "-1838256621"
+		descriptor = "(Lib;[IIII)Z",
+		garbageValue = "-1780917654"
 	)
-	boolean method4443(MusicPatchNode var1, int[] var2, int var3, int var4) {
-		var1.field2891 = PcmPlayer.field428 / 100; // L: 559
-		if (var1.field2895 < 0 || var1.stream != null && !var1.stream.method848()) { // L: 560
-			int var5 = var1.field2901; // L: 568
-			if (var5 > 0) { // L: 569
-				var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2852[var1.field2905] * 4.921259842519685E-4D) + 0.5D); // L: 570
-				if (var5 < 0) { // L: 571
+	boolean method4590(MusicPatchNode var1, int[] var2, int var3, int var4) {
+		var1.field2913 = class341.field3921 / 100; // L: 568
+		if (var1.field2903 < 0 || var1.stream != null && !var1.stream.method1065()) { // L: 569
+			int var5 = var1.field2914; // L: 577
+			if (var5 > 0) { // L: 578
+				var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2853[var1.field2898] * 4.921259842519685E-4D) + 0.5D); // L: 579
+				if (var5 < 0) { // L: 580
 					var5 = 0;
 				}
 
-				var1.field2901 = var5; // L: 572
+				var1.field2914 = var5; // L: 581
 			}
 
-			var1.stream.method959(this.method4415(var1)); // L: 574
-			MusicPatchNode2 var6 = var1.field2894; // L: 575
-			boolean var7 = false; // L: 576
-			++var1.field2907; // L: 577
-			var1.field2908 += var6.field2817; // L: 578
-			double var8 = 5.086263020833333E-6D * (double)((var1.field2896 - 60 << 8) + (var1.field2901 * var1.field2899 >> 12)); // L: 579
-			if (var6.field2815 > 0) { // L: 580
-				if (var6.field2820 > 0) { // L: 581
-					var1.field2902 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2820) + 0.5D);
+			var1.stream.method1052(this.method4632(var1)); // L: 583
+			MusicPatchNode2 var6 = var1.field2904; // L: 584
+			boolean var7 = false; // L: 585
+			++var1.field2908; // L: 586
+			var1.field2911 += var6.field2827; // L: 587
+			double var8 = (double)((var1.field2910 - 60 << 8) + (var1.field2914 * var1.field2901 >> 12)) * 5.086263020833333E-6D; // L: 588
+			if (var6.field2823 > 0) { // L: 589
+				if (var6.field2822 > 0) { // L: 590
+					var1.field2894 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2822) + 0.5D);
 				} else {
-					var1.field2902 += 128; // L: 582
+					var1.field2894 += 128; // L: 591
 				}
 			}
 
-			if (var6.field2825 != null) { // L: 584
-				if (var6.field2821 > 0) { // L: 585
-					var1.field2903 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2821 * var8) + 0.5D);
+			if (var6.field2821 != null) { // L: 593
+				if (var6.field2824 > 0) { // L: 594
+					var1.field2906 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2824 * var8) + 0.5D);
 				} else {
-					var1.field2903 += 128; // L: 586
+					var1.field2906 += 128; // L: 595
 				}
 
-				while (var1.field2911 < var6.field2825.length - 2 && var1.field2903 > (var6.field2825[var1.field2911 + 2] & 255) << 8) { // L: 587
-					var1.field2911 += 2;
+				while (var1.field2905 < var6.field2821.length - 2 && var1.field2906 > (var6.field2821[var1.field2905 + 2] & 255) << 8) { // L: 596
+					var1.field2905 += 2;
 				}
 
-				if (var6.field2825.length - 2 == var1.field2911 && var6.field2825[var1.field2911 + 1] == 0) { // L: 588
+				if (var6.field2821.length - 2 == var1.field2905 && var6.field2821[var1.field2905 + 1] == 0) { // L: 597
 					var7 = true;
 				}
 			}
 
-			if (var1.field2895 >= 0 && var6.field2816 != null && (this.field2846[var1.field2905] & 1) == 0 && (var1.field2893 < 0 || var1 != this.field2849[var1.field2905][var1.field2893])) { // L: 590 591
-				if (var6.field2819 > 0) { // L: 592
-					var1.field2895 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2819 * var8) + 0.5D);
+			if (var1.field2903 >= 0 && var6.field2828 != null && (this.field2851[var1.field2898] & 1) == 0 && (var1.field2897 < 0 || var1 != this.field2858[var1.field2898][var1.field2897])) { // L: 599 600
+				if (var6.field2825 > 0) { // L: 601
+					var1.field2903 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2825 * var8) + 0.5D);
 				} else {
-					var1.field2895 += 128; // L: 593
+					var1.field2903 += 128; // L: 602
 				}
 
-				while (var1.field2906 < var6.field2816.length - 2 && var1.field2895 > (var6.field2816[var1.field2906 + 2] & 255) << 8) { // L: 594
-					var1.field2906 += 2;
+				while (var1.field2909 < var6.field2828.length - 2 && var1.field2903 > (var6.field2828[var1.field2909 + 2] & 255) << 8) { // L: 603
+					var1.field2909 += 2;
 				}
 
-				if (var6.field2816.length - 2 == var1.field2906) { // L: 595
+				if (var6.field2828.length - 2 == var1.field2909) { // L: 604
 					var7 = true;
 				}
 			}
 
-			if (var7) { // L: 598
-				var1.stream.method855(var1.field2891); // L: 599
-				if (var2 != null) { // L: 600
+			if (var7) { // L: 607
+				var1.stream.method955(var1.field2913); // L: 608
+				if (var2 != null) { // L: 609
 					var1.stream.fill(var2, var3, var4);
 				} else {
-					var1.stream.skip(var4); // L: 601
+					var1.stream.skip(var4); // L: 610
 				}
 
-				if (var1.stream.method859()) { // L: 602
+				if (var1.stream.method959()) { // L: 611
 					this.patchStream.mixer.addSubStream(var1.stream);
 				}
 
-				var1.method4634(); // L: 603
-				if (var1.field2895 >= 0) { // L: 604
-					var1.remove(); // L: 605
-					if (var1.field2893 > 0 && var1 == this.field2849[var1.field2905][var1.field2893]) { // L: 606
-						this.field2849[var1.field2905][var1.field2893] = null; // L: 607
+				var1.method4772(); // L: 612
+				if (var1.field2903 >= 0) { // L: 613
+					var1.remove(); // L: 614
+					if (var1.field2897 > 0 && var1 == this.field2858[var1.field2898][var1.field2897]) { // L: 615
+						this.field2858[var1.field2898][var1.field2897] = null; // L: 616
 					}
 				}
 
-				return true; // L: 610
+				return true; // L: 619
 			} else {
-				var1.stream.method983(var1.field2891, this.method4434(var1), this.method4435(var1)); // L: 612
-				return false; // L: 613
+				var1.stream.method954(var1.field2913, this.method4581(var1), this.method4650(var1)); // L: 621
+				return false; // L: 622
 			}
 		} else {
-			var1.method4634(); // L: 561
-			var1.remove(); // L: 562
-			if (var1.field2893 > 0 && var1 == this.field2849[var1.field2905][var1.field2893]) { // L: 563
-				this.field2849[var1.field2905][var1.field2893] = null; // L: 564
+			var1.method4772(); // L: 570
+			var1.remove(); // L: 571
+			if (var1.field2897 > 0 && var1 == this.field2858[var1.field2898][var1.field2897]) { // L: 572
+				this.field2858[var1.field2898][var1.field2897] = null; // L: 573
 			}
 
-			return true; // L: 566
+			return true; // L: 575
 		}
 	}
-
-	@ObfuscatedName("gp")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-792504046"
-	)
-	static boolean method4445() {
-		return (Client.drawPlayerNames & 8) != 0; // L: 4430
-	}
 }
diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java
index a38bf656e4..c5d348f993 100644
--- a/runescape-client/src/main/java/MilliClock.java
+++ b/runescape-client/src/main/java/MilliClock.java
@@ -1,605 +1,152 @@
+import java.awt.Image;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ek")
+@ObfuscatedName("ec")
 @Implements("MilliClock")
 public class MilliClock extends Clock {
-	@ObfuscatedName("b")
-	@Export("SpriteBuffer_spritePalette")
-	public static int[] SpriteBuffer_spritePalette;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Ldf;"
-	)
-	@Export("World_request")
-	static UrlRequest World_request;
-	@ObfuscatedName("v")
-	long[] field1519;
-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1403302325
+		intValue = 1292974499
 	)
-	int field1515;
+	static int field1523;
+	@ObfuscatedName("ab")
+	static Image field1527;
 	@ObfuscatedName("f")
+	long[] field1518;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 892183401
+		intValue = -1121640641
 	)
-	int field1517;
+	int field1519;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1291175111
+	)
+	int field1521;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = -3130930086544390357L
+		longValue = 6157496358684260999L
 	)
-	long field1516;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 543039723
-	)
-	int field1518;
+	long field1520;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 652562423
+		intValue = -15673867
 	)
-	int field1514;
+	int field1522;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -668116803
+	)
+	int field1525;
 
 	public MilliClock() {
-		this.field1519 = new long[10]; // L: 7
-		this.field1515 = 256; // L: 15
-		this.field1517 = 1; // L: 16
-		this.field1518 = 0; // L: 17
-		this.field1516 = ObjectComposition.currentTimeMillis(); // L: 18
+		this.field1518 = new long[10]; // L: 7
+		this.field1519 = 256; // L: 15
+		this.field1521 = 1; // L: 16
+		this.field1522 = 0; // L: 17
+		this.field1520 = ClientPacket.currentTimeMillis(); // L: 18
 
 		for (int var1 = 0; var1 < 10; ++var1) { // L: 19
-			this.field1519[var1] = this.field1516; // L: 20
+			this.field1518[var1] = this.field1520; // L: 20
 		}
 
 	} // L: 22
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1887937791"
+		descriptor = "(B)V",
+		garbageValue = "-111"
 	)
 	@Export("mark")
 	public void mark() {
 		for (int var1 = 0; var1 < 10; ++var1) { // L: 25
-			this.field1519[var1] = 0L; // L: 26
+			this.field1518[var1] = 0L; // L: 26
 		}
 
 	} // L: 28
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-1841090229"
+		descriptor = "(IIB)I",
+		garbageValue = "-104"
 	)
 	@Export("wait")
 	public int wait(int var1, int var2) {
-		int var3 = this.field1515; // L: 31
-		int var4 = this.field1517; // L: 32
-		this.field1515 = 300; // L: 33
-		this.field1517 = 1; // L: 34
-		this.field1516 = ObjectComposition.currentTimeMillis(); // L: 35
-		if (0L == this.field1519[this.field1514]) { // L: 36
-			this.field1515 = var3; // L: 37
-			this.field1517 = var4; // L: 38
-		} else if (this.field1516 > this.field1519[this.field1514]) { // L: 40
-			this.field1515 = (int)((long)(var1 * 2560) / (this.field1516 - this.field1519[this.field1514]));
+		int var3 = this.field1519; // L: 31
+		int var4 = this.field1521; // L: 32
+		this.field1519 = 300; // L: 33
+		this.field1521 = 1; // L: 34
+		this.field1520 = ClientPacket.currentTimeMillis(); // L: 35
+		if (this.field1518[this.field1525] == 0L) { // L: 36
+			this.field1519 = var3; // L: 37
+			this.field1521 = var4; // L: 38
+		} else if (this.field1520 > this.field1518[this.field1525]) { // L: 40
+			this.field1519 = (int)((long)(var1 * 2560) / (this.field1520 - this.field1518[this.field1525]));
 		}
 
-		if (this.field1515 < 25) { // L: 41
-			this.field1515 = 25;
+		if (this.field1519 < 25) { // L: 41
+			this.field1519 = 25;
 		}
 
-		if (this.field1515 > 256) { // L: 42
-			this.field1515 = 256; // L: 43
-			this.field1517 = (int)((long)var1 - (this.field1516 - this.field1519[this.field1514]) / 10L); // L: 44
+		if (this.field1519 > 256) { // L: 42
+			this.field1519 = 256; // L: 43
+			this.field1521 = (int)((long)var1 - (this.field1520 - this.field1518[this.field1525]) / 10L); // L: 44
 		}
 
-		if (this.field1517 > var1) { // L: 46
-			this.field1517 = var1;
+		if (this.field1521 > var1) { // L: 46
+			this.field1521 = var1;
 		}
 
-		this.field1519[this.field1514] = this.field1516; // L: 47
-		this.field1514 = (this.field1514 + 1) % 10; // L: 48
-		if (this.field1517 > 1) { // L: 49
-			for (int var5 = 0; var5 < 10; ++var5) { // L: 50
-				if (0L != this.field1519[var5]) { // L: 51
-					this.field1519[var5] += (long)this.field1517;
+		this.field1518[this.field1525] = this.field1520; // L: 47
+		this.field1525 = (this.field1525 + 1) % 10; // L: 48
+		int var5;
+		if (this.field1521 > 1) { // L: 49
+			for (var5 = 0; var5 < 10; ++var5) { // L: 50
+				if (this.field1518[var5] != 0L) { // L: 51
+					this.field1518[var5] += (long)this.field1521;
 				}
 			}
 		}
 
-		if (this.field1517 < var2) { // L: 54
-			this.field1517 = var2;
+		if (this.field1521 < var2) { // L: 54
+			this.field1521 = var2;
 		}
 
-		long var10 = (long)this.field1517; // L: 55
-		if (var10 > 0L) { // L: 57
-			if (0L == var10 % 10L) { // L: 58
-				long var7 = var10 - 1L; // L: 59
+		class18.method272((long)this.field1521); // L: 55
 
-				try {
-					Thread.sleep(var7); // L: 62
-				} catch (InterruptedException var16) { // L: 64
-				}
-
-				try {
-					Thread.sleep(1L); // L: 68
-				} catch (InterruptedException var15) { // L: 70
-				}
-			} else {
-				try {
-					Thread.sleep(var10); // L: 75
-				} catch (InterruptedException var14) { // L: 77
-				}
-			}
+		for (var5 = 0; this.field1522 < 256; this.field1522 += this.field1519) { // L: 56 57 59
+			++var5; // L: 58
 		}
 
-		int var13;
-		for (var13 = 0; this.field1518 < 256; this.field1518 += this.field1515) { // L: 80 81 83
-			++var13; // L: 82
-		}
-
-		this.field1518 &= 255; // L: 85
-		return var13; // L: 86
+		this.field1522 &= 255; // L: 61
+		return var5; // L: 62
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "179304235"
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "70"
 	)
-	public static void method2587() {
-		WorldMapDecoration.SpriteBuffer_xOffsets = null; // L: 240
-		Calendar.SpriteBuffer_yOffsets = null; // L: 241
-		class396.SpriteBuffer_spriteWidths = null; // L: 242
-		class302.SpriteBuffer_spriteHeights = null; // L: 243
-		SpriteBuffer_spritePalette = null; // L: 244
-		class396.SpriteBuffer_pixels = null; // L: 245
-	} // L: 246
-
-	@ObfuscatedName("fs")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "47"
-	)
-	@Export("load")
-	static void load() {
-		int var31;
-		if (Client.titleLoadingStage == 0) { // L: 1523
-			AbstractSocket.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1524
-
-			for (var31 = 0; var31 < 4; ++var31) { // L: 1525
-				Client.collisionMaps[var31] = new CollisionMap(104, 104);
-			}
-
-			GameEngine.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1526
-			Login.Login_loadingText = "Starting game engine..."; // L: 1527
-			Login.Login_loadingPercent = 5; // L: 1528
-			Client.titleLoadingStage = 20; // L: 1529
-		} else if (Client.titleLoadingStage == 20) { // L: 1532
-			Login.Login_loadingText = "Prepared visibility map"; // L: 1533
-			Login.Login_loadingPercent = 10; // L: 1534
-			Client.titleLoadingStage = 30; // L: 1535
-		} else if (Client.titleLoadingStage == 30) { // L: 1538
-			NetCache.archive0 = FontName.newArchive(0, false, true, true); // L: 1539
-			class27.archive1 = FontName.newArchive(1, false, true, true); // L: 1540
-			class8.archive2 = FontName.newArchive(2, true, false, true); // L: 1541
-			ClanChannel.archive3 = FontName.newArchive(3, false, true, true); // L: 1542
-			class32.archive4 = FontName.newArchive(4, false, true, true); // L: 1543
-			class247.archive5 = FontName.newArchive(5, true, true, true); // L: 1544
-			UrlRequest.archive6 = FontName.newArchive(6, true, true, true); // L: 1545
-			Decimator.archive7 = FontName.newArchive(7, false, true, true); // L: 1546
-			GrandExchangeOfferAgeComparator.archive8 = FontName.newArchive(8, false, true, true); // L: 1547
-			CollisionMap.archive9 = FontName.newArchive(9, false, true, true); // L: 1548
-			SoundCache.archive10 = FontName.newArchive(10, false, true, true); // L: 1549
-			WorldMapManager.archive11 = FontName.newArchive(11, false, true, true); // L: 1550
-			UserComparator5.archive12 = FontName.newArchive(12, false, true, true); // L: 1551
-			Decimator.archive13 = FontName.newArchive(13, true, false, true); // L: 1552
-			class125.archive14 = FontName.newArchive(14, false, true, true); // L: 1553
-			ClanMate.archive15 = FontName.newArchive(15, false, true, true); // L: 1554
-			class8.archive17 = FontName.newArchive(17, true, true, true); // L: 1555
-			FontName.archive18 = FontName.newArchive(18, false, true, true); // L: 1556
-			class179.archive19 = FontName.newArchive(19, false, true, true); // L: 1557
-			class5.archive20 = FontName.newArchive(20, false, true, true); // L: 1558
-			Login.Login_loadingText = "Connecting to update server"; // L: 1559
-			Login.Login_loadingPercent = 20; // L: 1560
-			Client.titleLoadingStage = 40; // L: 1561
-		} else if (Client.titleLoadingStage != 40) { // L: 1564
-			if (Client.titleLoadingStage == 45) { // L: 1611
-				boolean var34 = !Client.isLowDetail; // L: 1612
-				PcmPlayer.field428 = 22050; // L: 1615
-				PcmPlayer.PcmPlayer_stereo = var34; // L: 1616
-				PcmPlayer.field418 = 2; // L: 1617
-				MidiPcmStream var32 = new MidiPcmStream(); // L: 1619
-				var32.method4502(9, 128); // L: 1620
-				DesktopPlatformInfoProvider.pcmPlayer0 = HorizontalAlignment.method2762(GameEngine.taskHandler, 0, 22050); // L: 1621
-				DesktopPlatformInfoProvider.pcmPlayer0.setStream(var32); // L: 1622
-				WorldMapID.method3636(ClanMate.archive15, class125.archive14, class32.archive4, var32); // L: 1623
-				MouseRecorder.pcmPlayer1 = HorizontalAlignment.method2762(GameEngine.taskHandler, 1, 2048); // L: 1624
-				class308.pcmStreamMixer = new PcmStreamMixer(); // L: 1625
-				MouseRecorder.pcmPlayer1.setStream(class308.pcmStreamMixer); // L: 1626
-				TileItem.decimator = new Decimator(22050, PcmPlayer.field428); // L: 1627
-				Login.Login_loadingText = "Prepared sound engine"; // L: 1628
-				Login.Login_loadingPercent = 35; // L: 1629
-				Client.titleLoadingStage = 50; // L: 1630
-				World.WorldMapElement_fonts = new Fonts(GrandExchangeOfferAgeComparator.archive8, Decimator.archive13); // L: 1631
-			} else {
-				int var1;
-				if (Client.titleLoadingStage == 50) { // L: 1634
-					FontName[] var29 = new FontName[]{FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_bold12}; // L: 1637
-					var1 = var29.length; // L: 1639
-					Fonts var33 = World.WorldMapElement_fonts; // L: 1640
-					FontName[] var27 = new FontName[]{FontName.FontName_plain12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana13, FontName.FontName_verdana11, FontName.FontName_bold12}; // L: 1643
-					Client.fontsMap = var33.createMap(var27); // L: 1645
-					if (Client.fontsMap.size() < var1) { // L: 1646
-						Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; // L: 1647
-						Login.Login_loadingPercent = 40; // L: 1648
-					} else {
-						Actor.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1651
-						UserComparator3.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1652
-						Widget.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1653
-						class10.platformInfo = Client.platformInfoProvider.get(); // L: 1654
-						Login.Login_loadingText = "Loaded fonts"; // L: 1655
-						Login.Login_loadingPercent = 40; // L: 1656
-						Client.titleLoadingStage = 60; // L: 1657
-					}
-				} else {
-					int var3;
-					int var4;
-					Archive var24;
-					Archive var25;
-					if (Client.titleLoadingStage == 60) { // L: 1660
-						var24 = SoundCache.archive10; // L: 1662
-						var25 = GrandExchangeOfferAgeComparator.archive8; // L: 1663
-						var3 = 0; // L: 1665
-						if (var24.tryLoadFileByNames("title.jpg", "")) { // L: 1666
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("logo", "")) { // L: 1667
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1668
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1669
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("titlebox", "")) { // L: 1670
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("titlebutton", "")) { // L: 1671
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("runes", "")) { // L: 1672
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("title_mute", "")) { // L: 1673
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1674
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1675
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1676
-							++var3;
-						}
-
-						if (var25.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1677
-							++var3;
-						}
-
-						var25.tryLoadFileByNames("sl_back", ""); // L: 1678
-						var25.tryLoadFileByNames("sl_flags", ""); // L: 1679
-						var25.tryLoadFileByNames("sl_arrows", ""); // L: 1680
-						var25.tryLoadFileByNames("sl_stars", ""); // L: 1681
-						var25.tryLoadFileByNames("sl_button", ""); // L: 1682
-						var4 = AbstractSocket.method5901(); // L: 1686
-						if (var3 < var4) { // L: 1687
-							Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var4 + "%"; // L: 1688
-							Login.Login_loadingPercent = 50; // L: 1689
-						} else {
-							Login.Login_loadingText = "Loaded title screen"; // L: 1692
-							Login.Login_loadingPercent = 50; // L: 1693
-							class12.updateGameState(5); // L: 1694
-							Client.titleLoadingStage = 70; // L: 1695
-						}
-					} else if (Client.titleLoadingStage == 70) { // L: 1698
-						if (!class8.archive2.isFullyLoaded()) { // L: 1699
-							Login.Login_loadingText = "Loading config - " + class8.archive2.loadPercent() + "%"; // L: 1700
-							Login.Login_loadingPercent = 60; // L: 1701
-						} else {
-							Archive var28 = class8.archive2; // L: 1704
-							class142.FloorOverlayDefinition_archive = var28; // L: 1706
-							class27.method277(class8.archive2); // L: 1708
-							ChatChannel.method2012(class8.archive2, Decimator.archive7); // L: 1709
-							var24 = class8.archive2; // L: 1710
-							var25 = Decimator.archive7; // L: 1711
-							boolean var30 = Client.isLowDetail; // L: 1712
-							ObjectComposition.ObjectDefinition_archive = var24; // L: 1714
-							class310.ObjectDefinition_modelsArchive = var25; // L: 1715
-							ObjectComposition.ObjectDefinition_isLowDetail = var30; // L: 1716
-							Archive var26 = class8.archive2; // L: 1718
-							Archive var5 = Decimator.archive7; // L: 1719
-							NPCComposition.NpcDefinition_archive = var26; // L: 1721
-							NPCComposition.NpcDefinition_modelArchive = var5; // L: 1722
-							class13.method180(class8.archive2); // L: 1724
-							Archive var6 = class8.archive2; // L: 1725
-							Archive var7 = Decimator.archive7; // L: 1726
-							boolean var8 = Client.isMembersWorld; // L: 1727
-							Font var9 = Actor.fontPlain11; // L: 1728
-							class341.ItemDefinition_archive = var6; // L: 1730
-							class311.ItemDefinition_modelArchive = var7; // L: 1731
-							ItemContainer.ItemDefinition_inMembersWorld = var8; // L: 1732
-							ItemComposition.ItemDefinition_fileCount = class341.ItemDefinition_archive.getGroupFileCount(10); // L: 1733
-							class288.ItemDefinition_fontPlain11 = var9; // L: 1734
-							Archive var10 = class8.archive2; // L: 1736
-							Archive var11 = NetCache.archive0; // L: 1737
-							Archive var12 = class27.archive1; // L: 1738
-							SequenceDefinition.SequenceDefinition_archive = var10; // L: 1740
-							SequenceDefinition.SequenceDefinition_animationsArchive = var11; // L: 1741
-							SequenceDefinition.SequenceDefinition_skeletonsArchive = var12; // L: 1742
-							class1.method13(class8.archive2, Decimator.archive7); // L: 1744
-							UserComparator10.method2471(class8.archive2); // L: 1745
-							class280.method5070(class8.archive2); // L: 1746
-							Archive var13 = ClanChannel.archive3; // L: 1747
-							Archive var14 = Decimator.archive7; // L: 1748
-							Archive var15 = GrandExchangeOfferAgeComparator.archive8; // L: 1749
-							Archive var16 = Decimator.archive13; // L: 1750
-							HealthBarUpdate.Widget_archive = var13; // L: 1752
-							SpriteMask.Widget_modelsArchive = var14; // L: 1753
-							class245.Widget_spritesArchive = var15; // L: 1754
-							VertexNormal.Widget_fontsArchive = var16; // L: 1755
-							Widget.Widget_interfaceComponents = new Widget[HealthBarUpdate.Widget_archive.getGroupCount()][]; // L: 1756
-							Widget.Widget_loadedInterfaces = new boolean[HealthBarUpdate.Widget_archive.getGroupCount()]; // L: 1757
-							LoginScreenAnimation.method2210(class8.archive2); // L: 1759
-							GrandExchangeOfferUnitPriceComparator.method5109(class8.archive2); // L: 1760
-							PacketWriter.method2384(class8.archive2); // L: 1761
-							Archive var17 = class8.archive2; // L: 1762
-							ParamComposition.ParamDefinition_archive = var17; // L: 1764
-							GrandExchangeOfferOwnWorldComparator.field634 = new class369(SoundSystem.field461, 54, class378.clientLanguage, class8.archive2); // L: 1766
-							ViewportMouse.HitSplatDefinition_cachedSprites = new class369(SoundSystem.field461, 47, class378.clientLanguage, class8.archive2); // L: 1767
-							GrandExchangeOfferOwnWorldComparator.varcs = new Varcs(); // L: 1768
-							Archive var18 = class8.archive2; // L: 1769
-							Archive var19 = GrandExchangeOfferAgeComparator.archive8; // L: 1770
-							Archive var20 = Decimator.archive13; // L: 1771
-							HitSplatDefinition.HitSplatDefinition_archive = var18; // L: 1773
-							HitSplatDefinition.field1734 = var19; // L: 1774
-							HitSplatDefinition.HitSplatDefinition_fontsArchive = var20; // L: 1775
-							Archive var21 = class8.archive2; // L: 1777
-							Archive var22 = GrandExchangeOfferAgeComparator.archive8; // L: 1778
-							HealthBarDefinition.HealthBarDefinition_archive = var21; // L: 1780
-							HealthBarDefinition.HitSplatDefinition_spritesArchive = var22; // L: 1781
-							UserComparator5.method2449(class8.archive2, GrandExchangeOfferAgeComparator.archive8); // L: 1783
-							Login.Login_loadingText = "Loaded config"; // L: 1784
-							Login.Login_loadingPercent = 60; // L: 1785
-							Client.titleLoadingStage = 80; // L: 1786
-						}
-					} else if (Client.titleLoadingStage == 80) { // L: 1789
-						var31 = 0; // L: 1790
-						if (NPCComposition.compass == null) { // L: 1791
-							NPCComposition.compass = ClientPacket.SpriteBuffer_getSprite(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.compass, 0);
-						} else {
-							++var31; // L: 1792
-						}
-
-						if (Interpreter.redHintArrowSprite == null) { // L: 1793
-							Interpreter.redHintArrowSprite = ClientPacket.SpriteBuffer_getSprite(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3897, 0);
-						} else {
-							++var31; // L: 1794
-						}
-
-						if (class10.mapSceneSprites == null) { // L: 1795
-							class10.mapSceneSprites = VerticalAlignment.method2799(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.mapScenes, 0);
-						} else {
-							++var31; // L: 1796
-						}
-
-						if (class35.headIconPkSprites == null) { // L: 1797
-							class35.headIconPkSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.headIconsPk, 0);
-						} else {
-							++var31; // L: 1798
-						}
-
-						if (TextureProvider.headIconPrayerSprites == null) { // L: 1799
-							TextureProvider.headIconPrayerSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3900, 0);
-						} else {
-							++var31; // L: 1800
-						}
-
-						if (PacketBufferNode.headIconHintSprites == null) { // L: 1801
-							PacketBufferNode.headIconHintSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3901, 0);
-						} else {
-							++var31; // L: 1802
-						}
-
-						if (WorldMapArea.mapMarkerSprites == null) { // L: 1803
-							WorldMapArea.mapMarkerSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3905, 0);
-						} else {
-							++var31; // L: 1804
-						}
-
-						if (ArchiveLoader.crossSprites == null) { // L: 1805
-							ArchiveLoader.crossSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3903, 0);
-						} else {
-							++var31; // L: 1806
-						}
-
-						if (class170.mapDotSprites == null) { // L: 1807
-							class170.mapDotSprites = ItemComposition.method3087(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3904, 0);
-						} else {
-							++var31; // L: 1808
-						}
-
-						if (Player.scrollBarSprites == null) { // L: 1809
-							Player.scrollBarSprites = VerticalAlignment.method2799(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3898, 0);
-						} else {
-							++var31; // L: 1810
-						}
-
-						if (WorldMapDecoration.modIconSprites == null) { // L: 1811
-							WorldMapDecoration.modIconSprites = VerticalAlignment.method2799(GrandExchangeOfferAgeComparator.archive8, TaskHandler.spriteIds.field3906, 0);
-						} else {
-							++var31; // L: 1812
-						}
-
-						if (var31 < 11) { // L: 1813
-							Login.Login_loadingText = "Loading sprites - " + var31 * 100 / 12 + "%"; // L: 1814
-							Login.Login_loadingPercent = 70; // L: 1815
-						} else {
-							AbstractFont.AbstractFont_modIconSprites = WorldMapDecoration.modIconSprites; // L: 1818
-							Interpreter.redHintArrowSprite.normalize(); // L: 1819
-							var1 = (int)(Math.random() * 21.0D) - 10; // L: 1820
-							int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1821
-							var3 = (int)(Math.random() * 21.0D) - 10; // L: 1822
-							var4 = (int)(Math.random() * 41.0D) - 20; // L: 1823
-							class10.mapSceneSprites[0].shiftColors(var1 + var4, var2 + var4, var4 + var3); // L: 1824
-							Login.Login_loadingText = "Loaded sprites"; // L: 1825
-							Login.Login_loadingPercent = 70; // L: 1826
-							Client.titleLoadingStage = 90; // L: 1827
-						}
-					} else if (Client.titleLoadingStage == 90) { // L: 1830
-						if (!CollisionMap.archive9.isFullyLoaded()) { // L: 1831
-							Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1832
-							Login.Login_loadingPercent = 90; // L: 1833
-						} else {
-							World.textureProvider = new TextureProvider(CollisionMap.archive9, GrandExchangeOfferAgeComparator.archive8, 20, ObjectComposition.clientPreferences.field1337, Client.isLowDetail ? 64 : 128); // L: 1836
-							Rasterizer3D.Rasterizer3D_setTextureLoader(World.textureProvider); // L: 1837
-							Rasterizer3D.Rasterizer3D_setBrightness(ObjectComposition.clientPreferences.field1337); // L: 1838
-							Client.titleLoadingStage = 100; // L: 1839
-						}
-					} else if (Client.titleLoadingStage == 100) { // L: 1842
-						var31 = World.textureProvider.getLoadedPercentage(); // L: 1843
-						if (var31 < 100) { // L: 1844
-							Login.Login_loadingText = "Loading textures - " + var31 + "%"; // L: 1845
-							Login.Login_loadingPercent = 90; // L: 1846
-						} else {
-							Login.Login_loadingText = "Loaded textures"; // L: 1849
-							Login.Login_loadingPercent = 90; // L: 1850
-							Client.titleLoadingStage = 110; // L: 1851
-						}
-					} else if (Client.titleLoadingStage == 110) { // L: 1854
-						Skills.mouseRecorder = new MouseRecorder(); // L: 1855
-						GameEngine.taskHandler.newThreadTask(Skills.mouseRecorder, 10); // L: 1856
-						Login.Login_loadingText = "Loaded input handler"; // L: 1857
-						Login.Login_loadingPercent = 92; // L: 1858
-						Client.titleLoadingStage = 120; // L: 1859
-					} else if (Client.titleLoadingStage == 120) { // L: 1862
-						if (!SoundCache.archive10.tryLoadFileByNames("huffman", "")) { // L: 1863
-							Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1864
-							Login.Login_loadingPercent = 94; // L: 1865
-						} else {
-							Huffman var0 = new Huffman(SoundCache.archive10.takeFileByNames("huffman", "")); // L: 1868
-							ClanChannelMember.method88(var0); // L: 1869
-							Login.Login_loadingText = "Loaded wordpack"; // L: 1870
-							Login.Login_loadingPercent = 94; // L: 1871
-							Client.titleLoadingStage = 130; // L: 1872
-						}
-					} else if (Client.titleLoadingStage == 130) { // L: 1875
-						if (!ClanChannel.archive3.isFullyLoaded()) { // L: 1876
-							Login.Login_loadingText = "Loading interfaces - " + ClanChannel.archive3.loadPercent() * 4 / 5 + "%"; // L: 1877
-							Login.Login_loadingPercent = 96; // L: 1878
-						} else if (!UserComparator5.archive12.isFullyLoaded()) { // L: 1881
-							Login.Login_loadingText = "Loading interfaces - " + (80 + UserComparator5.archive12.loadPercent() / 6) + "%"; // L: 1882
-							Login.Login_loadingPercent = 96; // L: 1883
-						} else if (!Decimator.archive13.isFullyLoaded()) { // L: 1886
-							Login.Login_loadingText = "Loading interfaces - " + (96 + Decimator.archive13.loadPercent() / 50) + "%"; // L: 1887
-							Login.Login_loadingPercent = 96; // L: 1888
-						} else {
-							Login.Login_loadingText = "Loaded interfaces"; // L: 1891
-							Login.Login_loadingPercent = 98; // L: 1892
-							Client.titleLoadingStage = 140; // L: 1893
-						}
-					} else if (Client.titleLoadingStage == 140) { // L: 1896
-						Login.Login_loadingPercent = 100; // L: 1897
-						if (!class179.archive19.tryLoadGroupByName(WorldMapCacheName.field2137.name)) { // L: 1898
-							Login.Login_loadingText = "Loading world map - " + class179.archive19.groupLoadPercentByName(WorldMapCacheName.field2137.name) / 10 + "%"; // L: 1899
-						} else {
-							if (class243.worldMap == null) { // L: 1902
-								class243.worldMap = new WorldMap(); // L: 1903
-								class243.worldMap.init(class179.archive19, FontName.archive18, class5.archive20, Widget.fontBold12, Client.fontsMap, class10.mapSceneSprites); // L: 1904
-							}
-
-							Login.Login_loadingText = "Loaded world map"; // L: 1906
-							Client.titleLoadingStage = 150; // L: 1907
-						}
-					} else if (Client.titleLoadingStage == 150) { // L: 1910
-						class12.updateGameState(10); // L: 1911
-					}
-				}
-			}
+	static int method2685(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == 3500) { // L: 2067
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2068
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class18.method271(var3) ? 1 : 0; // L: 2069
+			return 1; // L: 2070
+		} else if (var0 == 3501) { // L: 2072
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2073
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ClanChannelMember.method108(var3) ? 1 : 0; // L: 2074
+			return 1; // L: 2075
+		} else if (var0 == 3502) { // L: 2077
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2078
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = KitDefinition.method2778(var3) ? 1 : 0; // L: 2079
+			return 1; // L: 2080
 		} else {
-			byte var23 = 0; // L: 1565
-			var31 = var23 + NetCache.archive0.percentage() * 4 / 100; // L: 1566
-			var31 += class27.archive1.percentage() * 4 / 100; // L: 1567
-			var31 += class8.archive2.percentage() * 2 / 100; // L: 1568
-			var31 += ClanChannel.archive3.percentage() * 2 / 100; // L: 1569
-			var31 += class32.archive4.percentage() * 6 / 100; // L: 1570
-			var31 += class247.archive5.percentage() * 4 / 100; // L: 1571
-			var31 += UrlRequest.archive6.percentage() * 2 / 100; // L: 1572
-			var31 += Decimator.archive7.percentage() * 56 / 100; // L: 1573
-			var31 += GrandExchangeOfferAgeComparator.archive8.percentage() * 2 / 100; // L: 1574
-			var31 += CollisionMap.archive9.percentage() * 2 / 100; // L: 1575
-			var31 += SoundCache.archive10.percentage() * 2 / 100; // L: 1576
-			var31 += WorldMapManager.archive11.percentage() * 2 / 100; // L: 1577
-			var31 += UserComparator5.archive12.percentage() * 2 / 100; // L: 1578
-			var31 += Decimator.archive13.percentage() * 2 / 100; // L: 1579
-			var31 += class125.archive14.percentage() * 2 / 100; // L: 1580
-			var31 += ClanMate.archive15.percentage() * 2 / 100; // L: 1581
-			var31 += class179.archive19.percentage() / 100; // L: 1582
-			var31 += FontName.archive18.percentage() / 100; // L: 1583
-			var31 += class5.archive20.percentage() / 100; // L: 1584
-			var31 += class8.archive17.method4869() && class8.archive17.isFullyLoaded() ? 1 : 0; // L: 1585
-			if (var31 != 100) { // L: 1586
-				if (var31 != 0) { // L: 1587
-					Login.Login_loadingText = "Checking for updates - " + var31 + "%";
-				}
-
-				Login.Login_loadingPercent = 30; // L: 1588
-			} else {
-				class13.method175(NetCache.archive0, "Animations"); // L: 1591
-				class13.method175(class27.archive1, "Skeletons"); // L: 1592
-				class13.method175(class32.archive4, "Sound FX"); // L: 1593
-				class13.method175(class247.archive5, "Maps"); // L: 1594
-				class13.method175(UrlRequest.archive6, "Music Tracks"); // L: 1595
-				class13.method175(Decimator.archive7, "Models"); // L: 1596
-				class13.method175(GrandExchangeOfferAgeComparator.archive8, "Sprites"); // L: 1597
-				class13.method175(WorldMapManager.archive11, "Music Jingles"); // L: 1598
-				class13.method175(class125.archive14, "Music Samples"); // L: 1599
-				class13.method175(ClanMate.archive15, "Music Patches"); // L: 1600
-				class13.method175(class179.archive19, "World Map"); // L: 1601
-				class13.method175(FontName.archive18, "World Map Geography"); // L: 1602
-				class13.method175(class5.archive20, "World Map Ground"); // L: 1603
-				TaskHandler.spriteIds = new GraphicsDefaults(); // L: 1604
-				TaskHandler.spriteIds.decode(class8.archive17); // L: 1605
-				Login.Login_loadingText = "Loaded update list"; // L: 1606
-				Login.Login_loadingPercent = 30; // L: 1607
-				Client.titleLoadingStage = 45; // L: 1608
-			}
+			return 2; // L: 2082
 		}
-	} // L: 1530 1536 1562 1589 1609 1632 1649 1658 1690 1696 1702 1787 1816 1828 1834 1840 1847 1852 1860 1866 1873 1879 1884 1889 1894 1900 1908 1912 1914
-
-	@ObfuscatedName("is")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1594517863"
-	)
-	static final int method2588() {
-		return Client.menuOptionsCount - 1; // L: 8819
 	}
 }
diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java
index 8c54d0231e..e7ad935761 100644
--- a/runescape-client/src/main/java/ModeWhere.java
+++ b/runescape-client/src/main/java/ModeWhere.java
@@ -5,333 +5,568 @@ 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("kl")
+@ObfuscatedName("kg")
 @Implements("ModeWhere")
-public enum ModeWhere implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3686("", 0, new class286[]{class286.field3667}),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3702("", 1, new class286[]{class286.field3668, class286.field3667}),
+public enum ModeWhere implements Enumerated
+{
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkg;"
 	)
-	field3699("", 2, new class286[]{class286.field3668, class286.field3671, class286.field3667}),
+	field3701("", 0, new class287[]{class287.field3673}),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3690("", 1, new class287[]{class287.field3671, class287.field3673}),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3691("", 2, new class287[]{class287.field3671, class287.field3672, class287.field3673}),
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkg;"
 	)
-	field3698("", 3, new class286[]{class286.field3668}),
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3690("", 4),
+	field3692("", 3, new class287[]{class287.field3671}),
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkg;"
 	)
-	field3687("", 5, new class286[]{class286.field3668, class286.field3667}),
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3692("", 6, new class286[]{class286.field3667}),
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3693("", 8, new class286[]{class286.field3668, class286.field3667}),
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3694("", 9, new class286[]{class286.field3668, class286.field3671}),
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3695("", 10, new class286[]{class286.field3668}),
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3696("", 11, new class286[]{class286.field3668}),
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lkl;"
-	)
-	field3697("", 12, new class286[]{class286.field3668, class286.field3667}),
+	field3697("", 4),
 	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lkl;"
+		descriptor = "Lkg;"
 	)
-	field3689("", 13, new class286[]{class286.field3668});
+	field3694("", 5, new class287[]{class287.field3671, class287.field3673}),
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3695("", 6, new class287[]{class287.field3673}),
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3696("", 8, new class287[]{class287.field3671, class287.field3673}),
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3693("", 9, new class287[]{class287.field3671, class287.field3672}),
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3698("", 10, new class287[]{class287.field3671}),
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3699("", 11, new class287[]{class287.field3671}),
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3700("", 12, new class287[]{class287.field3671, class287.field3673}),
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lkg;"
+	)
+	field3704("", 13, new class287[]{class287.field3671});
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("dx")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive8")
+	static Archive archive8;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 448487515
+		intValue = 1725478607
 	)
 	@Export("id")
 	final int id;
-	@ObfuscatedName("e")
-	final Set field3700;
+	@ObfuscatedName("g")
+	final Set field3703;
 
 	static {
-		method5162(); // L: 28
+		method5289();
 	}
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I[Lky;)V"
+		descriptor = "(Ljava/lang/String;I[Lkc;)V"
 	)
-	ModeWhere(String var3, int var4, class286[] var5) {
-		this.field3700 = new HashSet();
-		this.id = var4; // L: 43
-		class286[] var6 = var5; // L: 45
+	ModeWhere(String var3, int var4, class287[] var5) {
+		this.field3703 = new HashSet();
+		this.id = var4;
+		class287[] var6 = var5;
 
-		for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46
-			class286 var8 = var6[var7]; // L: 47
-			this.field3700.add(var8); // L: 48
+		for (int var7 = 0; var7 < var6.length; ++var7) {
+			class287 var8 = var6[var7];
+			this.field3703.add(var8);
 		}
 
-	} // L: 51
+	}
 
 	ModeWhere(String var3, int var4) {
-		this.field3700 = new HashSet(); // L: 32
-		this.id = var4; // L: 39
-	} // L: 40
+		this.field3703 = new HashSet();
+		this.id = var4;
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id; // L: 54
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Lmr;I)Lmr;",
-		garbageValue = "-391561047"
+		descriptor = "(Lnt;Ljava/lang/String;I)I",
+		garbageValue = "-1585565275"
 	)
-	@Export("readStringIntParameters")
-	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
-		int var2 = var0.readUnsignedByte(); // L: 16
-		int var3;
-		if (var1 == null) { // L: 17
-			var3 = Player.method2128(var2); // L: 18
-			var1 = new IterableNodeHashTable(var3); // L: 19
-		}
+	public static int method5292(Buffer var0, String var1) {
+		int var2 = var0.offset; // L: 18
+		int var4 = var1.length(); // L: 21
+		byte[] var5 = new byte[var4]; // L: 22
 
-		for (var3 = 0; var3 < var2; ++var3) { // L: 21
-			boolean var4 = var0.readUnsignedByte() == 1; // L: 22
-			int var5 = var0.readMedium(); // L: 23
-			Object var6;
-			if (var4) { // L: 25
-				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
+		for (int var6 = 0; var6 < var4; ++var6) { // L: 23
+			char var7 = var1.charAt(var6); // L: 24
+			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 25
+				var5[var6] = (byte)var7;
+			} else if (var7 == 8364) { // L: 26
+				var5[var6] = -128;
+			} else if (var7 == 8218) { // L: 27
+				var5[var6] = -126;
+			} else if (var7 == 402) { // L: 28
+				var5[var6] = -125;
+			} else if (var7 == 8222) { // L: 29
+				var5[var6] = -124;
+			} else if (var7 == 8230) { // L: 30
+				var5[var6] = -123;
+			} else if (var7 == 8224) { // L: 31
+				var5[var6] = -122;
+			} else if (var7 == 8225) { // L: 32
+				var5[var6] = -121;
+			} else if (var7 == 710) { // L: 33
+				var5[var6] = -120;
+			} else if (var7 == 8240) { // L: 34
+				var5[var6] = -119;
+			} else if (var7 == 352) {
+				var5[var6] = -118;
+			} else if (var7 == 8249) { // L: 36
+				var5[var6] = -117;
+			} else if (var7 == 338) { // L: 37
+				var5[var6] = -116;
+			} else if (var7 == 381) { // L: 38
+				var5[var6] = -114;
+			} else if (var7 == 8216) { // L: 39
+				var5[var6] = -111;
+			} else if (var7 == 8217) { // L: 40
+				var5[var6] = -110;
+			} else if (var7 == 8220) { // L: 41
+				var5[var6] = -109;
+			} else if (var7 == 8221) { // L: 42
+				var5[var6] = -108;
+			} else if (var7 == 8226) { // L: 43
+				var5[var6] = -107;
+			} else if (var7 == 8211) {
+				var5[var6] = -106; // L: 44
+			} else if (var7 == 8212) { // L: 45
+				var5[var6] = -105;
+			} else if (var7 == 732) { // L: 46
+				var5[var6] = -104;
+			} else if (var7 == 8482) { // L: 47
+				var5[var6] = -103;
+			} else if (var7 == 353) { // L: 48
+				var5[var6] = -102;
+			} else if (var7 == 8250) { // L: 49
+				var5[var6] = -101;
+			} else if (var7 == 339) { // L: 50
+				var5[var6] = -100;
+			} else if (var7 == 382) { // L: 51
+				var5[var6] = -98;
+			} else if (var7 == 376) { // L: 52
+				var5[var6] = -97;
 			} else {
-				var6 = new IntegerNode(var0.readInt()); // L: 26
+				var5[var6] = 63; // L: 53
 			}
-
-			var1.put((Node)var6, (long)var5); // L: 27
 		}
 
-		return var1; // L: 29
+		var0.writeSmartByteShort(var5.length); // L: 58
+		var0.offset += class250.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); // L: 59
+		return var0.offset - var2; // L: 60
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lio;",
-		garbageValue = "-594011323"
+		descriptor = "(I)[Lkg;",
+		garbageValue = "1172185177"
 	)
-	@Export("getWidgetChild")
-	public static Widget getWidgetChild(int var0, int var1) {
-		Widget var2 = Frames.getWidget(var0); // L: 198
-		if (var1 == -1) { // L: 199
-			return var2;
+	static ModeWhere[] method5289() {
+		return new ModeWhere[]{field3701, field3693, field3696, field3699, field3694, field3704, field3691, field3690, field3700, field3695, field3698, field3692, field3697}; // L: 35
+	}
+
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-963755121"
+	)
+	static int method5283(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == 6600) { // L: 3844
+			var3 = SoundSystem.Client_plane; // L: 3845
+			int var15 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 3846
+			int var8 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 3847
+			BZip2State.getWorldMap().method6287(var3, var15, var8, true); // L: 3848
+			return 1; // L: 3849
 		} else {
-			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 200 201
-		}
-	}
+			WorldMapArea var9;
+			if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3851
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3852
+				String var16 = ""; // L: 3853
+				var9 = BZip2State.getWorldMap().getMapArea(var3); // L: 3854
+				if (var9 != null) { // L: 3855
+					var16 = var9.getExternalName(); // L: 3856
+				}
 
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lkl;",
-		garbageValue = "1537765097"
-	)
-	static ModeWhere[] method5162() {
-		return new ModeWhere[]{field3702, field3695, field3697, field3686, field3699, field3696, field3692, field3687, field3698, field3694, field3690, field3693, field3689}; // L: 35
-	}
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var16; // L: 3858
+				return 1; // L: 3859
+			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3861
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3862
+				BZip2State.getWorldMap().setCurrentMapAreaId(var3); // L: 3863
+				return 1; // L: 3864
+			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3866
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getZoomLevel(); // L: 3867
+				return 1; // L: 3868
+			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3870
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3871
+				BZip2State.getWorldMap().setZoomPercentage(var3); // L: 3872
+				return 1; // L: 3873
+			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3875
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3876
+				return 1; // L: 3877
+			} else {
+				Coord var14;
+				if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3879
+					var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3880
+					BZip2State.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3881
+					return 1; // L: 3882
+				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3884
+					var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3885
+					BZip2State.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3886
+					return 1; // L: 3887
+				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3889
+					var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3890
+					BZip2State.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3891
+					return 1; // L: 3892
+				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3894
+					var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3895
+					BZip2State.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3896
+					return 1; // L: 3897
+				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3899
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayX(); // L: 3900
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayY(); // L: 3901
+					return 1; // L: 3902
+				} else {
+					WorldMapArea var11;
+					if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3904
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3905
+						var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3906
+						if (var11 == null) { // L: 3907
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3908
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3911
+						}
 
-	@ObfuscatedName("jn")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;II)I",
-		garbageValue = "411912150"
-	)
-	static final int method5160(Widget var0, int var1) {
-		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 9890
-			try {
-				int[] var2 = var0.cs1Instructions[var1]; // L: 9892
-				int var3 = 0; // L: 9893
-				int var4 = 0; // L: 9894
-				byte var5 = 0; // L: 9895
+						return 1; // L: 3913
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3915
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3916
+						var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3917
+						if (var11 == null) { // L: 3918
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3919
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3920
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3923
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3924
+						}
 
-				while (true) {
-					int var6 = var2[var4++]; // L: 9897
-					int var7 = 0; // L: 9898
-					byte var8 = 0; // L: 9899
-					if (var6 == 0) { // L: 9900
-						return var3;
-					}
+						return 1; // L: 3926
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3928
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3929
+						var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3930
+						if (var11 == null) { // L: 3931
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3932
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3933
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3934
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3935
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3938
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3939
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3940
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3941
+						}
 
-					if (var6 == 1) { // L: 9901
-						var7 = Client.currentLevels[var2[var4++]];
-					}
+						return 1; // L: 3943
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3945
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3946
+						var11 = BZip2State.getWorldMap().getMapArea(var3); // L: 3947
+						if (var11 == null) { // L: 3948
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3949
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3952
+						}
 
-					if (var6 == 2) { // L: 9902
-						var7 = Client.levels[var2[var4++]];
-					}
+						return 1; // L: 3954
+					} else if (var0 == 6615) { // L: 3956
+						var14 = BZip2State.getWorldMap().getDisplayCoord(); // L: 3957
+						if (var14 == null) { // L: 3958
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3959
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3960
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var14.x; // L: 3963
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var14.y; // L: 3964
+						}
 
-					if (var6 == 3) { // L: 9903
-						var7 = Client.experience[var2[var4++]];
-					}
-
-					int var9;
-					Widget var10;
-					int var11;
-					int var12;
-					if (var6 == 4) { // L: 9904
-						var9 = var2[var4++] << 16; // L: 9905
-						var9 += var2[var4++]; // L: 9906
-						var10 = Frames.getWidget(var9); // L: 9907
-						var11 = var2[var4++]; // L: 9908
-						if (var11 != -1 && (!class260.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9909
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9910
-								if (var11 + 1 == var10.itemIds[var12]) { // L: 9911
-									var7 += var10.itemQuantities[var12];
-								}
+						return 1; // L: 3966
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3968
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().currentMapAreaId(); // L: 3969
+						return 1; // L: 3970
+					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3972
+						var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3973
+						var11 = BZip2State.getWorldMap().getCurrentMapArea(); // L: 3974
+						if (var11 == null) { // L: 3975
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3976
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3977
+							return 1; // L: 3978
+						} else {
+							int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3980
+							if (var12 == null) { // L: 3981
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3982
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3983
+							} else {
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12[0]; // L: 3986
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12[1]; // L: 3987
 							}
+
+							return 1; // L: 3989
 						}
-					}
-
-					if (var6 == 5) { // L: 9915
-						var7 = Varps.Varps_main[var2[var4++]];
-					}
-
-					if (var6 == 6) { // L: 9916
-						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
-					}
-
-					if (var6 == 7) { // L: 9917
-						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
-					}
-
-					if (var6 == 8) { // L: 9918
-						var7 = class93.localPlayer.combatLevel;
-					}
-
-					if (var6 == 9) { // L: 9919
-						for (var9 = 0; var9 < 25; ++var9) { // L: 9920
-							if (Skills.Skills_enabled[var9]) { // L: 9921
-								var7 += Client.levels[var9];
-							}
-						}
-					}
-
-					if (var6 == 10) { // L: 9924
-						var9 = var2[var4++] << 16; // L: 9925
-						var9 += var2[var4++]; // L: 9926
-						var10 = Frames.getWidget(var9); // L: 9927
-						var11 = var2[var4++]; // L: 9928
-						if (var11 != -1 && (!class260.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9929
-							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9930
-								if (var11 + 1 == var10.itemIds[var12]) { // L: 9931
-									var7 = 999999999; // L: 9932
-									break; // L: 9933
-								}
-							}
-						}
-					}
-
-					if (var6 == 11) { // L: 9938
-						var7 = Client.runEnergy;
-					}
-
-					if (var6 == 12) { // L: 9939
-						var7 = Client.weight;
-					}
-
-					if (var6 == 13) { // L: 9940
-						var9 = Varps.Varps_main[var2[var4++]]; // L: 9941
-						int var13 = var2[var4++]; // L: 9942
-						var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 9943
-					}
-
-					if (var6 == 14) { // L: 9945
-						var9 = var2[var4++]; // L: 9946
-						var7 = Skeleton.getVarbit(var9); // L: 9947
-					}
-
-					if (var6 == 15) { // L: 9949
-						var8 = 1;
-					}
-
-					if (var6 == 16) { // L: 9950
-						var8 = 2;
-					}
-
-					if (var6 == 17) { // L: 9951
-						var8 = 3;
-					}
-
-					if (var6 == 18) { // L: 9952
-						var7 = (class93.localPlayer.x >> 7) + VertexNormal.baseX;
-					}
-
-					if (var6 == 19) { // L: 9953
-						var7 = (class93.localPlayer.y >> 7) + SoundSystem.baseY;
-					}
-
-					if (var6 == 20) { // L: 9954
-						var7 = var2[var4++];
-					}
-
-					if (var8 == 0) { // L: 9955
-						if (var5 == 0) { // L: 9956
-							var3 += var7;
-						}
-
-						if (var5 == 1) { // L: 9957
-							var3 -= var7;
-						}
-
-						if (var5 == 2 && var7 != 0) { // L: 9958
-							var3 /= var7;
-						}
-
-						if (var5 == 3) { // L: 9959
-							var3 *= var7;
-						}
-
-						var5 = 0; // L: 9960
 					} else {
-						var5 = var8; // L: 9962
+						Coord var5;
+						if (var0 == 6618) { // L: 3991
+							var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 3992
+							var11 = BZip2State.getWorldMap().getCurrentMapArea(); // L: 3993
+							if (var11 == null) { // L: 3994
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3995
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3996
+								return 1; // L: 3997
+							} else {
+								var5 = var11.coord(var14.x, var14.y); // L: 3999
+								if (var5 == null) { // L: 4000
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4001
+								} else {
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.packed(); // L: 4004
+								}
+
+								return 1; // L: 4006
+							}
+						} else {
+							Coord var10;
+							if (var0 == 6619) { // L: 4008
+								ChatChannel.Interpreter_intStackSize -= 2; // L: 4009
+								var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4010
+								var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4011
+								Canvas.method497(var3, var10, false); // L: 4012
+								return 1; // L: 4013
+							} else if (var0 == 6620) { // L: 4015
+								ChatChannel.Interpreter_intStackSize -= 2; // L: 4016
+								var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4017
+								var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4018
+								Canvas.method497(var3, var10, true); // L: 4019
+								return 1; // L: 4020
+							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 4022
+								ChatChannel.Interpreter_intStackSize -= 2; // L: 4023
+								var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4024
+								var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4025
+								var9 = BZip2State.getWorldMap().getMapArea(var3); // L: 4026
+								if (var9 == null) { // L: 4027
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4028
+									return 1; // L: 4029
+								} else {
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 4031
+									return 1; // L: 4032
+								}
+							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 4034
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayWith(); // L: 4035
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getDisplayHeight(); // L: 4036
+								return 1; // L: 4037
+							} else if (var0 == 6623) { // L: 4039
+								var14 = new Coord(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 4040
+								var11 = BZip2State.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 4041
+								if (var11 == null) { // L: 4042
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4043
+								} else {
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var11.getId(); // L: 4046
+								}
+
+								return 1; // L: 4048
+							} else if (var0 == 6624) { // L: 4050
+								BZip2State.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 4051
+								return 1; // L: 4052
+							} else if (var0 == 6625) { // L: 4054
+								BZip2State.getWorldMap().resetMaxFlashCount(); // L: 4055
+								return 1; // L: 4056
+							} else if (var0 == 6626) { // L: 4058
+								BZip2State.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 4059
+								return 1; // L: 4060
+							} else if (var0 == 6627) { // L: 4062
+								BZip2State.getWorldMap().resetCyclesPerFlash(); // L: 4063
+								return 1; // L: 4064
+							} else {
+								boolean var13;
+								if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 4066
+									var13 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 4067
+									BZip2State.getWorldMap().setPerpetualFlash(var13); // L: 4068
+									return 1; // L: 4069
+								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 4071
+									var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4072
+									BZip2State.getWorldMap().flashElement(var3); // L: 4073
+									return 1; // L: 4074
+								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 4076
+									var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4077
+									BZip2State.getWorldMap().flashCategory(var3); // L: 4078
+									return 1; // L: 4079
+								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 4081
+									BZip2State.getWorldMap().stopCurrentFlashes(); // L: 4082
+									return 1; // L: 4083
+								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 4085
+									var13 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 4086
+									BZip2State.getWorldMap().setElementsDisabled(var13); // L: 4087
+									return 1; // L: 4088
+								} else {
+									boolean var7;
+									if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 4090
+										ChatChannel.Interpreter_intStackSize -= 2; // L: 4091
+										var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4092
+										var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 4093
+										BZip2State.getWorldMap().disableElement(var3, var7); // L: 4094
+										return 1; // L: 4095
+									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 4097
+										ChatChannel.Interpreter_intStackSize -= 2; // L: 4098
+										var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4099
+										var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 4100
+										BZip2State.getWorldMap().setCategoryDisabled(var3, var7); // L: 4101
+										return 1; // L: 4102
+									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 4104
+										Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 4105
+										return 1; // L: 4106
+									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 4108
+										var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4109
+										Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 4110
+										return 1; // L: 4111
+									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 4113
+										var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4114
+										Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = BZip2State.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 4115
+										return 1; // L: 4116
+									} else if (var0 == 6638) { // L: 4118
+										ChatChannel.Interpreter_intStackSize -= 2; // L: 4119
+										var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 4120
+										var10 = new Coord(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 4121
+										var5 = BZip2State.getWorldMap().method6184(var3, var10); // L: 4122
+										if (var5 == null) { // L: 4123
+											Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4124
+										} else {
+											Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.packed(); // L: 4127
+										}
+
+										return 1; // L: 4129
+									} else {
+										AbstractWorldMapIcon var6;
+										if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 4131
+											var6 = BZip2State.getWorldMap().iconStart(); // L: 4132
+											if (var6 == null) { // L: 4133
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4134
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4135
+											} else {
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4138
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4139
+											}
+
+											return 1; // L: 4141
+										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 4143
+											var6 = BZip2State.getWorldMap().iconNext(); // L: 4144
+											if (var6 == null) { // L: 4145
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4146
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4147
+											} else {
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.getElement(); // L: 4150
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 4151
+											}
+
+											return 1; // L: 4153
+										} else {
+											WorldMapElement var4;
+											if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 4155
+												var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4156
+												var4 = Archive.WorldMapElement_get(var3); // L: 4157
+												if (var4.name == null) { // L: 4158
+													Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4159
+												} else {
+													Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.name; // L: 4162
+												}
+
+												return 1; // L: 4164
+											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 4166
+												var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4167
+												var4 = Archive.WorldMapElement_get(var3); // L: 4168
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.textSize; // L: 4169
+												return 1; // L: 4170
+											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 4172
+												var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4173
+												var4 = Archive.WorldMapElement_get(var3); // L: 4174
+												if (var4 == null) { // L: 4175
+													Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4176
+												} else {
+													Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.category; // L: 4179
+												}
+
+												return 1; // L: 4181
+											} else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 4183
+												var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4184
+												var4 = Archive.WorldMapElement_get(var3); // L: 4185
+												if (var4 == null) { // L: 4186
+													Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4187
+												} else {
+													Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.sprite1; // L: 4190
+												}
+
+												return 1; // L: 4192
+											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 4194
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Occluder.worldMapEvent.mapElement; // L: 4195
+												return 1; // L: 4196
+											} else if (var0 == 6698) { // L: 4198
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Occluder.worldMapEvent.coord1.packed(); // L: 4199
+												return 1; // L: 4200
+											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 4202
+												Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Occluder.worldMapEvent.coord2.packed(); // L: 4203
+												return 1; // L: 4204
+											} else {
+												return 2; // L: 4206
+											}
+										}
+									}
+								}
+							}
+						}
 					}
 				}
-			} catch (Exception var14) { // L: 9965
-				return -1; // L: 9966
 			}
-		} else {
-			return -2;
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java
index 2a3435a783..5cd10b3269 100644
--- a/runescape-client/src/main/java/Model.java
+++ b/runescape-client/src/main/java/Model.java
@@ -3,180 +3,180 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gr")
+@ObfuscatedName("gd")
 @Implements("Model")
 public class Model extends Renderable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lgr;"
+		descriptor = "Lgd;"
 	)
 	@Export("Model_sharedSequenceModel")
 	static Model Model_sharedSequenceModel;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("Model_sharedSequenceModelFaceAlphas")
 	static byte[] Model_sharedSequenceModelFaceAlphas;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lgr;"
+		descriptor = "Lgd;"
 	)
 	@Export("Model_sharedSpotAnimationModel")
 	static Model Model_sharedSpotAnimationModel;
 	@ObfuscatedName("y")
 	@Export("Model_sharedSpotAnimationModelFaceAlphas")
 	static byte[] Model_sharedSpotAnimationModelFaceAlphas;
-	@ObfuscatedName("av")
-	static boolean[] field2455;
+	@ObfuscatedName("al")
+	static boolean[] field2469;
+	@ObfuscatedName("aj")
+	static boolean[] field2458;
 	@ObfuscatedName("ac")
-	static boolean[] field2485;
-	@ObfuscatedName("at")
 	@Export("modelViewportXs")
 	static int[] modelViewportXs;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@Export("modelViewportYs")
 	static int[] modelViewportYs;
-	@ObfuscatedName("ao")
-	static int[] field2465;
-	@ObfuscatedName("aq")
-	static int[] field2445;
-	@ObfuscatedName("aw")
-	static int[] field2467;
-	@ObfuscatedName("af")
-	static int[] field2422;
-	@ObfuscatedName("ay")
-	static int[] field2466;
-	@ObfuscatedName("aa")
-	static int[][] field2471;
 	@ObfuscatedName("au")
-	static int[] field2472;
-	@ObfuscatedName("an")
-	static int[][] field2473;
-	@ObfuscatedName("bd")
-	static int[] field2474;
-	@ObfuscatedName("bt")
-	static int[] field2475;
-	@ObfuscatedName("bq")
-	static int[] field2434;
-	@ObfuscatedName("bu")
+	static int[] field2461;
+	@ObfuscatedName("ay")
+	static int[] field2435;
+	@ObfuscatedName("am")
+	static int[] field2463;
+	@ObfuscatedName("aa")
 	static int[] field2477;
-	@ObfuscatedName("bl")
-	static int[] field2489;
+	@ObfuscatedName("av")
+	static int[] field2466;
+	@ObfuscatedName("ax")
+	static int[][] field2451;
+	@ObfuscatedName("ar")
+	static int[] field2468;
+	@ObfuscatedName("af")
+	static int[][] field2467;
+	@ObfuscatedName("bq")
+	static int[] field2470;
+	@ObfuscatedName("bx")
+	static int[] field2422;
+	@ObfuscatedName("bi")
+	static int[] field2472;
+	@ObfuscatedName("bz")
+	static int[] field2473;
+	@ObfuscatedName("bb")
+	static int[] field2474;
 	@ObfuscatedName("bv")
-	static int[] field2479;
-	@ObfuscatedName("bm")
+	static int[] field2475;
+	@ObfuscatedName("bc")
 	@Export("Model_transformTempX")
 	static int Model_transformTempX;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@Export("Model_transformTempY")
 	static int Model_transformTempY;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("ba")
 	@Export("Model_transformTempZ")
 	static int Model_transformTempZ;
 	@ObfuscatedName("bs")
-	static boolean field2483;
-	@ObfuscatedName("ba")
+	static boolean field2479;
+	@ObfuscatedName("by")
 	@Export("Model_sine")
 	static int[] Model_sine;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bt")
 	@Export("Model_cosine")
 	static int[] Model_cosine;
-	@ObfuscatedName("bj")
-	static int[] field2488;
-	@ObfuscatedName("bx")
-	static int[] field2425;
-	@ObfuscatedName("p")
+	@ObfuscatedName("bg")
+	static int[] field2484;
+	@ObfuscatedName("bm")
+	static int[] field2485;
+	@ObfuscatedName("j")
 	@Export("verticesCount")
 	int verticesCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("verticesX")
 	int[] verticesX;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("verticesY")
 	int[] verticesY;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("verticesZ")
 	int[] verticesZ;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("indicesCount")
 	int indicesCount;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("indices1")
 	int[] indices1;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("indices2")
 	int[] indices2;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("indices3")
 	int[] indices3;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("faceColors1")
 	int[] faceColors1;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("faceColors2")
 	int[] faceColors2;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("faceColors3")
 	int[] faceColors3;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("faceRenderPriorities")
 	byte[] faceRenderPriorities;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("faceAlphas")
 	byte[] faceAlphas;
-	@ObfuscatedName("k")
-	byte[] field2439;
-	@ObfuscatedName("m")
+	@ObfuscatedName("u")
+	byte[] field2448;
+	@ObfuscatedName("q")
 	@Export("faceTextures")
 	short[] faceTextures;
-	@ObfuscatedName("x")
-	byte field2441;
-	@ObfuscatedName("z")
-	int field2442;
+	@ObfuscatedName("s")
+	byte field2437;
+	@ObfuscatedName("p")
+	int field2438;
+	@ObfuscatedName("c")
+	int[] field2449;
+	@ObfuscatedName("n")
+	int[] field2440;
+	@ObfuscatedName("l")
+	int[] field2441;
 	@ObfuscatedName("w")
-	int[] field2443;
-	@ObfuscatedName("t")
-	int[] field2444;
-	@ObfuscatedName("h")
-	int[] field2468;
-	@ObfuscatedName("q")
 	@Export("vertexLabels")
 	int[][] vertexLabels;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@Export("faceLabelsAlpha")
 	int[][] faceLabelsAlpha;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@Export("isSingleTile")
 	public boolean isSingleTile;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("boundsType")
 	int boundsType;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("bottomY")
 	int bottomY;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("xzRadius")
 	int xzRadius;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@Export("diameter")
 	int diameter;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@Export("radius")
 	int radius;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("xMid")
 	int xMid;
 	@ObfuscatedName("ag")
 	@Export("yMid")
 	int yMid;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("zMid")
 	int zMid;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@Export("xMidOffset")
 	int xMidOffset;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@Export("yMidOffset")
 	int yMidOffset;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("zMidOffset")
 	int zMidOffset;
 
@@ -185,36 +185,36 @@ public class Model extends Renderable {
 		Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7
 		Model_sharedSpotAnimationModel = new Model(); // L: 8
 		Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9
-		field2455 = new boolean[4700]; // L: 45
-		field2485 = new boolean[4700]; // L: 46
-		modelViewportXs = new int[4700]; // L: 47
-		modelViewportYs = new int[4700]; // L: 48
-		field2465 = new int[4700]; // L: 49
-		field2445 = new int[4700]; // L: 50
-		field2467 = new int[4700]; // L: 51
-		field2422 = new int[4700]; // L: 52
+		field2469 = new boolean[6500]; // L: 45
+		field2458 = new boolean[6500]; // L: 46
+		modelViewportXs = new int[6500]; // L: 47
+		modelViewportYs = new int[6500]; // L: 48
+		field2461 = new int[6500]; // L: 49
+		field2435 = new int[6500]; // L: 50
+		field2463 = new int[6500]; // L: 51
+		field2477 = new int[6500]; // L: 52
 		field2466 = new int[1600]; // L: 54
-		field2471 = new int[1600][512]; // L: 55
-		field2472 = new int[12]; // L: 56
-		field2473 = new int[12][2000]; // L: 57
-		field2474 = new int[2000]; // L: 58
-		field2475 = new int[2000]; // L: 59
-		field2434 = new int[12]; // L: 60
-		field2477 = new int[10]; // L: 61
-		field2489 = new int[10]; // L: 62
-		field2479 = new int[10]; // L: 63
-		field2483 = true; // L: 67
+		field2451 = new int[1600][512]; // L: 55
+		field2468 = new int[12]; // L: 56
+		field2467 = new int[12][2000]; // L: 57
+		field2470 = new int[2000]; // L: 58
+		field2422 = new int[2000]; // L: 59
+		field2472 = new int[12]; // L: 60
+		field2473 = new int[10]; // L: 61
+		field2474 = new int[10]; // L: 62
+		field2475 = new int[10]; // L: 63
+		field2479 = true; // L: 67
 		Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70
 		Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71
-		field2488 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72
-		field2425 = Rasterizer3D.field2283; // L: 73
+		field2484 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72
+		field2485 = Rasterizer3D.field2282; // L: 73
 	}
 
 	Model() {
 		this.verticesCount = 0;
 		this.indicesCount = 0;
-		this.field2441 = 0;
-		this.field2442 = 0;
+		this.field2437 = 0;
+		this.field2438 = 0;
 		this.isSingleTile = false;
 		this.xMidOffset = -1;
 		this.yMidOffset = -1;
@@ -222,13 +222,13 @@ public class Model extends Renderable {
 	} // L: 77
 
 	@ObfuscatedSignature(
-		descriptor = "([Lgr;I)V"
+		descriptor = "([Lgd;I)V"
 	)
 	public Model(Model[] var1, int var2) {
 		this.verticesCount = 0; // L: 10
 		this.indicesCount = 0; // L: 14
-		this.field2441 = 0; // L: 25
-		this.field2442 = 0; // L: 26
+		this.field2437 = 0; // L: 25
+		this.field2438 = 0; // L: 26
 		this.isSingleTile = false; // L: 32
 		this.xMidOffset = -1; // L: 41
 		this.yMidOffset = -1; // L: 42
@@ -239,8 +239,8 @@ public class Model extends Renderable {
 		boolean var6 = false; // L: 83
 		this.verticesCount = 0; // L: 84
 		this.indicesCount = 0; // L: 85
-		this.field2442 = 0; // L: 86
-		this.field2441 = -1; // L: 87
+		this.field2438 = 0; // L: 86
+		this.field2437 = -1; // L: 87
 
 		int var7;
 		Model var8;
@@ -249,22 +249,22 @@ public class Model extends Renderable {
 			if (var8 != null) { // L: 90
 				this.verticesCount += var8.verticesCount; // L: 91
 				this.indicesCount += var8.indicesCount; // L: 92
-				this.field2442 += var8.field2442; // L: 93
+				this.field2438 += var8.field2438; // L: 93
 				if (var8.faceRenderPriorities != null) { // L: 94
 					var3 = true;
 				} else {
-					if (this.field2441 == -1) { // L: 96
-						this.field2441 = var8.field2441;
+					if (this.field2437 == -1) { // L: 96
+						this.field2437 = var8.field2437;
 					}
 
-					if (this.field2441 != var8.field2441) { // L: 97
+					if (this.field2437 != var8.field2437) { // L: 97
 						var3 = true;
 					}
 				}
 
 				var4 |= var8.faceAlphas != null; // L: 99
 				var5 |= var8.faceTextures != null; // L: 100
-				var6 |= var8.field2439 != null; // L: 101
+				var6 |= var8.field2448 != null; // L: 101
 			}
 		}
 
@@ -290,18 +290,18 @@ public class Model extends Renderable {
 		}
 
 		if (var6) { // L: 116
-			this.field2439 = new byte[this.indicesCount];
+			this.field2448 = new byte[this.indicesCount];
 		}
 
-		if (this.field2442 > 0) { // L: 117
-			this.field2443 = new int[this.field2442]; // L: 118
-			this.field2444 = new int[this.field2442]; // L: 119
-			this.field2468 = new int[this.field2442]; // L: 120
+		if (this.field2438 > 0) { // L: 117
+			this.field2449 = new int[this.field2438]; // L: 118
+			this.field2440 = new int[this.field2438]; // L: 119
+			this.field2441 = new int[this.field2438]; // L: 120
 		}
 
 		this.verticesCount = 0; // L: 122
 		this.indicesCount = 0; // L: 123
-		this.field2442 = 0; // L: 124
+		this.field2438 = 0; // L: 124
 
 		for (var7 = 0; var7 < var2; ++var7) { // L: 125
 			var8 = var1[var7]; // L: 126
@@ -318,7 +318,7 @@ public class Model extends Renderable {
 						if (var8.faceRenderPriorities != null) { // L: 136
 							this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9];
 						} else {
-							this.faceRenderPriorities[this.indicesCount] = var8.field2441; // L: 137
+							this.faceRenderPriorities[this.indicesCount] = var8.field2437; // L: 137
 						}
 					}
 
@@ -335,21 +335,21 @@ public class Model extends Renderable {
 					}
 
 					if (var6) { // L: 146
-						if (var8.field2439 != null && var8.field2439[var9] != -1) { // L: 147
-							this.field2439[this.indicesCount] = (byte)(this.field2442 + var8.field2439[var9]);
+						if (var8.field2448 != null && var8.field2448[var9] != -1) { // L: 147
+							this.field2448[this.indicesCount] = (byte)(this.field2438 + var8.field2448[var9]);
 						} else {
-							this.field2439[this.indicesCount] = -1; // L: 148
+							this.field2448[this.indicesCount] = -1; // L: 148
 						}
 					}
 
 					++this.indicesCount; // L: 150
 				}
 
-				for (var9 = 0; var9 < var8.field2442; ++var9) { // L: 152
-					this.field2443[this.field2442] = this.verticesCount + var8.field2443[var9]; // L: 153
-					this.field2444[this.field2442] = this.verticesCount + var8.field2444[var9]; // L: 154
-					this.field2468[this.field2442] = this.verticesCount + var8.field2468[var9]; // L: 155
-					++this.field2442; // L: 156
+				for (var9 = 0; var9 < var8.field2438; ++var9) { // L: 152
+					this.field2449[this.field2438] = this.verticesCount + var8.field2449[var9]; // L: 153
+					this.field2440[this.field2438] = this.verticesCount + var8.field2440[var9]; // L: 154
+					this.field2441[this.field2438] = this.verticesCount + var8.field2441[var9]; // L: 155
+					++this.field2438; // L: 156
 				}
 
 				for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158
@@ -363,9 +363,9 @@ public class Model extends Renderable {
 
 	} // L: 166
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "([[IIIIZI)Lgr;"
+		descriptor = "([[IIIIZI)Lgd;"
 	)
 	@Export("contourGround")
 	public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
@@ -387,7 +387,7 @@ public class Model extends Renderable {
 					var11 = new Model(); // L: 182
 					var11.verticesCount = this.verticesCount; // L: 183
 					var11.indicesCount = this.indicesCount; // L: 184
-					var11.field2442 = this.field2442; // L: 185
+					var11.field2438 = this.field2438; // L: 185
 					var11.verticesX = this.verticesX; // L: 186
 					var11.verticesZ = this.verticesZ; // L: 187
 					var11.indices1 = this.indices1; // L: 188
@@ -398,12 +398,12 @@ public class Model extends Renderable {
 					var11.faceColors3 = this.faceColors3; // L: 193
 					var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194
 					var11.faceAlphas = this.faceAlphas; // L: 195
-					var11.field2439 = this.field2439; // L: 196
+					var11.field2448 = this.field2448; // L: 196
 					var11.faceTextures = this.faceTextures; // L: 197
-					var11.field2441 = this.field2441; // L: 198
-					var11.field2443 = this.field2443; // L: 199
-					var11.field2444 = this.field2444; // L: 200
-					var11.field2468 = this.field2468; // L: 201
+					var11.field2437 = this.field2437; // L: 198
+					var11.field2449 = this.field2449; // L: 199
+					var11.field2440 = this.field2440; // L: 200
+					var11.field2441 = this.field2441; // L: 201
 					var11.vertexLabels = this.vertexLabels; // L: 202
 					var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203
 					var11.isSingleTile = this.isSingleTile; // L: 204
@@ -461,9 +461,9 @@ public class Model extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Z)Lgr;"
+		descriptor = "(Z)Lgd;"
 	)
 	@Export("toSharedSequenceModel")
 	public Model toSharedSequenceModel(boolean var1) {
@@ -474,9 +474,9 @@ public class Model extends Renderable {
 		return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Z)Lgr;"
+		descriptor = "(Z)Lgd;"
 	)
 	@Export("toSharedSpotAnimationModel")
 	public Model toSharedSpotAnimationModel(boolean var1) {
@@ -487,15 +487,15 @@ public class Model extends Renderable {
 		return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(ZLgr;[B)Lgr;"
+		descriptor = "(ZLgd;[B)Lgd;"
 	)
 	@Export("buildSharedModel")
 	Model buildSharedModel(boolean var1, Model var2, byte[] var3) {
 		var2.verticesCount = this.verticesCount; // L: 256
 		var2.indicesCount = this.indicesCount; // L: 257
-		var2.field2442 = this.field2442; // L: 258
+		var2.field2438 = this.field2438; // L: 258
 		if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259
 			var2.verticesX = new int[this.verticesCount + 100]; // L: 260
 			var2.verticesY = new int[this.verticesCount + 100]; // L: 261
@@ -531,12 +531,12 @@ public class Model extends Renderable {
 		var2.faceColors2 = this.faceColors2; // L: 283
 		var2.faceColors3 = this.faceColors3; // L: 284
 		var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285
-		var2.field2439 = this.field2439; // L: 286
+		var2.field2448 = this.field2448; // L: 286
 		var2.faceTextures = this.faceTextures; // L: 287
-		var2.field2441 = this.field2441; // L: 288
-		var2.field2443 = this.field2443; // L: 289
-		var2.field2444 = this.field2444; // L: 290
-		var2.field2468 = this.field2468; // L: 291
+		var2.field2437 = this.field2437; // L: 288
+		var2.field2449 = this.field2449; // L: 289
+		var2.field2440 = this.field2440; // L: 290
+		var2.field2441 = this.field2441; // L: 291
 		var2.vertexLabels = this.vertexLabels; // L: 292
 		var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293
 		var2.isSingleTile = this.isSingleTile; // L: 294
@@ -544,7 +544,7 @@ public class Model extends Renderable {
 		return var2; // L: 296
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("calculateBoundingBox")
 	void calculateBoundingBox(int var1) {
 		if (this.xMidOffset == -1) { // L: 300
@@ -558,9 +558,9 @@ public class Model extends Renderable {
 			int var9 = Model_sine[var1]; // L: 308
 
 			for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309
-				int var11 = Rasterizer3D.method3863(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310
+				int var11 = Rasterizer3D.method3969(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310
 				int var12 = this.verticesY[var10]; // L: 311
-				int var13 = Rasterizer3D.method3864(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312
+				int var13 = Rasterizer3D.method3970(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312
 				if (var11 < var2) { // L: 313
 					var2 = var11;
 				}
@@ -608,7 +608,7 @@ public class Model extends Renderable {
 		}
 	} // L: 334
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("r")
 	@Export("calculateBoundsCylinder")
 	public void calculateBoundsCylinder() {
 		if (this.boundsType != 1) { // L: 337
@@ -641,8 +641,8 @@ public class Model extends Renderable {
 		}
 	} // L: 354
 
-	@ObfuscatedName("u")
-	void method4150() {
+	@ObfuscatedName("h")
+	void method4307() {
 		if (this.boundsType != 2) { // L: 357
 			this.boundsType = 2; // L: 358
 			this.xzRadius = 0; // L: 359
@@ -663,22 +663,22 @@ public class Model extends Renderable {
 		}
 	} // L: 370
 
-	@ObfuscatedName("l")
-	public int method4180() {
+	@ObfuscatedName("d")
+	public int method4331() {
 		this.calculateBoundsCylinder(); // L: 373
 		return this.xzRadius; // L: 374
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("z")
 	@Export("resetBounds")
 	void resetBounds() {
 		this.boundsType = 0; // L: 378
 		this.xMidOffset = -1; // L: 379
 	} // L: 380
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lgd;I)V"
+		descriptor = "(Lgi;I)V"
 	)
 	@Export("animate")
 	public void animate(Frames var1, int var2) {
@@ -700,9 +700,9 @@ public class Model extends Renderable {
 		}
 	} // L: 395
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(Lgd;ILgd;I[I)V"
+		descriptor = "(Lgi;ILgi;I[I)V"
 	)
 	@Export("animate2")
 	public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) {
@@ -752,7 +752,7 @@ public class Model extends Renderable {
 		}
 	} // L: 401 427
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("k")
 	@Export("transform")
 	void transform(int var1, int[] var2, int var3, int var4, int var5) {
 		int var6 = var2.length; // L: 430
@@ -920,7 +920,7 @@ public class Model extends Renderable {
 		}
 	} // L: 459 474 516 537 555 557
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("g")
 	@Export("rotateY90Ccw")
 	public void rotateY90Ccw() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560
@@ -932,7 +932,7 @@ public class Model extends Renderable {
 		this.resetBounds(); // L: 565
 	} // L: 566
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@Export("rotateY180")
 	public void rotateY180() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569
@@ -943,7 +943,7 @@ public class Model extends Renderable {
 		this.resetBounds(); // L: 573
 	} // L: 574
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("x")
 	@Export("rotateY270Ccw")
 	public void rotateY270Ccw() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577
@@ -955,7 +955,7 @@ public class Model extends Renderable {
 		this.resetBounds(); // L: 582
 	} // L: 583
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("u")
 	@Export("rotateZ")
 	public void rotateZ(int var1) {
 		int var2 = Model_sine[var1]; // L: 586
@@ -970,7 +970,7 @@ public class Model extends Renderable {
 		this.resetBounds(); // L: 593
 	} // L: 594
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("q")
 	@Export("offsetBy")
 	public void offsetBy(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597
@@ -985,7 +985,7 @@ public class Model extends Renderable {
 		this.resetBounds(); // L: 602
 	} // L: 603
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("s")
 	@Export("scale")
 	public void scale(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606
@@ -997,11 +997,11 @@ public class Model extends Renderable {
 		this.resetBounds(); // L: 611
 	} // L: 612
 
-	@ObfuscatedName("t")
-	public final void method4217(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+	@ObfuscatedName("p")
+	public final void method4347(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		field2466[0] = -1; // L: 615
 		if (this.boundsType != 2 && this.boundsType != 1) { // L: 616
-			this.method4150();
+			this.method4307();
 		}
 
 		int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617
@@ -1044,13 +1044,13 @@ public class Model extends Renderable {
 			var22 += var7; // L: 649
 			var23 = var21 * var17 - var22 * var16 >> 16; // L: 650
 			var22 = var21 * var16 + var22 * var17 >> 16; // L: 651
-			field2465[var19] = var22 - var18; // L: 653
+			field2461[var19] = var22 - var18; // L: 653
 			modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654
 			modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655
-			if (this.field2442 > 0) { // L: 656
-				field2445[var19] = var20; // L: 657
-				field2467[var19] = var23; // L: 658
-				field2422[var19] = var22; // L: 659
+			if (this.field2438 > 0) { // L: 656
+				field2435[var19] = var20; // L: 657
+				field2463[var19] = var23; // L: 658
+				field2477[var19] = var22; // L: 659
 			}
 		}
 
@@ -1061,11 +1061,11 @@ public class Model extends Renderable {
 
 	} // L: 666
 
-	@ObfuscatedName("h")
-	public final void method4209(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+	@ObfuscatedName("c")
+	public final void method4309(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		field2466[0] = -1; // L: 669
 		if (this.boundsType != 2 && this.boundsType != 1) { // L: 670
-			this.method4150();
+			this.method4307();
 		}
 
 		int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671
@@ -1108,13 +1108,13 @@ public class Model extends Renderable {
 			var23 += var7; // L: 703
 			var24 = var22 * var18 - var23 * var17 >> 16; // L: 704
 			var23 = var22 * var17 + var23 * var18 >> 16; // L: 705
-			field2465[var20] = var23 - var19; // L: 707
+			field2461[var20] = var23 - var19; // L: 707
 			modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708
 			modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709
-			if (this.field2442 > 0) { // L: 710
-				field2445[var20] = var21; // L: 711
-				field2467[var20] = var24; // L: 712
-				field2422[var20] = var23; // L: 713
+			if (this.field2438 > 0) { // L: 710
+				field2435[var20] = var21; // L: 711
+				field2463[var20] = var24; // L: 712
+				field2477[var20] = var23; // L: 713
 			}
 		}
 
@@ -1125,16 +1125,16 @@ public class Model extends Renderable {
 
 	} // L: 720
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@Export("draw0")
 	final void draw0(boolean var1, boolean var2, boolean var3, long var4) {
-		if (this.diameter < 1600) { // L: 899
+		if (this.diameter < 1600) { // L: 922
 			int var6;
-			for (var6 = 0; var6 < this.diameter; ++var6) { // L: 900
+			for (var6 = 0; var6 < this.diameter; ++var6) { // L: 923
 				field2466[var6] = 0;
 			}
 
-			var6 = var3 ? 20 : 5; // L: 901
+			var6 = var3 ? 20 : 5; // L: 924
 
 			int var7;
 			int var8;
@@ -1146,423 +1146,423 @@ public class Model extends Renderable {
 			int var16;
 			int var18;
 			int var28;
-			for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 902
-				if (this.faceColors3[var7] != -2) { // L: 903
-					var8 = this.indices1[var7]; // L: 904
-					var9 = this.indices2[var7]; // L: 905
-					var10 = this.indices3[var7]; // L: 906
-					var11 = modelViewportXs[var8]; // L: 907
-					var12 = modelViewportXs[var9]; // L: 908
-					var28 = modelViewportXs[var10]; // L: 909
+			for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 925
+				if (this.faceColors3[var7] != -2) { // L: 926
+					var8 = this.indices1[var7]; // L: 927
+					var9 = this.indices2[var7]; // L: 928
+					var10 = this.indices3[var7]; // L: 929
+					var11 = modelViewportXs[var8]; // L: 930
+					var12 = modelViewportXs[var9]; // L: 931
+					var28 = modelViewportXs[var10]; // L: 932
 					int var29;
-					if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 910
-						if (var2 && ArchiveLoader.method2059(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 936
-							Actor.method2191(var4); // L: 937
-							var2 = false; // L: 938
+					if (!var1 || var11 != -5000 && var12 != -5000 && var28 != -5000) { // L: 933
+						if (var2 && FontName.method6331(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 959
+							ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; // L: 962
+							var2 = false; // L: 964
 						}
 
-						if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 940
-							field2485[var7] = false; // L: 941
-							if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 942
-								field2455[var7] = false; // L: 943
+						if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 966
+							field2458[var7] = false; // L: 967
+							if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 968
+								field2469[var7] = false; // L: 969
 							} else {
-								field2455[var7] = true;
+								field2469[var7] = true;
 							}
 
-							var29 = (field2465[var8] + field2465[var9] + field2465[var10]) / 3 + this.radius; // L: 944
-							field2471[var29][field2466[var29]++] = var7; // L: 945
+							var29 = (field2461[var8] + field2461[var9] + field2461[var10]) / 3 + this.radius; // L: 970
+							field2451[var29][field2466[var29]++] = var7; // L: 971
 						}
 					} else {
-						var29 = field2445[var8]; // L: 911
-						var15 = field2445[var9]; // L: 912
-						var16 = field2445[var10]; // L: 913
-						int var30 = field2467[var8]; // L: 914
-						var18 = field2467[var9]; // L: 915
-						int var19 = field2467[var10]; // L: 916
-						int var20 = field2422[var8]; // L: 917
-						int var21 = field2422[var9]; // L: 918
-						int var22 = field2422[var10]; // L: 919
-						var29 -= var15; // L: 920
-						var16 -= var15; // L: 921
-						var30 -= var18; // L: 922
-						var19 -= var18; // L: 923
-						var20 -= var21; // L: 924
-						var22 -= var21; // L: 925
-						int var23 = var30 * var22 - var20 * var19; // L: 926
-						int var24 = var20 * var16 - var29 * var22; // L: 927
-						int var25 = var29 * var19 - var30 * var16; // L: 928
-						if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 929
-							field2485[var7] = true; // L: 930
-							int var26 = (field2465[var8] + field2465[var9] + field2465[var10]) / 3 + this.radius; // L: 931
-							field2471[var26][field2466[var26]++] = var7; // L: 932
+						var29 = field2435[var8]; // L: 934
+						var15 = field2435[var9]; // L: 935
+						var16 = field2435[var10]; // L: 936
+						int var30 = field2463[var8]; // L: 937
+						var18 = field2463[var9]; // L: 938
+						int var19 = field2463[var10]; // L: 939
+						int var20 = field2477[var8]; // L: 940
+						int var21 = field2477[var9]; // L: 941
+						int var22 = field2477[var10]; // L: 942
+						var29 -= var15; // L: 943
+						var16 -= var15; // L: 944
+						var30 -= var18; // L: 945
+						var19 -= var18; // L: 946
+						var20 -= var21; // L: 947
+						var22 -= var21; // L: 948
+						int var23 = var30 * var22 - var20 * var19; // L: 949
+						int var24 = var20 * var16 - var29 * var22; // L: 950
+						int var25 = var29 * var19 - var30 * var16; // L: 951
+						if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 952
+							field2458[var7] = true; // L: 953
+							int var26 = (field2461[var8] + field2461[var9] + field2461[var10]) / 3 + this.radius; // L: 954
+							field2451[var26][field2466[var26]++] = var7; // L: 955
 						}
 					}
 				}
 			}
 
 			int[] var27;
-			if (this.faceRenderPriorities == null) { // L: 949
-				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 950
-					var8 = field2466[var7]; // L: 951
-					if (var8 > 0) { // L: 952
-						var27 = field2471[var7]; // L: 953
+			if (this.faceRenderPriorities == null) { // L: 975
+				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 976
+					var8 = field2466[var7]; // L: 977
+					if (var8 > 0) { // L: 978
+						var27 = field2451[var7]; // L: 979
 
-						for (var10 = 0; var10 < var8; ++var10) { // L: 954
+						for (var10 = 0; var10 < var8; ++var10) { // L: 980
 							this.drawFace(var27[var10]);
 						}
 					}
 				}
 
 			} else {
-				for (var7 = 0; var7 < 12; ++var7) { // L: 959
-					field2472[var7] = 0; // L: 960
-					field2434[var7] = 0; // L: 961
+				for (var7 = 0; var7 < 12; ++var7) { // L: 985
+					field2468[var7] = 0; // L: 986
+					field2472[var7] = 0; // L: 987
 				}
 
-				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 963
-					var8 = field2466[var7]; // L: 964
-					if (var8 > 0) { // L: 965
-						var27 = field2471[var7]; // L: 966
+				for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 989
+					var8 = field2466[var7]; // L: 990
+					if (var8 > 0) { // L: 991
+						var27 = field2451[var7]; // L: 992
 
-						for (var10 = 0; var10 < var8; ++var10) { // L: 967
-							var11 = var27[var10]; // L: 968
-							byte var31 = this.faceRenderPriorities[var11]; // L: 969
-							var28 = field2472[var31]++; // L: 970
-							field2473[var31][var28] = var11; // L: 971
-							if (var31 < 10) { // L: 972
-								int[] var10000 = field2434;
-								var10000[var31] += var7;
-							} else if (var31 == 10) { // L: 973
-								field2474[var28] = var7;
+						for (var10 = 0; var10 < var8; ++var10) { // L: 993
+							var11 = var27[var10]; // L: 994
+							byte var33 = this.faceRenderPriorities[var11]; // L: 995
+							var28 = field2468[var33]++; // L: 996
+							field2467[var33][var28] = var11; // L: 997
+							if (var33 < 10) { // L: 998
+								int[] var10000 = field2472;
+								var10000[var33] += var7;
+							} else if (var33 == 10) { // L: 999
+								field2470[var28] = var7;
 							} else {
-								field2475[var28] = var7; // L: 974
+								field2422[var28] = var7; // L: 1000
 							}
 						}
 					}
 				}
 
-				var7 = 0; // L: 978
-				if (field2472[1] > 0 || field2472[2] > 0) { // L: 979
-					var7 = (field2434[1] + field2434[2]) / (field2472[1] + field2472[2]);
+				var7 = 0; // L: 1004
+				if (field2468[1] > 0 || field2468[2] > 0) { // L: 1005
+					var7 = (field2472[1] + field2472[2]) / (field2468[1] + field2468[2]);
 				}
 
-				var8 = 0; // L: 980
-				if (field2472[3] > 0 || field2472[4] > 0) { // L: 981
-					var8 = (field2434[3] + field2434[4]) / (field2472[3] + field2472[4]);
+				var8 = 0; // L: 1006
+				if (field2468[3] > 0 || field2468[4] > 0) { // L: 1007
+					var8 = (field2472[3] + field2472[4]) / (field2468[3] + field2468[4]);
 				}
 
-				var9 = 0; // L: 982
-				if (field2472[6] > 0 || field2472[8] > 0) { // L: 983
-					var9 = (field2434[8] + field2434[6]) / (field2472[8] + field2472[6]);
+				var9 = 0; // L: 1008
+				if (field2468[6] > 0 || field2468[8] > 0) { // L: 1009
+					var9 = (field2472[8] + field2472[6]) / (field2468[8] + field2468[6]);
 				}
 
-				var11 = 0; // L: 985
-				var12 = field2472[10]; // L: 986
-				int[] var13 = field2473[10]; // L: 987
-				int[] var14 = field2474; // L: 988
-				if (var11 == var12) { // L: 989
-					var11 = 0; // L: 990
-					var12 = field2472[11]; // L: 991
-					var13 = field2473[11]; // L: 992
-					var14 = field2475; // L: 993
+				var11 = 0; // L: 1011
+				var12 = field2468[10]; // L: 1012
+				int[] var13 = field2467[10]; // L: 1013
+				int[] var14 = field2470; // L: 1014
+				if (var11 == var12) { // L: 1015
+					var11 = 0; // L: 1016
+					var12 = field2468[11]; // L: 1017
+					var13 = field2467[11]; // L: 1018
+					var14 = field2422; // L: 1019
 				}
 
-				if (var11 < var12) { // L: 995
+				if (var11 < var12) { // L: 1021
 					var10 = var14[var11];
 				} else {
-					var10 = -1000; // L: 996
+					var10 = -1000; // L: 1022
 				}
 
-				for (var15 = 0; var15 < 10; ++var15) { // L: 997
-					while (var15 == 0 && var10 > var7) { // L: 998
-						this.drawFace(var13[var11++]); // L: 999
-						if (var11 == var12 && var13 != field2473[11]) { // L: 1000
-							var11 = 0; // L: 1001
-							var12 = field2472[11]; // L: 1002
-							var13 = field2473[11]; // L: 1003
-							var14 = field2475; // L: 1004
+				for (var15 = 0; var15 < 10; ++var15) { // L: 1023
+					while (var15 == 0 && var10 > var7) { // L: 1024
+						this.drawFace(var13[var11++]); // L: 1025
+						if (var11 == var12 && var13 != field2467[11]) { // L: 1026
+							var11 = 0; // L: 1027
+							var12 = field2468[11]; // L: 1028
+							var13 = field2467[11]; // L: 1029
+							var14 = field2422; // L: 1030
 						}
 
-						if (var11 < var12) { // L: 1006
+						if (var11 < var12) { // L: 1032
 							var10 = var14[var11];
 						} else {
-							var10 = -1000; // L: 1007
+							var10 = -1000; // L: 1033
 						}
 					}
 
-					while (var15 == 3 && var10 > var8) { // L: 1009
-						this.drawFace(var13[var11++]); // L: 1010
-						if (var11 == var12 && var13 != field2473[11]) { // L: 1011
-							var11 = 0; // L: 1012
-							var12 = field2472[11]; // L: 1013
-							var13 = field2473[11]; // L: 1014
-							var14 = field2475; // L: 1015
+					while (var15 == 3 && var10 > var8) { // L: 1035
+						this.drawFace(var13[var11++]); // L: 1036
+						if (var11 == var12 && var13 != field2467[11]) { // L: 1037
+							var11 = 0; // L: 1038
+							var12 = field2468[11]; // L: 1039
+							var13 = field2467[11]; // L: 1040
+							var14 = field2422; // L: 1041
 						}
 
-						if (var11 < var12) { // L: 1017
+						if (var11 < var12) { // L: 1043
 							var10 = var14[var11];
 						} else {
-							var10 = -1000; // L: 1018
+							var10 = -1000; // L: 1044
 						}
 					}
 
-					while (var15 == 5 && var10 > var9) { // L: 1020
-						this.drawFace(var13[var11++]); // L: 1021
-						if (var11 == var12 && var13 != field2473[11]) { // L: 1022
-							var11 = 0; // L: 1023
-							var12 = field2472[11]; // L: 1024
-							var13 = field2473[11]; // L: 1025
-							var14 = field2475; // L: 1026
+					while (var15 == 5 && var10 > var9) { // L: 1046
+						this.drawFace(var13[var11++]); // L: 1047
+						if (var11 == var12 && var13 != field2467[11]) { // L: 1048
+							var11 = 0; // L: 1049
+							var12 = field2468[11]; // L: 1050
+							var13 = field2467[11]; // L: 1051
+							var14 = field2422; // L: 1052
 						}
 
-						if (var11 < var12) { // L: 1028
+						if (var11 < var12) { // L: 1054
 							var10 = var14[var11];
 						} else {
-							var10 = -1000; // L: 1029
+							var10 = -1000; // L: 1055
 						}
 					}
 
-					var16 = field2472[var15]; // L: 1031
-					int[] var17 = field2473[var15]; // L: 1032
+					var16 = field2468[var15]; // L: 1057
+					int[] var17 = field2467[var15]; // L: 1058
 
-					for (var18 = 0; var18 < var16; ++var18) { // L: 1033
-						this.drawFace(var17[var18]); // L: 1034
+					for (var18 = 0; var18 < var16; ++var18) { // L: 1059
+						this.drawFace(var17[var18]); // L: 1060
 					}
 				}
 
-				while (var10 != -1000) { // L: 1037
-					this.drawFace(var13[var11++]); // L: 1038
-					if (var11 == var12 && var13 != field2473[11]) { // L: 1039
-						var11 = 0; // L: 1040
-						var13 = field2473[11]; // L: 1041
-						var12 = field2472[11]; // L: 1042
-						var14 = field2475; // L: 1043
+				while (var10 != -1000) { // L: 1063
+					this.drawFace(var13[var11++]); // L: 1064
+					if (var11 == var12 && var13 != field2467[11]) { // L: 1065
+						var11 = 0; // L: 1066
+						var13 = field2467[11]; // L: 1067
+						var12 = field2468[11]; // L: 1068
+						var14 = field2422; // L: 1069
 					}
 
-					if (var11 < var12) { // L: 1045
+					if (var11 < var12) { // L: 1071
 						var10 = var14[var11];
 					} else {
-						var10 = -1000; // L: 1046
+						var10 = -1000; // L: 1072
 					}
 				}
 
 			}
 		}
-	} // L: 957 1048
+	} // L: 983 1074
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@Export("drawFace")
 	final void drawFace(int var1) {
-		if (field2485[var1]) { // L: 1051
-			this.method4167(var1); // L: 1052
+		if (field2458[var1]) { // L: 1077
+			this.method4320(var1); // L: 1078
 		} else {
-			int var2 = this.indices1[var1]; // L: 1055
-			int var3 = this.indices2[var1]; // L: 1056
-			int var4 = this.indices3[var1]; // L: 1057
-			Rasterizer3D.field2262 = field2455[var1]; // L: 1058
-			if (this.faceAlphas == null) { // L: 1059
+			int var2 = this.indices1[var1]; // L: 1081
+			int var3 = this.indices2[var1]; // L: 1082
+			int var4 = this.indices3[var1]; // L: 1083
+			Rasterizer3D.field2262 = field2469[var1]; // L: 1084
+			if (this.faceAlphas == null) { // L: 1085
 				Rasterizer3D.Rasterizer3D_alpha = 0;
 			} else {
-				Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1060
+				Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1086
 			}
 
-			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1061
+			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1087
 				int var5;
 				int var6;
 				int var7;
-				if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1069
-					int var8 = this.field2439[var1] & 255; // L: 1070
-					var5 = this.field2443[var8]; // L: 1071
-					var6 = this.field2444[var8]; // L: 1072
-					var7 = this.field2468[var8]; // L: 1073
+				if (this.field2448 != null && this.field2448[var1] != -1) { // L: 1095
+					int var8 = this.field2448[var1] & 255; // L: 1096
+					var5 = this.field2449[var8]; // L: 1097
+					var6 = this.field2440[var8]; // L: 1098
+					var7 = this.field2441[var8]; // L: 1099
 				} else {
-					var5 = var2; // L: 1076
-					var6 = var3; // L: 1077
-					var7 = var4; // L: 1078
+					var5 = var2; // L: 1102
+					var6 = var3; // L: 1103
+					var7 = var4; // L: 1104
 				}
 
 				if (this.faceColors3[var1] == -1) {
-					Rasterizer3D.method3877(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var5], field2445[var6], field2445[var7], field2467[var5], field2467[var6], field2467[var7], field2422[var5], field2422[var6], field2422[var7], this.faceTextures[var1]); // L: 1080
+					Rasterizer3D.method3964(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var5], field2435[var6], field2435[var7], field2463[var5], field2463[var6], field2463[var7], field2477[var5], field2477[var6], field2477[var7], this.faceTextures[var1]); // L: 1106
 				} else {
-					Rasterizer3D.method3877(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2445[var5], field2445[var6], field2445[var7], field2467[var5], field2467[var6], field2467[var7], field2422[var5], field2422[var6], field2422[var7], this.faceTextures[var1]); // L: 1081
+					Rasterizer3D.method3964(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2435[var5], field2435[var6], field2435[var7], field2463[var5], field2463[var6], field2463[var7], field2477[var5], field2477[var6], field2477[var7], this.faceTextures[var1]); // L: 1107
 				}
-			} else if (this.faceColors3[var1] == -1) { // L: 1062
-				Rasterizer3D.method3919(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2488[this.faceColors1[var1]]);
+			} else if (this.faceColors3[var1] == -1) { // L: 1088
+				Rasterizer3D.method3962(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2484[this.faceColors1[var1]]);
 			} else {
-				Rasterizer3D.method3854(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1063
+				Rasterizer3D.method3960(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1089
 			}
 
 		}
-	} // L: 1053 1083
+	} // L: 1079 1109
 
-	@ObfuscatedName("ae")
-	final void method4167(int var1) {
-		int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1086
-		int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1087
-		int var4 = 0; // L: 1088
-		int var5 = this.indices1[var1]; // L: 1089
-		int var6 = this.indices2[var1]; // L: 1090
-		int var7 = this.indices3[var1]; // L: 1091
-		int var8 = field2422[var5]; // L: 1092
-		int var9 = field2422[var6]; // L: 1093
-		int var10 = field2422[var7]; // L: 1094
-		if (this.faceAlphas == null) { // L: 1095
+	@ObfuscatedName("w")
+	final void method4320(int var1) {
+		int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1112
+		int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1113
+		int var4 = 0; // L: 1114
+		int var5 = this.indices1[var1]; // L: 1115
+		int var6 = this.indices2[var1]; // L: 1116
+		int var7 = this.indices3[var1]; // L: 1117
+		int var8 = field2477[var5]; // L: 1118
+		int var9 = field2477[var6]; // L: 1119
+		int var10 = field2477[var7]; // L: 1120
+		if (this.faceAlphas == null) { // L: 1121
 			Rasterizer3D.Rasterizer3D_alpha = 0;
 		} else {
-			Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1096
+			Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1122
 		}
 
 		int var11;
 		int var12;
 		int var13;
 		int var14;
-		if (var8 >= 50) { // L: 1097
-			field2477[var4] = modelViewportXs[var5]; // L: 1098
-			field2489[var4] = modelViewportYs[var5]; // L: 1099
-			field2479[var4++] = this.faceColors1[var1]; // L: 1100
+		if (var8 >= 50) { // L: 1123
+			field2473[var4] = modelViewportXs[var5]; // L: 1124
+			field2474[var4] = modelViewportYs[var5]; // L: 1125
+			field2475[var4++] = this.faceColors1[var1]; // L: 1126
 		} else {
-			var11 = field2445[var5]; // L: 1103
-			var12 = field2467[var5]; // L: 1104
-			var13 = this.faceColors1[var1]; // L: 1105
-			if (var10 >= 50) { // L: 1106
-				var14 = field2425[var10 - var8] * (50 - var8); // L: 1107
-				field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var7] - var11) * var14 >> 16)) / 50; // L: 1108
-				field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1109
-				field2479[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1110
+			var11 = field2435[var5]; // L: 1129
+			var12 = field2463[var5]; // L: 1130
+			var13 = this.faceColors1[var1]; // L: 1131
+			if (var10 >= 50) { // L: 1132
+				var14 = field2485[var10 - var8] * (50 - var8); // L: 1133
+				field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var7] - var11) * var14 >> 16)) / 50; // L: 1134
+				field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var7] - var12) * var14 >> 16)) / 50; // L: 1135
+				field2475[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1136
 			}
 
-			if (var9 >= 50) { // L: 1112
-				var14 = field2425[var9 - var8] * (50 - var8); // L: 1113
-				field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var6] - var11) * var14 >> 16)) / 50; // L: 1114
-				field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1115
-				field2479[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1116
+			if (var9 >= 50) { // L: 1138
+				var14 = field2485[var9 - var8] * (50 - var8); // L: 1139
+				field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var6] - var11) * var14 >> 16)) / 50; // L: 1140
+				field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var6] - var12) * var14 >> 16)) / 50; // L: 1141
+				field2475[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1142
 			}
 		}
 
-		if (var9 >= 50) { // L: 1119
-			field2477[var4] = modelViewportXs[var6]; // L: 1120
-			field2489[var4] = modelViewportYs[var6]; // L: 1121
-			field2479[var4++] = this.faceColors2[var1]; // L: 1122
+		if (var9 >= 50) { // L: 1145
+			field2473[var4] = modelViewportXs[var6]; // L: 1146
+			field2474[var4] = modelViewportYs[var6]; // L: 1147
+			field2475[var4++] = this.faceColors2[var1]; // L: 1148
 		} else {
-			var11 = field2445[var6]; // L: 1125
-			var12 = field2467[var6]; // L: 1126
-			var13 = this.faceColors2[var1]; // L: 1127
-			if (var8 >= 50) { // L: 1128
-				var14 = field2425[var8 - var9] * (50 - var9); // L: 1129
-				field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var5] - var11) * var14 >> 16)) / 50; // L: 1130
-				field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1131
-				field2479[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1132
+			var11 = field2435[var6]; // L: 1151
+			var12 = field2463[var6]; // L: 1152
+			var13 = this.faceColors2[var1]; // L: 1153
+			if (var8 >= 50) { // L: 1154
+				var14 = field2485[var8 - var9] * (50 - var9); // L: 1155
+				field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var5] - var11) * var14 >> 16)) / 50; // L: 1156
+				field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var5] - var12) * var14 >> 16)) / 50; // L: 1157
+				field2475[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1158
 			}
 
-			if (var10 >= 50) { // L: 1134
-				var14 = field2425[var10 - var9] * (50 - var9); // L: 1135
-				field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var7] - var11) * var14 >> 16)) / 50; // L: 1136
-				field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var7] - var12) * var14 >> 16)) / 50; // L: 1137
-				field2479[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1138
+			if (var10 >= 50) { // L: 1160
+				var14 = field2485[var10 - var9] * (50 - var9); // L: 1161
+				field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var7] - var11) * var14 >> 16)) / 50; // L: 1162
+				field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var7] - var12) * var14 >> 16)) / 50; // L: 1163
+				field2475[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1164
 			}
 		}
 
-		if (var10 >= 50) { // L: 1141
-			field2477[var4] = modelViewportXs[var7]; // L: 1142
-			field2489[var4] = modelViewportYs[var7]; // L: 1143
-			field2479[var4++] = this.faceColors3[var1]; // L: 1144
+		if (var10 >= 50) { // L: 1167
+			field2473[var4] = modelViewportXs[var7]; // L: 1168
+			field2474[var4] = modelViewportYs[var7]; // L: 1169
+			field2475[var4++] = this.faceColors3[var1]; // L: 1170
 		} else {
-			var11 = field2445[var7]; // L: 1147
-			var12 = field2467[var7]; // L: 1148
-			var13 = this.faceColors3[var1]; // L: 1149
-			if (var9 >= 50) { // L: 1150
-				var14 = field2425[var9 - var10] * (50 - var10); // L: 1151
-				field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var6] - var11) * var14 >> 16)) / 50; // L: 1152
-				field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var6] - var12) * var14 >> 16)) / 50; // L: 1153
-				field2479[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1154
+			var11 = field2435[var7]; // L: 1173
+			var12 = field2463[var7]; // L: 1174
+			var13 = this.faceColors3[var1]; // L: 1175
+			if (var9 >= 50) { // L: 1176
+				var14 = field2485[var9 - var10] * (50 - var10); // L: 1177
+				field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var6] - var11) * var14 >> 16)) / 50; // L: 1178
+				field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var6] - var12) * var14 >> 16)) / 50; // L: 1179
+				field2475[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1180
 			}
 
-			if (var8 >= 50) { // L: 1156
-				var14 = field2425[var8 - var10] * (50 - var10); // L: 1157
-				field2477[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2445[var5] - var11) * var14 >> 16)) / 50; // L: 1158
-				field2489[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2467[var5] - var12) * var14 >> 16)) / 50; // L: 1159
-				field2479[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1160
+			if (var8 >= 50) { // L: 1182
+				var14 = field2485[var8 - var10] * (50 - var10); // L: 1183
+				field2473[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field2435[var5] - var11) * var14 >> 16)) / 50; // L: 1184
+				field2474[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field2463[var5] - var12) * var14 >> 16)) / 50; // L: 1185
+				field2475[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1186
 			}
 		}
 
-		var11 = field2477[0]; // L: 1163
-		var12 = field2477[1]; // L: 1164
-		var13 = field2477[2]; // L: 1165
-		var14 = field2489[0]; // L: 1166
-		int var15 = field2489[1]; // L: 1167
-		int var16 = field2489[2]; // L: 1168
-		Rasterizer3D.field2262 = false; // L: 1169
+		var11 = field2473[0]; // L: 1189
+		var12 = field2473[1]; // L: 1190
+		var13 = field2473[2]; // L: 1191
+		var14 = field2474[0]; // L: 1192
+		int var15 = field2474[1]; // L: 1193
+		int var16 = field2474[2]; // L: 1194
+		Rasterizer3D.field2262 = false; // L: 1195
 		int var17;
 		int var18;
 		int var19;
 		int var20;
-		if (var4 == 3) { // L: 1170
-			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1171
+		if (var4 == 3) { // L: 1196
+			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1197
 				Rasterizer3D.field2262 = true;
 			}
 
-			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1172
-				if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1180
-					var20 = this.field2439[var1] & 255; // L: 1181
-					var17 = this.field2443[var20]; // L: 1182
-					var18 = this.field2444[var20]; // L: 1183
-					var19 = this.field2468[var20]; // L: 1184
+			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1198
+				if (this.field2448 != null && this.field2448[var1] != -1) { // L: 1206
+					var20 = this.field2448[var1] & 255; // L: 1207
+					var17 = this.field2449[var20]; // L: 1208
+					var18 = this.field2440[var20]; // L: 1209
+					var19 = this.field2441[var20]; // L: 1210
 				} else {
-					var17 = var5; // L: 1187
-					var18 = var6; // L: 1188
-					var19 = var7; // L: 1189
+					var17 = var5; // L: 1213
+					var18 = var6; // L: 1214
+					var19 = var7; // L: 1215
 				}
 
-				if (this.faceColors3[var1] == -1) { // L: 1191
-					Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], this.faceTextures[var1]);
+				if (this.faceColors3[var1] == -1) { // L: 1217
+					Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], this.faceTextures[var1]);
 				} else {
-					Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], this.faceTextures[var1]); // L: 1192
+					Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], this.faceTextures[var1]); // L: 1218
 				}
-			} else if (this.faceColors3[var1] == -1) { // L: 1173
-				Rasterizer3D.method3919(var14, var15, var16, var11, var12, var13, field2488[this.faceColors1[var1]]);
+			} else if (this.faceColors3[var1] == -1) { // L: 1199
+				Rasterizer3D.method3962(var14, var15, var16, var11, var12, var13, field2484[this.faceColors1[var1]]);
 			} else {
-				Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2]); // L: 1174
+				Rasterizer3D.method3960(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2]); // L: 1200
 			}
 		}
 
-		if (var4 == 4) { // L: 1195
-			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2477[3] < 0 || field2477[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1196
+		if (var4 == 4) { // L: 1221
+			if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field2473[3] < 0 || field2473[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1222
 				Rasterizer3D.field2262 = true;
 			}
 
-			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1197
-				if (this.field2439 != null && this.field2439[var1] != -1) { // L: 1212
-					var20 = this.field2439[var1] & 255; // L: 1213
-					var17 = this.field2443[var20]; // L: 1214
-					var18 = this.field2444[var20]; // L: 1215
-					var19 = this.field2468[var20]; // L: 1216
+			if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1223
+				if (this.field2448 != null && this.field2448[var1] != -1) { // L: 1238
+					var20 = this.field2448[var1] & 255; // L: 1239
+					var17 = this.field2449[var20]; // L: 1240
+					var18 = this.field2440[var20]; // L: 1241
+					var19 = this.field2441[var20]; // L: 1242
 				} else {
-					var17 = var5; // L: 1219
-					var18 = var6; // L: 1220
-					var19 = var7; // L: 1221
+					var17 = var5; // L: 1245
+					var18 = var6; // L: 1246
+					var19 = var7; // L: 1247
 				}
 
-				short var21 = this.faceTextures[var1]; // L: 1223
-				if (this.faceColors3[var1] == -1) { // L: 1224
-					Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1225
-					Rasterizer3D.method3877(var14, var16, field2489[3], var11, var13, field2477[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1226
+				short var21 = this.faceTextures[var1]; // L: 1249
+				if (this.faceColors3[var1] == -1) { // L: 1250
+					Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1251
+					Rasterizer3D.method3964(var14, var16, field2474[3], var11, var13, field2473[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1252
 				} else {
-					Rasterizer3D.method3877(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1229
-					Rasterizer3D.method3877(var14, var16, field2489[3], var11, var13, field2477[3], field2479[0], field2479[2], field2479[3], field2445[var17], field2445[var18], field2445[var19], field2467[var17], field2467[var18], field2467[var19], field2422[var17], field2422[var18], field2422[var19], var21); // L: 1230
+					Rasterizer3D.method3964(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1255
+					Rasterizer3D.method3964(var14, var16, field2474[3], var11, var13, field2473[3], field2475[0], field2475[2], field2475[3], field2435[var17], field2435[var18], field2435[var19], field2463[var17], field2463[var18], field2463[var19], field2477[var17], field2477[var18], field2477[var19], var21); // L: 1256
 				}
-			} else if (this.faceColors3[var1] == -1) { // L: 1198
-				var17 = field2488[this.faceColors1[var1]]; // L: 1199
-				Rasterizer3D.method3919(var14, var15, var16, var11, var12, var13, var17); // L: 1200
-				Rasterizer3D.method3919(var14, var16, field2489[3], var11, var13, field2477[3], var17); // L: 1201
+			} else if (this.faceColors3[var1] == -1) { // L: 1224
+				var17 = field2484[this.faceColors1[var1]]; // L: 1225
+				Rasterizer3D.method3962(var14, var15, var16, var11, var12, var13, var17); // L: 1226
+				Rasterizer3D.method3962(var14, var16, field2474[3], var11, var13, field2473[3], var17); // L: 1227
 			} else {
-				Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2479[0], field2479[1], field2479[2]); // L: 1204
-				Rasterizer3D.method3854(var14, var16, field2489[3], var11, var13, field2477[3], field2479[0], field2479[2], field2479[3]); // L: 1205
+				Rasterizer3D.method3960(var14, var15, var16, var11, var12, var13, field2475[0], field2475[1], field2475[2]); // L: 1230
+				Rasterizer3D.method3960(var14, var16, field2474[3], var11, var13, field2473[3], field2475[0], field2475[2], field2475[3]); // L: 1231
 			}
 		}
 
-	} // L: 1234
+	} // L: 1260
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("bh")
 	@Export("draw")
 	void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
 		field2466[0] = -1; // L: 723
@@ -1595,146 +1595,174 @@ public class Model extends Renderable {
 								var25 = true;
 							}
 
-							boolean var26 = var25 || this.field2442 > 0; // L: 747
-							int var27 = class125.method2504(); // L: 748
-							int var28 = Players.method2311(); // L: 749
-							boolean var29 = ViewportMouse.ViewportMouse_isInViewport; // L: 752
-							boolean var32 = var9 != 0L; // L: 757
-							boolean var33;
-							if (var32) { // L: 758
-								var33 = (int)(var9 >>> 16 & 1L) == 1; // L: 761
-								var32 = !var33; // L: 763
-							}
-
-							var33 = false; // L: 768
+							boolean var26 = var25 || this.field2438 > 0; // L: 747
+							int var27 = FloorUnderlayDefinition.method2924(); // L: 748
+							int var28 = WorldMapSection2.method3333(); // L: 749
+							boolean var29 = class8.method103(); // L: 750
+							boolean var30 = 0L != var9 && !class24.method329(var9); // L: 753
+							boolean var32 = false; // L: 756
+							int var36;
+							int var37;
 							int var38;
 							int var39;
-							int var40;
-							int var41;
-							int var42;
 							int var47;
-							int var51;
-							int var52;
-							if (var32 && var29) { // L: 769
-								boolean var34 = false; // L: 770
-								if (field2483) { // L: 771
-									boolean var37 = ViewportMouse.ViewportMouse_isInViewport; // L: 777
-									boolean var35;
-									if (!var37) { // L: 779
-										var35 = false; // L: 780
+							int var53;
+							int var54;
+							int var55;
+							if (var30 && var29) { // L: 757
+								boolean var33 = false; // L: 758
+								if (field2479) { // L: 759
+									boolean var34;
+									if (!class8.method103()) { // L: 763
+										var34 = false; // L: 764
 									} else {
-										FileSystem.method2545(); // L: 783
-										var38 = this.xMid + var6; // L: 784
-										var39 = var7 + this.yMid; // L: 785
-										var40 = var8 + this.zMid; // L: 786
-										var41 = this.xMidOffset; // L: 787
-										var42 = this.yMidOffset; // L: 788
-										int var43 = this.zMidOffset; // L: 789
-										int var44 = ViewportMouse.field2492 - var38; // L: 790
-										int var45 = class249.field3118 - var39; // L: 791
-										int var46 = ViewportMouse.field2497 - var40; // L: 792
-										if (Math.abs(var44) > var41 + class161.field1920) { // L: 793
-											var35 = false; // L: 794
-										} else if (Math.abs(var45) > var42 + class15.field140) { // L: 797
-											var35 = false; // L: 798
-										} else if (Math.abs(var46) > var43 + ApproximateRouteStrategy.field629) { // L: 801
-											var35 = false; // L: 802
-										} else if (Math.abs(var46 * WorldMapDecoration.field2082 - var45 * DirectByteArrayCopier.field3126) > var43 * class15.field140 + var42 * ApproximateRouteStrategy.field629) { // L: 805
-											var35 = false; // L: 806
-										} else if (Math.abs(var44 * DirectByteArrayCopier.field3126 - var46 * ViewportMouse.field2496) > var43 * class161.field1920 + var41 * ApproximateRouteStrategy.field629) { // L: 809
-											var35 = false; // L: 810
-										} else if (Math.abs(var45 * ViewportMouse.field2496 - var44 * WorldMapDecoration.field2082) > var41 * class15.field140 + var42 * class161.field1920) { // L: 813
-											var35 = false; // L: 814
+										int var42;
+										int var43;
+										int var44;
+										if (!ViewportMouse.ViewportMouse_false0) { // L: 768
+											var36 = Scene.Scene_cameraPitchSine; // L: 769
+											var37 = Scene.Scene_cameraPitchCosine; // L: 770
+											var38 = Scene.Scene_cameraYawSine; // L: 771
+											var39 = Scene.Scene_cameraYawCosine; // L: 772
+											byte var40 = 50; // L: 773
+											short var41 = 3500; // L: 774
+											var42 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 775
+											var43 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var40 / Rasterizer3D.Rasterizer3D_zoom; // L: 776
+											var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 777
+											int var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; // L: 778
+											int var46 = Rasterizer3D.method3973(var43, var40, var37, var36); // L: 780
+											var54 = Rasterizer3D.method4031(var43, var40, var37, var36); // L: 781
+											var43 = var46; // L: 782
+											var46 = Rasterizer3D.method3973(var45, var41, var37, var36); // L: 783
+											var55 = Rasterizer3D.method4031(var45, var41, var37, var36); // L: 784
+											var45 = var46; // L: 785
+											var46 = Rasterizer3D.method3992(var42, var54, var39, var38); // L: 786
+											var54 = Rasterizer3D.method4000(var42, var54, var39, var38); // L: 787
+											var42 = var46; // L: 788
+											var46 = Rasterizer3D.method3992(var44, var55, var39, var38); // L: 789
+											var55 = Rasterizer3D.method4000(var44, var55, var39, var38); // L: 790
+											class2.field20 = (var42 + var46) / 2; // L: 792
+											ViewportMouse.field2490 = (var45 + var43) / 2; // L: 793
+											FillMode.field4244 = (var55 + var54) / 2; // L: 794
+											UserComparator5.field1442 = (var46 - var42) / 2; // L: 795
+											ClanChannelMember.field68 = (var45 - var43) / 2; // L: 796
+											WorldMapEvent.field2146 = (var55 - var54) / 2; // L: 797
+											MilliClock.field1523 = Math.abs(UserComparator5.field1442); // L: 798
+											EnumComposition.field1629 = Math.abs(ClanChannelMember.field68); // L: 799
+											class21.field180 = Math.abs(WorldMapEvent.field2146); // L: 800
+										}
+
+										var36 = this.xMid + var6; // L: 802
+										var37 = var7 + this.yMid; // L: 803
+										var38 = var8 + this.zMid; // L: 804
+										var39 = this.xMidOffset; // L: 805
+										var54 = this.yMidOffset; // L: 806
+										var55 = this.zMidOffset; // L: 807
+										var42 = class2.field20 - var36; // L: 808
+										var43 = ViewportMouse.field2490 - var37; // L: 809
+										var44 = FillMode.field4244 - var38; // L: 810
+										if (Math.abs(var42) > var39 + MilliClock.field1523) { // L: 811
+											var34 = false; // L: 812
+										} else if (Math.abs(var43) > var54 + EnumComposition.field1629) { // L: 815
+											var34 = false; // L: 816
+										} else if (Math.abs(var44) > var55 + class21.field180) { // L: 819
+											var34 = false; // L: 820
+										} else if (Math.abs(var44 * ClanChannelMember.field68 - var43 * WorldMapEvent.field2146) > var54 * class21.field180 + var55 * EnumComposition.field1629) { // L: 823
+											var34 = false; // L: 824
+										} else if (Math.abs(var42 * WorldMapEvent.field2146 - var44 * UserComparator5.field1442) > var39 * class21.field180 + var55 * MilliClock.field1523) { // L: 827
+											var34 = false; // L: 828
+										} else if (Math.abs(var43 * UserComparator5.field1442 - var42 * ClanChannelMember.field68) > var54 * MilliClock.field1523 + var39 * EnumComposition.field1629) { // L: 831
+											var34 = false; // L: 832
 										} else {
-											var35 = true; // L: 817
+											var34 = true; // L: 835
 										}
 									}
 
-									var34 = var35; // L: 819
+									var33 = var34; // L: 837
 								} else {
-									var52 = var12 - var13; // L: 822
-									if (var52 <= 50) { // L: 823
-										var52 = 50;
+									var53 = var12 - var13; // L: 840
+									if (var53 <= 50) { // L: 841
+										var53 = 50;
 									}
 
-									if (var15 > 0) { // L: 824
-										var16 /= var14; // L: 825
-										var17 /= var52; // L: 826
+									if (var15 > 0) { // L: 842
+										var16 /= var14; // L: 843
+										var17 /= var53; // L: 844
 									} else {
-										var17 /= var14; // L: 829
-										var16 /= var52; // L: 830
+										var17 /= var14; // L: 847
+										var16 /= var53; // L: 848
 									}
 
-									if (var18 > 0) { // L: 832
-										var22 /= var14; // L: 833
-										var20 /= var52; // L: 834
+									if (var18 > 0) { // L: 850
+										var22 /= var14; // L: 851
+										var20 /= var53; // L: 852
 									} else {
-										var20 /= var14; // L: 837
-										var22 /= var52; // L: 838
+										var20 /= var14; // L: 855
+										var22 /= var53; // L: 856
 									}
 
-									var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 840
-									var51 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 841
-									if (var47 > var16 && var47 < var17 && var51 > var22 && var51 < var20) { // L: 842
-										var34 = true; // L: 843
+									var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 858
+									var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 859
+									if (var47 > var16 && var47 < var17 && var36 > var22 && var36 < var20) { // L: 860
+										var33 = true; // L: 861
 									}
 								}
 
-								if (var34) { // L: 846
-									if (this.isSingleTile) { // L: 847
-										Actor.method2191(var9);
+								if (var33) { // L: 864
+									if (this.isSingleTile) { // L: 865
+										ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; // L: 868
 									} else {
-										var33 = true; // L: 848
+										var32 = true; // L: 871
 									}
 								}
 							}
 
-							int var50 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 851
-							var52 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 852
-							var47 = 0; // L: 853
-							var51 = 0; // L: 854
-							if (var1 != 0) { // L: 855
-								var47 = Model_sine[var1]; // L: 856
-								var51 = Model_cosine[var1]; // L: 857
+							int var52 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 874
+							var53 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 875
+							var47 = 0; // L: 876
+							var36 = 0; // L: 877
+							if (var1 != 0) { // L: 878
+								var47 = Model_sine[var1]; // L: 879
+								var36 = Model_cosine[var1]; // L: 880
 							}
 
-							for (var38 = 0; var38 < this.verticesCount; ++var38) { // L: 859
-								var39 = this.verticesX[var38]; // L: 860
-								var40 = this.verticesY[var38]; // L: 861
-								var41 = this.verticesZ[var38]; // L: 862
-								if (var1 != 0) { // L: 863
-									var42 = var41 * var47 + var39 * var51 >> 16; // L: 864
-									var41 = var41 * var51 - var39 * var47 >> 16; // L: 865
-									var39 = var42; // L: 866
+							for (var37 = 0; var37 < this.verticesCount; ++var37) { // L: 882
+								var38 = this.verticesX[var37]; // L: 883
+								var39 = this.verticesY[var37]; // L: 884
+								var54 = this.verticesZ[var37]; // L: 885
+								if (var1 != 0) { // L: 886
+									var55 = var54 * var47 + var38 * var36 >> 16; // L: 887
+									var54 = var54 * var36 - var38 * var47 >> 16; // L: 888
+									var38 = var55; // L: 889
 								}
 
-								var39 += var6; // L: 868
-								var40 += var7; // L: 869
-								var41 += var8; // L: 870
-								var42 = var41 * var4 + var5 * var39 >> 16; // L: 871
-								var41 = var5 * var41 - var39 * var4 >> 16; // L: 872
-								var39 = var42; // L: 873
-								var42 = var3 * var40 - var41 * var2 >> 16; // L: 874
-								var41 = var40 * var2 + var3 * var41 >> 16; // L: 875
-								field2465[var38] = var41 - var12; // L: 877
-								if (var41 >= 50) { // L: 878
-									modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var50; // L: 879
-									modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var52; // L: 880
+								var38 += var6; // L: 891
+								var39 += var7; // L: 892
+								var54 += var8; // L: 893
+								var55 = var54 * var4 + var5 * var38 >> 16; // L: 894
+								var54 = var5 * var54 - var38 * var4 >> 16; // L: 895
+								var38 = var55; // L: 896
+								var55 = var3 * var39 - var54 * var2 >> 16; // L: 897
+								var54 = var39 * var2 + var3 * var54 >> 16; // L: 898
+								field2461[var37] = var54 - var12; // L: 900
+								if (var54 >= 50) { // L: 901
+									modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var54 + var52; // L: 902
+									modelViewportYs[var37] = var55 * Rasterizer3D.Rasterizer3D_zoom / var54 + var53; // L: 903
 								} else {
-									modelViewportXs[var38] = -5000; // L: 883
-									var24 = true; // L: 884
+									modelViewportXs[var37] = -5000; // L: 906
+									var24 = true; // L: 907
 								}
 
-								if (var26) { // L: 886
-									field2445[var38] = var39; // L: 887
-									field2467[var38] = var42; // L: 888
-									field2422[var38] = var41; // L: 889
+								if (var26) { // L: 909
+									field2435[var37] = var38; // L: 910
+									field2463[var37] = var55; // L: 911
+									field2477[var37] = var54; // L: 912
 								}
 							}
 
 							try {
-								this.draw0(var24, var33, this.isSingleTile, var9); // L: 893
-							} catch (Exception var49) { // L: 895
+								this.draw0(var24, var32, this.isSingleTile, var9); // L: 916
+							} catch (Exception var51) { // L: 918
 							}
 
 						}
@@ -1742,5 +1770,5 @@ public class Model extends Renderable {
 				}
 			}
 		}
-	} // L: 896
+	} // L: 919
 }
diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java
index cff425b605..2e463f9c44 100644
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -3,134 +3,134 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gm")
+@ObfuscatedName("ga")
 @Implements("ModelData")
 public class ModelData extends Renderable {
-	@ObfuscatedName("as")
-	static int[] field2196;
-	@ObfuscatedName("aj")
-	static int[] field2163;
-	@ObfuscatedName("am")
-	static int field2198;
-	@ObfuscatedName("az")
+	@ObfuscatedName("aq")
+	static int[] field2197;
+	@ObfuscatedName("ae")
+	static int[] field2179;
+	@ObfuscatedName("ao")
+	static int field2199;
+	@ObfuscatedName("an")
 	@Export("ModelData_sine")
 	static int[] ModelData_sine;
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@Export("ModelData_cosine")
 	static int[] ModelData_cosine;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("verticesCount")
 	int verticesCount;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("verticesX")
 	int[] verticesX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("verticesY")
 	int[] verticesY;
 	@ObfuscatedName("y")
 	@Export("verticesZ")
 	int[] verticesZ;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("faceCount")
 	int faceCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("indices1")
 	int[] indices1;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("indices2")
 	int[] indices2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("indices3")
 	int[] indices3;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("faceRenderTypes")
 	byte[] faceRenderTypes;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("faceRenderPriorities")
 	byte[] faceRenderPriorities;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("faceAlphas")
 	byte[] faceAlphas;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("textureCoords")
 	byte[] textureCoords;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("faceColors")
 	short[] faceColors;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("faceTextures")
 	short[] faceTextures;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("priority")
 	byte priority;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("textureTriangleCount")
 	int textureTriangleCount;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("textureRenderTypes")
 	byte[] textureRenderTypes;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("texTriangleX")
 	short[] texTriangleX;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("texTriangleY")
 	short[] texTriangleY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("texTriangleZ")
 	short[] texTriangleZ;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("vertexSkins")
 	int[] vertexSkins;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("faceSkins")
 	int[] faceSkins;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("vertexLabels")
 	int[][] vertexLabels;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("faceLabelsAlpha")
 	int[][] faceLabelsAlpha;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "[Lgk;"
+		descriptor = "[Lgy;"
 	)
 	@Export("faceNormals")
 	FaceNormal[] faceNormals;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "[Lgc;"
+		descriptor = "[Lgv;"
 	)
 	@Export("vertexNormals")
 	VertexNormal[] vertexNormals;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "[Lgc;"
+		descriptor = "[Lgv;"
 	)
-	VertexNormal[] field2166;
-	@ObfuscatedName("ap")
+	VertexNormal[] field2168;
+	@ObfuscatedName("ak")
 	@Export("ambient")
 	public short ambient;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("contrast")
 	public short contrast;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("isBoundsCalculated")
 	boolean isBoundsCalculated;
-	@ObfuscatedName("ad")
-	int field2191;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ah")
 	int field2192;
-	@ObfuscatedName("ar")
-	int field2195;
+	@ObfuscatedName("az")
+	int field2193;
+	@ObfuscatedName("ap")
+	int field2194;
 	@ObfuscatedName("ag")
-	int field2174;
-	@ObfuscatedName("ax")
-	int field2199;
+	int field2176;
+	@ObfuscatedName("ab")
+	int field2195;
 
 	static {
-		field2196 = new int[10000]; // L: 44
-		field2163 = new int[10000]; // L: 45
-		field2198 = 0; // L: 46
+		field2197 = new int[10000]; // L: 44
+		field2179 = new int[10000]; // L: 45
+		field2199 = 0; // L: 46
 		ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47
 		ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48
 	}
@@ -143,7 +143,7 @@ public class ModelData extends Renderable {
 	} // L: 50
 
 	@ObfuscatedSignature(
-		descriptor = "([Lgm;I)V"
+		descriptor = "([Lga;I)V"
 	)
 	public ModelData(ModelData[] var1, int var2) {
 		this.verticesCount = 0;
@@ -274,18 +274,18 @@ public class ModelData extends Renderable {
 					}
 
 					this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547
-					this.indices1[this.faceCount] = this.method3759(var10, var10.indices1[var11]); // L: 548
-					this.indices2[this.faceCount] = this.method3759(var10, var10.indices2[var11]); // L: 549
-					this.indices3[this.faceCount] = this.method3759(var10, var10.indices3[var11]); // L: 550
+					this.indices1[this.faceCount] = this.method3868(var10, var10.indices1[var11]); // L: 548
+					this.indices2[this.faceCount] = this.method3868(var10, var10.indices2[var11]); // L: 549
+					this.indices3[this.faceCount] = this.method3868(var10, var10.indices3[var11]); // L: 550
 					++this.faceCount; // L: 551
 				}
 
 				for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553
 					byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554
 					if (var12 == 0) { // L: 555
-						this.texTriangleX[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleX[var11]); // L: 556
-						this.texTriangleY[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleY[var11]); // L: 557
-						this.texTriangleZ[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleZ[var11]); // L: 558
+						this.texTriangleX[this.textureTriangleCount] = (short)this.method3868(var10, var10.texTriangleX[var11]); // L: 556
+						this.texTriangleY[this.textureTriangleCount] = (short)this.method3868(var10, var10.texTriangleY[var11]); // L: 557
+						this.texTriangleZ[this.textureTriangleCount] = (short)this.method3868(var10, var10.texTriangleZ[var11]); // L: 558
 					}
 
 					++this.textureTriangleCount; // L: 560
@@ -301,15 +301,15 @@ public class ModelData extends Renderable {
 		this.priority = 0;
 		this.isBoundsCalculated = false;
 		if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59
-			this.method3780(var1);
+			this.method3866(var1);
 		} else {
-			this.method3758(var1); // L: 60
+			this.method3903(var1); // L: 60
 		}
 
 	} // L: 61
 
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;ZZZZ)V",
+		descriptor = "(Lga;ZZZZ)V",
 		garbageValue = "1"
 	)
 	public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) {
@@ -375,13 +375,13 @@ public class ModelData extends Renderable {
 		this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640
 		this.vertexNormals = var1.vertexNormals; // L: 641
 		this.faceNormals = var1.faceNormals; // L: 642
-		this.field2166 = var1.field2166; // L: 643
+		this.field2168 = var1.field2168; // L: 643
 		this.ambient = var1.ambient; // L: 644
 		this.contrast = var1.contrast; // L: 645
 	}
 
-	@ObfuscatedName("f")
-	void method3780(byte[] var1) {
+	@ObfuscatedName("v")
+	void method3866(byte[] var1) {
 		Buffer var2 = new Buffer(var1); // L: 64
 		Buffer var3 = new Buffer(var1); // L: 65
 		Buffer var4 = new Buffer(var1); // L: 66
@@ -686,8 +686,8 @@ public class ModelData extends Renderable {
 
 	} // L: 273
 
-	@ObfuscatedName("y")
-	void method3758(byte[] var1) {
+	@ObfuscatedName("j")
+	void method3903(byte[] var1) {
 		boolean var2 = false; // L: 276
 		boolean var3 = false; // L: 277
 		Buffer var4 = new Buffer(var1); // L: 278
@@ -963,11 +963,11 @@ public class ModelData extends Renderable {
 
 	} // L: 468
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;I)I"
+		descriptor = "(Lga;I)I"
 	)
-	final int method3759(ModelData var1, int var2) {
+	final int method3868(ModelData var1, int var2) {
 		int var3 = -1; // L: 567
 		int var4 = var1.verticesX[var2]; // L: 568
 		int var5 = var1.verticesY[var2]; // L: 569
@@ -994,11 +994,11 @@ public class ModelData extends Renderable {
 		return var3; // L: 584
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lgm;"
+		descriptor = "()Lga;"
 	)
-	public ModelData method3760() {
+	public ModelData method3870() {
 		ModelData var1 = new ModelData(); // L: 650
 		if (this.faceRenderTypes != null) { // L: 651
 			var1.faceRenderTypes = new byte[this.faceCount]; // L: 652
@@ -1038,16 +1038,16 @@ public class ModelData extends Renderable {
 		return var1; // L: 682
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "([[IIIIZI)Lgm;"
+		descriptor = "([[IIIIZI)Lga;"
 	)
-	public ModelData method3761(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
+	public ModelData method3933(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
 		this.calculateBounds(); // L: 686
-		int var7 = var2 + this.field2192; // L: 687
-		int var8 = var2 + this.field2195; // L: 688
-		int var9 = var4 + this.field2199; // L: 689
-		int var10 = var4 + this.field2174; // L: 690
+		int var7 = var2 + this.field2193; // L: 687
+		int var8 = var2 + this.field2194; // L: 688
+		int var9 = var4 + this.field2195; // L: 689
+		int var10 = var4 + this.field2176; // L: 690
 		if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691
 			var7 >>= 7; // L: 692
 			var8 = var8 + 127 >> 7; // L: 693
@@ -1132,8 +1132,8 @@ public class ModelData extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("u")
-	void method3809() {
+	@ObfuscatedName("h")
+	void method3872() {
 		int[] var1;
 		int var2;
 		int var10002;
@@ -1193,8 +1193,8 @@ public class ModelData extends Renderable {
 
 	} // L: 804
 
-	@ObfuscatedName("l")
-	public void method3763() {
+	@ObfuscatedName("d")
+	public void method3873() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807
 			int var2 = this.verticesX[var1]; // L: 808
 			this.verticesX[var1] = this.verticesZ[var1]; // L: 809
@@ -1204,8 +1204,8 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 812
 	} // L: 813
 
-	@ObfuscatedName("o")
-	public void method3829() {
+	@ObfuscatedName("z")
+	public void method3874() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816
 			this.verticesX[var1] = -this.verticesX[var1]; // L: 817
 			this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818
@@ -1214,8 +1214,8 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 820
 	} // L: 821
 
-	@ObfuscatedName("c")
-	public void method3765() {
+	@ObfuscatedName("b")
+	public void method3875() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824
 			int var2 = this.verticesZ[var1]; // L: 825
 			this.verticesZ[var1] = this.verticesX[var1]; // L: 826
@@ -1225,8 +1225,8 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 829
 	} // L: 830
 
-	@ObfuscatedName("e")
-	public void method3776(int var1) {
+	@ObfuscatedName("i")
+	public void method3864(int var1) {
 		int var2 = ModelData_sine[var1]; // L: 833
 		int var3 = ModelData_cosine[var1]; // L: 834
 
@@ -1239,7 +1239,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 840
 	} // L: 841
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("k")
 	@Export("changeOffset")
 	public void changeOffset(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844
@@ -1254,7 +1254,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 849
 	} // L: 850
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("g")
 	@Export("recolor")
 	public void recolor(short var1, short var2) {
 		for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853
@@ -1265,7 +1265,7 @@ public class ModelData extends Renderable {
 
 	} // L: 856
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@Export("retexture")
 	public void retexture(short var1, short var2) {
 		if (this.faceTextures != null) { // L: 859
@@ -1278,8 +1278,8 @@ public class ModelData extends Renderable {
 		}
 	} // L: 863
 
-	@ObfuscatedName("m")
-	public void method3769() {
+	@ObfuscatedName("x")
+	public void method3877() {
 		int var1;
 		for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866
 			this.verticesZ[var1] = -this.verticesZ[var1];
@@ -1294,7 +1294,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 872
 	} // L: 873
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("u")
 	@Export("resize")
 	public void resize(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876
@@ -1306,7 +1306,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 881
 	} // L: 882
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("q")
 	@Export("calculateVertexNormals")
 	public void calculateVertexNormals() {
 		if (this.vertexNormals == null) { // L: 885
@@ -1382,52 +1382,52 @@ public class ModelData extends Renderable {
 		}
 	} // L: 940
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("s")
 	@Export("invalidate")
 	void invalidate() {
 		this.vertexNormals = null; // L: 943
-		this.field2166 = null; // L: 944
+		this.field2168 = null; // L: 944
 		this.faceNormals = null; // L: 945
 		this.isBoundsCalculated = false; // L: 946
 	} // L: 947
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("p")
 	@Export("calculateBounds")
 	void calculateBounds() {
 		if (!this.isBoundsCalculated) { // L: 950
 			super.height = 0; // L: 951
-			this.field2191 = 0; // L: 952
-			this.field2192 = 999999; // L: 953
-			this.field2195 = -999999; // L: 954
-			this.field2174 = -99999; // L: 955
-			this.field2199 = 99999; // L: 956
+			this.field2192 = 0; // L: 952
+			this.field2193 = 999999; // L: 953
+			this.field2194 = -999999; // L: 954
+			this.field2176 = -99999; // L: 955
+			this.field2195 = 99999; // L: 956
 
 			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957
 				int var2 = this.verticesX[var1]; // L: 958
 				int var3 = this.verticesY[var1]; // L: 959
 				int var4 = this.verticesZ[var1]; // L: 960
-				if (var2 < this.field2192) { // L: 961
-					this.field2192 = var2;
+				if (var2 < this.field2193) { // L: 961
+					this.field2193 = var2;
 				}
 
-				if (var2 > this.field2195) { // L: 962
-					this.field2195 = var2;
+				if (var2 > this.field2194) { // L: 962
+					this.field2194 = var2;
 				}
 
-				if (var4 < this.field2199) { // L: 963
-					this.field2199 = var4;
+				if (var4 < this.field2195) { // L: 963
+					this.field2195 = var4;
 				}
 
-				if (var4 > this.field2174) { // L: 964
-					this.field2174 = var4;
+				if (var4 > this.field2176) { // L: 964
+					this.field2176 = var4;
 				}
 
 				if (-var3 > super.height) { // L: 965
 					super.height = -var3;
 				}
 
-				if (var3 > this.field2191) { // L: 966
-					this.field2191 = var3;
+				if (var3 > this.field2192) { // L: 966
+					this.field2192 = var3;
 				}
 			}
 
@@ -1435,9 +1435,9 @@ public class ModelData extends Renderable {
 		}
 	} // L: 969
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)Lgr;"
+		descriptor = "(IIIII)Lgd;"
 	)
 	@Export("toModel")
 	public final Model toModel(int var1, int var2, int var3, int var4, int var5) {
@@ -1458,38 +1458,38 @@ public class ModelData extends Renderable {
 				}
 			}
 
-			var8.field2442 = 0; // L: 1040
+			var8.field2438 = 0; // L: 1040
 
 			for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041
 				if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042
-					++var8.field2442;
+					++var8.field2438;
 				}
 			}
 
-			var8.field2443 = new int[var8.field2442]; // L: 1044
-			var8.field2444 = new int[var8.field2442]; // L: 1045
-			var8.field2468 = new int[var8.field2442]; // L: 1046
+			var8.field2449 = new int[var8.field2438]; // L: 1044
+			var8.field2440 = new int[var8.field2438]; // L: 1045
+			var8.field2441 = new int[var8.field2438]; // L: 1046
 			var10 = 0; // L: 1047
 
 			int var11;
 			for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048
 				if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049
-					var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050
-					var8.field2444[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051
-					var8.field2468[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052
+					var8.field2449[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050
+					var8.field2440[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051
+					var8.field2441[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052
 					var9[var11] = var10++; // L: 1053
 				} else {
 					var9[var11] = -1; // L: 1055
 				}
 			}
 
-			var8.field2439 = new byte[this.faceCount]; // L: 1057
+			var8.field2448 = new byte[this.faceCount]; // L: 1057
 
 			for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058
 				if (this.textureCoords[var11] != -1) { // L: 1059
-					var8.field2439[var11] = (byte)var9[this.textureCoords[var11] & 255];
+					var8.field2448[var11] = (byte)var9[this.textureCoords[var11] & 255];
 				} else {
-					var8.field2439[var11] = -1; // L: 1060
+					var8.field2448[var11] = -1; // L: 1060
 				}
 			}
 		}
@@ -1532,7 +1532,7 @@ public class ModelData extends Renderable {
 					if (var17 == 1) { // L: 1093
 						var19 = this.faceNormals[var16]; // L: 1094
 						var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095
-						var8.faceColors1[var16] = method3764(this.faceColors[var16] & '\uffff', var14); // L: 1096
+						var8.faceColors1[var16] = method3887(this.faceColors[var16] & '\uffff', var14); // L: 1096
 						var8.faceColors3[var16] = -1; // L: 1097
 					} else if (var17 == 3) { // L: 1099
 						var8.faceColors1[var16] = 128; // L: 1100
@@ -1542,69 +1542,69 @@ public class ModelData extends Renderable {
 					}
 				} else {
 					int var15 = this.faceColors[var16] & '\uffff'; // L: 1079
-					if (this.field2166 != null && this.field2166[this.indices1[var16]] != null) { // L: 1080
-						var13 = this.field2166[this.indices1[var16]];
+					if (this.field2168 != null && this.field2168[this.indices1[var16]] != null) { // L: 1080
+						var13 = this.field2168[this.indices1[var16]];
 					} else {
 						var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081
 					}
 
 					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082
-					var8.faceColors1[var16] = method3764(var15, var14); // L: 1083
-					if (this.field2166 != null && this.field2166[this.indices2[var16]] != null) { // L: 1084
-						var13 = this.field2166[this.indices2[var16]];
+					var8.faceColors1[var16] = method3887(var15, var14); // L: 1083
+					if (this.field2168 != null && this.field2168[this.indices2[var16]] != null) { // L: 1084
+						var13 = this.field2168[this.indices2[var16]];
 					} else {
 						var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085
 					}
 
 					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086
-					var8.faceColors2[var16] = method3764(var15, var14); // L: 1087
-					if (this.field2166 != null && this.field2166[this.indices3[var16]] != null) { // L: 1088
-						var13 = this.field2166[this.indices3[var16]];
+					var8.faceColors2[var16] = method3887(var15, var14); // L: 1087
+					if (this.field2168 != null && this.field2168[this.indices3[var16]] != null) { // L: 1088
+						var13 = this.field2168[this.indices3[var16]];
 					} else {
 						var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089
 					}
 
 					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090
-					var8.faceColors3[var16] = method3764(var15, var14); // L: 1091
+					var8.faceColors3[var16] = method3887(var15, var14); // L: 1091
 				}
 			} else if (var17 != 0) { // L: 1108
 				if (var17 == 1) { // L: 1124
 					var19 = this.faceNormals[var16]; // L: 1125
 					var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126
-					var8.faceColors1[var16] = method3777(var14); // L: 1127
+					var8.faceColors1[var16] = method3888(var14); // L: 1127
 					var8.faceColors3[var16] = -1; // L: 1128
 				} else {
 					var8.faceColors3[var16] = -2; // L: 1131
 				}
 			} else {
-				if (this.field2166 != null && this.field2166[this.indices1[var16]] != null) { // L: 1111
-					var13 = this.field2166[this.indices1[var16]];
+				if (this.field2168 != null && this.field2168[this.indices1[var16]] != null) { // L: 1111
+					var13 = this.field2168[this.indices1[var16]];
 				} else {
 					var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112
 				}
 
 				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113
-				var8.faceColors1[var16] = method3777(var14); // L: 1114
-				if (this.field2166 != null && this.field2166[this.indices2[var16]] != null) { // L: 1115
-					var13 = this.field2166[this.indices2[var16]];
+				var8.faceColors1[var16] = method3888(var14); // L: 1114
+				if (this.field2168 != null && this.field2168[this.indices2[var16]] != null) { // L: 1115
+					var13 = this.field2168[this.indices2[var16]];
 				} else {
 					var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116
 				}
 
 				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117
-				var8.faceColors2[var16] = method3777(var14); // L: 1118
-				if (this.field2166 != null && this.field2166[this.indices3[var16]] != null) { // L: 1119
-					var13 = this.field2166[this.indices3[var16]];
+				var8.faceColors2[var16] = method3888(var14); // L: 1118
+				if (this.field2168 != null && this.field2168[this.indices3[var16]] != null) { // L: 1119
+					var13 = this.field2168[this.indices3[var16]];
 				} else {
 					var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120
 				}
 
 				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121
-				var8.faceColors3[var16] = method3777(var14); // L: 1122
+				var8.faceColors3[var16] = method3888(var14); // L: 1122
 			}
 		}
 
-		this.method3809(); // L: 1135
+		this.method3872(); // L: 1135
 		var8.verticesCount = this.verticesCount; // L: 1136
 		var8.verticesX = this.verticesX; // L: 1137
 		var8.verticesY = this.verticesY; // L: 1138
@@ -1615,16 +1615,16 @@ public class ModelData extends Renderable {
 		var8.indices3 = this.indices3; // L: 1143
 		var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144
 		var8.faceAlphas = this.faceAlphas; // L: 1145
-		var8.field2441 = this.priority; // L: 1146
+		var8.field2437 = this.priority; // L: 1146
 		var8.vertexLabels = this.vertexLabels; // L: 1147
 		var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148
 		var8.faceTextures = this.faceTextures; // L: 1149
 		return var8; // L: 1150
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;II)Lgm;"
+		descriptor = "(Ljp;II)Lga;"
 	)
 	@Export("ModelData_get")
 	public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) {
@@ -1632,16 +1632,16 @@ public class ModelData extends Renderable {
 		return var3 == null ? null : new ModelData(var3); // L: 54
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;Lgm;IIIZ)V"
+		descriptor = "(Lga;Lga;IIIZ)V"
 	)
-	static void method3774(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
+	static void method3885(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
 		var0.calculateBounds(); // L: 972
 		var0.calculateVertexNormals(); // L: 973
 		var1.calculateBounds(); // L: 974
 		var1.calculateVertexNormals(); // L: 975
-		++field2198; // L: 976
+		++field2199; // L: 976
 		int var6 = 0; // L: 977
 		int[] var7 = var1.verticesX; // L: 978
 		int var8 = var1.verticesCount; // L: 979
@@ -1651,30 +1651,30 @@ public class ModelData extends Renderable {
 			VertexNormal var10 = var0.vertexNormals[var9]; // L: 981
 			if (var10.magnitude != 0) { // L: 982
 				int var11 = var0.verticesY[var9] - var3; // L: 983
-				if (var11 <= var1.field2191) { // L: 984
+				if (var11 <= var1.field2192) { // L: 984
 					int var12 = var0.verticesX[var9] - var2; // L: 985
-					if (var12 >= var1.field2192 && var12 <= var1.field2195) { // L: 986
+					if (var12 >= var1.field2193 && var12 <= var1.field2194) { // L: 986
 						int var13 = var0.verticesZ[var9] - var4; // L: 987
-						if (var13 >= var1.field2199 && var13 <= var1.field2174) { // L: 988
+						if (var13 >= var1.field2195 && var13 <= var1.field2176) { // L: 988
 							for (int var14 = 0; var14 < var8; ++var14) { // L: 989
 								VertexNormal var15 = var1.vertexNormals[var14]; // L: 990
 								if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991
-									if (var0.field2166 == null) { // L: 992
-										var0.field2166 = new VertexNormal[var0.verticesCount];
+									if (var0.field2168 == null) { // L: 992
+										var0.field2168 = new VertexNormal[var0.verticesCount];
 									}
 
-									if (var1.field2166 == null) { // L: 993
-										var1.field2166 = new VertexNormal[var8];
+									if (var1.field2168 == null) { // L: 993
+										var1.field2168 = new VertexNormal[var8];
 									}
 
-									VertexNormal var16 = var0.field2166[var9]; // L: 994
+									VertexNormal var16 = var0.field2168[var9]; // L: 994
 									if (var16 == null) { // L: 995
-										var16 = var0.field2166[var9] = new VertexNormal(var10);
+										var16 = var0.field2168[var9] = new VertexNormal(var10);
 									}
 
-									VertexNormal var17 = var1.field2166[var14]; // L: 996
+									VertexNormal var17 = var1.field2168[var14]; // L: 996
 									if (var17 == null) {
-										var17 = var1.field2166[var14] = new VertexNormal(var15); // L: 997
+										var17 = var1.field2168[var14] = new VertexNormal(var15); // L: 997
 									}
 
 									var16.x += var15.x; // L: 998
@@ -1686,8 +1686,8 @@ public class ModelData extends Renderable {
 									var17.z += var10.z; // L: 1004
 									var17.magnitude += var10.magnitude; // L: 1005
 									++var6; // L: 1006
-									field2196[var9] = field2198; // L: 1007
-									field2163[var14] = field2198; // L: 1008
+									field2197[var9] = field2199; // L: 1007
+									field2179[var14] = field2199; // L: 1008
 								}
 							}
 						}
@@ -1698,7 +1698,7 @@ public class ModelData extends Renderable {
 
 		if (var6 >= 3 && var5) { // L: 1012
 			for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013
-				if (field2196[var0.indices1[var9]] == field2198 && field2196[var0.indices2[var9]] == field2198 && field2196[var0.indices3[var9]] == field2198) { // L: 1014
+				if (field2197[var0.indices1[var9]] == field2199 && field2197[var0.indices2[var9]] == field2199 && field2197[var0.indices3[var9]] == field2199) { // L: 1014
 					if (var0.faceRenderTypes == null) { // L: 1015
 						var0.faceRenderTypes = new byte[var0.faceCount];
 					}
@@ -1708,7 +1708,7 @@ public class ModelData extends Renderable {
 			}
 
 			for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019
-				if (field2198 == field2163[var1.indices1[var9]] && field2198 == field2163[var1.indices2[var9]] && field2198 == field2163[var1.indices3[var9]]) { // L: 1020
+				if (field2199 == field2179[var1.indices1[var9]] && field2199 == field2179[var1.indices2[var9]] && field2199 == field2179[var1.indices3[var9]]) { // L: 1020
 					if (var1.faceRenderTypes == null) { // L: 1021
 						var1.faceRenderTypes = new byte[var1.faceCount];
 					}
@@ -1720,8 +1720,8 @@ public class ModelData extends Renderable {
 		}
 	} // L: 1025
 
-	@ObfuscatedName("i")
-	static final int method3764(int var0, int var1) {
+	@ObfuscatedName("l")
+	static final int method3887(int var0, int var1) {
 		var1 = (var0 & 127) * var1 >> 7; // L: 1154
 		if (var1 < 2) { // L: 1155
 			var1 = 2;
@@ -1732,8 +1732,8 @@ public class ModelData extends Renderable {
 		return (var0 & 65408) + var1; // L: 1157
 	}
 
-	@ObfuscatedName("ae")
-	static final int method3777(int var0) {
+	@ObfuscatedName("w")
+	static final int method3888(int var0) {
 		if (var0 < 2) { // L: 1161
 			var0 = 2;
 		} else if (var0 > 126) {
diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java
index 668eaba718..126054ae21 100644
--- a/runescape-client/src/main/java/ModelData0.java
+++ b/runescape-client/src/main/java/ModelData0.java
@@ -1,184 +1,24 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hy")
+@ObfuscatedName("he")
 @Implements("ModelData0")
 public class ModelData0 {
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -254849601
-	)
-	@Export("KitDefinition_fileCount")
-	public static int KitDefinition_fileCount;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("musicTrackArchive")
-	public static AbstractArchive musicTrackArchive;
-	@ObfuscatedName("iq")
-	@ObfuscatedGetter(
-		intValue = -145310383
-	)
-	@Export("oculusOrbFocalPointY")
-	static int oculusOrbFocalPointY;
+	@ObfuscatedName("z")
+	public static short[] field2517;
 
 	ModelData0() {
 	} // L: 4
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)Ljava/lang/String;",
-		garbageValue = "25"
+		descriptor = "(II)I",
+		garbageValue = "-2137438684"
 	)
-	static String method4261(Buffer var0, int var1) {
-		try {
-			int var2 = var0.readUShortSmart(); // L: 31
-			if (var2 > var1) { // L: 32
-				var2 = var1;
-			}
-
-			byte[] var3 = new byte[var2]; // L: 33
-			var0.offset += class249.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 34
-			String var4 = class43.decodeStringCp1252(var3, 0, var2); // L: 35
-			return var4; // L: 36
-		} catch (Exception var6) { // L: 38
-			return "Cabbage"; // L: 39
-		}
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIZI)Loh;",
-		garbageValue = "768816682"
-	)
-	@Export("getItemSprite")
-	public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
-		if (var1 == -1) { // L: 345
-			var4 = 0;
-		} else if (var4 == 2 && var1 != 1) { // L: 346
-			var4 = 1;
-		}
-
-		long var6 = ((long)var3 << 42) + ((long)var4 << 40) + (long)var0 + ((long)var1 << 16) + ((long)var2 << 38); // L: 347
-		SpritePixels var8;
-		if (!var5) { // L: 349
-			var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 350
-			if (var8 != null) { // L: 351
-				return var8;
-			}
-		}
-
-		ItemComposition var9 = class260.ItemDefinition_get(var0); // L: 353
-		if (var1 > 1 && var9.countobj != null) { // L: 354
-			int var10 = -1; // L: 355
-
-			for (int var11 = 0; var11 < 10; ++var11) { // L: 356
-				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 357
-					var10 = var9.countobj[var11];
-				}
-			}
-
-			if (var10 != -1) { // L: 359
-				var9 = class260.ItemDefinition_get(var10);
-			}
-		}
-
-		Model var21 = var9.getModel(1); // L: 361
-		if (var21 == null) { // L: 362
-			return null;
-		} else {
-			SpritePixels var22 = null; // L: 363
-			if (var9.noteTemplate != -1) { // L: 364
-				var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 365
-				if (var22 == null) { // L: 366
-					return null;
-				}
-			} else if (var9.notedId != -1) { // L: 368
-				var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 369
-				if (var22 == null) { // L: 370
-					return null;
-				}
-			} else if (var9.placeholderTemplate != -1) { // L: 372
-				var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 373
-				if (var22 == null) { // L: 374
-					return null;
-				}
-			}
-
-			int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 376
-			int var13 = Rasterizer2D.Rasterizer2D_width; // L: 377
-			int var14 = Rasterizer2D.Rasterizer2D_height; // L: 378
-			int[] var15 = new int[4]; // L: 379
-			Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 380
-			var8 = new SpritePixels(36, 32); // L: 381
-			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 382
-			Rasterizer2D.Rasterizer2D_clear(); // L: 383
-			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 384
-			Rasterizer3D.method3848(16, 16); // L: 385
-			Rasterizer3D.field2282 = false; // L: 386
-			if (var9.placeholderTemplate != -1) { // L: 387
-				var22.drawTransBgAt(0, 0);
-			}
-
-			int var16 = var9.zoom2d; // L: 388
-			if (var5) { // L: 389
-				var16 = (int)((double)var16 * 1.5D);
-			} else if (var2 == 2) { // L: 390
-				var16 = (int)((double)var16 * 1.04D);
-			}
-
-			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 391
-			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 392
-			var21.calculateBoundsCylinder(); // L: 393
-			var21.method4217(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 394
-			if (var9.notedId != -1) { // L: 395
-				var22.drawTransBgAt(0, 0);
-			}
-
-			if (var2 >= 1) { // L: 396
-				var8.outline(1);
-			}
-
-			if (var2 >= 2) { // L: 397
-				var8.outline(16777215);
-			}
-
-			if (var3 != 0) { // L: 398
-				var8.shadow(var3);
-			}
-
-			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 399
-			if (var9.noteTemplate != -1) { // L: 400
-				var22.drawTransBgAt(0, 0);
-			}
-
-			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 401
-				Font var19 = class288.ItemDefinition_fontPlain11; // L: 402
-				String var20;
-				if (var1 < 100000) { // L: 405
-					var20 = "<col=ffff00>" + var1 + "</col>"; // L: 406
-				} else if (var1 < 10000000) { // L: 409
-					var20 = "<col=ffffff>" + var1 / 1000 + "K" + "</col>"; // L: 410
-				} else {
-					var20 = "<col=00ff80>" + var1 / 1000000 + "M" + "</col>"; // L: 413
-				}
-
-				var19.draw(var20, 0, 9, 16776960, 1); // L: 415
-			}
-
-			if (!var5) { // L: 417
-				ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
-			}
-
-			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 418
-			Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 419
-			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 420
-			Rasterizer3D.field2282 = true; // L: 421
-			return var8; // L: 422
-		}
+	@Export("Widget_unpackTargetMask")
+	public static int Widget_unpackTargetMask(int var0) {
+		return var0 >> 11 & 63; // L: 13
 	}
 }
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index fd891e9660..124f3900c9 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -3,387 +3,669 @@ import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.OptionalDataException;
+import java.io.StreamCorruptedException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ak")
+@ObfuscatedName("ai")
 @Implements("MouseHandler")
 public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener {
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = -7947308061041944289L
+		longValue = 706955279943509111L
 	)
 	@Export("MouseHandler_millis")
 	public static long MouseHandler_millis;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lak;"
+		descriptor = "Lai;"
 	)
 	@Export("MouseHandler_instance")
 	public static MouseHandler MouseHandler_instance;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1851121549
+		intValue = -323054323
 	)
 	@Export("MouseHandler_idleCycles")
 	public static volatile int MouseHandler_idleCycles;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -574089045
+		intValue = -885858399
 	)
 	@Export("MouseHandler_currentButtonVolatile")
 	static volatile int MouseHandler_currentButtonVolatile;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1657948993
+		intValue = 1506829559
 	)
 	@Export("MouseHandler_xVolatile")
 	static volatile int MouseHandler_xVolatile;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 299061503
+		intValue = -955747453
 	)
 	@Export("MouseHandler_yVolatile")
 	static volatile int MouseHandler_yVolatile;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = 7392479486141447999L
+		longValue = -8056893470675873067L
 	)
 	@Export("MouseHandler_lastMovedVolatile")
 	static volatile long MouseHandler_lastMovedVolatile;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 97210001
+		intValue = 1239059943
 	)
 	@Export("MouseHandler_currentButton")
 	public static int MouseHandler_currentButton;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -678881683
+		intValue = 1657999347
 	)
 	@Export("MouseHandler_x")
 	public static int MouseHandler_x;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1903378733
+		intValue = -1895436129
 	)
 	@Export("MouseHandler_y")
 	public static int MouseHandler_y;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1156070407
+		intValue = 826495123
 	)
 	@Export("MouseHandler_lastButtonVolatile")
 	static volatile int MouseHandler_lastButtonVolatile;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -221251943
+		intValue = 1870863145
 	)
 	@Export("MouseHandler_lastPressedXVolatile")
 	static volatile int MouseHandler_lastPressedXVolatile;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -2106187795
+		intValue = 1293703447
 	)
 	@Export("MouseHandler_lastPressedYVolatile")
 	static volatile int MouseHandler_lastPressedYVolatile;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		longValue = 3127797728599755635L
+		longValue = 1966416586161698317L
 	)
 	@Export("MouseHandler_lastPressedTimeMillisVolatile")
 	static volatile long MouseHandler_lastPressedTimeMillisVolatile;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -265253353
+		intValue = -1652979825
 	)
 	@Export("MouseHandler_lastButton")
 	public static int MouseHandler_lastButton;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1003938789
+		intValue = 5633659
 	)
 	@Export("MouseHandler_lastPressedX")
 	public static int MouseHandler_lastPressedX;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 339791065
+		intValue = 280210219
 	)
 	@Export("MouseHandler_lastPressedY")
 	public static int MouseHandler_lastPressedY;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = -6895120112634760665L
+		longValue = -6822610554360794767L
 	)
 	@Export("MouseHandler_lastPressedTimeMillis")
 	public static long MouseHandler_lastPressedTimeMillis;
-	@ObfuscatedName("hr")
-	@ObfuscatedGetter(
-		intValue = 1681670171
-	)
-	@Export("cameraX")
-	static int cameraX;
 
 	static {
 		MouseHandler_instance = new MouseHandler(); // L: 15
 		MouseHandler_idleCycles = 0; // L: 16
 		MouseHandler_currentButtonVolatile = 0; // L: 17
-		MouseHandler_xVolatile = -1; // L: 18
-		MouseHandler_yVolatile = -1; // L: 19
-		MouseHandler_lastMovedVolatile = -1L; // L: 20
-		MouseHandler_currentButton = 0; // L: 21
-		MouseHandler_x = 0; // L: 22
-		MouseHandler_y = 0; // L: 23
-		MouseHandler_millis = 0L; // L: 24
-		MouseHandler_lastButtonVolatile = 0; // L: 25
+		MouseHandler_xVolatile = -1;
+		MouseHandler_yVolatile = -1;
+		MouseHandler_lastMovedVolatile = -1L;
+		MouseHandler_currentButton = 0;
+		MouseHandler_x = 0;
+		MouseHandler_y = 0;
+		MouseHandler_millis = 0L;
+		MouseHandler_lastButtonVolatile = 0;
 		MouseHandler_lastPressedXVolatile = 0; // L: 26
-		MouseHandler_lastPressedYVolatile = 0; // L: 27
-		MouseHandler_lastPressedTimeMillisVolatile = 0L; // L: 28
-		MouseHandler_lastButton = 0; // L: 29
-		MouseHandler_lastPressedX = 0; // L: 30
-		MouseHandler_lastPressedY = 0; // L: 31
-		MouseHandler_lastPressedTimeMillis = 0L; // L: 32
+		MouseHandler_lastPressedYVolatile = 0;
+		MouseHandler_lastPressedTimeMillisVolatile = 0L;
+		MouseHandler_lastButton = 0;
+		MouseHandler_lastPressedX = 0;
+		MouseHandler_lastPressedY = 0;
+		MouseHandler_lastPressedTimeMillis = 0L;
 	}
 
 	MouseHandler() {
-	} // L: 34
+	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/awt/event/MouseEvent;I)I",
-		garbageValue = "1689031104"
+		garbageValue = "2128058823"
 	)
 	@Export("getButton")
 	final int getButton(MouseEvent var1) {
-		int var2 = var1.getButton(); // L: 55
-		if (!var1.isAltDown() && var2 != 2) { // L: 56
-			return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 57 58
+		int var2 = var1.getButton();
+		if (!var1.isAltDown() && var2 != 2) { // L: 62
+			return !var1.isMetaDown() && var2 != 3 ? 1 : 2;
 		} else {
 			return 4;
 		}
 	}
 
 	public final synchronized void mouseMoved(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 103
-			MouseHandler_idleCycles = 0; // L: 104
-			MouseHandler_xVolatile = var1.getX(); // L: 105
-			MouseHandler_yVolatile = var1.getY(); // L: 106
-			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 107
+		if (MouseHandler_instance != null) {
+			MouseHandler_idleCycles = 0; // L: 110
+			MouseHandler_xVolatile = var1.getX();
+			MouseHandler_yVolatile = var1.getY();
+			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 113
 		}
 
-	} // L: 109
+	}
 
 	public final synchronized void mousePressed(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 62
-			MouseHandler_idleCycles = 0; // L: 63
-			MouseHandler_lastPressedXVolatile = var1.getX(); // L: 64
-			MouseHandler_lastPressedYVolatile = var1.getY(); // L: 65
-			MouseHandler_lastPressedTimeMillisVolatile = ObjectComposition.currentTimeMillis(); // L: 66
-			MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 67
-			if (MouseHandler_lastButtonVolatile != 0) { // L: 68
+		if (MouseHandler_instance != null) {
+			MouseHandler_idleCycles = 0;
+			MouseHandler_lastPressedXVolatile = var1.getX(); // L: 70
+			MouseHandler_lastPressedYVolatile = var1.getY();
+			MouseHandler_lastPressedTimeMillisVolatile = ClientPacket.currentTimeMillis();
+			MouseHandler_lastButtonVolatile = this.getButton(var1);
+			if (MouseHandler_lastButtonVolatile != 0) {
 				MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile;
 			}
 		}
 
-		if (var1.isPopupTrigger()) { // L: 70
+		if (var1.isPopupTrigger()) { // L: 76
 			var1.consume();
 		}
 
-	} // L: 71
+	}
 
-	public final synchronized void mouseReleased(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 74
-			MouseHandler_idleCycles = 0; // L: 75
-			MouseHandler_currentButtonVolatile = 0; // L: 76
-		}
-
-		if (var1.isPopupTrigger()) { // L: 78
+	public final void mouseClicked(MouseEvent var1) {
+		if (var1.isPopupTrigger()) { // L: 88
 			var1.consume();
 		}
 
-	} // L: 79
-
-	public final synchronized void mouseExited(MouseEvent var1) {
-		if (MouseHandler_instance != null) { // L: 90
-			MouseHandler_idleCycles = 0; // L: 91
-			MouseHandler_xVolatile = -1; // L: 92
-			MouseHandler_yVolatile = -1; // L: 93
-			MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 94
-		}
-
-	} // L: 96
-
-	public final synchronized void mouseDragged(MouseEvent var1) {
-		this.mouseMoved(var1); // L: 99
-	} // L: 100
+	} // L: 89
 
 	public final synchronized void mouseEntered(MouseEvent var1) {
-		this.mouseMoved(var1); // L: 86
-	} // L: 87
+		this.mouseMoved(var1); // L: 92
+	}
 
-	public final void focusGained(FocusEvent var1) {
-	} // L: 111
+	public final synchronized void mouseExited(MouseEvent var1) {
+		if (MouseHandler_instance != null) {
+			MouseHandler_idleCycles = 0;
+			MouseHandler_xVolatile = -1; // L: 98
+			MouseHandler_yVolatile = -1;
+			MouseHandler_lastMovedVolatile = var1.getWhen();
+		}
+
+	}
+
+	public final synchronized void mouseDragged(MouseEvent var1) {
+		this.mouseMoved(var1);
+	}
 
 	public final synchronized void focusLost(FocusEvent var1) {
-		if (MouseHandler_instance != null) { // L: 114
+		if (MouseHandler_instance != null) {
 			MouseHandler_currentButtonVolatile = 0;
 		}
 
-	} // L: 115
+	}
 
-	public final void mouseClicked(MouseEvent var1) {
-		if (var1.isPopupTrigger()) { // L: 82
+	public final void focusGained(FocusEvent var1) {
+	}
+
+	public final synchronized void mouseReleased(MouseEvent var1) {
+		if (MouseHandler_instance != null) { // L: 80
+			MouseHandler_idleCycles = 0;
+			MouseHandler_currentButtonVolatile = 0; // L: 82
+		}
+
+		if (var1.isPopupTrigger()) {
 			var1.consume();
 		}
 
-	} // L: 83
-
-	@ObfuscatedName("v")
-	static double method620(double var0) {
-		return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;IS)Lop;",
-		garbageValue = "234"
+		descriptor = "(ILla;Ljf;I)V",
+		garbageValue = "1715760839"
 	)
-	public static IndexedSprite method647(AbstractArchive var0, int var1) {
-		if (!Decimator.method1075(var0, var1)) { // L: 127
-			return null;
-		} else {
-			IndexedSprite var3 = new IndexedSprite(); // L: 130
-			var3.width = class396.SpriteBuffer_spriteWidth; // L: 131
-			var3.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 132
-			var3.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[0]; // L: 133
-			var3.yOffset = Calendar.SpriteBuffer_yOffsets[0]; // L: 134
-			var3.subWidth = class396.SpriteBuffer_spriteWidths[0]; // L: 135
-			var3.subHeight = class302.SpriteBuffer_spriteHeights[0]; // L: 136
-			var3.palette = MilliClock.SpriteBuffer_spritePalette; // L: 137
-			var3.pixels = class396.SpriteBuffer_pixels[0]; // L: 138
-			MilliClock.method2587(); // L: 139
-			return var3; // L: 142
+	static void method727(int var0, ArchiveDisk var1, Archive var2) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18
+		var3.type = 1; // L: 19
+		var3.key = (long)var0; // L: 20
+		var3.archiveDisk = var1; // L: 21
+		var3.archive = var2; // L: 22
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24
+		} // L: 25
+
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 27
+			if (ArchiveDiskActionHandler.field3557 == 0) { // L: 28
+				class305.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 29
+				class305.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 30
+				class305.ArchiveDiskActionHandler_thread.start(); // L: 31
+				class305.ArchiveDiskActionHandler_thread.setPriority(5); // L: 32
+			}
+
+			ArchiveDiskActionHandler.field3557 = 600; // L: 34
 		}
 	}
 
-	@ObfuscatedName("fo")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1345954057"
+		descriptor = "(Lns;I)V",
+		garbageValue = "-1319930513"
 	)
-	@Export("getLoginError")
-	static void getLoginError(int var0) {
-		if (var0 == -3) { // L: 2542
-			class260.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
-		} else if (var0 == -2) { // L: 2543
-			class260.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
-		} else if (var0 == -1) { // L: 2544
-			class260.setLoginResponseString("No response from server.", "Please try using a different world.", "");
-		} else if (var0 == 3) { // L: 2545
-			Login.loginIndex = 3; // L: 2546
-			Login.field1039 = 1; // L: 2547
-		} else if (var0 == 4) { // L: 2549
-			GameEngine.method572(0); // L: 2550
-		} else if (var0 == 5) { // L: 2552
-			Login.field1039 = 2; // L: 2553
-			class260.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2554
-		} else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2556
-			if (var0 == 7) { // L: 2559
-				class260.setLoginResponseString("This world is full.", "Please use a different world.", "");
-			} else if (var0 == 8) { // L: 2560
-				class260.setLoginResponseString("Unable to connect.", "Login server offline.", "");
-			} else if (var0 == 9) { // L: 2561
-				class260.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
-			} else if (var0 == 10) { // L: 2562
-				class260.setLoginResponseString("Unable to connect.", "Bad session id.", "");
-			} else if (var0 == 11) { // L: 2563
-				class260.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
-			} else if (var0 == 12) { // L: 2564
-				class260.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
-			} else if (var0 == 13) { // L: 2565
-				class260.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
-			} else if (var0 == 14) { // L: 2566
-				class260.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
-			} else if (var0 == 16) { // L: 2567
-				class260.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
-			} else if (var0 == 17) { // L: 2568
-				class260.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
-			} else if (var0 == 18) { // L: 2569
-				GameEngine.method572(1); // L: 2570
-			} else if (var0 == 19) { // L: 2572
-				class260.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
-			} else if (var0 == 20) { // L: 2573
-				class260.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
-			} else if (var0 == 22) { // L: 2574
-				class260.setLoginResponseString("Malformed login packet.", "Please try again.", "");
-			} else if (var0 == 23) { // L: 2575
-				class260.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
-			} else if (var0 == 24) { // L: 2576
-				class260.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
-			} else if (var0 == 25) { // L: 2577
-				class260.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
-			} else if (var0 == 26) {
-				class260.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); // L: 2578
-			} else if (var0 == 27) { // L: 2579
-				class260.setLoginResponseString("", "Service unavailable.", "");
-			} else if (var0 == 31) { // L: 2580
-				class260.setLoginResponseString("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game.");
-			} else if (var0 == 32) { // L: 2581
-				class260.setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system.");
-			} else if (var0 == 37) { // L: 2582
-				class260.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
-			} else if (var0 == 38) { // L: 2583
-				class260.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
-			} else if (var0 == 55) { // L: 2584
-				Login.loginIndex = 8; // L: 2585
-			} else {
-				if (var0 == 56) { // L: 2587
-					class260.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2588
-					class12.updateGameState(11); // L: 2589
-					return; // L: 2590
-				}
+	@Export("performReflectionCheck")
+	public static void performReflectionCheck(PacketBuffer var0) {
+		ReflectionCheck var1 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 35
+		if (var1 != null) { // L: 36
+			int var2 = var0.offset; // L: 37
+			var0.writeInt(var1.id); // L: 38
 
-				if (var0 == 57) { // L: 2592
-					class260.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2593
-					class12.updateGameState(11); // L: 2594
-					return; // L: 2595
-				}
-
-				if (var0 == 61) { // L: 2597
-					Login.loginIndex = 7; // L: 2598
+			for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39
+				if (var1.creationErrors[var3] != 0) { // L: 40
+					var0.writeByte(var1.creationErrors[var3]); // L: 41
 				} else {
-					class260.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2600
+					try {
+						int var4 = var1.operations[var3]; // L: 45
+						Field var5;
+						int var6;
+						if (var4 == 0) { // L: 46
+							var5 = var1.fields[var3]; // L: 47
+							var6 = Reflection.getInt(var5, (Object)null); // L: 48
+							var0.writeByte(0); // L: 49
+							var0.writeInt(var6); // L: 50
+						} else if (var4 == 1) { // L: 52
+							var5 = var1.fields[var3]; // L: 53
+							Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54
+							var0.writeByte(0); // L: 55
+						} else if (var4 == 2) { // L: 57
+							var5 = var1.fields[var3]; // L: 58
+							var6 = var5.getModifiers(); // L: 59
+							var0.writeByte(0); // L: 60
+							var0.writeInt(var6); // L: 61
+						}
+
+						Method var25;
+						if (var4 != 3) { // L: 63
+							if (var4 == 4) { // L: 83
+								var25 = var1.methods[var3]; // L: 84
+								var6 = var25.getModifiers(); // L: 85
+								var0.writeByte(0); // L: 86
+								var0.writeInt(var6); // L: 87
+							}
+						} else {
+							var25 = var1.methods[var3]; // L: 64
+							byte[][] var10 = var1.arguments[var3]; // L: 65
+							Object[] var7 = new Object[var10.length]; // L: 66
+
+							for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67
+								ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68
+								var7[var8] = var9.readObject(); // L: 69
+							}
+
+							Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71
+							if (var11 == null) {
+								var0.writeByte(0);
+							} else if (var11 instanceof Number) {
+								var0.writeByte(1);
+								var0.writeLong(((Number)var11).longValue());
+							} else if (var11 instanceof String) { // L: 77
+								var0.writeByte(2); // L: 78
+								var0.writeStringCp1252NullTerminated((String)var11); // L: 79
+							} else {
+								var0.writeByte(4); // L: 81
+							}
+						}
+					} catch (ClassNotFoundException var13) { // L: 90
+						var0.writeByte(-10); // L: 91
+					} catch (InvalidClassException var14) { // L: 93
+						var0.writeByte(-11); // L: 94
+					} catch (StreamCorruptedException var15) { // L: 96
+						var0.writeByte(-12); // L: 97
+					} catch (OptionalDataException var16) { // L: 99
+						var0.writeByte(-13); // L: 100
+					} catch (IllegalAccessException var17) { // L: 102
+						var0.writeByte(-14); // L: 103
+					} catch (IllegalArgumentException var18) { // L: 105
+						var0.writeByte(-15); // L: 106
+					} catch (InvocationTargetException var19) { // L: 108
+						var0.writeByte(-16); // L: 109
+					} catch (SecurityException var20) { // L: 111
+						var0.writeByte(-17); // L: 112
+					} catch (IOException var21) { // L: 114
+						var0.writeByte(-18); // L: 115
+					} catch (NullPointerException var22) { // L: 117
+						var0.writeByte(-19); // L: 118
+					} catch (Exception var23) { // L: 120
+						var0.writeByte(-20); // L: 121
+					} catch (Throwable var24) { // L: 123
+						var0.writeByte(-21); // L: 124
+					}
+				}
+			}
+
+			var0.writeCrc(var2); // L: 127
+			var1.remove(); // L: 128
+		}
+	} // L: 129
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1544814105"
+	)
+	static int method718(int var0, Script var1, boolean var2) {
+		int var4;
+		int var9;
+		if (var0 == ScriptOpcodes.CC_CREATE) { // L: 482
+			ChatChannel.Interpreter_intStackSize -= 3; // L: 483
+			var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 484
+			var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 485
+			int var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 486
+			if (var4 == 0) { // L: 487
+				throw new RuntimeException(); // L: 488
+			} else {
+				Widget var6 = WorldMapData_1.getWidget(var9); // L: 490
+				if (var6.children == null) { // L: 491
+					var6.children = new Widget[var11 + 1];
+				}
+
+				if (var6.children.length <= var11) { // L: 492
+					Widget[] var7 = new Widget[var11 + 1]; // L: 493
+
+					for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 494
+						var7[var8] = var6.children[var8];
+					}
+
+					var6.children = var7; // L: 495
+				}
+
+				if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 497
+					throw new RuntimeException("" + (var11 - 1));
+				} else {
+					Widget var12 = new Widget(); // L: 498
+					var12.type = var4; // L: 499
+					var12.parentId = var12.id = var6.id; // L: 500
+					var12.childIndex = var11; // L: 501
+					var12.isIf3 = true; // L: 502
+					var6.children[var11] = var12; // L: 503
+					if (var2) { // L: 504
+						UserComparator5.scriptDotWidget = var12;
+					} else {
+						User.scriptActiveWidget = var12; // L: 505
+					}
+
+					Script.invalidateWidget(var6); // L: 506
+					return 1; // L: 507
 				}
 			}
 		} else {
-			class260.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2557
+			Widget var3;
+			if (var0 == ScriptOpcodes.CC_DELETE) { // L: 509
+				var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 510
+				Widget var10 = WorldMapData_1.getWidget(var3.id); // L: 511
+				var10.children[var3.childIndex] = null; // L: 512
+				Script.invalidateWidget(var10); // L: 513
+				return 1; // L: 514
+			} else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 516
+				var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 517
+				var3.children = null; // L: 518
+				Script.invalidateWidget(var3); // L: 519
+				return 1; // L: 520
+			} else if (var0 == 103) { // L: 522
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 523
+				return 1; // L: 524
+			} else if (var0 == 104) { // L: 526
+				--ChatChannel.Interpreter_intStackSize; // L: 527
+				return 1; // L: 528
+			} else if (var0 != ScriptOpcodes.CC_FIND) { // L: 530
+				if (var0 == ScriptOpcodes.IF_FIND) { // L: 543
+					var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 544
+					if (var3 != null) { // L: 545
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 546
+						if (var2) { // L: 547
+							UserComparator5.scriptDotWidget = var3;
+						} else {
+							User.scriptActiveWidget = var3; // L: 548
+						}
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 550
+					}
+
+					return 1; // L: 551
+				} else if (var0 == 202) { // L: 553
+					Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] = 0; // L: 554
+					return 1; // L: 555
+				} else if (var0 == 203) { // L: 557
+					Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize + 1] = 0; // L: 558
+					return 1; // L: 559
+				} else {
+					return 2; // L: 561
+				}
+			} else {
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 531
+				var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 532
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 533
+				Widget var5 = class17.getWidgetChild(var9, var4); // L: 534
+				if (var5 != null && var4 != -1) { // L: 535
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 536
+					if (var2) { // L: 537
+						UserComparator5.scriptDotWidget = var5;
+					} else {
+						User.scriptActiveWidget = var5; // L: 538
+					}
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 540
+				}
+
+				return 1; // L: 541
+			}
 		}
+	}
 
-		class12.updateGameState(10); // L: 2601
-	} // L: 2602
-
-	@ObfuscatedName("ke")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "86"
+		descriptor = "(I)[Leq;",
+		garbageValue = "47395397"
 	)
-	@Export("Clan_leaveChat")
-	static final void Clan_leaveChat() {
-		PacketBufferNode var0 = class21.getPacketBufferNode(ClientPacket.field2574, Client.packetWriter.isaacCipher); // L: 11308
-		var0.packetBuffer.writeByte(0); // L: 11309
-		Client.packetWriter.addNode(var0); // L: 11310
-	} // L: 11311
+	static HorizontalAlignment[] method726() {
+		return new HorizontalAlignment[]{HorizontalAlignment.field1632, HorizontalAlignment.field1630, HorizontalAlignment.HorizontalAlignment_centered}; // L: 14
+	}
 
-	@ObfuscatedName("la")
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1550544078"
+	)
+	static void method750(int var0) {
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72
+		if (var1 != null) {
+			var1.remove(); // L: 74
+		}
+	} // L: 73 75
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "292035251"
+	)
+	static int method747(int var0, Script var1, boolean var2) {
+		Widget var5;
+		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1364
+			var5 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1365
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.itemId; // L: 1366
+			return 1; // L: 1367
+		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1369
+			var5 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1370
+			if (var5.itemId != -1) { // L: 1371
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.itemQuantity;
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1372
+			}
+
+			return 1; // L: 1373
+		} else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1375
+			int var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1376
+			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1377
+			if (var4 != null) { // L: 1378
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1;
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1379
+			}
+
+			return 1; // L: 1380
+		} else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1382
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1383
+			return 1; // L: 1384
+		} else {
+			return 2; // L: 1386
+		}
+	}
+
+	@ObfuscatedName("gc")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-508707417"
+		garbageValue = "1980065411"
 	)
-	static void method634() {
-		Client.packetWriter.addNode(class21.getPacketBufferNode(ClientPacket.field2608, Client.packetWriter.isaacCipher)); // L: 11499
-		Client.oculusOrbState = 0; // L: 11500
-	} // L: 11501
+	static void method741() {
+		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4772
+			class160.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4773
+		}
+
+	} // L: 4775
+
+	@ObfuscatedName("iv")
+	@ObfuscatedSignature(
+		descriptor = "(IIIILjava/lang/String;I)V",
+		garbageValue = "-205223779"
+	)
+	@Export("widgetDefaultMenuAction")
+	static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
+		Widget var5 = class17.getWidgetChild(var1, var2); // L: 8818
+		if (var5 != null) { // L: 8819
+			if (var5.onOp != null) { // L: 8820
+				ScriptEvent var6 = new ScriptEvent(); // L: 8821
+				var6.widget = var5; // L: 8822
+				var6.opIndex = var0; // L: 8823
+				var6.targetName = var4; // L: 8824
+				var6.args = var5.onOp; // L: 8825
+				WorldMapSection1.runScriptEvent(var6); // L: 8826
+			}
+
+			boolean var8 = true; // L: 8828
+			if (var5.contentType > 0) { // L: 8829
+				var8 = class343.method6080(var5);
+			}
+
+			if (var8) { // L: 8830
+				if (class136.method2696(class22.getWidgetFlags(var5), var0 - 1)) { // L: 8831
+					PacketBufferNode var7;
+					if (var0 == 1) { // L: 8834
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2658, Client.packetWriter.isaacCipher); // L: 8836
+						var7.packetBuffer.writeInt(var1); // L: 8837
+						var7.packetBuffer.writeShort(var2); // L: 8838
+						var7.packetBuffer.writeShort(var3); // L: 8839
+						Client.packetWriter.addNode(var7); // L: 8840
+					}
+
+					if (var0 == 2) { // L: 8842
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); // L: 8844
+						var7.packetBuffer.writeInt(var1); // L: 8845
+						var7.packetBuffer.writeShort(var2); // L: 8846
+						var7.packetBuffer.writeShort(var3); // L: 8847
+						Client.packetWriter.addNode(var7); // L: 8848
+					}
+
+					if (var0 == 3) { // L: 8850
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2630, Client.packetWriter.isaacCipher); // L: 8852
+						var7.packetBuffer.writeInt(var1); // L: 8853
+						var7.packetBuffer.writeShort(var2); // L: 8854
+						var7.packetBuffer.writeShort(var3); // L: 8855
+						Client.packetWriter.addNode(var7); // L: 8856
+					}
+
+					if (var0 == 4) { // L: 8858
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); // L: 8860
+						var7.packetBuffer.writeInt(var1); // L: 8861
+						var7.packetBuffer.writeShort(var2); // L: 8862
+						var7.packetBuffer.writeShort(var3); // L: 8863
+						Client.packetWriter.addNode(var7); // L: 8864
+					}
+
+					if (var0 == 5) { // L: 8866
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); // L: 8868
+						var7.packetBuffer.writeInt(var1); // L: 8869
+						var7.packetBuffer.writeShort(var2); // L: 8870
+						var7.packetBuffer.writeShort(var3); // L: 8871
+						Client.packetWriter.addNode(var7); // L: 8872
+					}
+
+					if (var0 == 6) { // L: 8874
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2579, Client.packetWriter.isaacCipher); // L: 8876
+						var7.packetBuffer.writeInt(var1); // L: 8877
+						var7.packetBuffer.writeShort(var2); // L: 8878
+						var7.packetBuffer.writeShort(var3); // L: 8879
+						Client.packetWriter.addNode(var7); // L: 8880
+					}
+
+					if (var0 == 7) { // L: 8882
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); // L: 8884
+						var7.packetBuffer.writeInt(var1); // L: 8885
+						var7.packetBuffer.writeShort(var2); // L: 8886
+						var7.packetBuffer.writeShort(var3); // L: 8887
+						Client.packetWriter.addNode(var7); // L: 8888
+					}
+
+					if (var0 == 8) { // L: 8890
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2633, Client.packetWriter.isaacCipher); // L: 8892
+						var7.packetBuffer.writeInt(var1); // L: 8893
+						var7.packetBuffer.writeShort(var2); // L: 8894
+						var7.packetBuffer.writeShort(var3); // L: 8895
+						Client.packetWriter.addNode(var7); // L: 8896
+					}
+
+					if (var0 == 9) { // L: 8898
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2598, Client.packetWriter.isaacCipher); // L: 8900
+						var7.packetBuffer.writeInt(var1); // L: 8901
+						var7.packetBuffer.writeShort(var2); // L: 8902
+						var7.packetBuffer.writeShort(var3); // L: 8903
+						Client.packetWriter.addNode(var7); // L: 8904
+					}
+
+					if (var0 == 10) { // L: 8906
+						var7 = InterfaceParent.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); // L: 8908
+						var7.packetBuffer.writeInt(var1); // L: 8909
+						var7.packetBuffer.writeShort(var2); // L: 8910
+						var7.packetBuffer.writeShort(var3); // L: 8911
+						Client.packetWriter.addNode(var7); // L: 8912
+					}
+
+				}
+			}
+		}
+	} // L: 8832 8914
 }
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 1ec1bc32f6..e3a2a543ee 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cb")
+@ObfuscatedName("co")
 @Implements("MouseRecorder")
 public class MouseRecorder implements Runnable {
-	@ObfuscatedName("ri")
-	@ObfuscatedSignature(
-		descriptor = "Lbd;"
+	@ObfuscatedName("eq")
+	@ObfuscatedGetter(
+		intValue = -107969121
 	)
-	@Export("pcmPlayer1")
-	static PcmPlayer pcmPlayer1;
-	@ObfuscatedName("v")
+	@Export("js5Port")
+	static int js5Port;
+	@ObfuscatedName("f")
 	@Export("isRunning")
 	boolean isRunning;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("lock")
 	Object lock;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1046460859
+		intValue = -123388215
 	)
 	@Export("index")
 	int index;
 	@ObfuscatedName("y")
 	@Export("xs")
 	int[] xs;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("ys")
 	int[] ys;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("millis")
 	long[] millis;
 
@@ -40,104 +40,69 @@ public class MouseRecorder implements Runnable {
 		this.lock = new Object(); // L: 8
 		this.index = 0; // L: 9
 		this.xs = new int[500]; // L: 10
-		this.ys = new int[500]; // L: 11
-		this.millis = new long[500]; // L: 12
+		this.ys = new int[500];
+		this.millis = new long[500];
 	}
 
 	public void run() {
-		while (this.isRunning) { // L: 17
-			synchronized(this.lock) { // L: 18
-				if (this.index < 500) { // L: 19
-					this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20
-					this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 21
-					this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 22
+		for (; this.isRunning; class18.method272(50L)) {
+			synchronized(this.lock) {
+				if (this.index < 500) {
+					this.xs[this.index] = MouseHandler.MouseHandler_x;
+					this.ys[this.index] = MouseHandler.MouseHandler_y;
+					this.millis[this.index] = MouseHandler.MouseHandler_millis;
 					++this.index; // L: 23
 				}
 			}
-
-			long var4 = 49L; // L: 29
-
-			try {
-				Thread.sleep(var4); // L: 32
-			} catch (InterruptedException var7) { // L: 34
-			}
-
-			try {
-				Thread.sleep(1L); // L: 38
-			} catch (InterruptedException var6) { // L: 40
-			}
 		}
 
-	} // L: 51
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lem;",
-		garbageValue = "1845003548"
-	)
-	static VerticalAlignment[] method2095() {
-		return new VerticalAlignment[]{VerticalAlignment.field1672, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1670}; // L: 14
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "-558099635"
+		descriptor = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;",
+		garbageValue = "0"
 	)
-	static final void method2099(int var0, int var1, int var2) {
-		int var3;
-		for (var3 = 0; var3 < 8; ++var3) { // L: 111
-			for (int var4 = 0; var4 < 8; ++var4) { // L: 112
-				Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0;
-			}
-		}
-
-		if (var1 > 0) { // L: 114
-			for (var3 = 1; var3 < 8; ++var3) { // L: 115
-				Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2];
-			}
-		}
-
-		if (var2 > 0) { // L: 117
-			for (var3 = 1; var3 < 8; ++var3) { // L: 118
-				Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1];
-			}
-		}
-
-		if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 120
-			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2];
-		} else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 121
-			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1];
-		} else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 122
-			Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1];
-		}
-
-	} // L: 123
-
-	@ObfuscatedName("il")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-195720663"
-	)
-	static String method2098(int var0) {
-		if (var0 < 0) { // L: 8849
+	public static String method2203(CharSequence[] var0, int var1, int var2) {
+		if (var2 == 0) { // L: 11
 			return "";
+		} else if (var2 == 1) { // L: 12
+			CharSequence var10 = var0[var1]; // L: 13
+			return var10 == null ? "null" : var10.toString(); // L: 14 15
 		} else {
-			return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 8850 8851
+			int var3 = var2 + var1; // L: 17
+			int var4 = 0; // L: 18
+
+			for (int var5 = var1; var5 < var3; ++var5) { // L: 19
+				CharSequence var9 = var0[var5]; // L: 20
+				if (var9 == null) { // L: 21
+					var4 += 4;
+				} else {
+					var4 += var9.length(); // L: 22
+				}
+			}
+
+			StringBuilder var8 = new StringBuilder(var4); // L: 24
+
+			for (int var6 = var1; var6 < var3; ++var6) { // L: 25
+				CharSequence var7 = var0[var6]; // L: 26
+				if (var7 == null) { // L: 27
+					var8.append("null");
+				} else {
+					var8.append(var7); // L: 28
+				}
+			}
+
+			return var8.toString(); // L: 30
 		}
 	}
 
-	@ObfuscatedName("kc")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "642993573"
+		garbageValue = "-2020302651"
 	)
-	@Export("FriendSystem_invalidateIgnoreds")
-	static final void FriendSystem_invalidateIgnoreds() {
-		DesktopPlatformInfoProvider.method6068(); // L: 11262
-		if (WorldMapRegion.friendsChat != null) { // L: 11263
-			WorldMapRegion.friendsChat.invalidateIgnoreds(); // L: 11264
-		}
-
-	} // L: 11266
+	public static void method2202() {
+		FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 98
+	} // L: 99
 }
diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java
index 7ec8a5c8f2..d4ea392778 100644
--- a/runescape-client/src/main/java/MouseWheel.java
+++ b/runescape-client/src/main/java/MouseWheel.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dw")
+@ObfuscatedName("ei")
 @Implements("MouseWheel")
 public interface MouseWheel {
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1490330016"
+		descriptor = "(B)I",
+		garbageValue = "-39"
 	)
 	@Export("useRotation")
 	int useRotation();
diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java
index 7faa442719..cab950bc00 100644
--- a/runescape-client/src/main/java/MouseWheelHandler.java
+++ b/runescape-client/src/main/java/MouseWheelHandler.java
@@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("am")
+@ObfuscatedName("ao")
 @Implements("MouseWheelHandler")
 public final class MouseWheelHandler implements MouseWheel, MouseWheelListener {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1696386671
+		intValue = -425672547
 	)
 	@Export("rotation")
 	int rotation;
@@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener {
 		this.rotation = 0; // L: 8
 	} // L: 10
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "-1721881715"
+		descriptor = "(Ljava/awt/Component;B)V",
+		garbageValue = "43"
 	)
 	@Export("addTo")
 	void addTo(Component var1) {
 		var1.addMouseWheelListener(this); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "1850795023"
+		garbageValue = "-1293933370"
 	)
 	@Export("removeFrom")
 	void removeFrom(Component var1) {
 		var1.removeMouseWheelListener(this); // L: 17
 	} // L: 18
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1490330016"
+		descriptor = "(B)I",
+		garbageValue = "-39"
 	)
 	@Export("useRotation")
 	public synchronized int useRotation() {
diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java
index 2905c43a9b..1243179e49 100644
--- a/runescape-client/src/main/java/MusicPatch.java
+++ b/runescape-client/src/main/java/MusicPatch.java
@@ -4,330 +4,327 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("in")
+@ObfuscatedName("id")
 @Implements("MusicPatch")
 public class MusicPatch extends Node {
-	@ObfuscatedName("qo")
-	@Export("ClanChat_inClanChat")
-	static boolean ClanChat_inClanChat;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 222358093
+		intValue = 835733951
 	)
-	int field2881;
-	@ObfuscatedName("n")
+	int field2885;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "[Lau;"
+		descriptor = "[Lar;"
 	)
 	@Export("rawSounds")
 	RawSound[] rawSounds;
-	@ObfuscatedName("f")
-	short[] field2878;
+	@ObfuscatedName("v")
+	short[] field2882;
 	@ObfuscatedName("y")
-	byte[] field2879;
-	@ObfuscatedName("p")
-	byte[] field2880;
+	byte[] field2883;
 	@ObfuscatedName("j")
+	byte[] field2880;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[Lhk;"
+		descriptor = "[Lho;"
 	)
-	MusicPatchNode2[] field2876;
+	MusicPatchNode2[] field2884;
+	@ObfuscatedName("m")
+	byte[] field2886;
 	@ObfuscatedName("r")
-	byte[] field2882;
-	@ObfuscatedName("b")
-	int[] field2883;
+	int[] field2887;
 
 	MusicPatch(byte[] var1) {
-		this.rawSounds = new RawSound[128]; // L: 27
-		this.field2878 = new short[128]; // L: 28
-		this.field2879 = new byte[128]; // L: 29
-		this.field2880 = new byte[128]; // L: 30
-		this.field2876 = new MusicPatchNode2[128]; // L: 31
-		this.field2882 = new byte[128]; // L: 32
-		this.field2883 = new int[128]; // L: 33
-		Buffer var2 = new Buffer(var1); // L: 34
+		this.rawSounds = new RawSound[128]; // L: 21
+		this.field2882 = new short[128]; // L: 22
+		this.field2883 = new byte[128]; // L: 23
+		this.field2880 = new byte[128]; // L: 24
+		this.field2884 = new MusicPatchNode2[128]; // L: 25
+		this.field2886 = new byte[128]; // L: 26
+		this.field2887 = new int[128]; // L: 27
+		Buffer var2 = new Buffer(var1); // L: 28
 
 		int var3;
-		for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 35 36
+		for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30
 		}
 
-		byte[] var4 = new byte[var3]; // L: 37
+		byte[] var4 = new byte[var3]; // L: 31
 
 		int var5;
-		for (var5 = 0; var5 < var3; ++var5) { // L: 38
+		for (var5 = 0; var5 < var3; ++var5) { // L: 32
 			var4[var5] = var2.readByte();
 		}
 
-		++var2.offset; // L: 39
-		++var3; // L: 40
-		var5 = var2.offset; // L: 41
-		var2.offset += var3; // L: 42
+		++var2.offset; // L: 33
+		++var3; // L: 34
+		var5 = var2.offset; // L: 35
+		var2.offset += var3; // L: 36
 
 		int var6;
-		for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 43 44
+		for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38
 		}
 
-		byte[] var7 = new byte[var6]; // L: 45
+		byte[] var7 = new byte[var6]; // L: 39
 
 		int var8;
-		for (var8 = 0; var8 < var6; ++var8) { // L: 46
+		for (var8 = 0; var8 < var6; ++var8) { // L: 40
 			var7[var8] = var2.readByte();
 		}
 
-		++var2.offset; // L: 47
-		++var6; // L: 48
-		var8 = var2.offset; // L: 49
-		var2.offset += var6; // L: 50
+		++var2.offset; // L: 41
+		++var6; // L: 42
+		var8 = var2.offset; // L: 43
+		var2.offset += var6; // L: 44
 
 		int var9;
-		for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 51 52
+		for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46
 		}
 
-		byte[] var10 = new byte[var9]; // L: 53
+		byte[] var10 = new byte[var9]; // L: 47
 
-		for (int var11 = 0; var11 < var9; ++var11) { // L: 54
+		for (int var11 = 0; var11 < var9; ++var11) { // L: 48
 			var10[var11] = var2.readByte();
 		}
 
-		++var2.offset; // L: 55
-		++var9; // L: 56
-		byte[] var38 = new byte[var9]; // L: 57
+		++var2.offset; // L: 49
+		++var9; // L: 50
+		byte[] var36 = new byte[var9]; // L: 51
 		int var12;
 		int var14;
-		if (var9 > 1) { // L: 59
-			var38[1] = 1; // L: 60
-			int var13 = 1; // L: 61
-			var12 = 2; // L: 62
+		if (var9 > 1) { // L: 53
+			var36[1] = 1; // L: 54
+			int var13 = 1; // L: 55
+			var12 = 2; // L: 56
 
-			for (var14 = 2; var14 < var9; ++var14) { // L: 63
-				int var43 = var2.readUnsignedByte(); // L: 64
-				if (var43 == 0) { // L: 65
+			for (var14 = 2; var14 < var9; ++var14) { // L: 57
+				int var41 = var2.readUnsignedByte(); // L: 58
+				if (var41 == 0) { // L: 59
 					var13 = var12++;
 				} else {
-					if (var43 <= var13) { // L: 67
-						--var43;
+					if (var41 <= var13) { // L: 61
+						--var41;
 					}
 
-					var13 = var43; // L: 68
+					var13 = var41; // L: 62
 				}
 
-				var38[var14] = (byte)var13; // L: 70
+				var36[var14] = (byte)var13; // L: 64
 			}
 		} else {
-			var12 = var9; // L: 73
+			var12 = var9; // L: 67
 		}
 
-		MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 74
+		MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; // L: 68
 
 		MusicPatchNode2 var15;
-		for (var14 = 0; var14 < var39.length; ++var14) { // L: 75
-			var15 = var39[var14] = new MusicPatchNode2(); // L: 76
-			int var42 = var2.readUnsignedByte(); // L: 77
-			if (var42 > 0) { // L: 78
-				var15.field2825 = new byte[var42 * 2];
+		for (var14 = 0; var14 < var37.length; ++var14) { // L: 69
+			var15 = var37[var14] = new MusicPatchNode2(); // L: 70
+			int var40 = var2.readUnsignedByte(); // L: 71
+			if (var40 > 0) { // L: 72
+				var15.field2821 = new byte[var40 * 2];
 			}
 
-			var42 = var2.readUnsignedByte(); // L: 79
-			if (var42 > 0) { // L: 80
-				var15.field2816 = new byte[var42 * 2 + 2]; // L: 81
-				var15.field2816[1] = 64; // L: 82
+			var40 = var2.readUnsignedByte(); // L: 73
+			if (var40 > 0) { // L: 74
+				var15.field2828 = new byte[var40 * 2 + 2]; // L: 75
+				var15.field2828[1] = 64; // L: 76
 			}
 		}
 
-		var14 = var2.readUnsignedByte(); // L: 85
-		byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 86
-		var14 = var2.readUnsignedByte(); // L: 87
-		byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 88
+		var14 = var2.readUnsignedByte(); // L: 79
+		byte[] var42 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80
+		var14 = var2.readUnsignedByte(); // L: 81
+		byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82
 
 		int var17;
-		for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 89 90
+		for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84
 		}
 
-		byte[] var18 = new byte[var17]; // L: 91
+		byte[] var18 = new byte[var17]; // L: 85
 
 		int var19;
-		for (var19 = 0; var19 < var17; ++var19) { // L: 92
+		for (var19 = 0; var19 < var17; ++var19) { // L: 86
 			var18[var19] = var2.readByte();
 		}
 
-		++var2.offset; // L: 93
-		++var17; // L: 94
-		var19 = 0; // L: 95
+		++var2.offset; // L: 87
+		++var17; // L: 88
+		var19 = 0; // L: 89
 
 		int var20;
-		for (var20 = 0; var20 < 128; ++var20) { // L: 96
-			var19 += var2.readUnsignedByte(); // L: 97
-			this.field2878[var20] = (short)var19; // L: 98
+		for (var20 = 0; var20 < 128; ++var20) { // L: 90
+			var19 += var2.readUnsignedByte(); // L: 91
+			this.field2882[var20] = (short)var19; // L: 92
 		}
 
-		var19 = 0; // L: 100
+		var19 = 0; // L: 94
 
-		short[] var50;
-		for (var20 = 0; var20 < 128; ++var20) { // L: 101
-			var19 += var2.readUnsignedByte(); // L: 102
-			var50 = this.field2878; // L: 103
-			var50[var20] = (short)(var50[var20] + (var19 << 8));
+		short[] var48;
+		for (var20 = 0; var20 < 128; ++var20) { // L: 95
+			var19 += var2.readUnsignedByte(); // L: 96
+			var48 = this.field2882; // L: 97
+			var48[var20] = (short)(var48[var20] + (var19 << 8));
 		}
 
-		var20 = 0; // L: 105
-		int var21 = 0; // L: 106
-		int var22 = 0; // L: 107
+		var20 = 0; // L: 99
+		int var21 = 0; // L: 100
+		int var22 = 0; // L: 101
 
 		int var23;
-		for (var23 = 0; var23 < 128; ++var23) { // L: 108
-			if (var20 == 0) { // L: 109
-				if (var21 < var18.length) { // L: 110
+		for (var23 = 0; var23 < 128; ++var23) { // L: 102
+			if (var20 == 0) { // L: 103
+				if (var21 < var18.length) { // L: 104
 					var20 = var18[var21++];
 				} else {
-					var20 = -1; // L: 111
+					var20 = -1; // L: 105
 				}
 
-				var22 = var2.readVarInt(); // L: 112
+				var22 = var2.readVarInt(); // L: 106
 			}
 
-			var50 = this.field2878; // L: 114
-			var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14));
-			this.field2883[var23] = var22; // L: 115
-			--var20; // L: 116
+			var48 = this.field2882; // L: 108
+			var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14));
+			this.field2887[var23] = var22; // L: 109
+			--var20; // L: 110
 		}
 
-		var20 = 0; // L: 118
-		var21 = 0; // L: 119
-		var23 = 0; // L: 120
+		var20 = 0; // L: 112
+		var21 = 0; // L: 113
+		var23 = 0; // L: 114
 
 		int var24;
-		for (var24 = 0; var24 < 128; ++var24) { // L: 121
-			if (this.field2883[var24] != 0) { // L: 122
-				if (var20 == 0) { // L: 123
-					if (var21 < var4.length) { // L: 124
+		for (var24 = 0; var24 < 128; ++var24) { // L: 115
+			if (this.field2887[var24] != 0) { // L: 116
+				if (var20 == 0) { // L: 117
+					if (var21 < var4.length) { // L: 118
 						var20 = var4[var21++];
 					} else {
-						var20 = -1; // L: 125
+						var20 = -1; // L: 119
 					}
 
-					var23 = var2.array[var5++] - 1; // L: 126
+					var23 = var2.array[var5++] - 1; // L: 120
 				}
 
-				this.field2882[var24] = (byte)var23; // L: 128
-				--var20; // L: 129
+				this.field2886[var24] = (byte)var23; // L: 122
+				--var20; // L: 123
 			}
 		}
 
-		var20 = 0; // L: 131
-		var21 = 0; // L: 132
-		var24 = 0; // L: 133
+		var20 = 0; // L: 125
+		var21 = 0; // L: 126
+		var24 = 0; // L: 127
 
-		for (int var25 = 0; var25 < 128; ++var25) { // L: 134
-			if (this.field2883[var25] != 0) { // L: 135
-				if (var20 == 0) { // L: 136
-					if (var21 < var7.length) {
-						var20 = var7[var21++]; // L: 137
+		for (int var25 = 0; var25 < 128; ++var25) { // L: 128
+			if (this.field2887[var25] != 0) { // L: 129
+				if (var20 == 0) { // L: 130
+					if (var21 < var7.length) { // L: 131
+						var20 = var7[var21++];
 					} else {
-						var20 = -1; // L: 138
+						var20 = -1; // L: 132
 					}
 
-					var24 = var2.array[var8++] + 16 << 2; // L: 139
+					var24 = var2.array[var8++] + 16 << 2; // L: 133
 				}
 
-				this.field2880[var25] = (byte)var24; // L: 141
-				--var20; // L: 142
+				this.field2880[var25] = (byte)var24; // L: 135
+				--var20; // L: 136
 			}
 		}
 
-		var20 = 0; // L: 144
-		var21 = 0; // L: 145
-		MusicPatchNode2 var40 = null; // L: 146
+		var20 = 0; // L: 138
+		var21 = 0; // L: 139
+		MusicPatchNode2 var38 = null; // L: 140
 
 		int var26;
-		for (var26 = 0; var26 < 128; ++var26) { // L: 147
-			if (this.field2883[var26] != 0) { // L: 148
-				if (var20 == 0) { // L: 149
-					var40 = var39[var38[var21]]; // L: 150
-					if (var21 < var10.length) { // L: 151
+		for (var26 = 0; var26 < 128; ++var26) { // L: 141
+			if (this.field2887[var26] != 0) { // L: 142
+				if (var20 == 0) { // L: 143
+					var38 = var37[var36[var21]]; // L: 144
+					if (var21 < var10.length) { // L: 145
 						var20 = var10[var21++];
 					} else {
-						var20 = -1; // L: 152
+						var20 = -1; // L: 146
 					}
 				}
 
-				this.field2876[var26] = var40; // L: 154
-				--var20; // L: 155
+				this.field2884[var26] = var38; // L: 148
+				--var20; // L: 149
 			}
 		}
 
-		var20 = 0; // L: 157
-		var21 = 0; // L: 158
-		var26 = 0; // L: 159
+		var20 = 0; // L: 151
+		var21 = 0; // L: 152
+		var26 = 0; // L: 153
 
 		int var27;
-		for (var27 = 0; var27 < 128; ++var27) { // L: 160
-			if (var20 == 0) { // L: 161
-				if (var21 < var18.length) { // L: 162
+		for (var27 = 0; var27 < 128; ++var27) { // L: 154
+			if (var20 == 0) { // L: 155
+				if (var21 < var18.length) { // L: 156
 					var20 = var18[var21++];
 				} else {
-					var20 = -1; // L: 163
+					var20 = -1; // L: 157
 				}
 
-				if (this.field2883[var27] > 0) { // L: 164
+				if (this.field2887[var27] > 0) { // L: 158
 					var26 = var2.readUnsignedByte() + 1;
 				}
 			}
 
-			this.field2879[var27] = (byte)var26; // L: 166
-			--var20; // L: 167
+			this.field2883[var27] = (byte)var26; // L: 160
+			--var20; // L: 161
 		}
 
-		this.field2881 = var2.readUnsignedByte() + 1; // L: 169
+		this.field2885 = var2.readUnsignedByte() + 1; // L: 163
 
 		int var29;
-		MusicPatchNode2 var41;
-		for (var27 = 0; var27 < var12; ++var27) { // L: 170
-			var41 = var39[var27]; // L: 171
-			if (var41.field2825 != null) { // L: 172
-				for (var29 = 1; var29 < var41.field2825.length; var29 += 2) { // L: 173
-					var41.field2825[var29] = var2.readByte();
+		MusicPatchNode2 var39;
+		for (var27 = 0; var27 < var12; ++var27) { // L: 164
+			var39 = var37[var27]; // L: 165
+			if (var39.field2821 != null) { // L: 166
+				for (var29 = 1; var29 < var39.field2821.length; var29 += 2) { // L: 167
+					var39.field2821[var29] = var2.readByte();
 				}
 			}
 
-			if (var41.field2816 != null) { // L: 175
-				for (var29 = 3; var29 < var41.field2816.length - 2; var29 += 2) { // L: 176
-					var41.field2816[var29] = var2.readByte();
+			if (var39.field2828 != null) { // L: 169
+				for (var29 = 3; var29 < var39.field2828.length - 2; var29 += 2) { // L: 170
+					var39.field2828[var29] = var2.readByte();
 				}
 			}
 		}
 
-		if (var44 != null) { // L: 179
-			for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 180
-				var44[var27] = var2.readByte();
+		if (var42 != null) { // L: 173
+			for (var27 = 1; var27 < var42.length; var27 += 2) { // L: 174
+				var42[var27] = var2.readByte();
 			}
 		}
 
-		if (var16 != null) { // L: 182
-			for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 183
+		if (var16 != null) { // L: 176
+			for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177
 				var16[var27] = var2.readByte();
 			}
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 185
-			var41 = var39[var27]; // L: 186
-			if (var41.field2816 != null) { // L: 187
-				var19 = 0; // L: 188
+		for (var27 = 0; var27 < var12; ++var27) { // L: 179
+			var39 = var37[var27]; // L: 180
+			if (var39.field2828 != null) { // L: 181
+				var19 = 0; // L: 182
 
-				for (var29 = 2; var29 < var41.field2816.length; var29 += 2) { // L: 189
-					var19 = 1 + var19 + var2.readUnsignedByte(); // L: 190
-					var41.field2816[var29] = (byte)var19; // L: 191
+				for (var29 = 2; var29 < var39.field2828.length; var29 += 2) { // L: 183
+					var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184
+					var39.field2828[var29] = (byte)var19; // L: 185
 				}
 			}
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 195
-			var41 = var39[var27]; // L: 196
-			if (var41.field2825 != null) { // L: 197
-				var19 = 0; // L: 198
+		for (var27 = 0; var27 < var12; ++var27) { // L: 189
+			var39 = var37[var27]; // L: 190
+			if (var39.field2821 != null) { // L: 191
+				var19 = 0; // L: 192
 
-				for (var29 = 2; var29 < var41.field2825.length; var29 += 2) { // L: 199
-					var19 = 1 + var19 + var2.readUnsignedByte(); // L: 200
-					var41.field2825[var29] = (byte)var19; // L: 201
+				for (var29 = 2; var29 < var39.field2821.length; var29 += 2) { // L: 193
+					var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194
+					var39.field2821[var29] = (byte)var19; // L: 195
 				}
 			}
 		}
@@ -336,211 +333,196 @@ public class MusicPatch extends Node {
 		int var32;
 		int var33;
 		int var34;
-		int var35;
-		int var36;
-		int var47;
-		byte var49;
-		if (var44 != null) { // L: 205
-			var19 = var2.readUnsignedByte(); // L: 206
-			var44[0] = (byte)var19; // L: 207
+		int var45;
+		byte var47;
+		if (var42 != null) { // L: 199
+			var19 = var2.readUnsignedByte(); // L: 200
+			var42[0] = (byte)var19; // L: 201
 
-			for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 208
-				var19 = 1 + var19 + var2.readUnsignedByte(); // L: 209
-				var44[var27] = (byte)var19; // L: 210
+			for (var27 = 2; var27 < var42.length; var27 += 2) { // L: 202
+				var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203
+				var42[var27] = (byte)var19; // L: 204
 			}
 
-			var49 = var44[0]; // L: 212
-			byte var28 = var44[1]; // L: 213
+			var47 = var42[0]; // L: 206
+			byte var28 = var42[1]; // L: 207
 
-			for (var29 = 0; var29 < var49; ++var29) { // L: 214
-				this.field2879[var29] = (byte)(var28 * this.field2879[var29] + 32 >> 6);
+			for (var29 = 0; var29 < var47; ++var29) { // L: 208
+				this.field2883[var29] = (byte)(var28 * this.field2883[var29] + 32 >> 6);
 			}
 
-			for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 215 216 233
-				var30 = var44[var29]; // L: 217
-				byte var31 = var44[var29 + 1]; // L: 218
-				var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 219
+			for (var29 = 2; var29 < var42.length; var29 += 2) { // L: 209 210 221
+				var30 = var42[var29]; // L: 211
+				byte var31 = var42[var29 + 1]; // L: 212
+				var32 = var28 * (var30 - var47) + (var30 - var47) / 2; // L: 213
 
-				for (var33 = var49; var33 < var30; ++var33) { // L: 220
-					var35 = var30 - var49; // L: 222
-					var36 = var32 >>> 31; // L: 224
-					var34 = (var32 + var36) / var35 - var36; // L: 225
-					this.field2879[var33] = (byte)(var34 * this.field2879[var33] + 32 >> 6); // L: 228
-					var32 += var31 - var28; // L: 229
+				for (var33 = var47; var33 < var30; ++var33) { // L: 214
+					var34 = NPCComposition.method2841(var32, var30 - var47); // L: 215
+					this.field2883[var33] = (byte)(var34 * this.field2883[var33] + 32 >> 6); // L: 216
+					var32 += var31 - var28; // L: 217
 				}
 
-				var49 = var30; // L: 231
-				var28 = var31; // L: 232
+				var47 = var30; // L: 219
+				var28 = var31; // L: 220
 			}
 
-			for (var47 = var49; var47 < 128; ++var47) { // L: 235
-				this.field2879[var47] = (byte)(var28 * this.field2879[var47] + 32 >> 6);
+			for (var45 = var47; var45 < 128; ++var45) { // L: 223
+				this.field2883[var45] = (byte)(var28 * this.field2883[var45] + 32 >> 6);
 			}
 
-			var15 = null; // L: 236
+			var15 = null; // L: 224
 		}
 
-		if (var16 != null) { // L: 238
-			var19 = var2.readUnsignedByte(); // L: 239
-			var16[0] = (byte)var19; // L: 240
+		if (var16 != null) { // L: 226
+			var19 = var2.readUnsignedByte(); // L: 227
+			var16[0] = (byte)var19; // L: 228
 
-			for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 241
-				var19 = 1 + var19 + var2.readUnsignedByte(); // L: 242
-				var16[var27] = (byte)var19; // L: 243
+			for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 229
+				var19 = var19 + 1 + var2.readUnsignedByte(); // L: 230
+				var16[var27] = (byte)var19; // L: 231
 			}
 
-			var49 = var16[0]; // L: 245
-			int var46 = var16[1] << 1; // L: 246
+			var47 = var16[0]; // L: 233
+			int var44 = var16[1] << 1; // L: 234
 
-			for (var29 = 0; var29 < var49; ++var29) { // L: 247
-				var47 = var46 + (this.field2880[var29] & 255); // L: 248
-				if (var47 < 0) { // L: 249
-					var47 = 0;
+			for (var29 = 0; var29 < var47; ++var29) { // L: 235
+				var45 = var44 + (this.field2880[var29] & 255); // L: 236
+				if (var45 < 0) { // L: 237
+					var45 = 0;
 				}
 
-				if (var47 > 128) { // L: 250
-					var47 = 128;
+				if (var45 > 128) { // L: 238
+					var45 = 128;
 				}
 
-				this.field2880[var29] = (byte)var47; // L: 251
+				this.field2880[var29] = (byte)var45; // L: 239
 			}
 
-			int var48;
-			for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 253 254 274
-				var30 = var16[var29]; // L: 255
-				var48 = var16[var29 + 1] << 1; // L: 256
-				var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 257
+			int var46;
+			for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 241 242 256
+				var30 = var16[var29]; // L: 243
+				var46 = var16[var29 + 1] << 1; // L: 244
+				var32 = var44 * (var30 - var47) + (var30 - var47) / 2; // L: 245
 
-				for (var33 = var49; var33 < var30; ++var33) { // L: 258
-					var35 = var30 - var49; // L: 260
-					var36 = var32 >>> 31; // L: 262
-					var34 = (var32 + var36) / var35 - var36; // L: 263
-					int var37 = var34 + (this.field2880[var33] & 255); // L: 266
-					if (var37 < 0) { // L: 267
-						var37 = 0;
+				for (var33 = var47; var33 < var30; ++var33) { // L: 246
+					var34 = NPCComposition.method2841(var32, var30 - var47); // L: 247
+					int var35 = var34 + (this.field2880[var33] & 255); // L: 248
+					if (var35 < 0) { // L: 249
+						var35 = 0;
 					}
 
-					if (var37 > 128) { // L: 268
-						var37 = 128;
+					if (var35 > 128) { // L: 250
+						var35 = 128;
 					}
 
-					this.field2880[var33] = (byte)var37; // L: 269
-					var32 += var48 - var46; // L: 270
+					this.field2880[var33] = (byte)var35; // L: 251
+					var32 += var46 - var44; // L: 252
 				}
 
-				var49 = var30; // L: 272
-				var46 = var48; // L: 273
+				var47 = var30; // L: 254
+				var44 = var46; // L: 255
 			}
 
-			for (var47 = var49; var47 < 128; ++var47) { // L: 276
-				var48 = var46 + (this.field2880[var47] & 255); // L: 277
-				if (var48 < 0) { // L: 278
-					var48 = 0;
+			for (var45 = var47; var45 < 128; ++var45) { // L: 258
+				var46 = var44 + (this.field2880[var45] & 255); // L: 259
+				if (var46 < 0) { // L: 260
+					var46 = 0;
 				}
 
-				if (var48 > 128) { // L: 279
-					var48 = 128;
+				if (var46 > 128) { // L: 261
+					var46 = 128;
 				}
 
-				this.field2880[var47] = (byte)var48; // L: 280
+				this.field2880[var45] = (byte)var46; // L: 262
 			}
 
-			Object var45 = null; // L: 282
+			Object var43 = null; // L: 264
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 284
-			var39[var27].field2815 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 266
+			var37[var27].field2823 = var2.readUnsignedByte();
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 285
-			var41 = var39[var27]; // L: 286
-			if (var41.field2825 != null) { // L: 287
-				var41.field2821 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 267
+			var39 = var37[var27]; // L: 268
+			if (var39.field2821 != null) { // L: 269
+				var39.field2824 = var2.readUnsignedByte();
 			}
 
-			if (var41.field2816 != null) { // L: 288
-				var41.field2819 = var2.readUnsignedByte();
+			if (var39.field2828 != null) { // L: 270
+				var39.field2825 = var2.readUnsignedByte();
 			}
 
-			if (var41.field2815 > 0) { // L: 289
-				var41.field2820 = var2.readUnsignedByte();
+			if (var39.field2823 > 0) { // L: 271
+				var39.field2822 = var2.readUnsignedByte();
 			}
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 291
-			var39[var27].field2817 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 273
+			var37[var27].field2827 = var2.readUnsignedByte();
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 292
-			var41 = var39[var27]; // L: 293
-			if (var41.field2817 > 0) { // L: 294
-				var41.field2822 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 274
+			var39 = var37[var27]; // L: 275
+			if (var39.field2827 > 0) { // L: 276
+				var39.field2826 = var2.readUnsignedByte();
 			}
 		}
 
-		for (var27 = 0; var27 < var12; ++var27) { // L: 296
-			var41 = var39[var27]; // L: 297
-			if (var41.field2822 > 0) { // L: 298
-				var41.field2823 = var2.readUnsignedByte();
+		for (var27 = 0; var27 < var12; ++var27) { // L: 278
+			var39 = var37[var27]; // L: 279
+			if (var39.field2826 > 0) { // L: 280
+				var39.field2829 = var2.readUnsignedByte();
 			}
 		}
 
-	} // L: 300
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Lbu;[B[II)Z",
-		garbageValue = "122660467"
-	)
-	boolean method4588(SoundCache var1, byte[] var2, int[] var3) {
-		boolean var4 = true; // L: 303
-		int var5 = 0; // L: 304
-		RawSound var6 = null; // L: 305
-
-		for (int var7 = 0; var7 < 128; ++var7) { // L: 306
-			if (var2 == null || var2[var7] != 0) { // L: 307
-				int var8 = this.field2883[var7]; // L: 308
-				if (var8 != 0) { // L: 309
-					if (var5 != var8) { // L: 310
-						var5 = var8--; // L: 311 312
-						if ((var8 & 1) == 0) { // L: 313
-							var6 = var1.getSoundEffect(var8 >> 2, var3);
-						} else {
-							var6 = var1.getMusicSample(var8 >> 2, var3); // L: 314
-						}
-
-						if (var6 == null) {
-							var4 = false; // L: 315
-						}
-					}
-
-					if (var6 != null) { // L: 317
-						this.rawSounds[var7] = var6; // L: 318
-						this.field2883[var7] = 0; // L: 319
-					}
-				}
-			}
-		}
-
-		return var4; // L: 323
-	}
+	} // L: 282
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1514154807"
+		descriptor = "(Lbz;[B[II)Z",
+		garbageValue = "-1683954246"
+	)
+	boolean method4731(SoundCache var1, byte[] var2, int[] var3) {
+		boolean var4 = true; // L: 285
+		int var5 = 0; // L: 286
+		RawSound var6 = null; // L: 287
+
+		for (int var7 = 0; var7 < 128; ++var7) { // L: 288
+			if (var2 == null || var2[var7] != 0) { // L: 289
+				int var8 = this.field2887[var7]; // L: 290
+				if (var8 != 0) { // L: 291
+					if (var8 != var5) { // L: 292
+						var5 = var8--; // L: 293 294
+						if ((var8 & 1) == 0) { // L: 295
+							var6 = var1.getSoundEffect(var8 >> 2, var3);
+						} else {
+							var6 = var1.getMusicSample(var8 >> 2, var3); // L: 296
+						}
+
+						if (var6 == null) { // L: 297
+							var4 = false;
+						}
+					}
+
+					if (var6 != null) { // L: 299
+						this.rawSounds[var7] = var6; // L: 300
+						this.field2887[var7] = 0; // L: 301
+					}
+				}
+			}
+		}
+
+		return var4; // L: 305
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "18"
 	)
 	@Export("clear")
 	void clear() {
-		this.field2883 = null; // L: 327
-	} // L: 328
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Ljava/lang/String;",
-		garbageValue = "502303985"
-	)
-	public static String method4592(Buffer var0) {
-		return ModelData0.method4261(var0, 32767); // L: 26
-	}
+		this.field2887 = null; // L: 309
+	} // L: 310
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java
index 71b4aa9420..4a0730047e 100644
--- a/runescape-client/src/main/java/MusicPatchNode.java
+++ b/runescape-client/src/main/java/MusicPatchNode.java
@@ -4,191 +4,165 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iq")
+@ObfuscatedName("ib")
 @Implements("MusicPatchNode")
 public class MusicPatchNode extends Node {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1025207361
-	)
-	int field2905;
-	@ObfuscatedName("n")
+	@ObfuscatedName("lb")
 	@ObfuscatedSignature(
-		descriptor = "Lin;"
+		descriptor = "Liv;"
+	)
+	@Export("mousedOverWidgetIf1")
+	static Widget mousedOverWidgetIf1;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -830745709
+	)
+	int field2898;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lid;"
 	)
 	@Export("patch")
 	MusicPatch patch;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lau;"
+		descriptor = "Lar;"
 	)
 	@Export("rawSound")
 	RawSound rawSound;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhk;"
+		descriptor = "Lho;"
 	)
-	MusicPatchNode2 field2894;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -2143225367
-	)
-	int field2893;
+	MusicPatchNode2 field2904;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -723940785
-	)
-	int field2896;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = 1566640151
+		intValue = 461020611
 	)
 	int field2897;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 970092925
-	)
-	int field2898;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 215164221
-	)
-	int field2900;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1146128297
-	)
-	int field2899;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1897214019
-	)
-	int field2901;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -955818271
-	)
-	int field2902;
 	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 370154707
+		intValue = -127033357
 	)
-	int field2903;
-	@ObfuscatedName("c")
+	int field2910;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 939918277
+		intValue = -259364835
 	)
-	int field2911;
-	@ObfuscatedName("e")
+	int field2900;
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1951740649
+		intValue = -465046883
 	)
-	int field2895;
-	@ObfuscatedName("g")
+	int field2902;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -292962099
-	)
-	int field2906;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 726334989
+		intValue = -1421225285
 	)
 	int field2907;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = -1943082417
+	)
+	int field2901;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = 903145849
+	)
+	int field2914;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1537236139
+	)
+	int field2894;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = -920697405
+	)
+	int field2906;
 	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1237883869
+		intValue = 1809682869
+	)
+	int field2905;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 997505503
+	)
+	int field2903;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 725888983
+	)
+	int field2909;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -1407978861
 	)
 	int field2908;
-	@ObfuscatedName("m")
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 2142706347
+	)
+	int field2911;
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		descriptor = "Lbv;"
 	)
 	@Export("stream")
 	RawPcmStream stream;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 730487289
+		intValue = -1220588121
 	)
-	int field2891;
-	@ObfuscatedName("w")
+	int field2913;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -576530835
+		intValue = -1263258455
 	)
-	int field2904;
+	int field2899;
 
 	MusicPatchNode() {
 	} // L: 31
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-88"
+		descriptor = "(I)V",
+		garbageValue = "-818920920"
 	)
-	void method4634() {
+	void method4772() {
 		this.patch = null; // L: 34
 		this.rawSound = null; // L: 35
-		this.field2894 = null; // L: 36
+		this.field2904 = null; // L: 36
 		this.stream = null; // L: 37
-	}
+	} // L: 38
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;IZI)Z",
-		garbageValue = "-387650050"
+		descriptor = "(III)I",
+		garbageValue = "-1957500664"
 	)
-	static boolean method4638(CharSequence var0, int var1, boolean var2) {
-		if (var1 >= 2 && var1 <= 36) { // L: 38
-			boolean var3 = false; // L: 39
-			boolean var4 = false; // L: 40
-			int var5 = 0; // L: 41
-			int var6 = var0.length(); // L: 42
+	public static int method4776(int var0, int var1) {
+		return (var0 << 8) + var1; // L: 13
+	}
 
-			for (int var7 = 0; var7 < var6; ++var7) { // L: 43
-				char var8 = var0.charAt(var7); // L: 44
-				if (var7 == 0) { // L: 45
-					if (var8 == '-') { // L: 46
-						var3 = true; // L: 47
-						continue;
-					}
+	@ObfuscatedName("ji")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Ljava/lang/String;",
+		garbageValue = "-68"
+	)
+	@Export("formatItemStacks")
+	static final String formatItemStacks(int var0) {
+		String var1 = Integer.toString(var0); // L: 9906
 
-					if (var8 == '+') { // L: 50
-						continue;
-					}
-				}
+		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9907
+			var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9908
+		}
 
-				int var10;
-				if (var8 >= '0' && var8 <= '9') { // L: 52
-					var10 = var8 - '0';
-				} else if (var8 >= 'A' && var8 <= 'Z') { // L: 53
-					var10 = var8 - '7';
-				} else {
-					if (var8 < 'a' || var8 > 'z') { // L: 54
-						return false; // L: 55
-					}
-
-					var10 = var8 - 'W';
-				}
-
-				if (var10 >= var1) { // L: 56
-					return false;
-				}
-
-				if (var3) { // L: 57
-					var10 = -var10;
-				}
-
-				int var9 = var10 + var5 * var1; // L: 58
-				if (var9 / var1 != var5) { // L: 59
-					return false;
-				}
-
-				var5 = var9; // L: 60
-				var4 = true; // L: 61
-			}
-
-			return var4; // L: 63
+		if (var1.length() > 9) { // L: 9910
+			return " " + SecureRandomFuture.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
 		} else {
-			throw new IllegalArgumentException("" + var1);
+			return var1.length() > 6 ? " " + SecureRandomFuture.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + SecureRandomFuture.colorStartTag(16776960) + var1 + "</col>"; // L: 9911 9912
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java
index 787498182e..6514bf4bb5 100644
--- a/runescape-client/src/main/java/MusicPatchNode2.java
+++ b/runescape-client/src/main/java/MusicPatchNode2.java
@@ -1,50 +1,63 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hk")
+@ObfuscatedName("ho")
 @Implements("MusicPatchNode2")
 public class MusicPatchNode2 {
-	@ObfuscatedName("v")
-	byte[] field2825;
-	@ObfuscatedName("n")
-	byte[] field2816;
 	@ObfuscatedName("f")
+	byte[] field2821;
+	@ObfuscatedName("e")
+	byte[] field2828;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1176756579
-	)
-	int field2815;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -2020328807
-	)
-	int field2821;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -540295213
-	)
-	int field2819;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 1149162475
-	)
-	int field2820;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = 1263113975
-	)
-	int field2822;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -75268449
-	)
-	int field2817;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = -1029030671
+		intValue = 660158301
 	)
 	int field2823;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = -1122289667
+	)
+	int field2824;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 1506593887
+	)
+	int field2825;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1063297041
+	)
+	int field2822;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -1150913277
+	)
+	int field2826;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1271826479
+	)
+	int field2827;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -12467387
+	)
+	int field2829;
 
 	MusicPatchNode2() {
 	} // L: 14
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1118422723"
+	)
+	static final void method4537(String var0) {
+		StringBuilder var10000 = (new StringBuilder()).append(var0);
+		Object var10001 = null;
+		String var1 = var10000.append(" is already on your friend list").toString(); // L: 114
+		UserComparator10.addGameMessage(30, "", var1); // L: 116
+	} // L: 118
 }
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index cbddd5c8c2..5427d6238d 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -3,32 +3,30 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ih")
+@ObfuscatedName("it")
 @Implements("MusicPatchPcmStream")
 public class MusicPatchPcmStream extends PcmStream {
-	@ObfuscatedName("ag")
-	static String field2885;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lhp;"
+		descriptor = "Lie;"
 	)
 	@Export("superStream")
 	MidiPcmStream superStream;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("queue")
 	NodeDeque queue;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lay;"
+		descriptor = "Lav;"
 	)
 	@Export("mixer")
 	PcmStreamMixer mixer;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lhp;)V"
+		descriptor = "(Lie;)V"
 	)
 	MusicPatchPcmStream(MidiPcmStream var1) {
 		this.queue = new NodeDeque(); // L: 11
@@ -36,48 +34,48 @@ public class MusicPatchPcmStream extends PcmStream {
 		this.superStream = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;[IIIIS)V",
-		garbageValue = "25857"
+		descriptor = "(Lib;[IIIIB)V",
+		garbageValue = "0"
 	)
-	void method4604(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
-		if ((this.superStream.field2846[var1.field2905] & 4) != 0 && var1.field2895 < 0) { // L: 73
-			int var6 = this.superStream.field2851[var1.field2905] / PcmPlayer.field428; // L: 74
+	void method4761(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
+		if ((this.superStream.field2851[var1.field2898] & 4) != 0 && var1.field2903 < 0) { // L: 73
+			int var6 = this.superStream.field2856[var1.field2898] / class341.field3921; // L: 74
 
 			while (true) {
-				int var7 = (var6 + 1048575 - var1.field2904) / var6; // L: 76
+				int var7 = (var6 + 1048575 - var1.field2899) / var6; // L: 76
 				if (var7 > var4) { // L: 77
-					var1.field2904 += var4 * var6;
+					var1.field2899 += var4 * var6; // L: 99
 					break;
 				}
 
 				var1.stream.fill(var2, var3, var7); // L: 78
 				var3 += var7; // L: 79
 				var4 -= var7; // L: 80
-				var1.field2904 += var6 * var7 - 1048576; // L: 81
-				int var8 = PcmPlayer.field428 / 100; // L: 82
+				var1.field2899 += var7 * var6 - 1048576; // L: 81
+				int var8 = class341.field3921 / 100; // L: 82
 				int var9 = 262144 / var6; // L: 83
 				if (var9 < var8) { // L: 84
 					var8 = var9;
 				}
 
 				RawPcmStream var10 = var1.stream; // L: 85
-				if (this.superStream.field2836[var1.field2905] == 0) { // L: 86
-					var1.stream = RawPcmStream.method842(var1.rawSound, var10.method857(), var10.method914(), var10.method971()); // L: 87
+				if (this.superStream.field2854[var1.field2898] == 0) { // L: 86
+					var1.stream = RawPcmStream.method937(var1.rawSound, var10.method957(), var10.method948(), var10.method949()); // L: 87
 				} else {
-					var1.stream = RawPcmStream.method842(var1.rawSound, var10.method857(), 0, var10.method971()); // L: 90
-					this.superStream.method4421(var1, var1.patch.field2878[var1.field2896] < 0); // L: 91
-					var1.stream.method853(var8, var10.method914()); // L: 92
+					var1.stream = RawPcmStream.method937(var1.rawSound, var10.method957(), 0, var10.method949()); // L: 90
+					this.superStream.method4567(var1, var1.patch.field2882[var1.field2910] < 0); // L: 91
+					var1.stream.method953(var8, var10.method948()); // L: 92
 				}
 
-				if (var1.patch.field2878[var1.field2896] < 0) { // L: 94
+				if (var1.patch.field2882[var1.field2910] < 0) { // L: 94
 					var1.stream.setNumLoops(-1);
 				}
 
-				var10.method855(var8);
-				var10.fill(var2, var3, var5 - var3);
-				if (var10.method859()) {
+				var10.method955(var8); // L: 95
+				var10.fill(var2, var3, var5 - var3); // L: 96
+				if (var10.method959()) { // L: 97
 					this.mixer.addSubStream(var10);
 				}
 			}
@@ -86,52 +84,52 @@ public class MusicPatchPcmStream extends PcmStream {
 		var1.stream.fill(var2, var3, var4); // L: 101
 	} // L: 102
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Liq;II)V",
-		garbageValue = "1404066411"
+		descriptor = "(Lib;II)V",
+		garbageValue = "-1540806393"
 	)
-	void method4605(MusicPatchNode var1, int var2) {
-		if ((this.superStream.field2846[var1.field2905] & 4) != 0 && var1.field2895 < 0) { // L: 105
-			int var3 = this.superStream.field2851[var1.field2905] / PcmPlayer.field428; // L: 106
-			int var4 = (var3 + 1048575 - var1.field2904) / var3; // L: 107
-			var1.field2904 = var3 * var2 + var1.field2904 & 1048575; // L: 108
+	void method4744(MusicPatchNode var1, int var2) {
+		if ((this.superStream.field2851[var1.field2898] & 4) != 0 && var1.field2903 < 0) { // L: 105
+			int var3 = this.superStream.field2856[var1.field2898] / class341.field3921; // L: 106
+			int var4 = (var3 + 1048575 - var1.field2899) / var3; // L: 107
+			var1.field2899 = var3 * var2 + var1.field2899 & 1048575; // L: 108
 			if (var4 <= var2) { // L: 109
-				if (this.superStream.field2836[var1.field2905] == 0) { // L: 110
-					var1.stream = RawPcmStream.method842(var1.rawSound, var1.stream.method857(), var1.stream.method914(), var1.stream.method971()); // L: 111
+				if (this.superStream.field2854[var1.field2898] == 0) { // L: 110
+					var1.stream = RawPcmStream.method937(var1.rawSound, var1.stream.method957(), var1.stream.method948(), var1.stream.method949()); // L: 111
 				} else {
-					var1.stream = RawPcmStream.method842(var1.rawSound, var1.stream.method857(), 0, var1.stream.method971()); // L: 114
-					this.superStream.method4421(var1, var1.patch.field2878[var1.field2896] < 0); // L: 115
+					var1.stream = RawPcmStream.method937(var1.rawSound, var1.stream.method957(), 0, var1.stream.method949()); // L: 114
+					this.superStream.method4567(var1, var1.patch.field2882[var1.field2910] < 0); // L: 115
 				}
 
-				if (var1.patch.field2878[var1.field2896] < 0) { // L: 117
+				if (var1.patch.field2882[var1.field2910] < 0) { // L: 117
 					var1.stream.setNumLoops(-1);
 				}
 
-				var2 = var1.field2904 / var3; // L: 118
+				var2 = var1.field2899 / var3; // L: 118
 			}
 		}
 
 		var1.stream.skip(var2); // L: 121
 	} // L: 122
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19
-		if (var1 == null) {
-			return null; // L: 20
+		if (var1 == null) { // L: 20
+			return null;
 		} else {
 			return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); // L: 21 22
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
@@ -146,56 +144,56 @@ public class MusicPatchPcmStream extends PcmStream {
 		return var1.stream;
 	}
 
-	@ObfuscatedName("b")
-	protected int vmethod4610() {
+	@ObfuscatedName("r")
+	protected int vmethod4740() {
 		return 0; // L: 34
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("fill")
 	protected void fill(int[] var1, int var2, int var3) {
 		this.mixer.fill(var1, var2, var3); // L: 40
 
 		for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41
-			if (!this.superStream.method4442(var6)) { // L: 42
+			if (!this.superStream.method4589(var6)) { // L: 42
 				int var4 = var2; // L: 43
 				int var5 = var3; // L: 44
 
 				do {
-					if (var5 <= var6.field2891) { // L: 45
-						this.method4604(var6, var1, var4, var5, var4 + var5); // L: 51
-						var6.field2891 -= var5; // L: 52
+					if (var5 <= var6.field2913) { // L: 45
+						this.method4761(var6, var1, var4, var5, var4 + var5); // L: 51
+						var6.field2913 -= var5; // L: 52
 						break;
 					}
 
-					this.method4604(var6, var1, var4, var6.field2891, var5 + var4); // L: 46
-					var4 += var6.field2891; // L: 47
-					var5 -= var6.field2891; // L: 48
-				} while(!this.superStream.method4443(var6, var1, var4, var5)); // L: 49
+					this.method4761(var6, var1, var4, var6.field2913, var4 + var5); // L: 46
+					var4 += var6.field2913; // L: 47
+					var5 -= var6.field2913; // L: 48
+				} while(!this.superStream.method4590(var6, var1, var4, var5)); // L: 49
 			}
 		}
 
 	} // L: 54
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("skip")
 	protected void skip(int var1) {
 		this.mixer.skip(var1); // L: 58
 
 		for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59
-			if (!this.superStream.method4442(var3)) { // L: 60
+			if (!this.superStream.method4589(var3)) { // L: 60
 				int var2 = var1; // L: 61
 
 				do {
-					if (var2 <= var3.field2891) { // L: 62
-						this.method4605(var3, var2); // L: 67
-						var3.field2891 -= var2; // L: 68
+					if (var2 <= var3.field2913) { // L: 62
+						this.method4744(var3, var2); // L: 67
+						var3.field2913 -= var2; // L: 68
 						break;
 					}
 
-					this.method4605(var3, var3.field2891); // L: 63
-					var2 -= var3.field2891; // L: 64
-				} while(!this.superStream.method4443(var3, (int[])null, 0, var2)); // L: 65
+					this.method4744(var3, var3.field2913); // L: 63
+					var2 -= var3.field2913; // L: 64
+				} while(!this.superStream.method4590(var3, (int[])null, 0, var2)); // L: 65
 			}
 		}
 
@@ -203,20 +201,50 @@ public class MusicPatchPcmStream extends PcmStream {
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(CB)C",
-		garbageValue = "-53"
+		descriptor = "(IS)Ljava/lang/String;",
+		garbageValue = "-8788"
 	)
-	static char method4620(char var0) {
-		if (var0 == 198) { // L: 95
-			return 'E';
-		} else if (var0 == 230) { // L: 96
-			return 'e';
-		} else if (var0 == 223) {
-			return 's'; // L: 97
-		} else if (var0 == 338) { // L: 98
-			return 'E';
-		} else {
-			return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 99 100
-		}
+	static String method4743(int var0) {
+		return "<img=" + var0 + ">"; // L: 18
 	}
+
+	@ObfuscatedName("gd")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1611002250"
+	)
+	static final void method4762() {
+		for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4826 4827 4844
+			if (var0.plane == SoundSystem.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4828
+				if (Client.cycle >= var0.cycleStart) { // L: 4829
+					if (var0.targetIndex > 0) { // L: 4830
+						NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4831
+						if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4832
+							var0.setDestination(var1.x, var1.y, ItemContainer.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle);
+						}
+					}
+
+					if (var0.targetIndex < 0) { // L: 4834
+						int var2 = -var0.targetIndex - 1; // L: 4836
+						Player var3;
+						if (var2 == Client.localPlayerIndex) { // L: 4837
+							var3 = class262.localPlayer;
+						} else {
+							var3 = Client.players[var2]; // L: 4838
+						}
+
+						if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) {
+							var0.setDestination(var3.x, var3.y, ItemContainer.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4839
+						}
+					}
+
+					var0.advance(Client.field683); // L: 4841
+					DevicePcmPlayerProvider.scene.drawEntity(SoundSystem.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4842
+				}
+			} else {
+				var0.remove();
+			}
+		}
+
+	} // L: 4846
 }
diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java
index 8ff431ac0a..afbb7f837d 100644
--- a/runescape-client/src/main/java/MusicTrack.java
+++ b/runescape-client/src/main/java/MusicTrack.java
@@ -3,21 +3,21 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ie")
+@ObfuscatedName("io")
 @Implements("MusicTrack")
 public class MusicTrack extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("table")
 	NodeHashTable table;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("midi")
 	byte[] midi;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	MusicTrack(Buffer var1) {
 		var1.offset = var1.array.length - 3; // L: 22
@@ -335,8 +335,8 @@ public class MusicTrack extends Node {
 
 	} // L: 271
 
-	@ObfuscatedName("n")
-	void method4622() {
+	@ObfuscatedName("e")
+	void method4771() {
 		if (this.table == null) { // L: 274
 			this.table = new NodeHashTable(16); // L: 275
 			int[] var1 = new int[16]; // L: 276
@@ -416,18 +416,18 @@ public class MusicTrack extends Node {
 		}
 	} // L: 331
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("clear")
 	void clear() {
 		this.table = null; // L: 334
 	} // L: 335
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;II)Lie;"
+		descriptor = "(Ljp;II)Lio;"
 	)
 	@Export("readTrack")
-	public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) {
+	static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) {
 		byte[] var3 = var0.takeFile(var1, var2); // L: 16
 		return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17
 	}
diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java
index 0dc73eacf0..91c9b23267 100644
--- a/runescape-client/src/main/java/NPC.java
+++ b/runescape-client/src/main/java/NPC.java
@@ -3,12 +3,14 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("db")
+@ObfuscatedName("du")
 @Implements("NPC")
 public final class NPC extends Actor {
-	@ObfuscatedName("v")
+	@ObfuscatedName("h")
+	static int[][] field1328;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lef;"
+		descriptor = "Lev;"
 	)
 	@Export("definition")
 	NPCComposition definition;
@@ -16,17 +18,17 @@ public final class NPC extends Actor {
 	NPC() {
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(IBI)V",
-		garbageValue = "-300135840"
+		garbageValue = "464713679"
 	)
-	final void method2259(int var1, byte var2) {
+	final void method2343(int var1, byte var2) {
 		int var3 = super.pathX[0]; // L: 15
 		int var4 = super.pathY[0]; // L: 16
 		if (var1 == 0) { // L: 17
 			--var3; // L: 18
-			++var4;
+			++var4; // L: 19
 		}
 
 		if (var1 == 1) { // L: 21
@@ -60,8 +62,8 @@ public final class NPC extends Actor {
 			--var4; // L: 35
 		}
 
-		if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) {
-			super.sequence = -1; // L: 37
+		if (super.sequence != -1 && WorldMapScaleHandler.SequenceDefinition_get(super.sequence).field1893 == 1) { // L: 37
+			super.sequence = -1;
 		}
 
 		if (super.pathLength < 9) { // L: 38
@@ -79,18 +81,18 @@ public final class NPC extends Actor {
 		super.pathTraversed[0] = var2; // L: 46
 	} // L: 47
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
 		if (this.definition == null) { // L: 77
 			return null;
 		} else {
-			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? LoginScreenAnimation.SequenceDefinition_get(super.sequence) : null; // L: 78
-			SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : LoginScreenAnimation.SequenceDefinition_get(super.movementSequence); // L: 79
+			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapScaleHandler.SequenceDefinition_get(super.sequence) : null; // L: 78
+			SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : WorldMapScaleHandler.SequenceDefinition_get(super.movementSequence); // L: 79
 			Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80
 			if (var3 == null) { // L: 81
 				return null;
@@ -98,9 +100,9 @@ public final class NPC extends Actor {
 				var3.calculateBoundsCylinder(); // L: 82
 				super.defaultHeight = var3.height; // L: 83
 				if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84
-					Model var4 = VarcInt.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85
+					Model var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85
 					if (var4 != null) { // L: 86
-						var4.offsetBy(0, -super.field1277, 0); // L: 87
+						var4.offsetBy(0, -super.field1263, 0); // L: 87
 						Model[] var5 = new Model[]{var3, var4}; // L: 88
 						var3 = new Model(var5, 2); // L: 89
 					}
@@ -115,13 +117,13 @@ public final class NPC extends Actor {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIZI)V",
-		garbageValue = "-660093008"
+		descriptor = "(IIZB)V",
+		garbageValue = "3"
 	)
-	final void method2260(int var1, int var2, boolean var3) {
-		if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) { // L: 50
+	final void method2347(int var1, int var2, boolean var3) {
+		if (super.sequence != -1 && WorldMapScaleHandler.SequenceDefinition_get(super.sequence).field1893 == 1) { // L: 50
 			super.sequence = -1;
 		}
 
@@ -147,46 +149,21 @@ public final class NPC extends Actor {
 		}
 
 		super.pathLength = 0; // L: 67
-		super.field1274 = 0; // L: 68
-		super.field1294 = 0; // L: 69
+		super.field1281 = 0; // L: 68
+		super.field1242 = 0; // L: 69
 		super.pathX[0] = var1; // L: 70
 		super.pathY[0] = var2; // L: 71
-		super.x = super.pathX[0] * 128 + super.field1239 * 64; // L: 72
-		super.y = super.pathY[0] * 128 + super.field1239 * 64; // L: 73
+		super.x = super.pathX[0] * 128 + super.field1225 * 64; // L: 72
+		super.y = super.field1225 * 64 + super.pathY[0] * 128; // L: 73
 	} // L: 74
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-6"
+		garbageValue = "3"
 	)
 	@Export("isVisible")
 	final boolean isVisible() {
 		return this.definition != null; // L: 97
 	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-785880631"
-	)
-	@Export("isWorldMapEvent")
-	public static boolean isWorldMapEvent(int var0) {
-		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
-	}
-
-	@ObfuscatedName("jx")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "3"
-	)
-	static boolean method2258(int var0) {
-		for (int var1 = 0; var1 < Client.field806; ++var1) { // L: 10652
-			if (Client.field868[var1] == var0) { // L: 10653
-				return true;
-			}
-		}
-
-		return false; // L: 10655
-	}
 }
diff --git a/runescape-client/src/main/java/NPCComposition.java b/runescape-client/src/main/java/NPCComposition.java
index 64f524ee7f..721306a7b1 100644
--- a/runescape-client/src/main/java/NPCComposition.java
+++ b/runescape-client/src/main/java/NPCComposition.java
@@ -3,198 +3,193 @@ 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("ef")
+@ObfuscatedName("ev")
 @Implements("NPCComposition")
 public class NPCComposition extends DualNode {
-	@ObfuscatedName("qn")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ll;"
-	)
-	@Export("guestClanSettings")
-	static ClanSettings guestClanSettings;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("NpcDefinition_archive")
 	public static AbstractArchive NpcDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("NpcDefinition_modelArchive")
 	public static AbstractArchive NpcDefinition_modelArchive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("NpcDefinition_cached")
-	public static EvictingDualNodeHashTable NpcDefinition_cached;
+	static EvictingDualNodeHashTable NpcDefinition_cached;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("NpcDefinition_cachedModels")
-	public static EvictingDualNodeHashTable NpcDefinition_cachedModels;
-	@ObfuscatedName("gr")
+	static EvictingDualNodeHashTable NpcDefinition_cachedModels;
+	@ObfuscatedName("hy")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
+		descriptor = "[Loa;"
 	)
-	@Export("compass")
-	static SpritePixels compass;
-	@ObfuscatedName("p")
+	@Export("crossSprites")
+	static SpritePixels[] crossSprites;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -2060838679
+		intValue = 524920995
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1748856001
+		intValue = -382124903
 	)
 	@Export("size")
 	public int size;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("models")
 	int[] models;
+	@ObfuscatedName("h")
+	int[] field1644;
 	@ObfuscatedName("d")
-	int[] field1638;
-	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1310735685
+		intValue = 1765271701
 	)
 	@Export("idleSequence")
 	public int idleSequence;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1743545491
+		intValue = -1898618439
 	)
 	@Export("turnLeftSequence")
 	public int turnLeftSequence;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1143137827
+		intValue = 2020012415
 	)
 	@Export("turnRightSequence")
 	public int turnRightSequence;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1881319333
+		intValue = -941027459
 	)
 	@Export("walkSequence")
 	public int walkSequence;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2006031471
+		intValue = 1631754867
 	)
 	@Export("walkBackSequence")
 	public int walkBackSequence;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1692683489
+		intValue = 1695340251
 	)
 	@Export("walkLeftSequence")
 	public int walkLeftSequence;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1089328917
+		intValue = -1096930091
 	)
 	@Export("walkRightSequence")
 	public int walkRightSequence;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("actions")
 	public String[] actions;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("drawMapDot")
 	public boolean drawMapDot;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -427478981
+		intValue = 880136129
 	)
 	@Export("combatLevel")
 	public int combatLevel;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1078672503
+		intValue = -759959591
 	)
 	@Export("widthScale")
 	int widthScale;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1467757175
+		intValue = -1143359783
 	)
 	@Export("heightScale")
 	int heightScale;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@Export("isVisible")
 	public boolean isVisible;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 2079488611
+		intValue = 210983141
 	)
 	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 1867659125
+		intValue = -2083023515
 	)
 	@Export("contrast")
 	int contrast;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 1099409813
+		intValue = 2052657801
 	)
 	@Export("headIconPrayer")
 	public int headIconPrayer;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -729878735
+		intValue = 1072203595
 	)
 	@Export("rotation")
 	public int rotation;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -17335253
+		intValue = -1263939441
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -1483491067
+		intValue = 2131435543
 	)
 	@Export("transformVarp")
 	int transformVarp;
 	@ObfuscatedName("ag")
 	@Export("isInteractable")
 	public boolean isInteractable;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("isClickable")
 	public boolean isClickable;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@Export("isFollower")
 	public boolean isFollower;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
@@ -231,19 +226,19 @@ public class NPCComposition extends DualNode {
 		this.isFollower = false; // L: 51
 	} // L: 54
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-260686681"
+		garbageValue = "1067902872"
 	)
 	@Export("postDecode")
 	void postDecode() {
 	} // L: 68
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1170104499"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "-22"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -259,8 +254,8 @@ public class NPCComposition extends DualNode {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "-16"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "124"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -304,7 +299,7 @@ public class NPCComposition extends DualNode {
 
 			for (var4 = 0; var4 < var3; ++var4) { // L: 107
 				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 108
-				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 109
+				this.recolorTo[var4] = (short)var1.readUnsignedShort();
 			}
 		} else if (var2 == 41) { // L: 112
 			var3 = var1.readUnsignedByte(); // L: 113
@@ -317,10 +312,10 @@ public class NPCComposition extends DualNode {
 			}
 		} else if (var2 == 60) { // L: 121
 			var3 = var1.readUnsignedByte(); // L: 122
-			this.field1638 = new int[var3]; // L: 123
+			this.field1644 = new int[var3]; // L: 123
 
 			for (var4 = 0; var4 < var3; ++var4) { // L: 124
-				this.field1638[var4] = var1.readUnsignedShort();
+				this.field1644[var4] = var1.readUnsignedShort();
 			}
 		} else if (var2 == 93) { // L: 126
 			this.drawMapDot = false;
@@ -348,12 +343,12 @@ public class NPCComposition extends DualNode {
 			} else if (var2 == 111) { // L: 155
 				this.isFollower = true;
 			} else if (var2 == 249) { // L: 156
-				this.params = ModeWhere.readStringIntParameters(var1, this.params);
+				this.params = class19.readStringIntParameters(var1, this.params);
 			}
 		} else {
 			this.transformVarbit = var1.readUnsignedShort(); // L: 136
-			if (this.transformVarbit == 65535) { // L: 137
-				this.transformVarbit = -1;
+			if (this.transformVarbit == 65535) {
+				this.transformVarbit = -1; // L: 137
 			}
 
 			this.transformVarp = var1.readUnsignedShort(); // L: 138
@@ -384,10 +379,10 @@ public class NPCComposition extends DualNode {
 
 	} // L: 158
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lfl;ILfl;II)Lgr;",
-		garbageValue = "-26460885"
+		descriptor = "(Lfm;ILfm;IB)Lgd;",
+		garbageValue = "1"
 	)
 	@Export("getModel")
 	public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
@@ -440,41 +435,41 @@ public class NPCComposition extends DualNode {
 			}
 
 			Model var11;
-			if (var1 != null && var3 != null) { // L: 190
+			if (var1 != null && var3 != null) {
 				var11 = var1.applyTransformations(var5, var2, var3, var4);
-			} else if (var1 != null) { // L: 191
+			} else if (var1 != null) {
 				var11 = var1.transformActorModel(var5, var2);
-			} else if (var3 != null) { // L: 192
+			} else if (var3 != null) {
 				var11 = var3.transformActorModel(var5, var4);
 			} else {
-				var11 = var5.toSharedSequenceModel(true); // L: 193
+				var11 = var5.toSharedSequenceModel(true);
 			}
 
-			if (this.widthScale != 128 || this.heightScale != 128) { // L: 194
+			if (this.widthScale != 128 || this.heightScale != 128) {
 				var11.scale(this.widthScale, this.heightScale, this.widthScale);
 			}
 
-			return var11; // L: 195
+			return var11;
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(S)Lgm;",
-		garbageValue = "7106"
+		descriptor = "(I)Lga;",
+		garbageValue = "936474541"
 	)
 	@Export("getModelData")
 	public final ModelData getModelData() {
 		if (this.transforms != null) { // L: 199
 			NPCComposition var7 = this.transform(); // L: 200
 			return var7 == null ? null : var7.getModelData(); // L: 201 202
-		} else if (this.field1638 == null) { // L: 204
+		} else if (this.field1644 == null) { // L: 204
 			return null;
 		} else {
 			boolean var1 = false; // L: 205
 
-			for (int var2 = 0; var2 < this.field1638.length; ++var2) { // L: 206
-				if (!NpcDefinition_modelArchive.tryLoadFile(this.field1638[var2], 0)) {
+			for (int var2 = 0; var2 < this.field1644.length; ++var2) { // L: 206
+				if (!NpcDefinition_modelArchive.tryLoadFile(this.field1644[var2], 0)) {
 					var1 = true;
 				}
 			}
@@ -482,10 +477,10 @@ public class NPCComposition extends DualNode {
 			if (var1) { // L: 207
 				return null;
 			} else {
-				ModelData[] var5 = new ModelData[this.field1638.length]; // L: 208
+				ModelData[] var5 = new ModelData[this.field1644.length]; // L: 208
 
-				for (int var3 = 0; var3 < this.field1638.length; ++var3) { // L: 209
-					var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1638[var3], 0);
+				for (int var3 = 0; var3 < this.field1644.length; ++var3) { // L: 209
+					var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1644[var3], 0);
 				}
 
 				ModelData var6;
@@ -513,16 +508,16 @@ public class NPCComposition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lef;",
-		garbageValue = "5"
+		descriptor = "(I)Lev;",
+		garbageValue = "1438500977"
 	)
 	@Export("transform")
 	public final NPCComposition transform() {
 		int var1 = -1; // L: 227
 		if (this.transformVarbit != -1) { // L: 228
-			var1 = Skeleton.getVarbit(this.transformVarbit);
+			var1 = ScriptFrame.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) { // L: 229
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -534,13 +529,13 @@ public class NPCComposition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? StructComposition.getNpcDefinition(var2) : null; // L: 233 234
+		return var2 != -1 ? class248.getNpcDefinition(var2) : null; // L: 233 234
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1279569027"
+		garbageValue = "-263969679"
 	)
 	@Export("transformIsVisible")
 	public boolean transformIsVisible() {
@@ -549,7 +544,7 @@ public class NPCComposition extends DualNode {
 		} else {
 			int var1 = -1; // L: 239
 			if (this.transformVarbit != -1) { // L: 240
-				var1 = Skeleton.getVarbit(this.transformVarbit);
+				var1 = ScriptFrame.getVarbit(this.transformVarbit);
 			} else if (this.transformVarp != -1) { // L: 241
 				var1 = Varps.Varps_main[this.transformVarp];
 			}
@@ -562,63 +557,266 @@ public class NPCComposition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "506916452"
+		garbageValue = "121544801"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return SecureRandomFuture.method1977(this.params, var1, var2); // L: 247
+		IterableNodeHashTable var4 = this.params; // L: 248
+		int var3;
+		if (var4 == null) { // L: 250
+			var3 = var2; // L: 251
+		} else {
+			IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 254
+			if (var5 == null) { // L: 255
+				var3 = var2; // L: 256
+			} else {
+				var3 = var5.integer; // L: 259
+			}
+		}
+
+		return var3; // L: 261
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-614305753"
+		garbageValue = "-2089556399"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return FriendsList.method5650(this.params, var1, var2); // L: 251
+		return WorldMapElement.method2742(this.params, var1, var2); // L: 265
 	}
 
-	@ObfuscatedName("kb")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;S)V",
-		garbageValue = "-1922"
+		descriptor = "(Ljp;Ljp;Ljp;Ljp;I)V",
+		garbageValue = "1926659100"
 	)
-	@Export("Clan_joinChat")
-	static final void Clan_joinChat(String var0) {
-		if (!var0.equals("")) { // L: 11298
-			PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2574, Client.packetWriter.isaacCipher); // L: 11300
-			var1.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var0)); // L: 11301
-			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11302
-			Client.packetWriter.addNode(var1); // L: 11303
-		}
-	} // L: 11304
+	public static void method2868(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
+		AttackOption.Widget_archive = var0; // L: 190
+		class375.Widget_modelsArchive = var1; // L: 191
+		class44.Widget_spritesArchive = var2; // L: 192
+		ChatChannel.Widget_fontsArchive = var3; // L: 193
+		GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents = new Widget[AttackOption.Widget_archive.getGroupCount()][]; // L: 194
+		Widget.Widget_loadedInterfaces = new boolean[AttackOption.Widget_archive.getGroupCount()]; // L: 195
+	} // L: 196
 
-	@ObfuscatedName("lu")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1165253281"
+		descriptor = "(IIB)I",
+		garbageValue = "4"
 	)
-	static void method2791() {
-		if (Client.field724 && class93.localPlayer != null) { // L: 11510
-			int var0 = class93.localPlayer.pathX[0]; // L: 11511
-			int var1 = class93.localPlayer.pathY[0]; // L: 11512
-			if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { // L: 11513
-				return;
-			}
+	public static int method2841(int var0, int var1) {
+		int var2 = var0 >>> 31; // L: 109
+		return (var0 + var2) / var1 - var2; // L: 110
+	}
 
-			RouteStrategy.oculusOrbFocalPointX = class93.localPlayer.x; // L: 11514
-			int var2 = class105.getTileHeight(class93.localPlayer.x, class93.localPlayer.y, class22.Client_plane) - Client.camFollowHeight; // L: 11515
-			if (var2 < class17.field148) { // L: 11516
-				class17.field148 = var2;
-			}
+	@ObfuscatedName("ah")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-355441861"
+	)
+	static int method2857(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		if (var0 == ScriptOpcodes.ADD) { // L: 2784
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 2785
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2786
+			var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2787
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 + var4; // L: 2788
+			return 1; // L: 2789
+		} else if (var0 == ScriptOpcodes.SUB) { // L: 2791
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 2792
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2793
+			var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2794
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 - var4; // L: 2795
+			return 1; // L: 2796
+		} else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2798
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 2799
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2800
+			var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2801
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 * var4; // L: 2802
+			return 1; // L: 2803
+		} else if (var0 == ScriptOpcodes.DIV) { // L: 2805
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 2806
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2807
+			var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2808
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 / var4; // L: 2809
+			return 1; // L: 2810
+		} else if (var0 == ScriptOpcodes.RANDOM) { // L: 2812
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2813
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); // L: 2814
+			return 1; // L: 2815
+		} else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2817
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2818
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); // L: 2819
+			return 1; // L: 2820
+		} else {
+			int var5;
+			int var6;
+			int var7;
+			if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2822
+				ChatChannel.Interpreter_intStackSize -= 5; // L: 2823
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2824
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2825
+				var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2826
+				var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 2827
+				var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 4]; // L: 2828
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); // L: 2829
+				return 1; // L: 2830
+			} else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2832
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2833
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2834
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2835
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; // L: 2836
+				return 1; // L: 2837
+			} else if (var0 == ScriptOpcodes.SETBIT) { // L: 2839
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2840
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2841
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2842
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 | 1 << var4; // L: 2843
+				return 1; // L: 2844
+			} else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2846
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2847
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2848
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2849
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); // L: 2850
+				return 1; // L: 2851
+			} else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2853
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2854
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2855
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2856
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; // L: 2857
+				return 1; // L: 2858
+			} else if (var0 == ScriptOpcodes.MOD) { // L: 2860
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2861
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2862
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2863
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 % var4; // L: 2864
+				return 1; // L: 2865
+			} else if (var0 == ScriptOpcodes.POW) { // L: 2867
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2868
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2869
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2870
+				if (var3 == 0) { // L: 2871
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0;
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); // L: 2872
+				}
 
-			ModelData0.oculusOrbFocalPointY = class93.localPlayer.y; // L: 11517
-			Client.field724 = false; // L: 11518
+				return 1; // L: 2873
+			} else if (var0 == ScriptOpcodes.INVPOW) { // L: 2875
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2876
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2877
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2878
+				if (var3 == 0) { // L: 2879
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2880
+					return 1; // L: 2881
+				} else {
+					switch(var4) { // L: 2883
+					case 0:
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2896
+						break; // L: 2897
+					case 1:
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 2906
+						break; // L: 2907
+					case 2:
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); // L: 2886
+						break;
+					case 3:
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); // L: 2891
+						break; // L: 2892
+					case 4:
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); // L: 2901
+						break; // L: 2902
+					default:
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); // L: 2911
+					}
+
+					return 1; // L: 2915
+				}
+			} else if (var0 == ScriptOpcodes.AND) { // L: 2917
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2918
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2919
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2920
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 & var4; // L: 2921
+				return 1; // L: 2922
+			} else if (var0 == ScriptOpcodes.OR) { // L: 2924
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2925
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2926
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2927
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 | var4; // L: 2928
+				return 1; // L: 2929
+			} else if (var0 == ScriptOpcodes.SCALE) { // L: 2931
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 2932
+				long var9 = (long)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2933
+				long var11 = (long)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2934
+				long var13 = (long)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2935
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); // L: 2936
+				return 1; // L: 2937
+			} else if (var0 == ScriptOpcodes.BITCOUNT) { // L: 2939
+				var3 = class269.method4992(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 2940
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 2941
+				return 1; // L: 2942
+			} else if (var0 == ScriptOpcodes.TOGGLEBIT) { // L: 2944
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 2945
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2946
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2947
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 ^ 1 << var4; // L: 2948
+				return 1; // L: 2949
+			} else if (var0 == ScriptOpcodes.SETBIT_RANGE) { // L: 2951
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 2952
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2953
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2954
+				var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2955
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapLabel.method3714(var3, var4, var5); // L: 2956
+				return 1; // L: 2957
+			} else if (var0 == ScriptOpcodes.CLEARBIT_RANGE) { // L: 2959
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 2960
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2961
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2962
+				var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2963
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.method3785(var3, var4, var5); // L: 2964
+				return 1; // L: 2965
+			} else if (var0 == ScriptOpcodes.GETBIT_RANGE) { // L: 2967
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 2968
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2969
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2970
+				var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2971
+				var6 = 31 - var5; // L: 2972
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 << var6 >>> var6 + var4; // L: 2973
+				return 1; // L: 2974
+			} else if (var0 == 4030) { // L: 2976
+				ChatChannel.Interpreter_intStackSize -= 4; // L: 2977
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2978
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2979
+				var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2980
+				var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 2981
+				var3 = AbstractWorldMapIcon.method3785(var3, var5, var6); // L: 2982
+				var7 = UserComparator2.method6890(var6 - var5 + 1); // L: 2983
+				if (var4 > var7) { // L: 2984
+					var4 = var7;
+				}
+
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 | var4 << var5; // L: 2985
+				return 1; // L: 2986
+			} else {
+				return 2; // L: 2988
+			}
 		}
+	}
 
-	} // L: 11520
+	@ObfuscatedName("kq")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "-5"
+	)
+	static final void method2882(int var0) {
+		var0 = Math.min(Math.max(var0, 0), 127); // L: 11138
+		class4.clientPreferences.areaSoundEffectsVolume = var0; // L: 11139
+		Actor.savePreferences(); // L: 11140
+	} // L: 11141
 }
diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java
index 0ce8b0ee56..6972a485a2 100644
--- a/runescape-client/src/main/java/NanoClock.java
+++ b/runescape-client/src/main/java/NanoClock.java
@@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("de")
+@ObfuscatedName("dy")
 @Implements("NanoClock")
 public class NanoClock extends Clock {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = -87747295156547195L
+		longValue = -7053847469093771861L
 	)
 	@Export("lastTimeNano")
 	long lastTimeNano;
@@ -18,63 +18,41 @@ public class NanoClock extends Clock {
 		this.lastTimeNano = System.nanoTime(); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1887937791"
+		descriptor = "(B)V",
+		garbageValue = "-111"
 	)
 	@Export("mark")
 	public void mark() {
 		this.lastTimeNano = System.nanoTime(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-1841090229"
+		descriptor = "(IIB)I",
+		garbageValue = "-104"
 	)
 	@Export("wait")
 	public int wait(int var1, int var2) {
-		long var3 = (long)var2 * 1000000L; // L: 18
+		long var3 = 1000000L * (long)var2; // L: 18
 		long var5 = this.lastTimeNano - System.nanoTime(); // L: 19
 		if (var5 < var3) { // L: 20
 			var5 = var3;
 		}
 
-		long var7 = var5 / 1000000L; // L: 21
-		long var9;
-		if (var7 > 0L) { // L: 23
-			if (var7 % 10L == 0L) { // L: 24
-				var9 = var7 - 1L; // L: 25
+		class18.method272(var5 / 1000000L); // L: 21
+		long var7 = System.nanoTime(); // L: 22
 
-				try {
-					Thread.sleep(var9); // L: 28
-				} catch (InterruptedException var16) { // L: 30
-				}
-
-				try {
-					Thread.sleep(1L); // L: 34
-				} catch (InterruptedException var15) { // L: 36
-				}
-			} else {
-				try {
-					Thread.sleep(var7); // L: 41
-				} catch (InterruptedException var14) { // L: 43
-				}
-			}
+		int var9;
+		for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26
+			++var9; // L: 25
 		}
 
-		var9 = System.nanoTime(); // L: 46
-
-		int var13;
-		for (var13 = 0; var13 < 10 && (var13 < 1 || this.lastTimeNano < var9); this.lastTimeNano += 1000000L * (long)var1) { // L: 47 48 50
-			++var13; // L: 49
+		if (this.lastTimeNano < var7) { // L: 28
+			this.lastTimeNano = var7;
 		}
 
-		if (this.lastTimeNano < var9) { // L: 52
-			this.lastTimeNano = var9;
-		}
-
-		return var13; // L: 53
+		return var9; // L: 29
 	}
 }
diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java
index 09fe12cf87..d87beabad1 100644
--- a/runescape-client/src/main/java/NetCache.java
+++ b/runescape-client/src/main/java/NetCache.java
@@ -4,116 +4,122 @@ 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("jx")
+@ObfuscatedName("jb")
 @Implements("NetCache")
 public class NetCache {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lls;"
+		descriptor = "Llk;"
 	)
 	@Export("NetCache_socket")
 	public static AbstractSocket NetCache_socket;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 356448421
+		intValue = -371422605
 	)
 	@Export("NetCache_loadTime")
 	public static int NetCache_loadTime;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		longValue = -6267907732532608685L
+	)
+	public static long field3604;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("NetCache_pendingPriorityWrites")
 	public static NodeHashTable NetCache_pendingPriorityWrites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1204808007
+		intValue = 786077645
 	)
 	@Export("NetCache_pendingPriorityWritesCount")
 	public static int NetCache_pendingPriorityWritesCount;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("NetCache_pendingPriorityResponses")
 	public static NodeHashTable NetCache_pendingPriorityResponses;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 317801023
+		intValue = 1874437275
 	)
 	@Export("NetCache_pendingPriorityResponsesCount")
 	public static int NetCache_pendingPriorityResponsesCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lka;"
+		descriptor = "Lke;"
 	)
 	@Export("NetCache_pendingWritesQueue")
 	public static DualNodeDeque NetCache_pendingWritesQueue;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("NetCache_pendingWrites")
-	public static NodeHashTable NetCache_pendingWrites;
-	@ObfuscatedName("s")
+	static NodeHashTable NetCache_pendingWrites;
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -2006204735
+		intValue = 470761029
 	)
 	@Export("NetCache_pendingWritesCount")
 	public static int NetCache_pendingWritesCount;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("NetCache_pendingResponses")
 	public static NodeHashTable NetCache_pendingResponses;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1362666837
+		intValue = -535814739
 	)
 	@Export("NetCache_pendingResponsesCount")
 	public static int NetCache_pendingResponsesCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lnt;"
 	)
 	@Export("NetCache_responseHeaderBuffer")
 	public static Buffer NetCache_responseHeaderBuffer;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -288041073
+		intValue = 1970079707
 	)
-	public static int field3612;
-	@ObfuscatedName("m")
+	public static int field3615;
+	@ObfuscatedName("q")
 	@Export("NetCache_crc")
 	public static CRC32 NetCache_crc;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "[Ljp;"
+		descriptor = "[Ljf;"
 	)
 	@Export("NetCache_archives")
 	public static Archive[] NetCache_archives;
-	@ObfuscatedName("w")
-	public static byte field3607;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
+	public static byte field3618;
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1063840627
+		intValue = 1816313081
 	)
 	@Export("NetCache_crcMismatches")
 	public static int NetCache_crcMismatches;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1965429235
+		intValue = 1810903915
 	)
 	@Export("NetCache_ioExceptions")
 	public static int NetCache_ioExceptions;
-	@ObfuscatedName("dd")
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Lof;"
 	)
-	@Export("archive0")
-	static Archive archive0;
+	@Export("worldSelectLeftSprite")
+	static IndexedSprite worldSelectLeftSprite;
 
 	static {
 		NetCache_loadTime = 0; // L: 13
@@ -127,170 +133,77 @@ public class NetCache {
 		NetCache_pendingResponses = new NodeHashTable(4096); // L: 22
 		NetCache_pendingResponsesCount = 0; // L: 23
 		NetCache_responseHeaderBuffer = new Buffer(8); // L: 26
-		field3612 = 0; // L: 28
+		field3615 = 0; // L: 28
 		NetCache_crc = new CRC32(); // L: 30
 		NetCache_archives = new Archive[256]; // L: 32
-		field3607 = 0; // L: 33
+		field3618 = 0; // L: 33
 		NetCache_crcMismatches = 0; // L: 34
 		NetCache_ioExceptions = 0; // L: 35
 	}
 
-	@ObfuscatedName("gc")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "1592550546"
+		descriptor = "(I)V",
+		garbageValue = "-2090121313"
 	)
-	static final void method5025(int var0, int var1, int var2, int var3) {
-		Client.overheadTextCount = 0; // L: 4886
-		boolean var4 = false; // L: 4887
-		int var5 = -1; // L: 4888
-		int var6 = -1; // L: 4889
-		int var7 = Players.Players_count; // L: 4890
-		int[] var8 = Players.Players_indices; // L: 4891
-
-		int var9;
-		for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4892
-			Object var20;
-			if (var9 < var7) { // L: 4894
-				var20 = Client.players[var8[var9]]; // L: 4895
-				if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4896
-					var4 = true; // L: 4897
-					var5 = var9; // L: 4898
-					continue;
-				}
-
-				if (var20 == class93.localPlayer) { // L: 4901
-					var6 = var9; // L: 4902
-					continue; // L: 4903
-				}
-			} else {
-				var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4906
-			}
-
-			Ignored.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4907
+	static void method5177() {
+		if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 124
+			KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 125
+			KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 126
+			KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 127
+			KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 128
+			KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 129
+			KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 130
+			KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 131
+			KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 132
+			KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 133
+			KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 134
+			KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 135
+			KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 136
+		} else {
+			KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 139
+			KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 140
+			KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 141
+			KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 142
+			KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 143
+			KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 144
+			KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 145
+			KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 146
+			KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 147
+			KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 148
+			KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 149
+			KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 150
 		}
 
-		if (Client.renderSelf && var6 != -1) { // L: 4909
-			Ignored.drawActor2d(class93.localPlayer, var6, var0, var1, var2, var3); // L: 4910
+	} // L: 152
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "71"
+	)
+	static int method5178(int var0, Script var1, boolean var2) {
+		Widget var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1266
+		if (var0 == ScriptOpcodes.IF_GETX) { // L: 1267
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.x; // L: 1268
+			return 1; // L: 1269
+		} else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1271
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.y; // L: 1272
+			return 1; // L: 1273
+		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1275
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.width; // L: 1276
+			return 1; // L: 1277
+		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1279
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.height; // L: 1280
+			return 1; // L: 1281
+		} else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1283
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1284
+			return 1; // L: 1285
+		} else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1287
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.parentId; // L: 1288
+			return 1; // L: 1289
+		} else {
+			return 2; // L: 1291
 		}
-
-		if (var4) { // L: 4912
-			Ignored.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4913
-		}
-
-		for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4915
-			int var10 = Client.overheadTextXs[var9]; // L: 4916
-			int var11 = Client.overheadTextYs[var9]; // L: 4917
-			int var12 = Client.overheadTextXOffsets[var9]; // L: 4918
-			int var13 = Client.overheadTextAscents[var9]; // L: 4919
-			boolean var14 = true; // L: 4920
-
-			while (var14) {
-				var14 = false; // L: 4922
-
-				for (int var19 = 0; var19 < var9; ++var19) { // L: 4923
-					if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4924 4925
-						var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4926
-						var14 = true; // L: 4927
-					}
-				}
-			}
-
-			Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4932
-			Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4933
-			String var15 = Client.overheadText[var9]; // L: 4934
-			if (Client.chatEffects == 0) { // L: 4935
-				int var16 = 16776960; // L: 4936
-				if (Client.overheadTextColors[var9] < 6) { // L: 4937
-					var16 = Client.field877[Client.overheadTextColors[var9]];
-				}
-
-				if (Client.overheadTextColors[var9] == 6) { // L: 4938
-					var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
-				}
-
-				if (Client.overheadTextColors[var9] == 7) { // L: 4939
-					var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
-				}
-
-				if (Client.overheadTextColors[var9] == 8) { // L: 4940
-					var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
-				}
-
-				int var17;
-				if (Client.overheadTextColors[var9] == 9) { // L: 4941
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4942
-					if (var17 < 50) { // L: 4943
-						var16 = var17 * 1280 + 16711680;
-					} else if (var17 < 100) { // L: 4944
-						var16 = 16776960 - (var17 - 50) * 327680;
-					} else if (var17 < 150) { // L: 4945
-						var16 = (var17 - 100) * 5 + 65280;
-					}
-				}
-
-				if (Client.overheadTextColors[var9] == 10) { // L: 4947
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4948
-					if (var17 < 50) { // L: 4949
-						var16 = var17 * 5 + 16711680;
-					} else if (var17 < 100) { // L: 4950
-						var16 = 16711935 - (var17 - 50) * 327680;
-					} else if (var17 < 150) { // L: 4951
-						var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
-					}
-				}
-
-				if (Client.overheadTextColors[var9] == 11) { // L: 4953
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4954
-					if (var17 < 50) { // L: 4955
-						var16 = 16777215 - var17 * 327685;
-					} else if (var17 < 100) { // L: 4956
-						var16 = (var17 - 50) * 327685 + 65280;
-					} else if (var17 < 150) { // L: 4957
-						var16 = 16777215 - (var17 - 100) * 327680;
-					}
-				}
-
-				if (Client.overheadTextEffects[var9] == 0) { // L: 4959
-					Widget.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
-				}
-
-				if (Client.overheadTextEffects[var9] == 1) { // L: 4960
-					Widget.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var9] == 2) { // L: 4961
-					Widget.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var9] == 3) { // L: 4962
-					Widget.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
-				}
-
-				if (Client.overheadTextEffects[var9] == 4) { // L: 4963
-					var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (Widget.fontBold12.stringWidth(var15) + 100) / 150; // L: 4964
-					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4965
-					Widget.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4966
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4967
-				}
-
-				if (Client.overheadTextEffects[var9] == 5) { // L: 4969
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4970
-					int var18 = 0; // L: 4971
-					if (var17 < 25) { // L: 4972
-						var18 = var17 - 25;
-					} else if (var17 > 125) { // L: 4973
-						var18 = var17 - 125;
-					}
-
-					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - Widget.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4974
-					Widget.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4975
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4976
-				}
-			} else {
-				Widget.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4980
-			}
-		}
-
-	} // L: 4983
+	}
 }
diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java
index cdcb7de2e3..311a782e97 100644
--- a/runescape-client/src/main/java/NetFileRequest.java
+++ b/runescape-client/src/main/java/NetFileRequest.java
@@ -4,41 +4,397 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jf")
+@ObfuscatedName("jq")
 @Implements("NetFileRequest")
 public class NetFileRequest extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Lof;"
+	)
+	static IndexedSprite field3577;
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
 	)
 	@Export("archive")
 	public Archive archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1816786653
+		intValue = 1109753371
 	)
 	@Export("crc")
 	public int crc;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("padding")
 	public byte padding;
 
 	NetFileRequest() {
 	} // L: 10
 
-	@ObfuscatedName("fw")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-552402310"
+		descriptor = "(Lkj;Lkj;Lkj;I)V",
+		garbageValue = "1099473080"
 	)
-	static final void method4912() {
-		if (Client.logoutTimer > 0) { // L: 2687
-			class7.logOut(); // L: 2688
+	@Export("drawTitle")
+	static void drawTitle(Font var0, Font var1, Font var2) {
+		Login.xPadding = (AttackOption.canvasWidth - 765) / 2; // L: 879
+		Login.loginBoxX = Login.xPadding + 202; // L: 880
+		class25.loginBoxCenter = Login.loginBoxX + 180; // L: 881
+		if (Login.worldSelectOpen) { // L: 882
+			class27.method353(var0, var1); // L: 883
 		} else {
-			Client.timer.method5590(); // L: 2691
-			class12.updateGameState(40); // L: 2692
-			Client.field688 = Client.packetWriter.getSocket(); // L: 2693
-			Client.packetWriter.removeSocket(); // L: 2694
+			class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 886
+			class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 887
+			Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 888
+			int var4;
+			if (Client.gameState == 0 || Client.gameState == 5) { // L: 889
+				byte var3 = 20; // L: 890
+				var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 891
+				var4 = 253 - var3; // L: 892
+				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 893
+				Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 894
+				Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 895
+				Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 896
+				var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 897
+			}
+
+			String var5;
+			String var6;
+			short var16;
+			int var17;
+			short var18;
+			if (Client.gameState == 20) { // L: 899
+				Coord.titleboxSprite.drawAt(Login.loginBoxX + 180 - Coord.titleboxSprite.subWidth / 2, 271 - Coord.titleboxSprite.subHeight / 2); // L: 900
+				var16 = 201; // L: 901
+				var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); // L: 902
+				var17 = var16 + 15; // L: 903
+				var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); // L: 904
+				var17 += 15; // L: 905
+				var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); // L: 906
+				var17 += 15; // L: 907
+				var17 += 7; // L: 908
+				if (Login.loginIndex != 4) { // L: 909
+					var0.draw("Login: ", Login.loginBoxX + 180 - 110, var17, 16777215, 0); // L: 910
+					var18 = 200; // L: 911
+
+					for (var5 = class17.method255(); var0.stringWidth(var5) > var18; var5 = var5.substring(0, var5.length() - 1)) { // L: 912 913 914
+					}
+
+					var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var17, 16777215, 0); // L: 916
+					var17 += 15; // L: 917
+
+					for (var6 = class22.method315(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { // L: 918 919 920
+					}
+
+					var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var17, 16777215, 0); // L: 922
+					var17 += 15; // L: 923
+				}
+			}
+
+			if (Client.gameState == 10 || Client.gameState == 11) { // L: 926
+				Coord.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 927
+				short var11;
+				if (Login.loginIndex == 0) { // L: 928
+					var16 = 251; // L: 929
+					var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var16, 16776960, 0); // L: 930
+					var17 = var16 + 30; // L: 931
+					var4 = Login.loginBoxX + 180 - 80; // L: 932
+					var11 = 291; // L: 933
+					class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 934
+					var0.drawLines("New User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 935
+					var4 = Login.loginBoxX + 180 + 80; // L: 936
+					class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 937
+					var0.drawLines("Existing User", var4 - 73, var11 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 938
+				} else if (Login.loginIndex == 1) { // L: 940
+					var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 941
+					var16 = 236; // L: 942
+					var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); // L: 943
+					var17 = var16 + 15; // L: 944
+					var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); // L: 945
+					var17 += 15; // L: 946
+					var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); // L: 947
+					var17 += 15; // L: 948
+					var4 = Login.loginBoxX + 180 - 80; // L: 949
+					var11 = 321; // L: 950
+					class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 951
+					var0.drawCentered("Continue", var4, var11 + 5, 16777215, 0); // L: 952
+					var4 = Login.loginBoxX + 180 + 80; // L: 953
+					class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 954
+					var0.drawCentered("Cancel", var4, var11 + 5, 16777215, 0); // L: 955
+				} else {
+					int var7;
+					if (Login.loginIndex == 2) { // L: 957
+						var16 = 201; // L: 958
+						var0.drawCentered(Login.Login_response1, class25.loginBoxCenter, var16, 16776960, 0); // L: 959
+						var17 = var16 + 15; // L: 960
+						var0.drawCentered(Login.Login_response2, class25.loginBoxCenter, var17, 16776960, 0); // L: 961
+						var17 += 15; // L: 962
+						var0.drawCentered(Login.Login_response3, class25.loginBoxCenter, var17, 16776960, 0); // L: 963
+						var17 += 15; // L: 964
+						var17 += 7; // L: 965
+						var0.draw("Login: ", class25.loginBoxCenter - 110, var17, 16777215, 0); // L: 966
+						var18 = 200; // L: 967
+
+						for (var5 = class17.method255(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { // L: 968 969 970
+						}
+
+						var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), class25.loginBoxCenter - 70, var17, 16777215, 0); // L: 972
+						var17 += 15; // L: 973
+
+						for (var6 = class22.method315(Login.Login_password); var0.stringWidth(var6) > var18; var6 = var6.substring(1)) { // L: 974 975 976
+						}
+
+						var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), class25.loginBoxCenter - 108, var17, 16777215, 0); // L: 978
+						var17 += 15; // L: 979
+						var16 = 277; // L: 980
+						var7 = class25.loginBoxCenter + -117; // L: 981
+						IndexedSprite var14 = Archive.method5021(Client.Login_isUsernameRemembered, Login.field1006); // L: 982
+						var14.drawAt(var7, var16); // L: 983
+						var7 = var7 + var14.subWidth + 5; // L: 984
+						var1.draw("Remember username", var7, var16 + 13, 16776960, 0); // L: 985
+						var7 = class25.loginBoxCenter + 24; // L: 986
+						var14 = Archive.method5021(class4.clientPreferences.hideUsername, Login.field1021); // L: 987
+						var14.drawAt(var7, var16); // L: 988
+						var7 = var7 + var14.subWidth + 5; // L: 989
+						var1.draw("Hide username", var7, var16 + 13, 16776960, 0); // L: 990
+						var17 = var16 + 15; // L: 991
+						int var9 = class25.loginBoxCenter - 80; // L: 992
+						short var10 = 321; // L: 993
+						class289.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); // L: 994
+						var0.drawCentered("Login", var9, var10 + 5, 16777215, 0); // L: 995
+						var9 = class25.loginBoxCenter + 80; // L: 996
+						class289.titlebuttonSprite.drawAt(var9 - 73, var10 - 20); // L: 997
+						var0.drawCentered("Cancel", var9, var10 + 5, 16777215, 0); // L: 998
+						var16 = 357; // L: 999
+						switch(Login.field1012) { // L: 1000
+						case 2:
+							class215.field2557 = "Having trouble logging in?"; // L: 1005
+							break;
+						default:
+							class215.field2557 = "Can't login? Click here."; // L: 1002
+						}
+
+						Client.field903 = new Bounds(class25.loginBoxCenter, var16, var1.stringWidth(class215.field2557), 11); // L: 1008
+						DefaultsGroup.field3891 = new Bounds(class25.loginBoxCenter, var16, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1009
+						var1.drawCentered(class215.field2557, class25.loginBoxCenter, var16, 16777215, 0); // L: 1010
+					} else if (Login.loginIndex == 3) { // L: 1012
+						var16 = 201; // L: 1013
+						var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var16, 16776960, 0); // L: 1014
+						var17 = var16 + 20; // L: 1015
+						var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1016
+						var17 += 15; // L: 1017
+						var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1018
+						var17 += 15; // L: 1019
+						var4 = Login.loginBoxX + 180; // L: 1020
+						var11 = 276; // L: 1021
+						class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1022
+						var2.drawCentered("Try again", var4, var11 + 5, 16777215, 0); // L: 1023
+						var4 = Login.loginBoxX + 180; // L: 1024
+						var11 = 326; // L: 1025
+						class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1026
+						var2.drawCentered("Forgotten password?", var4, var11 + 5, 16777215, 0); // L: 1027
+					} else {
+						short var8;
+						if (Login.loginIndex == 4) { // L: 1029
+							var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1030
+							var16 = 236; // L: 1031
+							var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); // L: 1032
+							var17 = var16 + 15; // L: 1033
+							var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1034
+							var17 += 15; // L: 1035
+							var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1036
+							var17 += 15; // L: 1037
+							var0.draw("PIN: " + class22.method315(ItemLayer.otp) + (Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var17, 16777215, 0); // L: 1038
+							var17 -= 8; // L: 1039
+							var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var17, 16776960, 0); // L: 1040
+							var17 += 15; // L: 1041
+							var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var17, 16776960, 0); // L: 1042
+							var4 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1043
+							int var21 = var17 - var0.ascent; // L: 1044
+							IndexedSprite var19;
+							if (Login.field1022) { // L: 1046
+								var19 = WorldMapCacheName.options_buttons_2Sprite; // L: 1047
+							} else {
+								var19 = Login.options_buttons_0Sprite; // L: 1050
+							}
+
+							var19.drawAt(var4, var21); // L: 1052
+							var17 += 15; // L: 1053
+							var7 = Login.loginBoxX + 180 - 80; // L: 1054
+							var8 = 321; // L: 1055
+							class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1056
+							var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); // L: 1057
+							var7 = Login.loginBoxX + 180 + 80; // L: 1058
+							class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1059
+							var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); // L: 1060
+							var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1061
+						} else if (Login.loginIndex == 5) { // L: 1063
+							var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1064
+							var16 = 221; // L: 1065
+							var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); // L: 1066
+							var17 = var16 + 15; // L: 1067
+							var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1068
+							var17 += 15; // L: 1069
+							var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1070
+							var17 += 15; // L: 1071
+							var17 += 14; // L: 1072
+							var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var17, 16777215, 0); // L: 1073
+							var18 = 174; // L: 1074
+
+							for (var5 = class17.method255(); var0.stringWidth(var5) > var18; var5 = var5.substring(1)) { // L: 1075 1076 1077
+							}
+
+							var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? SecureRandomFuture.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var17, 16777215, 0); // L: 1079
+							var17 += 15; // L: 1080
+							int var13 = Login.loginBoxX + 180 - 80; // L: 1081
+							short var20 = 321; // L: 1082
+							class289.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); // L: 1083
+							var0.drawCentered("Recover", var13, var20 + 5, 16777215, 0); // L: 1084
+							var13 = Login.loginBoxX + 180 + 80; // L: 1085
+							class289.titlebuttonSprite.drawAt(var13 - 73, var20 - 20); // L: 1086
+							var0.drawCentered("Back", var13, var20 + 5, 16777215, 0); // L: 1087
+							var20 = 356; // L: 1088
+							var1.drawCentered("Still having trouble logging in?", class25.loginBoxCenter, var20, 268435455, 0); // L: 1089
+						} else if (Login.loginIndex == 6) { // L: 1091
+							var16 = 201; // L: 1092
+							var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16776960, 0); // L: 1093
+							var17 = var16 + 15; // L: 1094
+							var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1095
+							var17 += 15; // L: 1096
+							var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1097
+							var17 += 15; // L: 1098
+							var4 = Login.loginBoxX + 180; // L: 1099
+							var11 = 321; // L: 1100
+							class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1101
+							var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); // L: 1102
+						} else if (Login.loginIndex == 7) { // L: 1104
+							var16 = 216; // L: 1105
+							var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var16, 16776960, 0); // L: 1106
+							var17 = var16 + 15; // L: 1107
+							var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1108
+							var17 += 15; // L: 1109
+							var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1110
+							var17 += 15; // L: 1111
+							var4 = Login.loginBoxX + 180 - 80; // L: 1112
+							var11 = 321; // L: 1113
+							class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1114
+							var0.drawCentered("Set Date of Birth", var4, var11 + 5, 16777215, 0); // L: 1115
+							var4 = Login.loginBoxX + 180 + 80; // L: 1116
+							class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1117
+							var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); // L: 1118
+						} else if (Login.loginIndex == 8) { // L: 1120
+							var16 = 216; // L: 1121
+							var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var16, 16776960, 0); // L: 1122
+							var17 = var16 + 15; // L: 1123
+							var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1124
+							var17 += 15; // L: 1125
+							var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var17, 16776960, 0); // L: 1126
+							var17 += 15; // L: 1127
+							var4 = Login.loginBoxX + 180 - 80; // L: 1128
+							var11 = 321; // L: 1129
+							class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1130
+							var0.drawCentered("Privacy Policy", var4, var11 + 5, 16777215, 0); // L: 1131
+							var4 = Login.loginBoxX + 180 + 80; // L: 1132
+							class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1133
+							var0.drawCentered("Back", var4, var11 + 5, 16777215, 0); // L: 1134
+						} else if (Login.loginIndex == 12) { // L: 1136
+							var16 = 201; // L: 1137
+							String var12 = ""; // L: 1138
+							var5 = ""; // L: 1139
+							var6 = ""; // L: 1140
+							switch(Login.field1011) { // L: 1141
+							case 0:
+								var12 = "Your account has been disabled."; // L: 1144
+								var5 = Strings.field3284; // L: 1145
+								var6 = ""; // L: 1146
+								break;
+							case 1:
+								var12 = "Account locked as we suspect it has been stolen."; // L: 1151
+								var5 = Strings.field3529; // L: 1152
+								var6 = ""; // L: 1153
+								break; // L: 1154
+							default:
+								class69.Login_promptCredentials(false); // L: 1158
+							}
+
+							var0.drawCentered(var12, Login.loginBoxX + 180, var16, 16776960, 0); // L: 1162
+							var17 = var16 + 15; // L: 1163
+							var2.drawCentered(var5, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1164
+							var17 += 15; // L: 1165
+							var2.drawCentered(var6, Login.loginBoxX + 180, var17, 16776960, 0); // L: 1166
+							var17 += 15; // L: 1167
+							var7 = Login.loginBoxX + 180; // L: 1168
+							var8 = 276; // L: 1169
+							class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1170
+							var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); // L: 1171
+							var7 = Login.loginBoxX + 180; // L: 1172
+							var8 = 326; // L: 1173
+							class289.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1174
+							var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); // L: 1175
+						} else if (Login.loginIndex == 24) { // L: 1177
+							var16 = 221; // L: 1178
+							var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var16, 16777215, 0); // L: 1179
+							var17 = var16 + 15; // L: 1180
+							var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1181
+							var17 += 15; // L: 1182
+							var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var17, 16777215, 0); // L: 1183
+							var17 += 15; // L: 1184
+							var4 = Login.loginBoxX + 180; // L: 1185
+							var11 = 301; // L: 1186
+							class289.titlebuttonSprite.drawAt(var4 - 73, var11 - 20); // L: 1187
+							var0.drawCentered("Ok", var4, var11 + 5, 16777215, 0); // L: 1188
+						}
+					}
+				}
+			}
+
+			if (Client.gameState >= 10) { // L: 1191
+				int[] var15 = new int[4]; // L: 1192
+				Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 1193
+				Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class0.canvasHeight); // L: 1194
+				PendingSpawn.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1195
+				PendingSpawn.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1196
+				Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 1197
+			}
+
+			GrandExchangeEvents.title_muteSprite[class4.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1199
+			if (Client.gameState > 5 && AbstractArchive.clientLanguage == Language.Language_EN) { // L: 1200
+				if (class35.field244 != null) { // L: 1201
+					var17 = Login.xPadding + 5; // L: 1202
+					var18 = 463; // L: 1203
+					byte var23 = 100; // L: 1204
+					byte var22 = 35; // L: 1205
+					class35.field244.drawAt(var17, var18); // L: 1206
+					var0.drawCentered("World" + " " + Client.worldId, var23 / 2 + var17, var22 / 2 + var18 - 2, 16777215, 0); // L: 1207
+					if (World.World_request != null) { // L: 1208
+						var1.drawCentered("Loading...", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0);
+					} else {
+						var1.drawCentered("Click to switch", var23 / 2 + var17, var22 / 2 + var18 + 12, 16777215, 0); // L: 1209
+					}
+				} else {
+					class35.field244 = TextureProvider.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "sl_button", ""); // L: 1212
+				}
+			}
+
 		}
-	} // L: 2689 2695
+	} // L: 884 1215
+
+	@ObfuscatedName("ah")
+	@ObfuscatedSignature(
+		descriptor = "(Lbc;I)V",
+		garbageValue = "2038899006"
+	)
+	@Export("PcmStream_disable")
+	static final void PcmStream_disable(PcmStream var0) {
+		var0.active = false; // L: 263
+		if (var0.sound != null) { // L: 264
+			var0.sound.position = 0;
+		}
+
+		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
+			PcmStream_disable(var1); // L: 265
+		}
+
+	} // L: 266
 }
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index a54622bdbb..83eff64812 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -12,69 +12,63 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("ea")
 @Implements("NetSocket")
 public final class NetSocket extends AbstractSocket implements Runnable {
-	@ObfuscatedName("se")
-	@ObfuscatedSignature(
-		descriptor = "Lby;"
-	)
-	@Export("friendSystem")
-	public static FriendSystem friendSystem;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("socket")
 	Socket socket;
 	@ObfuscatedName("y")
 	@Export("isClosed")
 	boolean isClosed;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Ldp;"
+		descriptor = "Lda;"
 	)
 	@Export("taskHandler")
 	TaskHandler taskHandler;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Leu;"
+		descriptor = "Lel;"
 	)
 	@Export("task")
 	Task task;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("outBuffer")
 	byte[] outBuffer;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1751872319
+		intValue = -1328963059
 	)
 	@Export("outLength")
 	int outLength;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1540552653
+		intValue = -1887422677
 	)
 	@Export("outOffset")
 	int outOffset;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("exceptionWriting")
 	boolean exceptionWriting;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -459397033
+		intValue = 957852253
 	)
 	@Export("bufferLength")
 	final int bufferLength;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1021465411
+		intValue = -1007889337
 	)
 	@Export("maxPacketLength")
 	final int maxPacketLength;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/net/Socket;Ldp;I)V"
+		descriptor = "(Ljava/net/Socket;Lda;I)V"
 	)
 	public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException {
 		this.isClosed = false; // L: 16
@@ -93,10 +87,10 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 		this.outputStream = this.socket.getOutputStream(); // L: 37
 	} // L: 38
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1654713390"
+		garbageValue = "1854440694"
 	)
 	@Export("close")
 	public void close() {
@@ -108,131 +102,128 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 
 			if (this.task != null) { // L: 46
 				while (this.task.status == 0) { // L: 47
-					try {
-						Thread.sleep(1L); // L: 67
-					} catch (InterruptedException var4) { // L: 69
-					}
+					class18.method272(1L); // L: 48
 				}
 
-				if (this.task.status == 1) { // L: 73
+				if (this.task.status == 1) { // L: 50
 					try {
-						((Thread)this.task.result).join(); // L: 75
-					} catch (InterruptedException var3) { // L: 77
+						((Thread)this.task.result).join(); // L: 52
+					} catch (InterruptedException var3) { // L: 54
 					}
 				}
 			}
 
-			this.task = null; // L: 80
+			this.task = null; // L: 57
 		}
-	} // L: 81
+	} // L: 58
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "479468921"
+		garbageValue = "574875272"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
-		return this.isClosed ? 0 : this.inputStream.read(); // L: 88 89
+		return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1659206769"
+		garbageValue = "-2063198043"
 	)
 	@Export("available")
 	public int available() throws IOException {
-		return this.isClosed ? 0 : this.inputStream.available(); // L: 93 94
+		return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "-211935081"
+		garbageValue = "-2019948581"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
-		if (this.isClosed) { // L: 98
+		if (this.isClosed) { // L: 75
 			return false;
 		} else {
-			return this.inputStream.available() >= var1; // L: 99
-		}
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "([BIII)I",
-		garbageValue = "-2041736219"
-	)
-	@Export("read")
-	public int read(byte[] var1, int var2, int var3) throws IOException {
-		if (this.isClosed) { // L: 103
-			return 0;
-		} else {
-			int var4;
-			int var5;
-			for (var4 = var3; var3 > 0; var3 -= var5) { // L: 104 105 109
-				var5 = this.inputStream.read(var1, var2, var3); // L: 106
-				if (var5 <= 0) { // L: 107
-					throw new EOFException();
-				}
-
-				var2 += var5; // L: 108
-			}
-
-			return var4; // L: 111
+			return this.inputStream.available() >= var1; // L: 76
 		}
 	}
 
 	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "([BIII)I",
+		garbageValue = "-334344092"
+	)
+	@Export("read")
+	public int read(byte[] var1, int var2, int var3) throws IOException {
+		if (this.isClosed) { // L: 80
+			return 0;
+		} else {
+			int var4;
+			int var5;
+			for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86
+				var5 = this.inputStream.read(var1, var2, var3); // L: 83
+				if (var5 <= 0) { // L: 84
+					throw new EOFException();
+				}
+
+				var2 += var5; // L: 85
+			}
+
+			return var4; // L: 88
+		}
+	}
+
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "([BIIB)V",
-		garbageValue = "12"
+		garbageValue = "-94"
 	)
 	@Export("write0")
 	void write0(byte[] var1, int var2, int var3) throws IOException {
-		if (!this.isClosed) { // L: 115
-			if (this.exceptionWriting) { // L: 116
-				this.exceptionWriting = false; // L: 117
-				throw new IOException(); // L: 118
+		if (!this.isClosed) { // L: 92
+			if (this.exceptionWriting) { // L: 93
+				this.exceptionWriting = false; // L: 94
+				throw new IOException(); // L: 95
 			} else {
-				if (this.outBuffer == null) { // L: 120
+				if (this.outBuffer == null) { // L: 97
 					this.outBuffer = new byte[this.bufferLength];
 				}
 
-				synchronized(this) { // L: 121
-					for (int var5 = 0; var5 < var3; ++var5) { // L: 122
-						this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 123
-						this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 124
-						if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 125
-							throw new IOException(); // L: 126
+				synchronized(this) { // L: 98
+					for (int var5 = 0; var5 < var3; ++var5) { // L: 99
+						this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100
+						this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101
+						if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { // L: 102
+							throw new IOException(); // L: 103
 						}
 					}
 
-					if (this.task == null) { // L: 129
-						this.task = this.taskHandler.newThreadTask(this, 3); // L: 130
+					if (this.task == null) { // L: 106
+						this.task = this.taskHandler.newThreadTask(this, 3); // L: 107
 					}
 
-					this.notifyAll(); // L: 132
+					this.notifyAll();
 				}
 			}
 		}
-	} // L: 134
+	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "([BIII)V",
-		garbageValue = "263213011"
+		garbageValue = "-1206684972"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
-		this.write0(var1, var2, var3); // L: 183
-	} // L: 184
+		this.write0(var1, var2, var3); // L: 160
+	} // L: 161
 
 	protected void finalize() {
-		this.close(); // L: 84
-	} // L: 85
+		this.close(); // L: 61
+	} // L: 62
 
 	public void run() {
 		try {
@@ -240,125 +231,135 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 				label84: {
 					int var1;
 					int var2;
-					synchronized(this) { // L: 141
-						if (this.outOffset == this.outLength) { // L: 142
-							if (this.isClosed) { // L: 143
+					synchronized(this) {
+						if (this.outLength == this.outOffset) {
+							if (this.isClosed) {
 								break label84;
 							}
 
 							try {
-								this.wait(); // L: 145
-							} catch (InterruptedException var10) { // L: 147
+								this.wait();
+							} catch (InterruptedException var10) {
 							}
 						}
 
-						var2 = this.outLength; // L: 149
-						if (this.outOffset >= this.outLength) { // L: 150
+						var2 = this.outLength;
+						if (this.outOffset >= this.outLength) {
 							var1 = this.outOffset - this.outLength;
 						} else {
-							var1 = this.bufferLength - this.outLength; // L: 151
+							var1 = this.bufferLength - this.outLength;
 						}
 					}
 
-					if (var1 <= 0) { // L: 153
+					if (var1 <= 0) { // L: 130
 						continue;
 					}
 
 					try {
-						this.outputStream.write(this.outBuffer, var2, var1); // L: 155
-					} catch (IOException var9) { // L: 157
-						this.exceptionWriting = true; // L: 158
+						this.outputStream.write(this.outBuffer, var2, var1); // L: 132
+					} catch (IOException var9) {
+						this.exceptionWriting = true;
 					}
 
-					this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 160
+					this.outLength = (var1 + this.outLength) % this.bufferLength;
 
 					try {
-						if (this.outLength == this.outOffset) { // L: 162
+						if (this.outOffset == this.outLength) {
 							this.outputStream.flush();
 						}
-					} catch (IOException var8) { // L: 164
-						this.exceptionWriting = true; // L: 165
+					} catch (IOException var8) {
+						this.exceptionWriting = true;
 					}
 					continue;
 				}
 
 				try {
-					if (this.inputStream != null) { // L: 170
+					if (this.inputStream != null) { // L: 147
 						this.inputStream.close();
 					}
 
-					if (this.outputStream != null) { // L: 171
+					if (this.outputStream != null) { // L: 148
 						this.outputStream.close();
 					}
 
-					if (this.socket != null) { // L: 172
+					if (this.socket != null) { // L: 149
 						this.socket.close();
 					}
-				} catch (IOException var7) { // L: 174
+				} catch (IOException var7) { // L: 151
 				}
 
-				this.outBuffer = null; // L: 175
+				this.outBuffer = null; // L: 152
 				break;
 			}
-		} catch (Exception var12) { // L: 177
-			class266.RunException_sendStackTrace((String)null, var12); // L: 178
+		} catch (Exception var12) { // L: 154
+			FriendsChat.RunException_sendStackTrace((String)null, var12); // L: 155
 		}
 
-	} // L: 180
+	} // L: 157
 
-	@ObfuscatedName("gt")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lce;ZI)V",
-		garbageValue = "2061936798"
+		descriptor = "([BI)Lcf;",
+		garbageValue = "1671409942"
 	)
-	@Export("addPlayerToScene")
-	static void addPlayerToScene(Player var0, boolean var1) {
-		if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4361
-			var0.isUnanimated = false; // L: 4362
-			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.idleSequence == var0.movementSequence) { // L: 4363 4364
-				var0.isUnanimated = true;
-			}
+	@Export("newScript")
+	static Script newScript(byte[] var0) {
+		Script var1 = new Script(); // L: 108
+		Buffer var2 = new Buffer(var0); // L: 109
+		var2.offset = var2.array.length - 2; // L: 110
+		int var3 = var2.readUnsignedShort(); // L: 111
+		int var4 = var2.array.length - 2 - var3 - 12; // L: 112
+		var2.offset = var4; // L: 113
+		int var5 = var2.readInt(); // L: 114
+		var1.localIntCount = var2.readUnsignedShort(); // L: 115
+		var1.localStringCount = var2.readUnsignedShort(); // L: 116
+		var1.intArgumentCount = var2.readUnsignedShort(); // L: 117
+		var1.stringArgumentCount = var2.readUnsignedShort(); // L: 118
+		int var6 = var2.readUnsignedByte(); // L: 119
+		int var7;
+		int var8;
+		if (var6 > 0) { // L: 120
+			var1.switches = var1.newIterableNodeHashTable(var6); // L: 121
 
-			int var2 = var0.x >> 7; // L: 4366
-			int var3 = var0.y >> 7; // L: 4367
-			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4368
-				long var4 = DevicePcmPlayerProvider.calculateTag(0, 0, 0, false, var0.index); // L: 4369
-				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4370
-					var0.isUnanimated = false; // L: 4371
-					var0.tileHeight = class105.getTileHeight(var0.x, var0.y, class22.Client_plane); // L: 4372
-					var0.playerCycle = Client.cycle; // L: 4373
-					AbstractSocket.scene.addNullableObject(class22.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4374
-				} else {
-					if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4377
-						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4378
-							return;
-						}
+			for (var7 = 0; var7 < var6; ++var7) { // L: 122
+				var8 = var2.readUnsignedShort(); // L: 123
+				IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? UrlRequester.method2504(var8) : 1); // L: 124
+				var1.switches[var7] = var9; // L: 125
 
-						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4379
-					}
-
-					var0.tileHeight = class105.getTileHeight(var0.x, var0.y, class22.Client_plane); // L: 4381
-					var0.playerCycle = Client.cycle; // L: 4382
-					AbstractSocket.scene.drawEntity(class22.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4383
+				while (var8-- > 0) { // L: 126
+					int var10 = var2.readInt(); // L: 127
+					int var11 = var2.readInt(); // L: 128
+					var9.put(new IntegerNode(var11), (long)var10); // L: 129
 				}
 			}
 		}
 
-	} // L: 4387
+		var2.offset = 0; // L: 133
+		var1.field1069 = var2.readStringCp1252NullTerminatedOrNull(); // L: 134
+		var1.opcodes = new int[var5]; // L: 135
+		var1.intOperands = new int[var5]; // L: 136
+		var1.stringOperands = new String[var5]; // L: 137
 
-	@ObfuscatedName("hl")
+		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 138 139 144
+			var8 = var2.readUnsignedShort(); // L: 140
+			if (var8 == 3) { // L: 141
+				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+				var1.intOperands[var7] = var2.readInt(); // L: 142
+			} else {
+				var1.intOperands[var7] = var2.readUnsignedByte(); // L: 143
+			}
+		}
+
+		return var1; // L: 146
+	}
+
+	@ObfuscatedName("fc")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1283553484"
+		descriptor = "(II)I",
+		garbageValue = "582256450"
 	)
-	@Export("addCancelMenuEntry")
-	static void addCancelMenuEntry() {
-		Client.menuOptionsCount = 0; // L: 7591
-		Client.isMenuOpen = false; // L: 7592
-		Client.menuActions[0] = "Cancel"; // L: 7594
-		Client.menuTargets[0] = ""; // L: 7595
-		Client.menuOpcodes[0] = 1006; // L: 7596
-		Client.menuShiftClick[0] = false; // L: 7597
-		Client.menuOptionsCount = 1; // L: 7598
-	} // L: 7599
+	static int method2676(int var0) {
+		return var0 * 3 + 600; // L: 1723
+	}
 }
diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java
index c14f24c749..73938193a2 100644
--- a/runescape-client/src/main/java/Node.java
+++ b/runescape-client/src/main/java/Node.java
@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mw")
+@ObfuscatedName("mf")
 @Implements("Node")
 public class Node {
-	@ObfuscatedName("ff")
+	@ObfuscatedName("fu")
 	@Export("key")
 	public long key;
-	@ObfuscatedName("fw")
+	@ObfuscatedName("fb")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("previous")
 	public Node previous;
-	@ObfuscatedName("fj")
+	@ObfuscatedName("fp")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("next")
 	public Node next;
 
-	@ObfuscatedName("eq")
+	@ObfuscatedName("eo")
 	@Export("remove")
 	public void remove() {
 		if (this.next != null) { // L: 9
@@ -33,7 +33,7 @@ public class Node {
 		}
 	} // L: 14
 
-	@ObfuscatedName("fz")
+	@ObfuscatedName("ew")
 	@Export("hasNext")
 	public boolean hasNext() {
 		return this.next != null; // L: 17
diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java
index 87cf700c19..57c92bb501 100644
--- a/runescape-client/src/main/java/NodeDeque.java
+++ b/runescape-client/src/main/java/NodeDeque.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kx")
+@ObfuscatedName("kq")
 @Implements("NodeDeque")
 public class NodeDeque {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("sentinel")
 	public Node sentinel;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("current")
 	Node current;
@@ -25,7 +25,7 @@ public class NodeDeque {
 		this.sentinel.next = this.sentinel; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("clear")
 	public void clear() {
 		while (true) {
@@ -39,9 +39,9 @@ public class NodeDeque {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)V"
+		descriptor = "(Lmf;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(Node var1) {
@@ -55,9 +55,9 @@ public class NodeDeque {
 		var1.previous.next = var1; // L: 28
 	} // L: 29
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;)V"
+		descriptor = "(Lmf;)V"
 	)
 	@Export("addLast")
 	public void addLast(Node var1) {
@@ -71,9 +71,9 @@ public class NodeDeque {
 		var1.previous.next = var1; // L: 36
 	} // L: 37
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("removeLast")
 	public Node removeLast() {
@@ -86,9 +86,9 @@ public class NodeDeque {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("removeFirst")
 	public Node removeFirst() {
@@ -101,9 +101,9 @@ public class NodeDeque {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("last")
 	public Node last() {
@@ -117,9 +117,9 @@ public class NodeDeque {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("first")
 	public Node first() {
@@ -133,9 +133,9 @@ public class NodeDeque {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("previous")
 	public Node previous() {
@@ -149,9 +149,9 @@ public class NodeDeque {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("next")
 	public Node next() {
@@ -167,7 +167,7 @@ public class NodeDeque {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;Lmw;)V"
+		descriptor = "(Lmf;Lmf;)V"
 	)
 	@Export("NodeDeque_addBefore")
 	public static void NodeDeque_addBefore(Node var0, Node var1) {
diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java
index a21b89a0b0..04b9d6b021 100644
--- a/runescape-client/src/main/java/NodeHashTable.java
+++ b/runescape-client/src/main/java/NodeHashTable.java
@@ -3,31 +3,31 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("md")
+@ObfuscatedName("mn")
 @Implements("NodeHashTable")
 public final class NodeHashTable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("size")
 	int size;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "[Lmw;"
+		descriptor = "[Lmf;"
 	)
 	@Export("buckets")
 	Node[] buckets;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("currentGet")
 	Node currentGet;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmw;"
+		descriptor = "Lmf;"
 	)
 	@Export("current")
 	Node current;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("index")
 	int index;
 
@@ -44,9 +44,9 @@ public final class NodeHashTable {
 
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(J)Lmw;"
+		descriptor = "(J)Lmf;"
 	)
 	@Export("get")
 	public Node get(long var1) {
@@ -64,9 +64,9 @@ public final class NodeHashTable {
 		return null; // L: 34
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;J)V"
+		descriptor = "(Lmf;J)V"
 	)
 	@Export("put")
 	public void put(Node var1, long var2) {
@@ -82,9 +82,9 @@ public final class NodeHashTable {
 		var1.key = var2; // L: 44
 	} // L: 45
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("first")
 	public Node first() {
@@ -94,7 +94,7 @@ public final class NodeHashTable {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "()Lmw;"
+		descriptor = "()Lmf;"
 	)
 	@Export("next")
 	public Node next() {
diff --git a/runescape-client/src/main/java/ObjectComposition.java b/runescape-client/src/main/java/ObjectComposition.java
index b406e382e4..b07dc690cf 100644
--- a/runescape-client/src/main/java/ObjectComposition.java
+++ b/runescape-client/src/main/java/ObjectComposition.java
@@ -3,261 +3,259 @@ 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("eg")
+@ObfuscatedName("ez")
 @Implements("ObjectComposition")
 public class ObjectComposition extends DualNode {
-	@ObfuscatedName("sf")
-	@ObfuscatedSignature(
-		descriptor = "Lcl;"
-	)
-	@Export("clientPreferences")
-	static ClientPreferences clientPreferences;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("ObjectDefinition_isLowDetail")
-	public static boolean ObjectDefinition_isLowDetail;
-	@ObfuscatedName("n")
+	static boolean ObjectDefinition_isLowDetail;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("ObjectDefinition_archive")
-	public static AbstractArchive ObjectDefinition_archive;
+	static AbstractArchive ObjectDefinition_archive;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("ObjectDefinition_modelsArchive")
+	static AbstractArchive ObjectDefinition_modelsArchive;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ObjectDefinition_cached")
 	static EvictingDualNodeHashTable ObjectDefinition_cached;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ObjectDefinition_cachedModelData")
 	public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ObjectDefinition_cachedEntities")
 	static EvictingDualNodeHashTable ObjectDefinition_cachedEntities;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ObjectDefinition_cachedModels")
 	static EvictingDualNodeHashTable ObjectDefinition_cachedModels;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "[Lgm;"
+		descriptor = "[Lga;"
 	)
-	static ModelData[] field1758;
-	@ObfuscatedName("d")
+	static ModelData[] field1781;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1257920551
+		intValue = -299287981
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("modelIds")
 	int[] modelIds;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("models")
 	int[] models;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -288612135
+		intValue = 2087453689
 	)
 	@Export("sizeX")
 	public int sizeX;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1812944985
+		intValue = -1592905647
 	)
 	@Export("sizeY")
 	public int sizeY;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1384594797
+		intValue = 468402991
 	)
 	@Export("interactType")
 	public int interactType;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("boolean1")
 	public boolean boolean1;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1747290425
+		intValue = 1311902237
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1982259081
+		intValue = 771514781
 	)
 	@Export("clipType")
 	int clipType;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("nonFlatShading")
 	boolean nonFlatShading;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("modelClipped")
 	public boolean modelClipped;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 91732693
+		intValue = -1229817209
 	)
 	@Export("animationId")
 	public int animationId;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -2141564523
+		intValue = 1445120767
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 737098019
+		intValue = 513103785
 	)
 	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1951915357
+		intValue = -752104097
 	)
 	@Export("contrast")
 	int contrast;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("actions")
 	public String[] actions;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = 715137677
+		intValue = -1655247623
 	)
 	@Export("mapIconId")
 	public int mapIconId;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 1953806269
+		intValue = 1328062479
 	)
 	@Export("mapSceneId")
 	public int mapSceneId;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@Export("isRotated")
 	boolean isRotated;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("clipped")
 	public boolean clipped;
 	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 2023882183
+		intValue = 1365837635
 	)
 	@Export("modelSizeX")
 	int modelSizeX;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -128734905
+		intValue = 1650256591
 	)
 	@Export("modelHeight")
 	int modelHeight;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 1793446173
+		intValue = -2089911171
 	)
 	@Export("modelSizeY")
 	int modelSizeY;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = -1494268527
+		intValue = -1183715057
 	)
 	@Export("offsetX")
 	int offsetX;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -743874879
+		intValue = 1452192063
 	)
 	@Export("offsetHeight")
 	int offsetHeight;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -227509265
+		intValue = 2035086537
 	)
 	@Export("offsetY")
 	int offsetY;
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@Export("boolean2")
 	public boolean boolean2;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aj")
 	@Export("isSolid")
 	boolean isSolid;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -1364896901
+		intValue = 2118223987
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -240174169
+		intValue = 1811920289
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = 758936167
+		intValue = -385662773
 	)
 	@Export("transformVarp")
 	int transformVarp;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = 805251355
+		intValue = -298713219
 	)
 	@Export("ambientSoundId")
 	public int ambientSoundId;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -342258981
+		intValue = -773175377
 	)
-	@Export("int4")
-	public int int4;
-	@ObfuscatedName("ak")
+	public int field1801;
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = 777161755
+		intValue = -324754679
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -1832840413
+		intValue = 1014383153
 	)
 	@Export("int6")
 	public int int6;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ax")
 	@Export("soundEffectIds")
 	public int[] soundEffectIds;
-	@ObfuscatedName("au")
-	public boolean field1801;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ar")
+	public boolean field1784;
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Lmo;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
@@ -268,13 +266,13 @@ public class ObjectComposition extends DualNode {
 		ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21
 		ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22
 		ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23
-		field1758 = new ModelData[4]; // L: 24
+		field1781 = new ModelData[4]; // L: 24
 	}
 
 	ObjectComposition() {
 		this.name = "null"; // L: 28
-		this.sizeX = 1; // L: 33
-		this.sizeY = 1; // L: 34
+		this.sizeX = 1;
+		this.sizeY = 1;
 		this.interactType = 2; // L: 35
 		this.boolean1 = true; // L: 36
 		this.int1 = -1; // L: 37
@@ -302,741 +300,632 @@ public class ObjectComposition extends DualNode {
 		this.transformVarbit = -1; // L: 60
 		this.transformVarp = -1; // L: 61
 		this.ambientSoundId = -1; // L: 62
-		this.int4 = 0; // L: 63
+		this.field1801 = 0; // L: 63
 		this.int5 = 0; // L: 64
 		this.int6 = 0; // L: 65
-		this.field1801 = true; // L: 67
+		this.field1784 = true; // L: 67
 	} // L: 70
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "1"
+		garbageValue = "-2"
 	)
 	@Export("postDecode")
 	void postDecode() {
-		if (this.int1 == -1) { // L: 89
-			this.int1 = 0; // L: 90
-			if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 91
+		if (this.int1 == -1) { // L: 95
+			this.int1 = 0; // L: 96
+			if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 97
 				this.int1 = 1;
 			}
 
-			for (int var1 = 0; var1 < 5; ++var1) { // L: 92
+			for (int var1 = 0; var1 < 5; ++var1) { // L: 98
 				if (this.actions[var1] != null) {
 					this.int1 = 1;
 				}
 			}
 		}
 
-		if (this.int3 == -1) { // L: 94
+		if (this.int3 == -1) { // L: 100
 			this.int3 = this.interactType != 0 ? 1 : 0;
 		}
 
-	} // L: 95
+	} // L: 101
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;B)V",
-		garbageValue = "1"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-104234518"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 99
-			if (var2 == 0) { // L: 100
-				return; // L: 103
+			int var2 = var1.readUnsignedByte(); // L: 105
+			if (var2 == 0) { // L: 106
+				return; // L: 109
 			}
 
-			this.decodeNext(var1, var2); // L: 101
-		}
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1041207607"
-	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2) {
-		int var3;
-		int var4;
-		if (var2 == 1) { // L: 106
-			var3 = var1.readUnsignedByte(); // L: 107
-			if (var3 > 0) { // L: 108
-				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 109
-					var1.offset += 3 * var3; // L: 117
-				} else {
-					this.models = new int[var3]; // L: 110
-					this.modelIds = new int[var3]; // L: 111
-
-					for (var4 = 0; var4 < var3; ++var4) { // L: 112
-						this.modelIds[var4] = var1.readUnsignedShort(); // L: 113
-						this.models[var4] = var1.readUnsignedByte(); // L: 114
-					}
-				}
-			}
-		} else if (var2 == 2) { // L: 120
-			this.name = var1.readStringCp1252NullTerminated();
-		} else if (var2 == 5) { // L: 121
-			var3 = var1.readUnsignedByte(); // L: 122
-			if (var3 > 0) { // L: 123
-				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 124
-					var1.offset += 2 * var3; // L: 129
-				} else {
-					this.models = null; // L: 125
-					this.modelIds = new int[var3]; // L: 126
-
-					for (var4 = 0; var4 < var3; ++var4) { // L: 127
-						this.modelIds[var4] = var1.readUnsignedShort();
-					}
-				}
-			}
-		} else if (var2 == 14) { // L: 132
-			this.sizeX = var1.readUnsignedByte();
-		} else if (var2 == 15) { // L: 133
-			this.sizeY = var1.readUnsignedByte();
-		} else if (var2 == 17) { // L: 134
-			this.interactType = 0; // L: 135
-			this.boolean1 = false; // L: 136
-		} else if (var2 == 18) { // L: 138
-			this.boolean1 = false;
-		} else if (var2 == 19) { // L: 139
-			this.int1 = var1.readUnsignedByte();
-		} else if (var2 == 21) { // L: 140
-			this.clipType = 0;
-		} else if (var2 == 22) { // L: 141
-			this.nonFlatShading = true;
-		} else if (var2 == 23) { // L: 142
-			this.modelClipped = true;
-		} else if (var2 == 24) { // L: 143
-			this.animationId = var1.readUnsignedShort(); // L: 144
-			if (this.animationId == 65535) { // L: 145
-				this.animationId = -1;
-			}
-		} else if (var2 == 27) { // L: 147
-			this.interactType = 1;
-		} else if (var2 == 28) { // L: 148
-			this.int2 = var1.readUnsignedByte();
-		} else if (var2 == 29) { // L: 149
-			this.ambient = var1.readByte();
-		} else if (var2 == 39) { // L: 150
-			this.contrast = var1.readByte() * 25;
-		} else if (var2 >= 30 && var2 < 35) { // L: 151
-			this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 152
-			if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 153
-				this.actions[var2 - 30] = null;
-			}
-		} else if (var2 == 40) { // L: 155
-			var3 = var1.readUnsignedByte(); // L: 156
-			this.recolorFrom = new short[var3]; // L: 157
-			this.recolorTo = new short[var3]; // L: 158
-
-			for (var4 = 0; var4 < var3; ++var4) { // L: 159
-				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 160
-				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 161
-			}
-		} else if (var2 == 41) { // L: 164
-			var3 = var1.readUnsignedByte(); // L: 165
-			this.retextureFrom = new short[var3]; // L: 166
-			this.retextureTo = new short[var3]; // L: 167
-
-			for (var4 = 0; var4 < var3; ++var4) { // L: 168
-				this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 169
-				this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 170
-			}
-		} else if (var2 == 62) { // L: 173
-			this.isRotated = true;
-		} else if (var2 == 64) { // L: 174
-			this.clipped = false;
-		} else if (var2 == 65) { // L: 175
-			this.modelSizeX = var1.readUnsignedShort();
-		} else if (var2 == 66) { // L: 176
-			this.modelHeight = var1.readUnsignedShort();
-		} else if (var2 == 67) { // L: 177
-			this.modelSizeY = var1.readUnsignedShort();
-		} else if (var2 == 68) { // L: 178
-			this.mapSceneId = var1.readUnsignedShort();
-		} else if (var2 == 69) { // L: 179
-			var1.readUnsignedByte(); // L: 180
-		} else if (var2 == 70) { // L: 182
-			this.offsetX = var1.readShort();
-		} else if (var2 == 71) { // L: 183
-			this.offsetHeight = var1.readShort();
-		} else if (var2 == 72) { // L: 184
-			this.offsetY = var1.readShort();
-		} else if (var2 == 73) { // L: 185
-			this.boolean2 = true;
-		} else if (var2 == 74) { // L: 186
-			this.isSolid = true;
-		} else if (var2 == 75) { // L: 187
-			this.int3 = var1.readUnsignedByte();
-		} else if (var2 != 77 && var2 != 92) { // L: 188
-			if (var2 == 78) { // L: 206
-				this.ambientSoundId = var1.readUnsignedShort(); // L: 207
-				this.int4 = var1.readUnsignedByte(); // L: 208
-			} else if (var2 == 79) { // L: 210
-				this.int5 = var1.readUnsignedShort(); // L: 211
-				this.int6 = var1.readUnsignedShort(); // L: 212
-				this.int4 = var1.readUnsignedByte(); // L: 213
-				var3 = var1.readUnsignedByte(); // L: 214
-				this.soundEffectIds = new int[var3]; // L: 215
-
-				for (var4 = 0; var4 < var3; ++var4) { // L: 216
-					this.soundEffectIds[var4] = var1.readUnsignedShort();
-				}
-			} else if (var2 == 81) { // L: 218
-				this.clipType = var1.readUnsignedByte() * 256;
-			} else if (var2 == 82) { // L: 219
-				this.mapIconId = var1.readUnsignedShort();
-			} else if (var2 == 89) { // L: 220
-				this.field1801 = false;
-			} else if (var2 == 249) { // L: 221
-				this.params = ModeWhere.readStringIntParameters(var1, this.params);
-			}
-		} else {
-			this.transformVarbit = var1.readUnsignedShort(); // L: 189
-			if (this.transformVarbit == 65535) { // L: 190
-				this.transformVarbit = -1;
-			}
-
-			this.transformVarp = var1.readUnsignedShort(); // L: 191
-			if (this.transformVarp == 65535) { // L: 192
-				this.transformVarp = -1;
-			}
-
-			var3 = -1; // L: 193
-			if (var2 == 92) { // L: 194
-				var3 = var1.readUnsignedShort(); // L: 195
-				if (var3 == 65535) { // L: 196
-					var3 = -1;
-				}
-			}
-
-			var4 = var1.readUnsignedByte(); // L: 198
-			this.transforms = new int[var4 + 2]; // L: 199
-
-			for (int var5 = 0; var5 <= var4; ++var5) { // L: 200
-				this.transforms[var5] = var1.readUnsignedShort(); // L: 201
-				if (this.transforms[var5] == 65535) { // L: 202
-					this.transforms[var5] = -1;
-				}
-			}
-
-			this.transforms[var4 + 1] = var3; // L: 204
-		}
-
-	} // L: 223
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1378932606"
-	)
-	public final boolean method2956(int var1) {
-		if (this.models != null) { // L: 226
-			for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 236
-				if (this.models[var4] == var1) { // L: 237
-					return class310.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0);
-				}
-			}
-
-			return true; // L: 239
-		} else if (this.modelIds == null) { // L: 227
-			return true;
-		} else if (var1 != 10) { // L: 228
-			return true;
-		} else {
-			boolean var2 = true; // L: 229
-
-			for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 230
-				var2 &= class310.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 231
-			}
-
-			return var2; // L: 233
+			this.decodeNext(var1, var2); // L: 107
 		}
 	}
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-205337927"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "54"
+	)
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2) {
+		int var3;
+		int var4;
+		if (var2 == 1) { // L: 112
+			var3 = var1.readUnsignedByte(); // L: 113
+			if (var3 > 0) { // L: 114
+				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 115
+					var1.offset += var3 * 3; // L: 123
+				} else {
+					this.models = new int[var3]; // L: 116
+					this.modelIds = new int[var3]; // L: 117
+
+					for (var4 = 0; var4 < var3; ++var4) { // L: 118
+						this.modelIds[var4] = var1.readUnsignedShort(); // L: 119
+						this.models[var4] = var1.readUnsignedByte(); // L: 120
+					}
+				}
+			}
+		} else if (var2 == 2) { // L: 126
+			this.name = var1.readStringCp1252NullTerminated();
+		} else if (var2 == 5) { // L: 127
+			var3 = var1.readUnsignedByte(); // L: 128
+			if (var3 > 0) { // L: 129
+				if (this.modelIds != null && !ObjectDefinition_isLowDetail) { // L: 130
+					var1.offset += var3 * 2; // L: 135
+				} else {
+					this.models = null; // L: 131
+					this.modelIds = new int[var3]; // L: 132
+
+					for (var4 = 0; var4 < var3; ++var4) { // L: 133
+						this.modelIds[var4] = var1.readUnsignedShort();
+					}
+				}
+			}
+		} else if (var2 == 14) { // L: 138
+			this.sizeX = var1.readUnsignedByte();
+		} else if (var2 == 15) { // L: 139
+			this.sizeY = var1.readUnsignedByte();
+		} else if (var2 == 17) { // L: 140
+			this.interactType = 0; // L: 141
+			this.boolean1 = false; // L: 142
+		} else if (var2 == 18) { // L: 144
+			this.boolean1 = false;
+		} else if (var2 == 19) { // L: 145
+			this.int1 = var1.readUnsignedByte();
+		} else if (var2 == 21) { // L: 146
+			this.clipType = 0;
+		} else if (var2 == 22) { // L: 147
+			this.nonFlatShading = true;
+		} else if (var2 == 23) { // L: 148
+			this.modelClipped = true;
+		} else if (var2 == 24) { // L: 149
+			this.animationId = var1.readUnsignedShort(); // L: 150
+			if (this.animationId == 65535) { // L: 151
+				this.animationId = -1;
+			}
+		} else if (var2 == 27) { // L: 153
+			this.interactType = 1;
+		} else if (var2 == 28) { // L: 154
+			this.int2 = var1.readUnsignedByte();
+		} else if (var2 == 29) { // L: 155
+			this.ambient = var1.readByte();
+		} else if (var2 == 39) { // L: 156
+			this.contrast = var1.readByte() * 25;
+		} else if (var2 >= 30 && var2 < 35) { // L: 157
+			this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 158
+			if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 159
+				this.actions[var2 - 30] = null;
+			}
+		} else if (var2 == 40) { // L: 161
+			var3 = var1.readUnsignedByte(); // L: 162
+			this.recolorFrom = new short[var3]; // L: 163
+			this.recolorTo = new short[var3]; // L: 164
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 165
+				this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 166
+				this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 167
+			}
+		} else if (var2 == 41) { // L: 170
+			var3 = var1.readUnsignedByte(); // L: 171
+			this.retextureFrom = new short[var3]; // L: 172
+			this.retextureTo = new short[var3]; // L: 173
+
+			for (var4 = 0; var4 < var3; ++var4) { // L: 174
+				this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 175
+				this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 176
+			}
+		} else if (var2 == 61) { // L: 179
+			var1.readUnsignedShort(); // L: 180
+		} else if (var2 == 62) { // L: 182
+			this.isRotated = true;
+		} else if (var2 == 64) { // L: 183
+			this.clipped = false;
+		} else if (var2 == 65) { // L: 184
+			this.modelSizeX = var1.readUnsignedShort();
+		} else if (var2 == 66) { // L: 185
+			this.modelHeight = var1.readUnsignedShort();
+		} else if (var2 == 67) { // L: 186
+			this.modelSizeY = var1.readUnsignedShort();
+		} else if (var2 == 68) { // L: 187
+			this.mapSceneId = var1.readUnsignedShort();
+		} else if (var2 == 69) { // L: 188
+			var1.readUnsignedByte(); // L: 189
+		} else if (var2 == 70) { // L: 191
+			this.offsetX = var1.readShort();
+		} else if (var2 == 71) { // L: 192
+			this.offsetHeight = var1.readShort();
+		} else if (var2 == 72) {
+			this.offsetY = var1.readShort(); // L: 193
+		} else if (var2 == 73) { // L: 194
+			this.boolean2 = true;
+		} else if (var2 == 74) { // L: 195
+			this.isSolid = true;
+		} else if (var2 == 75) { // L: 196
+			this.int3 = var1.readUnsignedByte();
+		} else if (var2 != 77 && var2 != 92) { // L: 197
+			if (var2 == 78) { // L: 215
+				this.ambientSoundId = var1.readUnsignedShort(); // L: 216
+				this.field1801 = var1.readUnsignedByte(); // L: 217
+			} else if (var2 == 79) { // L: 219
+				this.int5 = var1.readUnsignedShort(); // L: 220
+				this.int6 = var1.readUnsignedShort(); // L: 221
+				this.field1801 = var1.readUnsignedByte(); // L: 222
+				var3 = var1.readUnsignedByte(); // L: 223
+				this.soundEffectIds = new int[var3]; // L: 224
+
+				for (var4 = 0; var4 < var3; ++var4) { // L: 225
+					this.soundEffectIds[var4] = var1.readUnsignedShort();
+				}
+			} else if (var2 == 81) { // L: 227
+				this.clipType = var1.readUnsignedByte() * 256;
+			} else if (var2 == 82) { // L: 228
+				this.mapIconId = var1.readUnsignedShort();
+			} else if (var2 == 89) { // L: 229
+				this.field1784 = false;
+			} else if (var2 == 249) { // L: 230
+				this.params = class19.readStringIntParameters(var1, this.params);
+			}
+		} else {
+			this.transformVarbit = var1.readUnsignedShort(); // L: 198
+			if (this.transformVarbit == 65535) { // L: 199
+				this.transformVarbit = -1;
+			}
+
+			this.transformVarp = var1.readUnsignedShort(); // L: 200
+			if (this.transformVarp == 65535) { // L: 201
+				this.transformVarp = -1;
+			}
+
+			var3 = -1; // L: 202
+			if (var2 == 92) { // L: 203
+				var3 = var1.readUnsignedShort(); // L: 204
+				if (var3 == 65535) { // L: 205
+					var3 = -1;
+				}
+			}
+
+			var4 = var1.readUnsignedByte(); // L: 207
+			this.transforms = new int[var4 + 2]; // L: 208
+
+			for (int var5 = 0; var5 <= var4; ++var5) { // L: 209
+				this.transforms[var5] = var1.readUnsignedShort(); // L: 210
+				if (this.transforms[var5] == 65535) { // L: 211
+					this.transforms[var5] = -1;
+				}
+			}
+
+			this.transforms[var4 + 1] = var3; // L: 213
+		}
+
+	} // L: 232
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-1935277260"
+	)
+	public final boolean method3019(int var1) {
+		if (this.models != null) { // L: 235
+			for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 245
+				if (this.models[var4] == var1) { // L: 246
+					return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0);
+				}
+			}
+
+			return true; // L: 248
+		} else if (this.modelIds == null) { // L: 236
+			return true;
+		} else if (var1 != 10) { // L: 237
+			return true;
+		} else {
+			boolean var2 = true; // L: 238
+
+			for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 239
+				var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 240
+			}
+
+			return var2; // L: 242
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "121"
 	)
 	@Export("needsModelFiles")
 	public final boolean needsModelFiles() {
-		if (this.modelIds == null) { // L: 244
+		if (this.modelIds == null) { // L: 253
 			return true;
 		} else {
-			boolean var1 = true; // L: 245
+			boolean var1 = true; // L: 254
 
-			for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 246
-				var1 &= class310.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 247
+			for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 255
+				var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 256
 			}
 
-			return var1; // L: 249
+			return var1; // L: 258
 		}
 	}
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(II[[IIIIB)Lgl;",
-		garbageValue = "109"
+		descriptor = "(II[[IIIII)Lgr;",
+		garbageValue = "-212944221"
 	)
 	@Export("getEntity")
 	public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
 		long var7;
-		if (this.models == null) { // L: 254
+		if (this.models == null) { // L: 263
 			var7 = (long)(var2 + (this.id << 10));
 		} else {
-			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 255
+			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 264
 		}
 
-		Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 256
-		if (var9 == null) { // L: 257
-			ModelData var10 = this.getModelData(var1, var2); // L: 258
-			if (var10 == null) { // L: 259
+		Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 265
+		if (var9 == null) { // L: 266
+			ModelData var10 = this.getModelData(var1, var2); // L: 267
+			if (var10 == null) { // L: 268
 				return null;
 			}
 
-			if (!this.nonFlatShading) { // L: 260
+			if (!this.nonFlatShading) { // L: 269
 				var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
 			} else {
-				var10.ambient = (short)(this.ambient + 64); // L: 262
-				var10.contrast = (short)(this.contrast + 768); // L: 263
-				var10.calculateVertexNormals(); // L: 264
-				var9 = var10; // L: 265
+				var10.ambient = (short)(this.ambient + 64); // L: 271
+				var10.contrast = (short)(this.contrast + 768); // L: 272
+				var10.calculateVertexNormals(); // L: 273
+				var9 = var10; // L: 274
 			}
 
-			ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 267
+			ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 276
 		}
 
-		if (this.nonFlatShading) { // L: 269
-			var9 = ((ModelData)var9).method3760(); // L: 270
+		if (this.nonFlatShading) { // L: 278
+			var9 = ((ModelData)var9).method3870(); // L: 279
 		}
 
-		if (this.clipType >= 0) { // L: 272
-			if (var9 instanceof Model) { // L: 273
+		if (this.clipType >= 0) { // L: 281
+			if (var9 instanceof Model) { // L: 282
 				var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType);
 			} else if (var9 instanceof ModelData) {
-				var9 = ((ModelData)var9).method3761(var3, var4, var5, var6, true, this.clipType); // L: 274
+				var9 = ((ModelData)var9).method3933(var3, var4, var5, var6, true, this.clipType); // L: 283
 			}
 		}
 
-		return (Renderable)var9; // L: 276
+		return (Renderable)var9; // L: 285
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(II[[IIIII)Lgr;",
-		garbageValue = "-925676771"
+		descriptor = "(II[[IIIII)Lgd;",
+		garbageValue = "1736457663"
 	)
 	@Export("getModel")
 	public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
 		long var7;
-		if (this.models == null) { // L: 281
+		if (this.models == null) { // L: 290
 			var7 = (long)(var2 + (this.id << 10));
 		} else {
-			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 282
+			var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 291
 		}
 
-		Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 283
-		if (var9 == null) { // L: 284
-			ModelData var10 = this.getModelData(var1, var2); // L: 285
-			if (var10 == null) { // L: 286
+		Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 292
+		if (var9 == null) { // L: 293
+			ModelData var10 = this.getModelData(var1, var2); // L: 294
+			if (var10 == null) { // L: 295
 				return null;
 			}
 
-			var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 287
-			ObjectDefinition_cachedModels.put(var9, var7); // L: 288
+			var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 296
+			ObjectDefinition_cachedModels.put(var9, var7); // L: 297
 		}
 
 		if (this.clipType >= 0) {
-			var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 290
+			var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 299
 		}
 
-		return var9; // L: 291
+		return var9; // L: 300
 	}
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(II[[IIIILfl;II)Lgr;",
-		garbageValue = "1200809976"
+		descriptor = "(II[[IIIILfm;IB)Lgd;",
+		garbageValue = "-15"
 	)
 	@Export("getModelDynamic")
 	public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) {
 		long var9;
-		if (this.models == null) { // L: 296
+		if (this.models == null) { // L: 305
 			var9 = (long)(var2 + (this.id << 10));
 		} else {
-			var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 297
+			var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 306
 		}
 
-		Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 298
-		if (var11 == null) { // L: 299
-			ModelData var12 = this.getModelData(var1, var2); // L: 300
-			if (var12 == null) { // L: 301
+		Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 307
+		if (var11 == null) { // L: 308
+			ModelData var12 = this.getModelData(var1, var2); // L: 309
+			if (var12 == null) { // L: 310
 				return null;
 			}
 
-			var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 302
-			ObjectDefinition_cachedModels.put(var11, var9); // L: 303
+			var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 311
+			ObjectDefinition_cachedModels.put(var11, var9); // L: 312
 		}
 
-		if (var7 == null && this.clipType == -1) { // L: 305
-			return var11;
+		if (var7 == null && this.clipType == -1) {
+			return var11; // L: 314
 		} else {
-			if (var7 != null) { // L: 306
+			if (var7 != null) { // L: 315
 				var11 = var7.transformObjectModel(var11, var8, var2);
 			} else {
-				var11 = var11.toSharedSequenceModel(true); // L: 307
+				var11 = var11.toSharedSequenceModel(true); // L: 316
 			}
 
-			if (this.clipType >= 0) { // L: 308
+			if (this.clipType >= 0) { // L: 317
 				var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType);
 			}
 
-			return var11; // L: 309
+			return var11; // L: 318
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lgm;",
-		garbageValue = "1581886638"
+		descriptor = "(III)Lga;",
+		garbageValue = "1848806272"
 	)
 	@Export("getModelData")
 	final ModelData getModelData(int var1, int var2) {
-		ModelData var3 = null; // L: 313
+		ModelData var3 = null; // L: 322
 		boolean var4;
 		int var5;
 		int var7;
-		if (this.models == null) { // L: 314
-			if (var1 != 10) { // L: 315
+		if (this.models == null) { // L: 323
+			if (var1 != 10) { // L: 324
 				return null;
 			}
 
-			if (this.modelIds == null) { // L: 316
+			if (this.modelIds == null) { // L: 325
 				return null;
 			}
 
-			var4 = this.isRotated; // L: 317
-			if (var1 == 2 && var2 > 3) { // L: 318
+			var4 = this.isRotated; // L: 326
+			if (var1 == 2 && var2 > 3) { // L: 327
 				var4 = !var4;
 			}
 
-			var5 = this.modelIds.length; // L: 319
+			var5 = this.modelIds.length; // L: 328
 
-			for (int var6 = 0; var6 < var5; ++var6) { // L: 320
-				var7 = this.modelIds[var6]; // L: 321
-				if (var4) { // L: 322
+			for (int var6 = 0; var6 < var5; ++var6) { // L: 329
+				var7 = this.modelIds[var6]; // L: 330
+				if (var4) { // L: 331
 					var7 += 65536;
 				}
 
-				var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 323
-				if (var3 == null) { // L: 324
-					var3 = ModelData.ModelData_get(class310.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 325
-					if (var3 == null) { // L: 326
+				var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 332
+				if (var3 == null) { // L: 333
+					var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 334
+					if (var3 == null) { // L: 335
 						return null;
 					}
 
-					if (var4) { // L: 327
-						var3.method3769();
+					if (var4) { // L: 336
+						var3.method3877();
 					}
 
-					ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 328
+					ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 337
 				}
 
-				if (var5 > 1) { // L: 330
-					field1758[var6] = var3;
+				if (var5 > 1) { // L: 339
+					field1781[var6] = var3;
 				}
 			}
 
-			if (var5 > 1) { // L: 332
-				var3 = new ModelData(field1758, var5);
+			if (var5 > 1) { // L: 341
+				var3 = new ModelData(field1781, var5);
 			}
 		} else {
-			int var9 = -1; // L: 335
+			int var9 = -1; // L: 344
 
-			for (var5 = 0; var5 < this.models.length; ++var5) { // L: 336
-				if (this.models[var5] == var1) { // L: 337
-					var9 = var5; // L: 338
+			for (var5 = 0; var5 < this.models.length; ++var5) { // L: 345
+				if (this.models[var5] == var1) { // L: 346
+					var9 = var5; // L: 347
 					break;
 				}
 			}
 
-			if (var9 == -1) { // L: 342
+			if (var9 == -1) { // L: 351
 				return null;
 			}
 
-			var5 = this.modelIds[var9]; // L: 343
-			boolean var10 = this.isRotated ^ var2 > 3; // L: 344
-			if (var10) { // L: 345
+			var5 = this.modelIds[var9]; // L: 352
+			boolean var10 = this.isRotated ^ var2 > 3; // L: 353
+			if (var10) { // L: 354
 				var5 += 65536;
 			}
 
-			var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 346
-			if (var3 == null) { // L: 347
-				var3 = ModelData.ModelData_get(class310.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 348
-				if (var3 == null) { // L: 349
+			var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 355
+			if (var3 == null) { // L: 356
+				var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 357
+				if (var3 == null) { // L: 358
 					return null;
 				}
 
-				if (var10) { // L: 350
-					var3.method3769();
+				if (var10) { // L: 359
+					var3.method3877();
 				}
 
-				ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 351
+				ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 360
 			}
 		}
 
-		if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 355
-			var4 = false; // L: 356
+		if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 364
+			var4 = false; // L: 365
 		} else {
 			var4 = true;
 		}
 
 		boolean var11;
-		if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 358
-			var11 = false; // L: 359
+		if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 367
+			var11 = false; // L: 368
 		} else {
 			var11 = true;
 		}
 
-		ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); // L: 360
-		if (var1 == 4 && var2 > 3) { // L: 361
-			var8.method3776(256); // L: 362
-			var8.changeOffset(45, 0, -45); // L: 363
+		ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); // L: 369
+		if (var1 == 4 && var2 > 3) { // L: 370
+			var8.method3864(256); // L: 371
+			var8.changeOffset(45, 0, -45); // L: 372
 		}
 
-		var2 &= 3; // L: 365
-		if (var2 == 1) { // L: 366
-			var8.method3763();
-		} else if (var2 == 2) { // L: 367
-			var8.method3829();
-		} else if (var2 == 3) { // L: 368
-			var8.method3765();
+		var2 &= 3; // L: 374
+		if (var2 == 1) { // L: 375
+			var8.method3873();
+		} else if (var2 == 2) { // L: 376
+			var8.method3874();
+		} else if (var2 == 3) { // L: 377
+			var8.method3875();
 		}
 
-		if (this.recolorFrom != null) { // L: 369
-			for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 370
-				var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 371
+		if (this.recolorFrom != null) { // L: 378
+			for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 379
+				var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 380
 			}
 		}
 
-		if (this.retextureFrom != null) { // L: 374
-			for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 375
-				var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 376
+		if (this.retextureFrom != null) { // L: 383
+			for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 384
+				var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 385
 			}
 		}
 
-		if (var4) { // L: 379
+		if (var4) { // L: 388
 			var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY);
 		}
 
-		if (var11) { // L: 380
+		if (var11) { // L: 389
 			var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY);
 		}
 
-		return var8; // L: 381
+		return var8; // L: 390
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Leg;",
-		garbageValue = "1894862325"
+		descriptor = "(B)Lez;",
+		garbageValue = "-68"
 	)
 	@Export("transform")
 	public final ObjectComposition transform() {
-		int var1 = -1; // L: 385
-		if (this.transformVarbit != -1) { // L: 386
-			var1 = Skeleton.getVarbit(this.transformVarbit);
-		} else if (this.transformVarp != -1) { // L: 387
+		int var1 = -1; // L: 394
+		if (this.transformVarbit != -1) { // L: 395
+			var1 = ScriptFrame.getVarbit(this.transformVarbit);
+		} else if (this.transformVarp != -1) { // L: 396
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
 
 		int var2;
-		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 389
-			var2 = this.transforms[var1]; // L: 390
+		if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 398
+			var2 = this.transforms[var1]; // L: 399
 		} else {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? class23.getObjectDefinition(var2) : null; // L: 391 392
+		return var2 != -1 ? Tiles.getObjectDefinition(var2) : null; // L: 400 401
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "-1270474150"
+		garbageValue = "-822504671"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return SecureRandomFuture.method1977(this.params, var1, var2); // L: 396
+		IterableNodeHashTable var4 = this.params; // L: 406
+		int var3;
+		if (var4 == null) { // L: 408
+			var3 = var2; // L: 409
+		} else {
+			IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 412
+			if (var5 == null) { // L: 413
+				var3 = var2; // L: 414
+			} else {
+				var3 = var5.integer; // L: 417
+			}
+		}
+
+		return var3; // L: 419
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "110294181"
+		descriptor = "(ILjava/lang/String;B)Ljava/lang/String;",
+		garbageValue = "0"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return FriendsList.method5650(this.params, var1, var2); // L: 400
+		return WorldMapElement.method2742(this.params, var1, var2); // L: 423
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "16"
+		garbageValue = "114"
 	)
 	@Export("hasSound")
 	public boolean hasSound() {
-		if (this.transforms == null) { // L: 411
+		if (this.transforms == null) { // L: 434
 			return this.ambientSoundId != -1 || this.soundEffectIds != null;
 		} else {
-			for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 412
-				if (this.transforms[var1] != -1) { // L: 413
-					ObjectComposition var2 = class23.getObjectDefinition(this.transforms[var1]); // L: 414
-					if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 415
+			for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 435
+				if (this.transforms[var1] != -1) { // L: 436
+					ObjectComposition var2 = Tiles.getObjectDefinition(this.transforms[var1]); // L: 437
+					if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 438
 						return true;
 					}
 				}
 			}
 
-			return false; // L: 418
+			return false; // L: 441
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)J",
-		garbageValue = "1"
+		descriptor = "(Ljp;Ljp;B)V",
+		garbageValue = "-24"
 	)
-	@Export("currentTimeMillis")
-	public static final synchronized long currentTimeMillis() {
-		long var0 = System.currentTimeMillis(); // L: 14
-		if (var0 < class379.field4146) { // L: 15
-			class379.field4147 += class379.field4146 - var0; // L: 16
-		}
-
-		class379.field4146 = var0; // L: 18
-		return class379.field4147 + var0; // L: 19
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "2009331321"
-	)
-	static int method2964(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1810
-			class44.Interpreter_intStackSize -= 3; // L: 1811
-			BufferedSource.queueSoundEffect(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]); // L: 1812
-			return 1; // L: 1813
-		} else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1815
-			class27.playSong(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1816
-			return 1; // L: 1817
-		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1819
-			class44.Interpreter_intStackSize -= 2; // L: 1820
-			GrandExchangeOfferNameComparator.method5059(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 1821
-			return 1; // L: 1822
-		} else {
-			int var3;
-			if (var0 == 3203) { // L: 1824
-				var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1825
-				PacketWriter.method2402(Math.round((float)var3 * 2.55F)); // L: 1826
-				return 1; // L: 1827
-			} else if (var0 == 3204) { // L: 1829
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Math.round((float)clientPreferences.musicVolume / 2.55F); // L: 1830
-				return 1; // L: 1831
-			} else if (var0 == 3205) { // L: 1833
-				var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1834
-				WorldMapLabelSize.updateSoundEffectVolume(Math.round(1.27F * (float)var3)); // L: 1835
-				return 1; // L: 1836
-			} else if (var0 == 3206) { // L: 1838
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Math.round((float)clientPreferences.soundEffectsVolume / 1.27F); // L: 1839
-				return 1; // L: 1840
-			} else if (var0 == 3207) { // L: 1842
-				var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1843
-				LoginPacket.method4373(Math.round((float)var3 * 1.27F)); // L: 1844
-				return 1; // L: 1845
-			} else if (var0 == 3208) { // L: 1847
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Math.round((float)clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1848
-				return 1; // L: 1849
-			} else {
-				return 2; // L: 1851
-			}
-		}
-	}
-
-	@ObfuscatedName("ko")
-	@ObfuscatedSignature(
-		descriptor = "(IIIILoh;Lit;I)V",
-		garbageValue = "-1287867325"
-	)
-	@Export("drawSpriteOnMinimap")
-	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
-		if (var4 != null) { // L: 11231
-			int var6 = Client.camAngleY & 2047; // L: 11232
-			int var7 = var3 * var3 + var2 * var2; // L: 11233
-			if (var7 <= 6400) { // L: 11234
-				int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11235
-				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11236
-				int var10 = var3 * var8 + var9 * var2 >> 16; // L: 11237
-				int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11238
-				if (var7 > 2500) {
-					var4.method6989(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11239
-				} else {
-					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11240
-				}
-
-			}
-		}
-	} // L: 11241
-
-	@ObfuscatedName("lt")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZB)V",
-		garbageValue = "42"
-	)
-	@Export("findItemDefinitions")
-	static void findItemDefinitions(String var0, boolean var1) {
-		var0 = var0.toLowerCase(); // L: 11427
-		short[] var2 = new short[16]; // L: 11428
-		int var3 = 0; // L: 11429
-
-		for (int var4 = 0; var4 < ItemComposition.ItemDefinition_fileCount; ++var4) { // L: 11430
-			ItemComposition var9 = class260.ItemDefinition_get(var4); // L: 11431
-			if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 11432 11433 11434
-				if (var3 >= 250) { // L: 11435
-					ClanSettings.foundItemIdCount = -1; // L: 11436
-					Clock.foundItemIds = null; // L: 11437
-					return; // L: 11438
-				}
-
-				if (var3 >= var2.length) { // L: 11440
-					short[] var6 = new short[var2.length * 2]; // L: 11441
-
-					for (int var7 = 0; var7 < var3; ++var7) { // L: 11442
-						var6[var7] = var2[var7];
-					}
-
-					var2 = var6; // L: 11443
-				}
-
-				var2[var3++] = (short)var4; // L: 11445
-			}
-		}
-
-		Clock.foundItemIds = var2; // L: 11447
-		Canvas.foundItemIndex = 0; // L: 11448
-		ClanSettings.foundItemIdCount = var3; // L: 11449
-		String[] var8 = new String[ClanSettings.foundItemIdCount]; // L: 11450
-
-		for (int var5 = 0; var5 < ClanSettings.foundItemIdCount; ++var5) { // L: 11451
-			var8[var5] = class260.ItemDefinition_get(var2[var5]).name;
-		}
-
-		short[] var10 = Clock.foundItemIds; // L: 11452
-		PacketBufferNode.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 11454
-	} // L: 11456
+	public static void method3069(AbstractArchive var0, AbstractArchive var1) {
+		SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32
+		SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33
+	} // L: 34
 }
diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java
index 5a582a0c5c..e0208e62d7 100644
--- a/runescape-client/src/main/java/ObjectNode.java
+++ b/runescape-client/src/main/java/ObjectNode.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("mk")
+@ObfuscatedName("mh")
 @Implements("ObjectNode")
 public class ObjectNode extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("obj")
 	public final Object obj;
 
diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java
index 7a6b4b3d03..808cde05e5 100644
--- a/runescape-client/src/main/java/ObjectSound.java
+++ b/runescape-client/src/main/java/ObjectSound.java
@@ -3,86 +3,93 @@ 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("bf")
 @Implements("ObjectSound")
 public final class ObjectSound extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("objectSounds")
 	static NodeDeque objectSounds;
-	@ObfuscatedName("n")
+	@ObfuscatedName("ha")
 	@ObfuscatedGetter(
-		intValue = 1262714503
+		intValue = 501440191
+	)
+	@Export("cameraX")
+	static int cameraX;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 179593907
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 382039955
+		intValue = 724214627
 	)
 	@Export("x")
 	int x;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -377542945
+		intValue = 775363577
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1913199289
-	)
-	int field956;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 846164283
+		intValue = 1416185027
 	)
-	int field957;
+	int field937;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 50432371
+	)
+	int field944;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -663897917
+	)
+	int field939;
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Leg;"
+		descriptor = "Lez;"
 	)
 	@Export("obj")
 	ObjectComposition obj;
-	@ObfuscatedName("b")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 2101998419
-	)
-	int field958;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 2113426875
+		intValue = -709047569
 	)
 	@Export("soundEffectId")
 	int soundEffectId;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1385478755
-	)
-	int field961;
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "Lbv;"
 	)
 	@Export("stream1")
 	RawPcmStream stream1;
-	@ObfuscatedName("l")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1819837691
+		intValue = -1448686013
 	)
-	int field964;
-	@ObfuscatedName("o")
+	int field941;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1441209589
+	)
+	int field943;
+	@ObfuscatedName("i")
 	@Export("soundEffectIds")
 	int[] soundEffectIds;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1313201795
+		intValue = 1984833823
 	)
-	int field954;
-	@ObfuscatedName("e")
+	int field945;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "Lbv;"
 	)
@@ -96,172 +103,172 @@ public final class ObjectSound extends Node {
 	ObjectSound() {
 	} // L: 27
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "10"
+		garbageValue = "1"
 	)
 	@Export("set")
 	void set() {
-		int var1 = this.soundEffectId; // L: 50
-		ObjectComposition var2 = this.obj.transform(); // L: 51
-		if (var2 != null) { // L: 52
-			this.soundEffectId = var2.ambientSoundId; // L: 53
-			this.field958 = var2.int4 * 128; // L: 54
-			this.field961 = var2.int5; // L: 55
-			this.field964 = var2.int6; // L: 56
-			this.soundEffectIds = var2.soundEffectIds; // L: 57
+		int var1 = this.soundEffectId; // L: 36
+		ObjectComposition var2 = this.obj.transform(); // L: 37
+		if (var2 != null) { // L: 38
+			this.soundEffectId = var2.ambientSoundId; // L: 39
+			this.field939 = var2.field1801 * 128; // L: 40
+			this.field941 = var2.int5; // L: 41
+			this.field943 = var2.int6; // L: 42
+			this.soundEffectIds = var2.soundEffectIds; // L: 43
 		} else {
-			this.soundEffectId = -1; // L: 60
-			this.field958 = 0; // L: 61
-			this.field961 = 0; // L: 62
-			this.field964 = 0; // L: 63
-			this.soundEffectIds = null; // L: 64
+			this.soundEffectId = -1; // L: 46
+			this.field939 = 0; // L: 47
+			this.field941 = 0; // L: 48
+			this.field943 = 0; // L: 49
+			this.soundEffectIds = null; // L: 50
 		}
 
-		if (var1 != this.soundEffectId && this.stream1 != null) { // L: 66
-			class308.pcmStreamMixer.removeSubStream(this.stream1); // L: 67
-			this.stream1 = null; // L: 68
+		if (var1 != this.soundEffectId && this.stream1 != null) { // L: 52
+			UserComparator7.pcmStreamMixer.removeSubStream(this.stream1); // L: 53
+			this.stream1 = null; // L: 54
 		}
 
-	} // L: 70
+	} // L: 56
 
-	@ObfuscatedName("ki")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;IIII)V",
-		garbageValue = "-1477565954"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "706769109"
 	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		HealthBarUpdate.playPcmPlayers(); // L: 11121
-		SpriteMask var4 = var0.getSpriteMask(false); // L: 11122
-		if (var4 != null) { // L: 11123
-			Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 11124
-			if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 11125
-				int var5 = Client.camAngleY & 2047; // L: 11126
-				int var6 = class93.localPlayer.x / 32 + 48; // L: 11127
-				int var7 = 464 - class93.localPlayer.y / 32; // L: 11128
-				GameEngine.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 11129
+	static int method1889(int var0, Script var1, boolean var2) {
+		boolean var3 = true; // L: 844
+		Widget var4;
+		if (var0 >= 2000) { // L: 846
+			var0 -= 1000; // L: 847
+			var4 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 848
+			var3 = false; // L: 849
+		} else {
+			var4 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 851
+		}
 
-				int var8;
-				int var10;
-				int var16;
-				for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 11130
-					var16 = Client.mapIconXs[var8] * 4 + 2 - class93.localPlayer.x / 32; // L: 11131
-					var10 = Client.mapIconYs[var8] * 4 + 2 - class93.localPlayer.y / 32; // L: 11132
-					ObjectComposition.drawSpriteOnMinimap(var1, var2, var16, var10, Client.mapIcons[var8], var4); // L: 11133
-				}
-
-				int var11;
-				int var12;
-				for (var8 = 0; var8 < 104; ++var8) { // L: 11135
-					for (var16 = 0; var16 < 104; ++var16) { // L: 11136
-						NodeDeque var14 = Client.groundItems[class22.Client_plane][var8][var16]; // L: 11137
-						if (var14 != null) { // L: 11138
-							var11 = var8 * 4 + 2 - class93.localPlayer.x / 32; // L: 11139
-							var12 = var16 * 4 + 2 - class93.localPlayer.y / 32; // L: 11140
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var11, var12, class170.mapDotSprites[0], var4); // L: 11141
-						}
-					}
-				}
-
-				for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 11145
-					NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 11146
-					if (var9 != null && var9.isVisible()) { // L: 11147
-						NPCComposition var18 = var9.definition; // L: 11148
-						if (var18 != null && var18.transforms != null) { // L: 11149
-							var18 = var18.transform();
-						}
-
-						if (var18 != null && var18.drawMapDot && var18.isInteractable) { // L: 11150
-							var11 = var9.x / 32 - class93.localPlayer.x / 32; // L: 11151
-							var12 = var9.y / 32 - class93.localPlayer.y / 32; // L: 11152
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var11, var12, class170.mapDotSprites[1], var4); // L: 11153
-						}
-					}
-				}
-
-				var8 = Players.Players_count; // L: 11157
-				int[] var17 = Players.Players_indices; // L: 11158
-
-				for (var10 = 0; var10 < var8; ++var10) { // L: 11159
-					Player var15 = Client.players[var17[var10]]; // L: 11160
-					if (var15 != null && var15.isVisible() && !var15.isHidden && var15 != class93.localPlayer) { // L: 11161
-						var12 = var15.x / 32 - class93.localPlayer.x / 32; // L: 11162
-						int var13 = var15.y / 32 - class93.localPlayer.y / 32; // L: 11163
-						if (var15.isFriend()) { // L: 11164
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[3], var4);
-						} else if (class93.localPlayer.team != 0 && var15.team != 0 && var15.team == class93.localPlayer.team) { // L: 11165
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[4], var4);
-						} else if (var15.isFriendsChatMember()) { // L: 11166
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[5], var4);
-						} else if (var15.isClanMember()) { // L: 11167
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[6], var4);
-						} else {
-							ObjectComposition.drawSpriteOnMinimap(var1, var2, var12, var13, class170.mapDotSprites[2], var4); // L: 11168
-						}
-					}
-				}
-
-				if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 11171
-					if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 11172
-						NPC var19 = Client.npcs[Client.hintArrowNpcIndex]; // L: 11173
-						if (var19 != null) { // L: 11174
-							var11 = var19.x / 32 - class93.localPlayer.x / 32; // L: 11175
-							var12 = var19.y / 32 - class93.localPlayer.y / 32; // L: 11176
-							MenuAction.worldToMinimap(var1, var2, var11, var12, WorldMapArea.mapMarkerSprites[1], var4); // L: 11177
-						}
-					}
-
-					if (Client.hintArrowType == 2) { // L: 11180
-						var10 = Client.hintArrowX * 4 - VertexNormal.baseX * 4 + 2 - class93.localPlayer.x / 32; // L: 11181
-						var11 = Client.hintArrowY * 4 - SoundSystem.baseY * 4 + 2 - class93.localPlayer.y / 32; // L: 11182
-						MenuAction.worldToMinimap(var1, var2, var10, var11, WorldMapArea.mapMarkerSprites[1], var4); // L: 11183
-					}
-
-					if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 11185
-						Player var20 = Client.players[Client.hintArrowPlayerIndex]; // L: 11186
-						if (var20 != null) { // L: 11187
-							var11 = var20.x / 32 - class93.localPlayer.x / 32; // L: 11188
-							var12 = var20.y / 32 - class93.localPlayer.y / 32; // L: 11189
-							MenuAction.worldToMinimap(var1, var2, var11, var12, WorldMapArea.mapMarkerSprites[1], var4); // L: 11190
-						}
-					}
-				}
-
-				if (Client.destinationX != 0) { // L: 11194
-					var10 = Client.destinationX * 4 + 2 - class93.localPlayer.x / 32; // L: 11195
-					var11 = Client.destinationY * 4 + 2 - class93.localPlayer.y / 32; // L: 11196
-					ObjectComposition.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapArea.mapMarkerSprites[0], var4); // L: 11197
-				}
-
-				if (!class93.localPlayer.isHidden) { // L: 11199
-					Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
-				}
+		int var11;
+		if (var0 == ScriptOpcodes.CC_SETOP) { // L: 852
+			var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] - 1; // L: 853
+			if (var11 >= 0 && var11 <= 9) { // L: 854
+				var4.setAction(var11, Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 858
+				return 1; // L: 859
 			} else {
-				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11201
+				--UserComparator9.Interpreter_stringStackSize; // L: 855
+				return 1; // L: 856
 			}
+		} else {
+			int var6;
+			if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 861
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 862
+				var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 863
+				var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 864
+				var4.parent = class17.getWidgetChild(var11, var6); // L: 865
+				return 1; // L: 866
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 868
+				var4.isScrollBar = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 869
+				return 1; // L: 870
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 872
+				var4.dragZoneSize = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 873
+				return 1; // L: 874
+			} else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 876
+				var4.dragThreshold = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 877
+				return 1; // L: 878
+			} else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 880
+				var4.dataText = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 881
+				return 1; // L: 882
+			} else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 884
+				var4.spellActionName = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 885
+				return 1; // L: 886
+			} else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 888
+				var4.actions = null; // L: 889
+				return 1; // L: 890
+			} else if (var0 == 1308) { // L: 892
+				var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 893
+				return 1; // L: 894
+			} else if (var0 == 1309) { // L: 896
+				--ChatChannel.Interpreter_intStackSize; // L: 897
+				return 1; // L: 898
+			} else {
+				int var7;
+				byte[] var8;
+				if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 900
+					byte var5;
+					if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 930
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 931
+						var5 = 10; // L: 932
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]}; // L: 933
+						byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]}; // L: 934
+						UserComparator8.Widget_setKey(var4, var5, var8, var9); // L: 935
+						return 1; // L: 936
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 938
+						ChatChannel.Interpreter_intStackSize -= 3; // L: 939
+						var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] - 1; // L: 940
+						var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 941
+						var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 942
+						if (var11 >= 0 && var11 <= 9) { // L: 943
+							FileSystem.Widget_setKeyRate(var4, var11, var6, var7); // L: 946
+							return 1; // L: 947
+						} else {
+							throw new RuntimeException(); // L: 944
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 949
+						var5 = 10; // L: 950
+						var6 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 951
+						var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 952
+						FileSystem.Widget_setKeyRate(var4, var5, var6, var7); // L: 953
+						return 1; // L: 954
+					} else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 956
+						--ChatChannel.Interpreter_intStackSize; // L: 957
+						var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] - 1; // L: 958
+						if (var11 >= 0 && var11 <= 9) { // L: 959
+							class25.Widget_setKeyIgnoreHeld(var4, var11); // L: 962
+							return 1; // L: 963
+						} else {
+							throw new RuntimeException(); // L: 960
+						}
+					} else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 965
+						var5 = 10; // L: 966
+						class25.Widget_setKeyIgnoreHeld(var4, var5); // L: 967
+						return 1; // L: 968
+					} else {
+						return 2; // L: 970
+					}
+				} else {
+					byte[] var10 = null; // L: 901
+					var8 = null; // L: 902
+					if (var3) { // L: 903
+						ChatChannel.Interpreter_intStackSize -= 10; // L: 904
 
-			Client.field780[var3] = true; // L: 11202
-		}
-	} // L: 11203
+						for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + ChatChannel.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 906 907
+						}
 
-	@ObfuscatedName("ls")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1750320042"
-	)
-	static void method1761() {
-		if (UserComparator3.field1444 != null) { // L: 11541
-			Client.field717 = Client.cycle; // L: 11542
-			UserComparator3.field1444.method5126(); // L: 11543
+						if (var7 > 0) { // L: 909
+							var10 = new byte[var7 / 2]; // L: 910
+							var8 = new byte[var7 / 2]; // L: 911
 
-			for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 11544
-				if (Client.players[var0] != null) { // L: 11545
-					UserComparator3.field1444.method5117((Client.players[var0].x >> 7) + VertexNormal.baseX, (Client.players[var0].y >> 7) + SoundSystem.baseY); // L: 11546
+							for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 912
+								var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + ChatChannel.Interpreter_intStackSize]; // L: 913
+								var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + ChatChannel.Interpreter_intStackSize + 1]; // L: 914
+							}
+						}
+					} else {
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 919
+						var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]}; // L: 920
+						var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]}; // L: 921
+					}
+
+					var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] - 1; // L: 923
+					if (var7 >= 0 && var7 <= 9) { // L: 924
+						UserComparator8.Widget_setKey(var4, var7, var10, var8); // L: 927
+						return 1; // L: 928
+					} else {
+						throw new RuntimeException(); // L: 925
+					}
 				}
 			}
 		}
-
-	} // L: 11550
+	}
 }
diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java
index 5fc4dbad39..ded1fca2c5 100644
--- a/runescape-client/src/main/java/Occluder.java
+++ b/runescape-client/src/main/java/Occluder.java
@@ -3,175 +3,128 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gn")
+@ObfuscatedName("gc")
 @Implements("Occluder")
 public final class Occluder {
-	@ObfuscatedName("gn")
-	@ObfuscatedGetter(
-		intValue = 1575841489
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "Lgu;"
 	)
-	static int field2387;
-	@ObfuscatedName("v")
+	@Export("worldMapEvent")
+	static WorldMapEvent worldMapEvent;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1269044325
+		intValue = -1188565001
 	)
 	@Export("minTileX")
 	int minTileX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -386233567
+		intValue = -1313768427
 	)
 	@Export("maxTileX")
 	int maxTileX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 725968227
+		intValue = -1783285633
 	)
 	@Export("minTileY")
 	int minTileY;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1353247321
+		intValue = 1287011473
 	)
 	@Export("maxTileY")
 	int maxTileY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -713034583
+		intValue = 1737527969
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 818345769
+		intValue = -134760601
 	)
 	@Export("minX")
 	int minX;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -635118225
+		intValue = 1472974577
 	)
 	@Export("maxX")
 	int maxX;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -621751483
+		intValue = -1609596079
 	)
 	@Export("minZ")
 	int minZ;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1703842397
+		intValue = -338099237
 	)
 	@Export("maxZ")
 	int maxZ;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -189041849
+		intValue = -1143338287
 	)
 	@Export("minY")
 	int minY;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1423545413
+		intValue = -1870122495
 	)
 	@Export("maxY")
 	int maxY;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -2138961749
+		intValue = 2114600339
 	)
-	int field2380;
-	@ObfuscatedName("o")
+	int field2378;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -853135435
+		intValue = -183900019
 	)
-	int field2385;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -668340379
-	)
-	int field2372;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -2125693873
-	)
-	int field2382;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 1761408947
-	)
-	int field2384;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 536172955
-	)
-	int field2369;
+	int field2370;
 	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -533190237
+		intValue = -685155783
 	)
-	int field2386;
+	int field2380;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 204431275
+	)
+	int field2383;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -78782023
+	)
+	int field2382;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = 1929660861
+	)
+	int field2385;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 2103719141
+	)
+	int field2384;
 
 	Occluder() {
 	} // L: 23
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "106"
+		descriptor = "(IB)[B",
+		garbageValue = "0"
 	)
-	static final int method4109(int var0, int var1) {
-		int var2 = GrandExchangeOfferAgeComparator.method5067(var0 - 1, var1 - 1) + GrandExchangeOfferAgeComparator.method5067(1 + var0, var1 - 1) + GrandExchangeOfferAgeComparator.method5067(var0 - 1, 1 + var1) + GrandExchangeOfferAgeComparator.method5067(1 + var0, 1 + var1); // L: 833
-		int var3 = GrandExchangeOfferAgeComparator.method5067(var0 - 1, var1) + GrandExchangeOfferAgeComparator.method5067(var0 + 1, var1) + GrandExchangeOfferAgeComparator.method5067(var0, var1 - 1) + GrandExchangeOfferAgeComparator.method5067(var0, var1 + 1); // L: 834
-		int var4 = GrandExchangeOfferAgeComparator.method5067(var0, var1); // L: 835
-		return var2 / 16 + var3 / 8 + var4 / 4; // L: 836
+	@Export("ByteArrayPool_getArray")
+	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
+		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 57
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-1000061278"
-	)
-	static int method4110(int var0, Script var1, boolean var2) {
-		Widget var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1376
-		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1377
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var3)); // L: 1378
-			return 1; // L: 1379
-		} else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1381
-			if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1388
-				if (var3.dataText == null) { // L: 1389
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1390
-				}
-
-				return 1; // L: 1391
-			} else {
-				return 2; // L: 1393
-			}
-		} else {
-			int var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1382
-			--var4; // L: 1383
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1384
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1385
-			} else {
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1; // L: 1386
-		}
-	}
-
-	@ObfuscatedName("ig")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V",
-		garbageValue = "-1750560328"
-	)
-	@Export("insertMenuItemNoShift")
-	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
-		BoundaryObject.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8801
-	} // L: 8802
 }
diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java
index 455b8a0ebc..c4e1c1a232 100644
--- a/runescape-client/src/main/java/PacketBuffer.java
+++ b/runescape-client/src/main/java/PacketBuffer.java
@@ -4,56 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nb")
+@ObfuscatedName("ns")
 @Implements("PacketBuffer")
 public class PacketBuffer extends Buffer {
-	@ObfuscatedName("n")
-	static final int[] field4153;
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
+	static final int[] field4155;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Loy;"
+		descriptor = "Lod;"
 	)
 	@Export("isaacCipher")
 	IsaacCipher isaacCipher;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -958717145
+		intValue = -901766623
 	)
 	@Export("bitIndex")
 	int bitIndex;
 
 	static {
-		field4153 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7
+		field4155 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; // L: 7
 	}
 
 	public PacketBuffer(int var1) {
 		super(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "([II)V",
-		garbageValue = "-1125763957"
+		garbageValue = "-287297214"
 	)
 	@Export("newIsaacCipher")
 	public void newIsaacCipher(int[] var1) {
 		this.isaacCipher = new IsaacCipher(var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Loy;B)V",
-		garbageValue = "78"
+		descriptor = "(Lod;B)V",
+		garbageValue = "-56"
 	)
 	@Export("setIsaacCipher")
 	public void setIsaacCipher(IsaacCipher var1) {
 		this.isaacCipher = var1; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "60225869"
+		descriptor = "(IB)V",
+		garbageValue = "27"
 	)
 	@Export("writeByteIsaac")
 	public void writeByteIsaac(int var1) {
@@ -62,28 +62,28 @@ public class PacketBuffer extends Buffer {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "7"
+		descriptor = "(I)I",
+		garbageValue = "1735363051"
 	)
 	@Export("readByteIsaac")
 	public int readByteIsaac() {
 		return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1334182155"
+		garbageValue = "-867479471"
 	)
-	public boolean method6529() {
-		int var1 = super.array[super.offset] - this.isaacCipher.method7096() & 255; // L: 31
+	public boolean method6569() {
+		int var1 = super.array[super.offset] - this.isaacCipher.method7168() & 255; // L: 31
 		return var1 >= 128; // L: 32
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1807969364"
+		descriptor = "(B)I",
+		garbageValue = "7"
 	)
 	@Export("readSmartByteShortIsaac")
 	public int readSmartByteShortIsaac() {
@@ -91,32 +91,32 @@ public class PacketBuffer extends Buffer {
 		return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "([BIIS)V",
-		garbageValue = "255"
+		descriptor = "([BIII)V",
+		garbageValue = "-799445636"
 	)
-	public void method6521(byte[] var1, int var2, int var3) {
+	public void method6561(byte[] var1, int var2, int var3) {
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 43
 			var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt());
 		}
 
 	} // L: 44
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-201706662"
+		descriptor = "(B)V",
+		garbageValue = "0"
 	)
 	@Export("importIndex")
 	public void importIndex() {
 		this.bitIndex = super.offset * 8; // L: 47
 	} // L: 48
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(IB)I",
-		garbageValue = "-61"
+		garbageValue = "-119"
 	)
 	@Export("readBits")
 	public int readBits(int var1) {
@@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer {
 		int var4 = 0; // L: 53
 
 		for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58
-			var4 += (super.array[var2++] & field4153[var3]) << var1 - var3; // L: 56
+			var4 += (super.array[var2++] & field4155[var3]) << var1 - var3; // L: 56
 			var1 -= var3; // L: 57
 		}
 
 		if (var3 == var1) { // L: 60
-			var4 += super.array[var2] & field4153[var3];
+			var4 += super.array[var2] & field4155[var3];
 		} else {
-			var4 += super.array[var2] >> var3 - var1 & field4153[var1]; // L: 61
+			var4 += super.array[var2] >> var3 - var1 & field4155[var1]; // L: 61
 		}
 
 		return var4; // L: 62
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-32"
+		descriptor = "(I)V",
+		garbageValue = "-1717321285"
 	)
 	@Export("exportIndex")
 	public void exportIndex() {
 		super.offset = (this.bitIndex + 7) / 8; // L: 66
 	} // L: 67
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "41"
+		descriptor = "(IS)I",
+		garbageValue = "252"
 	)
 	@Export("bitsRemaining")
 	public int bitsRemaining(int var1) {
diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java
index 7e6452c43f..c9aa49d17d 100644
--- a/runescape-client/src/main/java/PacketBufferNode.java
+++ b/runescape-client/src/main/java/PacketBufferNode.java
@@ -1,119 +1,78 @@
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hq")
+@ObfuscatedName("hg")
 @Implements("PacketBufferNode")
 public class PacketBufferNode extends Node {
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "[Lhq;"
+		descriptor = "[Lhg;"
 	)
 	@Export("PacketBufferNode_packetBufferNodes")
 	static PacketBufferNode[] PacketBufferNode_packetBufferNodes;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -227614929
+		intValue = 194087835
 	)
 	@Export("PacketBufferNode_packetBufferNodeCount")
 	static int PacketBufferNode_packetBufferNodeCount;
-	@ObfuscatedName("hw")
-	@ObfuscatedSignature(
-		descriptor = "[Loh;"
-	)
-	@Export("headIconHintSprites")
-	static SpritePixels[] headIconHintSprites;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lhs;"
-	)
-	@Export("clientPacket")
-	ClientPacket clientPacket;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = 1934863547
-	)
-	@Export("clientPacketLength")
-	int clientPacketLength;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lnb;"
+		descriptor = "Lhw;"
+	)
+	@Export("clientPacket")
+	public ClientPacket clientPacket;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -970275451
+	)
+	@Export("clientPacketLength")
+	public int clientPacketLength;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lns;"
 	)
 	@Export("packetBuffer")
 	public PacketBuffer packetBuffer;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -2120774193
+		intValue = 272345779
 	)
 	@Export("index")
 	public int index;
 
 	static {
-		PacketBufferNode_packetBufferNodes = new PacketBufferNode[300];
-		PacketBufferNode_packetBufferNodeCount = 0;
+		PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13
+		PacketBufferNode_packetBufferNodeCount = 0; // L: 14
 	}
 
 	PacketBufferNode() {
-	}
+	} // L: 19
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "100"
+		descriptor = "(I)V",
+		garbageValue = "249212949"
 	)
 	@Export("release")
 	public void release() {
-		if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 61
-			PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 62
+		if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 58
+			PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 59
 		}
-	} // L: 63
+	} // L: 60
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[SIII)V",
-		garbageValue = "1137110463"
+		descriptor = "(Ljava/awt/Component;I)V",
+		garbageValue = "1856428662"
 	)
-	@Export("sortItemsByName")
-	public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
-		if (var2 < var3) { // L: 9
-			int var4 = (var3 + var2) / 2; // L: 10
-			int var5 = var2; // L: 11
-			String var6 = var0[var4]; // L: 12
-			var0[var4] = var0[var3]; // L: 13
-			var0[var3] = var6; // L: 14
-			short var7 = var1[var4]; // L: 15
-			var1[var4] = var1[var3]; // L: 16
-			var1[var3] = var7; // L: 17
-
-			for (int var8 = var2; var8 < var3; ++var8) { // L: 18
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19
-					String var9 = var0[var8]; // L: 20
-					var0[var8] = var0[var5]; // L: 21
-					var0[var5] = var9; // L: 22
-					short var10 = var1[var8]; // L: 23
-					var1[var8] = var1[var5]; // L: 24
-					var1[var5++] = var10; // L: 25
-				}
-			}
-
-			var0[var3] = var0[var5]; // L: 29
-			var0[var5] = var6; // L: 30
-			var1[var3] = var1[var5]; // L: 31
-			var1[var5] = var7; // L: 32
-			sortItemsByName(var0, var1, var2, var5 - 1); // L: 33
-			sortItemsByName(var0, var1, var5 + 1, var3); // L: 34
-		}
-
-	} // L: 36
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-250082153"
-	)
-	public static boolean method4367(int var0) {
-		return var0 >= WorldMapDecorationType.field3162.id && var0 <= WorldMapDecorationType.field3144.id; // L: 46
-	}
+	static void method4497(Component var0) {
+		var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37
+		var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38
+		var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39
+	} // L: 40
 }
diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java
index 039ce87f76..bf02ff7a2d 100644
--- a/runescape-client/src/main/java/PacketWriter.java
+++ b/runescape-client/src/main/java/PacketWriter.java
@@ -5,105 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ds")
+@ObfuscatedName("dq")
 @Implements("PacketWriter")
 public class PacketWriter {
-	@ObfuscatedName("av")
-	@Export("null_string")
-	protected static String null_string;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ei")
 	@ObfuscatedSignature(
-		descriptor = "Lls;"
+		descriptor = "Ljf;"
+	)
+	@Export("archive14")
+	static Archive archive14;
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Llk;"
 	)
 	@Export("socket")
 	AbstractSocket socket;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lki;"
+		descriptor = "Lkz;"
 	)
 	@Export("packetBufferNodes")
 	IterableNodeDeque packetBufferNodes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -432974383
+		intValue = 1878760487
 	)
 	@Export("bufferSize")
 	int bufferSize;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lnt;"
 	)
 	@Export("buffer")
 	Buffer buffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Loy;"
+		descriptor = "Lod;"
 	)
 	@Export("isaacCipher")
 	public IsaacCipher isaacCipher;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lnb;"
+		descriptor = "Lns;"
 	)
 	@Export("packetBuffer")
 	PacketBuffer packetBuffer;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
 	@Export("serverPacket")
 	ServerPacket serverPacket;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -83736147
+		intValue = 824884821
 	)
 	@Export("serverPacketLength")
 	int serverPacketLength;
+	@ObfuscatedName("h")
+	boolean field1412;
 	@ObfuscatedName("d")
-	boolean field1408;
-	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1169449061
+		intValue = -1875627651
 	)
-	int field1409;
-	@ObfuscatedName("u")
+	int field1408;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 239536285
+		intValue = 120433437
 	)
 	@Export("pendingWrites")
 	int pendingWrites;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
+	)
+	ServerPacket field1410;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
 	)
 	ServerPacket field1411;
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	ServerPacket field1412;
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	ServerPacket field1400;
+	ServerPacket field1399;
 
 	PacketWriter() {
 		this.packetBufferNodes = new IterableNodeDeque(); // L: 15
 		this.bufferSize = 0; // L: 16
-		this.buffer = new Buffer(5000);
+		this.buffer = new Buffer(5000); // L: 17
 		this.packetBuffer = new PacketBuffer(40000); // L: 19
 		this.serverPacket = null; // L: 20
 		this.serverPacketLength = 0; // L: 21
-		this.field1408 = true; // L: 22
-		this.field1409 = 0; // L: 23
+		this.field1412 = true; // L: 22
+		this.field1408 = 0; // L: 23
 		this.pendingWrites = 0; // L: 24
 	} // L: 29
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "238860483"
+		garbageValue = "-2055980283"
 	)
 	@Export("clearBuffer")
 	final void clearBuffer() {
@@ -111,10 +114,10 @@ public class PacketWriter {
 		this.bufferSize = 0; // L: 33
 	} // L: 34
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1875758370"
+		garbageValue = "-1160814368"
 	)
 	@Export("flush")
 	final void flush() throws IOException {
@@ -139,10 +142,10 @@ public class PacketWriter {
 
 	} // L: 52
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lhq;I)V",
-		garbageValue = "-2081373116"
+		descriptor = "(Lhg;I)V",
+		garbageValue = "-1221651734"
 	)
 	@Export("addNode")
 	public final void addNode(PacketBufferNode var1) {
@@ -154,18 +157,18 @@ public class PacketWriter {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lls;I)V",
-		garbageValue = "-1060689503"
+		descriptor = "(Llk;S)V",
+		garbageValue = "3168"
 	)
 	@Export("setSocket")
 	void setSocket(AbstractSocket var1) {
 		this.socket = var1; // L: 62
 	} // L: 63
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-24"
+		descriptor = "(I)V",
+		garbageValue = "2099753174"
 	)
 	@Export("close")
 	void close() {
@@ -176,70 +179,66 @@ public class PacketWriter {
 
 	} // L: 70
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-329279812"
+		garbageValue = "-1099127678"
 	)
 	@Export("removeSocket")
 	void removeSocket() {
 		this.socket = null; // L: 73
 	} // L: 74
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lls;",
-		garbageValue = "-1467210924"
+		descriptor = "(I)Llk;",
+		garbageValue = "526936130"
 	)
 	@Export("getSocket")
 	AbstractSocket getSocket() {
 		return this.socket; // L: 77
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lcz;B)V",
-		garbageValue = "1"
+		descriptor = "(CI)Z",
+		garbageValue = "1259341442"
 	)
-	@Export("runScriptEvent")
-	public static void runScriptEvent(ScriptEvent var0) {
-		World.runScript(var0, 500000, 475000); // L: 106
-	} // L: 107
+	static boolean method2496(char var0) {
+		return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; // L: 689
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("iz")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;B)V",
-		garbageValue = "0"
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V",
+		garbageValue = "22"
 	)
-	public static void method2384(AbstractArchive var0) {
-		VarcInt.VarcInt_archive = var0; // L: 17
-	} // L: 18
-
-	@ObfuscatedName("ky")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1183744930"
-	)
-	static final void method2402(int var0) {
-		var0 = Math.min(Math.max(var0, 0), 255); // L: 10896
-		if (var0 != ObjectComposition.clientPreferences.musicVolume) { // L: 10897
-			if (ObjectComposition.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 10898
-				LoginScreenAnimation.method2219(UrlRequest.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 10899
-				Client.field881 = false; // L: 10900
-			} else if (var0 == 0) { // L: 10902
-				class124.midiPcmStream.clear(); // L: 10904
-				class232.musicPlayerStatus = 1; // L: 10905
-				ModelData0.musicTrackArchive = null; // L: 10906
-				Client.field881 = false; // L: 10908
-			} else if (class232.musicPlayerStatus != 0) { // L: 10911
-				class232.musicTrackVolume = var0;
-			} else {
-				class124.midiPcmStream.setPcmStreamVolume(var0); // L: 10912
+	@Export("insertMenuItem")
+	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		if (!Client.isMenuOpen) { // L: 8954
+			if (Client.menuOptionsCount < 500) { // L: 8955
+				Client.menuActions[Client.menuOptionsCount] = var0; // L: 8956
+				Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8957
+				Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8958
+				Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8959
+				Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8960
+				Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8961
+				Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8962
+				++Client.menuOptionsCount; // L: 8963
 			}
 
-			ObjectComposition.clientPreferences.musicVolume = var0; // L: 10914
-			TileItem.savePreferences(); // L: 10915
 		}
+	} // L: 8965
 
-	} // L: 10917
+	@ObfuscatedName("jr")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIII)V",
+		garbageValue = "-277336927"
+	)
+	@Export("updateRootInterface")
+	static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (class20.loadInterface(var0)) { // L: 10365
+			MenuAction.updateInterface(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10366
+		}
+	} // L: 10367
 }
diff --git a/runescape-client/src/main/java/ParamComposition.java b/runescape-client/src/main/java/ParamComposition.java
index 5355e4765f..22a3218857 100644
--- a/runescape-client/src/main/java/ParamComposition.java
+++ b/runescape-client/src/main/java/ParamComposition.java
@@ -1,45 +1,37 @@
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eh")
+@ObfuscatedName("ed")
 @Implements("ParamComposition")
 public class ParamComposition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("ParamDefinition_archive")
 	public static AbstractArchive ParamDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("ParamDefinition_cached")
 	static EvictingDualNodeHashTable ParamDefinition_cached;
-	@ObfuscatedName("o")
-	@Export("Tiles_hueMultiplier")
-	static int[] Tiles_hueMultiplier;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("type")
 	char type;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1035114241
+		intValue = -1782057793
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("autoDisable")
 	boolean autoDisable;
 
@@ -49,21 +41,21 @@ public class ParamComposition extends DualNode {
 
 	ParamComposition() {
 		this.autoDisable = true; // L: 16
-	}
+	} // L: 18
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2035039136"
+		descriptor = "(B)V",
+		garbageValue = "-117"
 	)
 	@Export("postDecode")
 	void postDecode() {
-	}
+	} // L: 31
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;S)V",
-		garbageValue = "-22209"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "-90"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -79,8 +71,8 @@ public class ParamComposition extends DualNode {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "36"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "-101"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -92,7 +84,7 @@ public class ParamComposition extends DualNode {
 			}
 
 			if (var5 >= 128 && var5 < 160) { // L: 48
-				char var6 = class301.cp1252AsciiExtension[var5 - 128]; // L: 49
+				char var6 = class302.cp1252AsciiExtension[var5 - 128]; // L: 49
 				if (var6 == 0) { // L: 50
 					var6 = '?';
 				}
@@ -112,166 +104,13 @@ public class ParamComposition extends DualNode {
 
 	} // L: 61
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "25333"
+		descriptor = "(I)Z",
+		garbageValue = "-1047624515"
 	)
 	@Export("isString")
 	public boolean isString() {
 		return this.type == 's'; // L: 64
 	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "([BB)Loh;",
-		garbageValue = "116"
-	)
-	@Export("convertJpgToSprite")
-	public static final SpritePixels convertJpgToSprite(byte[] var0) {
-		BufferedImage var1 = null;
-
-		try {
-			var1 = ImageIO.read(new ByteArrayInputStream(var0));
-			int var2 = var1.getWidth(); // L: 23
-			int var3 = var1.getHeight(); // L: 24
-			int[] var4 = new int[var2 * var3]; // L: 25
-			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26
-			var5.grabPixels(); // L: 27
-			return new SpritePixels(var4, var2, var3); // L: 28
-		} catch (IOException var7) { // L: 30
-		} catch (InterruptedException var8) { // L: 31
-		}
-
-		return new SpritePixels(0, 0); // L: 32
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;Ljava/lang/String;I)I",
-		garbageValue = "-44618968"
-	)
-	public static int method2878(Buffer var0, String var1) {
-		int var2 = var0.offset; // L: 18
-		byte[] var3 = DynamicObject.method2004(var1); // L: 19
-		var0.writeSmartByteShort(var3.length); // L: 20
-		var0.offset += class249.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 21
-		return var0.offset - var2; // L: 22
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Lnb;II)Z",
-		garbageValue = "422196307"
-	)
-	@Export("updateExternalPlayer")
-	static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
-		int var2 = var0.readBits(2); // L: 571
-		int var3;
-		int var4;
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		if (var2 == 0) { // L: 572
-			if (var0.readBits(1) != 0) { // L: 573
-				updateExternalPlayer(var0, var1);
-			}
-
-			var3 = var0.readBits(13); // L: 574
-			var4 = var0.readBits(13); // L: 575
-			boolean var12 = var0.readBits(1) == 1; // L: 576
-			if (var12) { // L: 577
-				Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
-			}
-
-			if (Client.players[var1] != null) { // L: 578
-				throw new RuntimeException(); // L: 579
-			} else {
-				Player var11 = Client.players[var1] = new Player(); // L: 581
-				var11.index = var1; // L: 582
-				if (Players.field1374[var1] != null) { // L: 583
-					var11.read(Players.field1374[var1]);
-				}
-
-				var11.orientation = Players.Players_orientations[var1]; // L: 584
-				var11.targetIndex = Players.Players_targetIndices[var1]; // L: 585
-				var7 = Players.Players_regions[var1]; // L: 586
-				var8 = var7 >> 28; // L: 587
-				var9 = var7 >> 14 & 255; // L: 588
-				var10 = var7 & 255; // L: 589
-				var11.pathTraversed[0] = Players.field1373[var1]; // L: 590
-				var11.plane = (byte)var8; // L: 591
-				var11.resetPath((var9 << 13) + var3 - VertexNormal.baseX, (var10 << 13) + var4 - SoundSystem.baseY); // L: 592
-				var11.field1218 = false; // L: 593
-				return true; // L: 594
-			}
-		} else if (var2 == 1) { // L: 596
-			var3 = var0.readBits(2); // L: 597
-			var4 = Players.Players_regions[var1]; // L: 598
-			Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 599
-			return false; // L: 600
-		} else {
-			int var5;
-			int var6;
-			if (var2 == 2) { // L: 602
-				var3 = var0.readBits(5); // L: 603
-				var4 = var3 >> 3; // L: 604
-				var5 = var3 & 7; // L: 605
-				var6 = Players.Players_regions[var1]; // L: 606
-				var7 = (var6 >> 28) + var4 & 3; // L: 607
-				var8 = var6 >> 14 & 255; // L: 608
-				var9 = var6 & 255; // L: 609
-				if (var5 == 0) { // L: 610
-					--var8; // L: 611
-					--var9; // L: 612
-				}
-
-				if (var5 == 1) { // L: 614
-					--var9;
-				}
-
-				if (var5 == 2) { // L: 615
-					++var8; // L: 616
-					--var9; // L: 617
-				}
-
-				if (var5 == 3) { // L: 619
-					--var8;
-				}
-
-				if (var5 == 4) { // L: 620
-					++var8;
-				}
-
-				if (var5 == 5) { // L: 621
-					--var8; // L: 622
-					++var9; // L: 623
-				}
-
-				if (var5 == 6) { // L: 625
-					++var9;
-				}
-
-				if (var5 == 7) { // L: 626
-					++var8; // L: 627
-					++var9; // L: 628
-				}
-
-				Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 630
-				return false; // L: 631
-			} else {
-				var3 = var0.readBits(18); // L: 633
-				var4 = var3 >> 16; // L: 634
-				var5 = var3 >> 8 & 255; // L: 635
-				var6 = var3 & 255; // L: 636
-				var7 = Players.Players_regions[var1]; // L: 637
-				var8 = (var7 >> 28) + var4 & 3; // L: 638
-				var9 = var5 + (var7 >> 14) & 255; // L: 639
-				var10 = var6 + var7 & 255; // L: 640
-				Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 641
-				return false; // L: 642
-			}
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index aa1a81bd83..c2f97110fb 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -1,144 +1,158 @@
+import java.io.IOException;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bd")
+@ObfuscatedName("bq")
 @Implements("PcmPlayer")
 public class PcmPlayer {
-	@ObfuscatedName("p")
+	@ObfuscatedName("tz")
 	@ObfuscatedGetter(
-		intValue = 1631160541
+		intValue = -1656768019
 	)
-	public static int field428;
-	@ObfuscatedName("j")
+	@Export("foundItemIndex")
+	static int foundItemIndex;
+	@ObfuscatedName("o")
 	@Export("PcmPlayer_stereo")
 	public static boolean PcmPlayer_stereo;
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
+	@Export("soundSystemExecutor")
+	static ScheduledExecutorService soundSystemExecutor;
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = -1797165253
+		intValue = -900105725
 	)
-	public static int field418;
-	@ObfuscatedName("c")
+	static int field416;
+	@ObfuscatedName("dj")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive7")
+	static Archive archive7;
+	@ObfuscatedName("k")
 	@Export("samples")
 	protected int[] samples;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lbm;"
+		descriptor = "Lbc;"
 	)
 	@Export("stream")
 	PcmStream stream;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 881118859
+		intValue = 1427209561
 	)
-	int field435;
-	@ObfuscatedName("a")
+	int field400;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		longValue = 2377200656236085237L
+		longValue = -1728161507642357129L
 	)
 	@Export("timeMs")
 	long timeMs;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1181152315
+		intValue = -140802569
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = -908602587
-	)
-	int field425;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 1178073075
-	)
-	int field426;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		longValue = 7200649757382554285L
-	)
-	long field427;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -847045713
-	)
-	int field436;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 1580986367
-	)
-	int field422;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -70989363
-	)
-	int field430;
 	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = -1818884622277911111L
+		intValue = -857903809
 	)
-	long field431;
-	@ObfuscatedName("i")
-	boolean field432;
-	@ObfuscatedName("ai")
+	int field403;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1875393861
+		intValue = 1599565829
 	)
-	int field433;
-	@ObfuscatedName("ar")
+	int field396;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		longValue = -6258201281571484971L
+	)
+	long field405;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1984678795
+	)
+	int field412;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -658055953
+	)
+	int field407;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -1674190229
+	)
+	int field413;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		longValue = 939543839577998155L
+	)
+	long field409;
+	@ObfuscatedName("a")
+	boolean field415;
+	@ObfuscatedName("az")
+	@ObfuscatedGetter(
+		intValue = 1615466093
+	)
+	int field411;
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "[Lbm;"
+		descriptor = "[Lbc;"
 	)
-	PcmStream[] field434;
+	PcmStream[] field408;
 	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "[Lbm;"
+		descriptor = "[Lbc;"
 	)
-	PcmStream[] field439;
+	PcmStream[] field406;
 
 	protected PcmPlayer() {
-		this.field435 = 32; // L: 22
-		this.timeMs = ObjectComposition.currentTimeMillis(); // L: 23
-		this.field427 = 0L; // L: 27
-		this.field436 = 0; // L: 28
-		this.field422 = 0; // L: 29
-		this.field430 = 0; // L: 30
-		this.field431 = 0L; // L: 31
-		this.field432 = true; // L: 32
-		this.field433 = 0; // L: 38
-		this.field434 = new PcmStream[8]; // L: 39
-		this.field439 = new PcmStream[8]; // L: 40
+		this.field400 = 32; // L: 22
+		this.timeMs = ClientPacket.currentTimeMillis(); // L: 23
+		this.field405 = 0L; // L: 27
+		this.field412 = 0; // L: 28
+		this.field407 = 0; // L: 29
+		this.field413 = 0; // L: 30
+		this.field409 = 0L; // L: 31
+		this.field415 = true; // L: 32
+		this.field411 = 0; // L: 38
+		this.field408 = new PcmStream[8]; // L: 39
+		this.field406 = new PcmStream[8]; // L: 40
 	} // L: 42
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "4"
+		garbageValue = "86"
 	)
 	@Export("init")
 	protected void init() throws Exception {
 	} // L: 277
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IS)V",
-		garbageValue = "-6942"
+		descriptor = "(II)V",
+		garbageValue = "-412057865"
 	)
 	@Export("open")
 	protected void open(int var1) throws Exception {
-	}
+	} // L: 278
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(B)I",
-		garbageValue = "-42"
+		garbageValue = "19"
 	)
 	@Export("position")
 	protected int position() throws Exception {
-		return this.capacity;
+		return this.capacity; // L: 281
 	}
 
 	@ObfuscatedName("y")
@@ -146,61 +160,61 @@ public class PcmPlayer {
 	protected void write() throws Exception {
 	} // L: 284
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "4345"
-	)
-	@Export("close")
-	protected void close() {
-	}
-
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2070498959"
+		garbageValue = "-2004376502"
+	)
+	@Export("close")
+	protected void close() {
+	} // L: 285
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1448704014"
 	)
 	@Export("discard")
 	protected void discard() throws Exception {
-	}
+	} // L: 286
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lbm;B)V",
-		garbageValue = "46"
+		descriptor = "(Lbc;B)V",
+		garbageValue = "82"
 	)
 	@Export("setStream")
 	public final synchronized void setStream(PcmStream var1) {
 		this.stream = var1; // L: 76
 	} // L: 77
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "72"
+		descriptor = "(I)V",
+		garbageValue = "2069251377"
 	)
 	@Export("run")
 	public final synchronized void run() {
 		if (this.samples != null) { // L: 80
-			long var1 = ObjectComposition.currentTimeMillis(); // L: 81
+			long var1 = ClientPacket.currentTimeMillis(); // L: 81
 
 			try {
-				if (0L != this.field427) { // L: 83
-					if (var1 < this.field427) { // L: 84
+				if (0L != this.field405) { // L: 83
+					if (var1 < this.field405) { // L: 84
 						return;
 					}
 
 					this.open(this.capacity); // L: 85
-					this.field427 = 0L; // L: 86
-					this.field432 = true; // L: 87
+					this.field405 = 0L; // L: 86
+					this.field415 = true; // L: 87
 				}
 
 				int var3 = this.position(); // L: 89
-				if (this.field430 - var3 > this.field436) { // L: 90
-					this.field436 = this.field430 - var3;
+				if (this.field413 - var3 > this.field412) { // L: 90
+					this.field412 = this.field413 - var3;
 				}
 
-				int var4 = this.field426 + this.field425; // L: 91
+				int var4 = this.field403 + this.field396; // L: 91
 				if (var4 + 256 > 16384) { // L: 92
 					var4 = 16128;
 				}
@@ -214,10 +228,10 @@ public class PcmPlayer {
 					this.close(); // L: 96
 					this.open(this.capacity); // L: 97
 					var3 = 0; // L: 98
-					this.field432 = true; // L: 99
+					this.field415 = true; // L: 99
 					if (var4 + 256 > this.capacity) { // L: 100
 						var4 = this.capacity - 256; // L: 101
-						this.field426 = var4 - this.field425; // L: 102
+						this.field396 = var4 - this.field403; // L: 102
 					}
 				}
 
@@ -227,38 +241,38 @@ public class PcmPlayer {
 					var3 += 256; // L: 108
 				}
 
-				if (var1 > this.field431) { // L: 110
-					if (!this.field432) { // L: 111
-						if (this.field436 == 0 && this.field422 == 0) { // L: 112
+				if (var1 > this.field409) { // L: 110
+					if (!this.field415) { // L: 111
+						if (this.field412 == 0 && this.field407 == 0) { // L: 112
 							this.close(); // L: 113
-							this.field427 = 2000L + var1; // L: 114
+							this.field405 = var1 + 2000L; // L: 114
 							return; // L: 115
 						}
 
-						this.field426 = Math.min(this.field422, this.field436); // L: 117
-						this.field422 = this.field436; // L: 118
+						this.field396 = Math.min(this.field407, this.field412); // L: 117
+						this.field407 = this.field412; // L: 118
 					} else {
-						this.field432 = false; // L: 120
+						this.field415 = false; // L: 120
 					}
 
-					this.field436 = 0; // L: 121
-					this.field431 = 2000L + var1; // L: 122
+					this.field412 = 0; // L: 121
+					this.field409 = 2000L + var1; // L: 122
 				}
 
-				this.field430 = var3; // L: 124
+				this.field413 = var3; // L: 124
 			} catch (Exception var7) { // L: 126
 				this.close(); // L: 127
-				this.field427 = var1 + 2000L; // L: 128
+				this.field405 = 2000L + var1; // L: 128
 			}
 
 			try {
-				if (var1 > this.timeMs + 500000L) { // L: 131
+				if (var1 > 500000L + this.timeMs) {
 					var1 = this.timeMs;
 				}
 
-				while (var1 > 5000L + this.timeMs) { // L: 132
+				while (var1 > this.timeMs + 5000L) { // L: 132
 					this.skip(256); // L: 133
-					this.timeMs += (long)(256000 / field428); // L: 134
+					this.timeMs += (long)(256000 / class341.field3921); // L: 134
 				}
 			} catch (Exception var6) { // L: 137
 				this.timeMs = var1; // L: 138
@@ -267,57 +281,57 @@ public class PcmPlayer {
 		}
 	} // L: 140
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1062568016"
+		garbageValue = "-1732163057"
 	)
-	public final void method733() {
-		this.field432 = true; // L: 143
+	public final void method844() {
+		this.field415 = true; // L: 143
 	} // L: 144
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "955250326"
+		garbageValue = "-1915909212"
 	)
 	@Export("tryDiscard")
 	public final synchronized void tryDiscard() {
-		this.field432 = true; // L: 147
+		this.field415 = true; // L: 147
 
 		try {
 			this.discard(); // L: 149
 		} catch (Exception var2) { // L: 151
 			this.close(); // L: 152
-			this.field427 = ObjectComposition.currentTimeMillis() + 2000L; // L: 153
+			this.field405 = ClientPacket.currentTimeMillis() + 2000L; // L: 153
 		}
 
 	} // L: 155
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2106105090"
+		garbageValue = "-2141825819"
 	)
 	@Export("shutdown")
 	public final synchronized void shutdown() {
-		if (Message.soundSystem != null) { // L: 158
+		if (Login.soundSystem != null) { // L: 158
 			boolean var1 = true; // L: 159
 
 			for (int var2 = 0; var2 < 2; ++var2) { // L: 160
-				if (this == Message.soundSystem.players[var2]) { // L: 161
-					Message.soundSystem.players[var2] = null;
+				if (this == Login.soundSystem.players[var2]) { // L: 161
+					Login.soundSystem.players[var2] = null;
 				}
 
-				if (Message.soundSystem.players[var2] != null) { // L: 162
+				if (Login.soundSystem.players[var2] != null) { // L: 162
 					var1 = false;
 				}
 			}
 
 			if (var1) { // L: 164
-				Huffman.soundSystemExecutor.shutdownNow(); // L: 165
-				Huffman.soundSystemExecutor = null; // L: 166
-				Message.soundSystem = null; // L: 167
+				soundSystemExecutor.shutdownNow(); // L: 165
+				soundSystemExecutor = null; // L: 166
+				Login.soundSystem = null; // L: 167
 			}
 		}
 
@@ -327,14 +341,14 @@ public class PcmPlayer {
 
 	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1429485953"
+		descriptor = "(IB)V",
+		garbageValue = "120"
 	)
 	@Export("skip")
 	final void skip(int var1) {
-		this.field433 -= var1; // L: 175
-		if (this.field433 < 0) {
-			this.field433 = 0; // L: 176
+		this.field411 -= var1; // L: 175
+		if (this.field411 < 0) {
+			this.field411 = 0; // L: 176
 		}
 
 		if (this.stream != null) {
@@ -343,7 +357,7 @@ public class PcmPlayer {
 
 	} // L: 178
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("at")
 	@Export("fill")
 	final void fill(int[] var1, int var2) {
 		int var3 = var2; // L: 182
@@ -351,12 +365,12 @@ public class PcmPlayer {
 			var3 = var2 << 1;
 		}
 
-		class306.clearIntArray(var1, 0, var3); // L: 184
-		this.field433 -= var2; // L: 185
-		if (this.stream != null && this.field433 <= 0) { // L: 186
-			this.field433 += field428 >> 4; // L: 187
-			FloorOverlayDefinition.PcmStream_disable(this.stream); // L: 188
-			this.method738(this.stream, this.stream.vmethod987()); // L: 189
+		class307.clearIntArray(var1, 0, var3); // L: 184
+		this.field411 -= var2; // L: 185
+		if (this.stream != null && this.field411 <= 0) { // L: 186
+			this.field411 += class341.field3921 >> 4; // L: 187
+			NetFileRequest.PcmStream_disable(this.stream); // L: 188
+			this.method843(this.stream, this.stream.vmethod1099()); // L: 189
 			int var4 = 0; // L: 190
 			int var5 = 255; // L: 191
 
@@ -378,7 +392,7 @@ public class PcmPlayer {
 					if ((var9 & 1) != 0) { // L: 208
 						var5 &= ~(1 << var7); // L: 211
 						var10 = null; // L: 212
-						PcmStream var11 = this.field434[var7]; // L: 213
+						PcmStream var11 = this.field408[var7]; // L: 213
 
 						label103:
 						while (true) {
@@ -394,33 +408,33 @@ public class PcmPlayer {
 									var11 = var11.after; // L: 219
 								} else {
 									var11.active = true; // L: 222
-									int var13 = var11.vmethod4610(); // L: 223
+									int var13 = var11.vmethod4740(); // L: 223
 									var4 += var13; // L: 224
 									if (var12 != null) { // L: 225
 										var12.position += var13;
 									}
 
-									if (var4 >= this.field435) { // L: 226
+									if (var4 >= this.field400) { // L: 226
 										break label109;
 									}
 
 									PcmStream var14 = var11.firstSubStream(); // L: 227
 									if (var14 != null) { // L: 228
-										for (int var15 = var11.field494; var14 != null; var14 = var11.nextSubStream()) { // L: 229 230 232
-											this.method738(var14, var15 * var14.vmethod987() >> 8); // L: 231
+										for (int var15 = var11.field473; var14 != null; var14 = var11.nextSubStream()) { // L: 229 230 232
+											this.method843(var14, var15 * var14.vmethod1099() >> 8); // L: 231
 										}
 									}
 
 									PcmStream var18 = var11.after; // L: 235
 									var11.after = null; // L: 236
 									if (var10 == null) { // L: 237
-										this.field434[var7] = var18;
+										this.field408[var7] = var18;
 									} else {
 										var10.after = var18; // L: 238
 									}
 
 									if (var18 == null) { // L: 239
-										this.field439[var7] = var10;
+										this.field406[var7] = var10;
 									}
 
 									var11 = var18; // L: 240
@@ -435,240 +449,926 @@ public class PcmPlayer {
 			}
 
 			for (var6 = 0; var6 < 8; ++var6) { // L: 244
-				PcmStream var16 = this.field434[var6]; // L: 245
-				PcmStream[] var17 = this.field434; // L: 246
-				this.field439[var6] = null; // L: 248
+				PcmStream var16 = this.field408[var6]; // L: 245
+				PcmStream[] var17 = this.field408; // L: 246
+				this.field406[var6] = null; // L: 248
 
-				for (var17[var6] = null; var16 != null; var16 = var10) { // L: 249 250
+				for (var17[var6] = null; var16 != null; var16 = var10) { // L: 249 250 253
 					var10 = var16.after; // L: 251
-					var16.after = null;
+					var16.after = null; // L: 252
 				}
 			}
 		}
 
-		if (this.field433 < 0) {
-			this.field433 = 0;
+		if (this.field411 < 0) { // L: 257
+			this.field411 = 0;
 		}
 
-		if (this.stream != null) {
+		if (this.stream != null) { // L: 258
 			this.stream.fill(var1, 0, var2);
 		}
 
-		this.timeMs = ObjectComposition.currentTimeMillis();
+		this.timeMs = ClientPacket.currentTimeMillis(); // L: 259
 	} // L: 260
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(Lbm;II)V",
-		garbageValue = "-1859037567"
+		descriptor = "(Lbc;II)V",
+		garbageValue = "176073519"
 	)
-	final void method738(PcmStream var1, int var2) {
-		int var3 = var2 >> 5;
-		PcmStream var4 = this.field439[var3];
-		if (var4 == null) {
-			this.field434[var3] = var1;
+	final void method843(PcmStream var1, int var2) {
+		int var3 = var2 >> 5; // L: 269
+		PcmStream var4 = this.field406[var3]; // L: 270
+		if (var4 == null) { // L: 271
+			this.field408[var3] = var1;
 		} else {
 			var4.after = var1; // L: 272
 		}
 
-		this.field439[var3] = var1; // L: 273
-		var1.field494 = var2;
+		this.field406[var3] = var1; // L: 273
+		var1.field473 = var2; // L: 274
+	} // L: 275
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "0"
+	)
+	public static void method856(int var0) {
+		class233.musicPlayerStatus = 1; // L: 60
+		InvDefinition.musicTrackArchive = null; // L: 61
+		class233.musicTrackGroupId = -1; // L: 62
+		class233.musicTrackFileId = -1; // L: 63
+		class233.musicTrackVolume = 0; // L: 64
+		GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false; // L: 65
+		FaceNormal.pcmSampleLength = var0; // L: 66
+	} // L: 67
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1170967176"
+	)
+	public static void method893() {
+		KitDefinition.KitDefinition_cached.clear(); // L: 130
+	} // L: 131
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/net/Socket;III)Llk;",
+		garbageValue = "1530151189"
+	)
+	public static AbstractSocket method897(Socket var0, int var1, int var2) throws IOException {
+		return new BufferedNetSocket(var0, var1, var2); // L: 10
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(Lnb;I)V",
-		garbageValue = "-1728648073"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1965845813"
 	)
-	static final void method750(PacketBuffer var0) {
-		int var1 = 0; // L: 252
-		var0.importIndex(); // L: 253
+	static int method898(int var0, Script var1, boolean var2) {
+		if (var0 >= 7200 && var0 < 7204) { // L: 4365
+			ChatChannel.Interpreter_intStackSize -= 5; // L: 4366
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4367
+			return 1; // L: 4368
+		} else if (var0 == 7204) { // L: 4370
+			ChatChannel.Interpreter_intStackSize -= 6; // L: 4371
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4372
+			return 1; // L: 4373
+		} else if (var0 >= 7205 && var0 < 7209) { // L: 4375
+			Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4376
+			return 1; // L: 4377
+		} else if (var0 == 7209) { // L: 4379
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 4380
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4381
+			return 1; // L: 4382
+		} else if (var0 >= 7210 && var0 < 7214) { // L: 4384
+			--ChatChannel.Interpreter_intStackSize; // L: 4385
+			return 1; // L: 4386
+		} else if (var0 == 7214) { // L: 4388
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 4389
+			return 1; // L: 4390
+		} else {
+			return 2; // L: 4392
+		}
+	}
 
-		byte[] var10000;
-		int var2;
-		int var4;
-		int var6;
-		int var7;
-		int var8;
-		for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 254
-			var8 = Players.Players_indices[var2]; // L: 255
-			if ((Players.field1370[var8] & 1) == 0) { // L: 256
-				if (var1 > 0) { // L: 257
-					--var1; // L: 258
-					var10000 = Players.field1370; // L: 259
-					var10000[var8] = (byte)(var10000[var8] | 2);
-				} else {
-					var4 = var0.readBits(1); // L: 262
-					if (var4 == 0) { // L: 263
-						var6 = var0.readBits(2); // L: 266
-						if (var6 == 0) { // L: 268
-							var7 = 0;
-						} else if (var6 == 1) { // L: 269
-							var7 = var0.readBits(5);
-						} else if (var6 == 2) { // L: 270
-							var7 = var0.readBits(8);
-						} else {
-							var7 = var0.readBits(11); // L: 271
-						}
+	@ObfuscatedName("fn")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-998429895"
+	)
+	static void method895() {
+		Client.mouseLastLastPressedTimeMillis = -1L; // L: 2921
+		UrlRequester.mouseRecorder.index = 0; // L: 2922
+		class397.hasFocus = true; // L: 2923
+		Client.hadFocus = true; // L: 2924
+		Client.field850 = -1L; // L: 2925
+		Decimator.method1160(); // L: 2926
+		Client.packetWriter.clearBuffer(); // L: 2927
+		Client.packetWriter.packetBuffer.offset = 0; // L: 2928
+		Client.packetWriter.serverPacket = null; // L: 2929
+		Client.packetWriter.field1410 = null; // L: 2930
+		Client.packetWriter.field1411 = null; // L: 2931
+		Client.packetWriter.field1399 = null; // L: 2932
+		Client.packetWriter.serverPacketLength = 0; // L: 2933
+		Client.packetWriter.field1408 = 0; // L: 2934
+		Client.rebootTimer = 0; // L: 2935
+		Client.logoutTimer = 0; // L: 2936
+		Client.hintArrowType = 0; // L: 2937
+		class34.method407(); // L: 2938
+		MouseHandler.MouseHandler_idleCycles = 0; // L: 2940
+		class69.method1208(); // L: 2942
+		Client.isItemSelected = 0; // L: 2943
+		Client.isSpellSelected = false; // L: 2944
+		Client.soundEffectCount = 0; // L: 2945
+		Client.camAngleY = 0; // L: 2946
+		Client.oculusOrbState = 0; // L: 2947
+		LoginPacket.field2800 = null; // L: 2948
+		Client.minimapState = 0; // L: 2949
+		Client.field853 = -1; // L: 2950
+		Client.destinationX = 0; // L: 2951
+		Client.destinationY = 0; // L: 2952
+		Client.playerAttackOption = AttackOption.AttackOption_hidden; // L: 2953
+		Client.npcAttackOption = AttackOption.AttackOption_hidden; // L: 2954
+		Client.npcCount = 0; // L: 2955
+		SoundCache.method928(); // L: 2956
 
-						var1 = var7; // L: 274
-						var10000 = Players.field1370; // L: 275
-						var10000[var8] = (byte)(var10000[var8] | 2);
-					} else {
-						ItemComposition.readPlayerUpdate(var0, var8); // L: 278
-					}
+		int var0;
+		for (var0 = 0; var0 < 2048; ++var0) { // L: 2957
+			Client.players[var0] = null;
+		}
+
+		for (var0 = 0; var0 < 32768; ++var0) { // L: 2958
+			Client.npcs[var0] = null;
+		}
+
+		Client.combatTargetPlayerIndex = -1; // L: 2959
+		Client.projectiles.clear(); // L: 2960
+		Client.graphicsObjects.clear(); // L: 2961
+
+		for (var0 = 0; var0 < 4; ++var0) { // L: 2962
+			for (int var4 = 0; var4 < 104; ++var4) { // L: 2963
+				for (int var2 = 0; var2 < 104; ++var2) { // L: 2964
+					Client.groundItems[var0][var4][var2] = null; // L: 2965
 				}
 			}
 		}
 
-		var0.exportIndex(); // L: 281
-		if (var1 != 0) { // L: 282
-			throw new RuntimeException(); // L: 283
-		} else {
-			var0.importIndex(); // L: 285
+		Client.pendingSpawns = new NodeDeque(); // L: 2969
+		DevicePcmPlayerProvider.friendSystem.clear(); // L: 2970
 
-			for (var2 = 0; var2 < Players.Players_count; ++var2) { // L: 286
-				var8 = Players.Players_indices[var2]; // L: 287
-				if ((Players.field1370[var8] & 1) != 0) { // L: 288
-					if (var1 > 0) { // L: 289
-						--var1; // L: 290
-						var10000 = Players.field1370; // L: 291
-						var10000[var8] = (byte)(var10000[var8] | 2);
-					} else {
-						var4 = var0.readBits(1); // L: 294
-						if (var4 == 0) { // L: 295
-							var6 = var0.readBits(2); // L: 298
-							if (var6 == 0) { // L: 300
-								var7 = 0;
-							} else if (var6 == 1) { // L: 301
-								var7 = var0.readBits(5);
-							} else if (var6 == 2) { // L: 302
-								var7 = var0.readBits(8);
-							} else {
-								var7 = var0.readBits(11); // L: 303
-							}
+		for (var0 = 0; var0 < SoundSystem.VarpDefinition_fileCount; ++var0) { // L: 2971
+			VarpDefinition var1 = class1.VarpDefinition_get(var0); // L: 2972
+			if (var1 != null) { // L: 2973
+				Varps.Varps_temp[var0] = 0; // L: 2974
+				Varps.Varps_main[var0] = 0; // L: 2975
+			}
+		}
 
-							var1 = var7; // L: 306
-							var10000 = Players.field1370; // L: 307
-							var10000[var8] = (byte)(var10000[var8] | 2);
-						} else {
-							ItemComposition.readPlayerUpdate(var0, var8); // L: 310
-						}
-					}
-				}
+		class20.varcs.clearTransient(); // L: 2978
+		Client.followerIndex = -1; // L: 2979
+		if (Client.rootInterface != -1) { // L: 2980
+			class44.method540(Client.rootInterface);
+		}
+
+		for (InterfaceParent var3 = (InterfaceParent)Client.interfaceParents.first(); var3 != null; var3 = (InterfaceParent)Client.interfaceParents.next()) { // L: 2981
+			InvDefinition.closeInterface(var3, true); // L: 2982
+		}
+
+		Client.rootInterface = -1; // L: 2984
+		Client.interfaceParents = new NodeHashTable(8); // L: 2985
+		Client.meslayerContinueWidget = null; // L: 2986
+		class34.method407(); // L: 2987
+		Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2988
+
+		for (var0 = 0; var0 < 8; ++var0) { // L: 2989
+			Client.playerMenuActions[var0] = null; // L: 2990
+			Client.playerOptionsPriorities[var0] = false; // L: 2991
+		}
+
+		ItemContainer.itemContainers = new NodeHashTable(32); // L: 2994
+		Client.isLoading = true; // L: 2996
+
+		for (var0 = 0; var0 < 100; ++var0) { // L: 2997
+			Client.field831[var0] = true;
+		}
+
+		BufferedSink.method5992(); // L: 2998
+		class289.friendsChat = null; // L: 2999
+		WorldMapManager.guestClanSettings = null; // L: 3000
+		Arrays.fill(Client.currentClanSettings, (Object)null); // L: 3001
+		AttackOption.guestClanChannel = null; // L: 3002
+		Arrays.fill(Client.currentClanChannels, (Object)null); // L: 3003
+
+		for (var0 = 0; var0 < 8; ++var0) { // L: 3004
+			Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
+		}
+
+		class267.grandExchangeEvents = null; // L: 3005
+	} // L: 3006
+
+	@ObfuscatedName("fu")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1475129816"
+	)
+	@Export("logOut")
+	static final void logOut() {
+		Client.packetWriter.close(); // L: 3078
+		MouseRecorder.method2202(); // L: 3080
+		UserComparator7.method2539(); // L: 3081
+		method893(); // L: 3082
+		CollisionMap.method3245(); // L: 3083
+		class143.method2811(); // L: 3084
+		Projectile.method2075(); // L: 3085
+		SequenceDefinition.SequenceDefinition_cached.clear(); // L: 3087
+		SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 3088
+		MenuAction.method2028(); // L: 3090
+		VarbitComposition.VarbitDefinition_cached.clear(); // L: 3092
+		class69.method1224(); // L: 3094
+		class27.field215.method6474(); // L: 3095
+		class26.HitSplatDefinition_cachedSprites.method6474(); // L: 3096
+		class171.method3613(); // L: 3097
+		Decimator.method1168(); // L: 3098
+		SoundSystem.method916(); // L: 3099
+		Players.method2402(); // L: 3100
+		WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 3102
+		PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 3105
+		Widget.Widget_cachedSprites.clear(); // L: 3108
+		Widget.Widget_cachedModels.clear(); // L: 3109
+		Widget.Widget_cachedFonts.clear(); // L: 3110
+		Widget.Widget_cachedSpriteMasks.clear(); // L: 3111
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 3113
+		Script.Script_cached.clear(); // L: 3114
+		ClanChannel.archive0.clearFiles(); // L: 3115
+		KitDefinition.archive1.clearFiles(); // L: 3116
+		class18.archive3.clearFiles(); // L: 3117
+		class26.archive4.clearFiles(); // L: 3118
+		class4.archive5.clearFiles(); // L: 3119
+		DynamicObject.archive6.clearFiles(); // L: 3120
+		archive7.clearFiles(); // L: 3121
+		ModeWhere.archive8.clearFiles(); // L: 3122
+		class16.archive9.clearFiles(); // L: 3123
+		JagexCache.archive10.clearFiles(); // L: 3124
+		class160.archive11.clearFiles(); // L: 3125
+		Varcs.archive12.clearFiles(); // L: 3126
+		DevicePcmPlayerProvider.scene.clear(); // L: 3128
+
+		for (int var0 = 0; var0 < 4; ++var0) { // L: 3129
+			Client.collisionMaps[var0].clear();
+		}
+
+		System.gc(); // L: 3130
+		method856(2); // L: 3131
+		Client.currentTrackGroupId = -1; // L: 3132
+		Client.field862 = false; // L: 3133
+
+		for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 3135
+			if (var1.stream1 != null) { // L: 3136
+				UserComparator7.pcmStreamMixer.removeSubStream(var1.stream1); // L: 3137
+				var1.stream1 = null; // L: 3138
 			}
 
-			var0.exportIndex(); // L: 313
-			if (var1 != 0) { // L: 314
-				throw new RuntimeException(); // L: 315
-			} else {
-				var0.importIndex(); // L: 317
+			if (var1.stream2 != null) { // L: 3140
+				UserComparator7.pcmStreamMixer.removeSubStream(var1.stream2); // L: 3141
+				var1.stream2 = null; // L: 3142
+			}
+		}
 
-				for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 318
-					var8 = Players.Players_emptyIndices[var2]; // L: 319
-					if ((Players.field1370[var8] & 1) != 0) { // L: 320
-						if (var1 > 0) { // L: 321
-							--var1; // L: 322
-							var10000 = Players.field1370; // L: 323
-							var10000[var8] = (byte)(var10000[var8] | 2);
-						} else {
-							var4 = var0.readBits(1); // L: 326
-							if (var4 == 0) { // L: 327
-								var6 = var0.readBits(2); // L: 330
-								if (var6 == 0) { // L: 332
-									var7 = 0;
-								} else if (var6 == 1) { // L: 333
-									var7 = var0.readBits(5);
-								} else if (var6 == 2) {
-									var7 = var0.readBits(8); // L: 334
-								} else {
-									var7 = var0.readBits(11); // L: 335
-								}
+		ObjectSound.objectSounds.clear(); // L: 3145
+		Projectile.updateGameState(10); // L: 3147
+	} // L: 3148
 
-								var1 = var7; // L: 338
-								var10000 = Players.field1370; // L: 339
-								var10000[var8] = (byte)(var10000[var8] | 2);
-							} else if (ParamComposition.updateExternalPlayer(var0, var8)) { // L: 342
-								var10000 = Players.field1370;
-								var10000[var8] = (byte)(var10000[var8] | 2);
-							}
-						}
-					}
+	@ObfuscatedName("im")
+	@ObfuscatedSignature(
+		descriptor = "([Liv;IIIIIIIII)V",
+		garbageValue = "-1362986911"
+	)
+	@Export("drawInterface")
+	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9390
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9391
+
+		for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9392
+			Widget var10 = var0[var9]; // L: 9393
+			if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9394 9395
+				int var11;
+				if (var8 == -1) { // L: 9397
+					Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9398
+					Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9399
+					Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9400
+					Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9401
+					var11 = ++Client.rootWidgetCount - 1; // L: 9402
+				} else {
+					var11 = var8; // L: 9404
 				}
 
-				var0.exportIndex(); // L: 345
-				if (var1 != 0) { // L: 346
-					throw new RuntimeException(); // L: 347
-				} else {
-					var0.importIndex(); // L: 349
+				var10.rootIndex = var11; // L: 9405
+				var10.cycle = Client.cycle; // L: 9406
+				if (!var10.isIf3 || !class35.isComponentHidden(var10)) { // L: 9407
+					if (var10.contentType > 0) { // L: 9408
+						class309.method5671(var10);
+					}
 
-					for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { // L: 350
-						var8 = Players.Players_emptyIndices[var2]; // L: 351
-						if ((Players.field1370[var8] & 1) == 0) { // L: 352
-							if (var1 > 0) { // L: 353
-								--var1; // L: 354
-								var10000 = Players.field1370; // L: 355
-								var10000[var8] = (byte)(var10000[var8] | 2);
-							} else {
-								var4 = var0.readBits(1); // L: 358
-								if (var4 == 0) { // L: 359
-									var6 = var0.readBits(2); // L: 362
-									if (var6 == 0) { // L: 364
-										var7 = 0;
-									} else if (var6 == 1) { // L: 365
-										var7 = var0.readBits(5);
-									} else if (var6 == 2) { // L: 366
-										var7 = var0.readBits(8);
-									} else {
-										var7 = var0.readBits(11); // L: 367
+					int var12 = var10.x + var6; // L: 9409
+					int var13 = var7 + var10.y; // L: 9410
+					int var14 = var10.transparencyTop; // L: 9411
+					int var15;
+					int var16;
+					if (var10 == Client.clickedWidget) { // L: 9412
+						if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9413
+							WorldMapCacheName.field2135 = var0; // L: 9414
+							Clock.field1538 = var6; // L: 9415
+							Canvas.field296 = var7; // L: 9416
+							continue; // L: 9417
+						}
+
+						if (Client.isDraggingWidget && Client.field821) { // L: 9419
+							var15 = MouseHandler.MouseHandler_x; // L: 9420
+							var16 = MouseHandler.MouseHandler_y; // L: 9421
+							var15 -= Client.widgetClickX; // L: 9422
+							var16 -= Client.widgetClickY; // L: 9423
+							if (var15 < Client.field801) { // L: 9424
+								var15 = Client.field801;
+							}
+
+							if (var15 + var10.width > Client.field801 + Client.clickedWidgetParent.width) { // L: 9425
+								var15 = Client.field801 + Client.clickedWidgetParent.width - var10.width;
+							}
+
+							if (var16 < Client.field802) { // L: 9426
+								var16 = Client.field802;
+							}
+
+							if (var16 + var10.height > Client.field802 + Client.clickedWidgetParent.height) { // L: 9427
+								var16 = Client.field802 + Client.clickedWidgetParent.height - var10.height;
+							}
+
+							var12 = var15; // L: 9428
+							var13 = var16; // L: 9429
+						}
+
+						if (!var10.isScrollBar) { // L: 9431
+							var14 = 128;
+						}
+					}
+
+					int var17;
+					int var18;
+					int var19;
+					int var20;
+					int var21;
+					int var22;
+					if (var10.type == 2) { // L: 9437
+						var15 = var2; // L: 9438
+						var16 = var3; // L: 9439
+						var17 = var4; // L: 9440
+						var18 = var5; // L: 9441
+					} else if (var10.type == 9) { // L: 9443
+						var19 = var12; // L: 9444
+						var20 = var13; // L: 9445
+						var21 = var12 + var10.width; // L: 9446
+						var22 = var13 + var10.height; // L: 9447
+						if (var21 < var12) { // L: 9448
+							var19 = var21; // L: 9450
+							var21 = var12; // L: 9451
+						}
+
+						if (var22 < var13) { // L: 9453
+							var20 = var22; // L: 9455
+							var22 = var13; // L: 9456
+						}
+
+						++var21; // L: 9458
+						++var22; // L: 9459
+						var15 = var19 > var2 ? var19 : var2; // L: 9460
+						var16 = var20 > var3 ? var20 : var3; // L: 9461
+						var17 = var21 < var4 ? var21 : var4; // L: 9462
+						var18 = var22 < var5 ? var22 : var5; // L: 9463
+					} else {
+						var19 = var12 + var10.width; // L: 9466
+						var20 = var13 + var10.height; // L: 9467
+						var15 = var12 > var2 ? var12 : var2; // L: 9468
+						var16 = var13 > var3 ? var13 : var3; // L: 9469
+						var17 = var19 < var4 ? var19 : var4; // L: 9470
+						var18 = var20 < var5 ? var20 : var5; // L: 9471
+					}
+
+					if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9473
+						if (var10.contentType != 0) { // L: 9474
+							if (var10.contentType == 1336) { // L: 9475
+								if (Client.displayFps) { // L: 9476
+									var13 += 15; // L: 9477
+									AbstractSocket.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9478
+									var13 += 15; // L: 9479
+									Runtime var42 = Runtime.getRuntime(); // L: 9480
+									var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9481
+									var21 = 16776960; // L: 9482
+									if (var20 > 327680 && !Client.isLowDetail) { // L: 9483
+										var21 = 16711680;
 									}
 
-									var1 = var7; // L: 370
-									var10000 = Players.field1370; // L: 371
-									var10000[var8] = (byte)(var10000[var8] | 2);
-								} else if (ParamComposition.updateExternalPlayer(var0, var8)) { // L: 374
-									var10000 = Players.field1370;
-									var10000[var8] = (byte)(var10000[var8] | 2);
+									AbstractSocket.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9484
+									var13 += 15; // L: 9485
+								}
+								continue;
+							}
+
+							if (var10.contentType == 1337) { // L: 9489
+								Client.viewportX = var12; // L: 9490
+								Client.viewportY = var13; // L: 9491
+								UserComparator9.drawEntities(var12, var13, var10.width, var10.height); // L: 9492
+								Client.field831[var10.rootIndex] = true; // L: 9493
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9494
+								continue; // L: 9495
+							}
+
+							if (var10.contentType == 1338) { // L: 9497
+								FloorOverlayDefinition.drawMinimap(var10, var12, var13, var11); // L: 9498
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9499
+								continue; // L: 9500
+							}
+
+							if (var10.contentType == 1339) { // L: 9502
+								IsaacCipher.drawCompass(var10, var12, var13, var11); // L: 9503
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9504
+								continue; // L: 9505
+							}
+
+							if (var10.contentType == 1400) { // L: 9507
+								class80.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9508
+							}
+
+							if (var10.contentType == 1401) { // L: 9510
+								class80.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9511
+							}
+
+							if (var10.contentType == 1402) { // L: 9513
+								PendingSpawn.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9514
+							}
+						}
+
+						if (var10.type == 0) { // L: 9517
+							if (!var10.isIf3 && class35.isComponentHidden(var10) && var10 != MusicPatchNode.mousedOverWidgetIf1) { // L: 9518
+								continue;
+							}
+
+							if (!var10.isIf3) { // L: 9519
+								if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9520
+									var10.scrollY = var10.scrollHeight - var10.height;
+								}
+
+								if (var10.scrollY < 0) { // L: 9521
+									var10.scrollY = 0;
+								}
+							}
+
+							drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9523
+							if (var10.children != null) { // L: 9524
+								drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+							}
+
+							InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9525
+							if (var30 != null) { // L: 9526
+								SoundSystem.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9527
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9529
+							Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9530
+						}
+
+						if (Client.isResizable || Client.field833[var11] || Client.gameDrawingMode > 1) { // L: 9532
+							if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9533 9534
+								BufferedSource.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+							}
+
+							if (var10.type != 1) { // L: 9536
+								int var23;
+								int var24;
+								int var25;
+								int var26;
+								if (var10.type == 2) { // L: 9539
+									var19 = 0; // L: 9540
+
+									for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9541
+										for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9542
+											var22 = var12 + var21 * (var10.paddingX + 32); // L: 9543
+											var23 = var20 * (var10.paddingY + 32) + var13; // L: 9544
+											if (var19 < 20) { // L: 9545
+												var22 += var10.inventoryXOffsets[var19]; // L: 9546
+												var23 += var10.inventoryYOffsets[var19]; // L: 9547
+											}
+
+											if (var10.itemIds[var19] <= 0) { // L: 9549
+												if (var10.inventorySprites != null && var19 < 20) { // L: 9594
+													SpritePixels var46 = var10.getInventorySprite(var19); // L: 9595
+													if (var46 != null) { // L: 9596
+														var46.drawTransBgAt(var22, var23);
+													} else if (Widget.field2958) { // L: 9597
+														Script.invalidateWidget(var10);
+													}
+												}
+											} else {
+												boolean var37 = false; // L: 9550
+												boolean var38 = false; // L: 9551
+												var26 = var10.itemIds[var19] - 1; // L: 9552
+												if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == VerticalAlignment.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9553
+													SpritePixels var35;
+													if (Client.isItemSelected == 1 && var19 == Timer.selectedItemSlot && var10.id == class246.selectedItemWidget) { // L: 9555
+														var35 = SpotAnimationDefinition.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
+													} else {
+														var35 = SpotAnimationDefinition.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9556
+													}
+
+													if (var35 != null) { // L: 9557
+														if (var10 == VerticalAlignment.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9558
+															var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9559
+															var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9560
+															if (var24 < 5 && var24 > -5) { // L: 9561
+																var24 = 0;
+															}
+
+															if (var25 < 5 && var25 > -5) { // L: 9562
+																var25 = 0;
+															}
+
+															if (Client.itemDragDuration < 5) { // L: 9563
+																var24 = 0; // L: 9564
+																var25 = 0; // L: 9565
+															}
+
+															var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 9567
+															if (var1 != -1) { // L: 9568
+																Widget var28 = var0[var1 & 65535]; // L: 9569
+																int var29;
+																if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9570
+																	var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field683 / 3; // L: 9571
+																	if (var29 > Client.field683 * 10) { // L: 9572
+																		var29 = Client.field683 * 10;
+																	}
+
+																	if (var29 > var28.scrollY) { // L: 9573
+																		var29 = var28.scrollY;
+																	}
+
+																	var28.scrollY -= var29; // L: 9574
+																	Client.draggedWidgetY += var29; // L: 9575
+																	Script.invalidateWidget(var28); // L: 9576
+																}
+
+																if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9578
+																	var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field683 / 3; // L: 9579
+																	if (var29 > Client.field683 * 10) { // L: 9580
+																		var29 = Client.field683 * 10;
+																	}
+
+																	if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9581
+																		var29 = var28.scrollHeight - var28.height - var28.scrollY;
+																	}
+
+																	var28.scrollY += var29; // L: 9582
+																	Client.draggedWidgetY -= var29; // L: 9583
+																	Script.invalidateWidget(var28); // L: 9584
+																}
+															}
+														} else if (var10 == Login.field1034 && var19 == Client.field729) { // L: 9588
+															var35.drawTransAt(var22, var23, 128);
+														} else {
+															var35.drawTransBgAt(var22, var23); // L: 9589
+														}
+													} else {
+														Script.invalidateWidget(var10); // L: 9591
+													}
+												}
+											}
+
+											++var19; // L: 9599
+										}
+									}
+								} else if (var10.type == 3) { // L: 9604
+									if (Friend.runCs1(var10)) { // L: 9606
+										var19 = var10.color2; // L: 9607
+										if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9608
+											var19 = var10.mouseOverColor2;
+										}
+									} else {
+										var19 = var10.color; // L: 9611
+										if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9612
+											var19 = var10.mouseOverColor;
+										}
+									}
+
+									if (var10.fill) { // L: 9614
+										switch(var10.fillMode.field4242) { // L: 9615
+										case 1:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9624
+											break; // L: 9625
+										case 2:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9621
+											break; // L: 9622
+										default:
+											if (var14 == 0) { // L: 9617
+												Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
+											} else {
+												Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9618
+											}
+										}
+									} else if (var14 == 0) { // L: 9629
+										Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
+									} else {
+										Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9630
+									}
+								} else {
+									Font var39;
+									if (var10.type == 4) { // L: 9634
+										var39 = var10.getFont(); // L: 9635
+										if (var39 == null) { // L: 9636
+											if (Widget.field2958) { // L: 9637
+												Script.invalidateWidget(var10);
+											}
+										} else {
+											String var44 = var10.text; // L: 9641
+											if (Friend.runCs1(var10)) { // L: 9642
+												var20 = var10.color2; // L: 9643
+												if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9644
+													var20 = var10.mouseOverColor2;
+												}
+
+												if (var10.text2.length() > 0) { // L: 9645
+													var44 = var10.text2;
+												}
+											} else {
+												var20 = var10.color; // L: 9648
+												if (var10 == MusicPatchNode.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9649
+													var20 = var10.mouseOverColor;
+												}
+											}
+
+											if (var10.isIf3 && var10.itemId != -1) { // L: 9651
+												ItemComposition var45 = class250.ItemDefinition_get(var10.itemId); // L: 9652
+												var44 = var45.name; // L: 9653
+												if (var44 == null) { // L: 9654
+													var44 = "null";
+												}
+
+												if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9655
+													var44 = SecureRandomFuture.colorStartTag(16748608) + var44 + "</col>" + " " + 'x' + MusicPatchNode.formatItemStacks(var10.itemQuantity);
+												}
+											}
+
+											if (var10 == Client.meslayerContinueWidget) { // L: 9657
+												var44 = "Please wait..."; // L: 9658
+												var20 = var10.color; // L: 9659
+											}
+
+											if (!var10.isIf3) { // L: 9661
+												var44 = ItemContainer.method2184(var44, var10);
+											}
+
+											var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9662
+										}
+									} else if (var10.type == 5) { // L: 9665
+										SpritePixels var40;
+										if (!var10.isIf3) { // L: 9666
+											var40 = var10.getSprite(Friend.runCs1(var10)); // L: 9667
+											if (var40 != null) { // L: 9668
+												var40.drawTransBgAt(var12, var13);
+											} else if (Widget.field2958) { // L: 9669
+												Script.invalidateWidget(var10);
+											}
+										} else {
+											if (var10.itemId != -1) { // L: 9673
+												var40 = SpotAnimationDefinition.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
+											} else {
+												var40 = var10.getSprite(false); // L: 9674
+											}
+
+											if (var40 == null) { // L: 9675
+												if (Widget.field2958) { // L: 9699
+													Script.invalidateWidget(var10);
+												}
+											} else {
+												var20 = var40.width; // L: 9676
+												var21 = var40.height; // L: 9677
+												if (!var10.spriteTiling) { // L: 9678
+													var22 = var10.width * 4096 / var20; // L: 9692
+													if (var10.spriteAngle != 0) { // L: 9693
+														var40.method7097(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
+													} else if (var14 != 0) { // L: 9694
+														var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+													} else if (var20 == var10.width && var21 == var10.height) { // L: 9695
+														var40.drawTransBgAt(var12, var13); // L: 9696
+													} else {
+														var40.drawScaledAt(var12, var13, var10.width, var10.height);
+													}
+												} else {
+													Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9679
+													var22 = (var20 - 1 + var10.width) / var20; // L: 9680
+													var23 = (var21 - 1 + var10.height) / var21; // L: 9681
+
+													for (var24 = 0; var24 < var22; ++var24) { // L: 9682
+														for (var25 = 0; var25 < var23; ++var25) { // L: 9683
+															if (var10.spriteAngle != 0) { // L: 9684
+																var40.method7097(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
+															} else if (var14 != 0) { // L: 9685
+																var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
+															} else {
+																var40.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21); // L: 9686
+															}
+														}
+													}
+
+													Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9689
+												}
+											}
+										}
+									} else {
+										ItemComposition var33;
+										if (var10.type == 6) { // L: 9703
+											boolean var36 = Friend.runCs1(var10); // L: 9704
+											if (var36) { // L: 9706
+												var20 = var10.sequenceId2;
+											} else {
+												var20 = var10.sequenceId; // L: 9707
+											}
+
+											Model var41 = null; // L: 9708
+											var22 = 0; // L: 9709
+											if (var10.itemId != -1) { // L: 9710
+												var33 = class250.ItemDefinition_get(var10.itemId); // L: 9711
+												if (var33 != null) { // L: 9712
+													var33 = var33.getCountObj(var10.itemQuantity); // L: 9713
+													var41 = var33.getModel(1); // L: 9714
+													if (var41 != null) { // L: 9715
+														var41.calculateBoundsCylinder(); // L: 9716
+														var22 = var41.height / 2; // L: 9717
+													} else {
+														Script.invalidateWidget(var10); // L: 9719
+													}
+												}
+											} else if (var10.modelType == 5) { // L: 9722
+												if (var10.modelId == 0) { // L: 9723
+													var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+												} else {
+													var41 = class262.localPlayer.getModel(); // L: 9724
+												}
+											} else if (var20 == -1) { // L: 9726
+												var41 = var10.getModel((SequenceDefinition)null, -1, var36, class262.localPlayer.appearance); // L: 9727
+												if (var41 == null && Widget.field2958) { // L: 9728
+													Script.invalidateWidget(var10);
+												}
+											} else {
+												SequenceDefinition var47 = WorldMapScaleHandler.SequenceDefinition_get(var20); // L: 9731
+												var41 = var10.getModel(var47, var10.modelFrame, var36, class262.localPlayer.appearance); // L: 9732
+												if (var41 == null && Widget.field2958) { // L: 9733
+													Script.invalidateWidget(var10);
+												}
+											}
+
+											Rasterizer3D.method3950(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9735
+											var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9736
+											var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9737
+											if (var41 != null) { // L: 9738
+												if (!var10.isIf3) { // L: 9739
+													var41.method4347(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+												} else {
+													var41.calculateBoundsCylinder(); // L: 9741
+													if (var10.modelOrthog) { // L: 9742
+														var41.method4309(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+													} else {
+														var41.method4347(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9743
+													}
+												}
+											}
+
+											Rasterizer3D.Rasterizer3D_method3(); // L: 9746
+										} else {
+											if (var10.type == 7) { // L: 9749
+												var39 = var10.getFont(); // L: 9750
+												if (var39 == null) { // L: 9751
+													if (Widget.field2958) { // L: 9752
+														Script.invalidateWidget(var10);
+													}
+													continue;
+												}
+
+												var20 = 0; // L: 9755
+
+												for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9756
+													for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9757
+														if (var10.itemIds[var20] > 0) { // L: 9758
+															var33 = class250.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9759
+															String var34;
+															if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9761
+																var34 = SecureRandomFuture.colorStartTag(16748608) + var33.name + "</col>";
+															} else {
+																var34 = SecureRandomFuture.colorStartTag(16748608) + var33.name + "</col>" + " " + 'x' + MusicPatchNode.formatItemStacks(var10.itemQuantities[var20]); // L: 9762
+															}
+
+															var25 = var12 + var22 * (var10.paddingX + 115); // L: 9763
+															var26 = (var10.paddingY + 12) * var21 + var13; // L: 9764
+															if (var10.textXAlignment == 0) { // L: 9765
+																var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else if (var10.textXAlignment == 1) { // L: 9766
+																var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else {
+																var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9767
+															}
+														}
+
+														++var20; // L: 9769
+													}
+												}
+											}
+
+											if (var10.type == 8 && var10 == class5.field42 && Client.field773 == Client.field693) { // L: 9773 9774
+												var19 = 0; // L: 9775
+												var20 = 0; // L: 9776
+												Font var31 = AbstractSocket.fontPlain12; // L: 9777
+												String var32 = var10.text; // L: 9778
+
+												String var43;
+												for (var32 = ItemContainer.method2184(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9780 9781 9793
+													var24 = var32.indexOf("<br>"); // L: 9782
+													if (var24 != -1) { // L: 9783
+														var43 = var32.substring(0, var24); // L: 9784
+														var32 = var32.substring(var24 + 4); // L: 9785
+													} else {
+														var43 = var32; // L: 9788
+														var32 = ""; // L: 9789
+													}
+
+													var25 = var31.stringWidth(var43); // L: 9791
+													if (var25 > var19) { // L: 9792
+														var19 = var25;
+													}
+												}
+
+												var19 += 6; // L: 9795
+												var20 += 7; // L: 9796
+												var24 = var12 + var10.width - 5 - var19; // L: 9797
+												var25 = var13 + var10.height + 5; // L: 9798
+												if (var24 < var12 + 5) { // L: 9799
+													var24 = var12 + 5;
+												}
+
+												if (var19 + var24 > var4) { // L: 9800
+													var24 = var4 - var19;
+												}
+
+												if (var25 + var20 > var5) { // L: 9801
+													var25 = var5 - var20;
+												}
+
+												Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9802
+												Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9803
+												var32 = var10.text; // L: 9804
+												var26 = var25 + var31.ascent + 2; // L: 9805
+
+												for (var32 = ItemContainer.method2184(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9806 9807 9818
+													int var27 = var32.indexOf("<br>"); // L: 9808
+													if (var27 != -1) { // L: 9809
+														var43 = var32.substring(0, var27); // L: 9810
+														var32 = var32.substring(var27 + 4); // L: 9811
+													} else {
+														var43 = var32; // L: 9814
+														var32 = ""; // L: 9815
+													}
+
+													var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9817
+												}
+											}
+
+											if (var10.type == 9) { // L: 9822
+												if (var10.field2994) { // L: 9827
+													var19 = var12; // L: 9828
+													var20 = var13 + var10.height; // L: 9829
+													var21 = var12 + var10.width; // L: 9830
+													var22 = var13; // L: 9831
+												} else {
+													var19 = var12; // L: 9834
+													var20 = var13; // L: 9835
+													var21 = var12 + var10.width; // L: 9836
+													var22 = var13 + var10.height; // L: 9837
+												}
+
+												if (var10.lineWid == 1) { // L: 9839
+													Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9840
+												} else {
+													PlayerComposition.method4850(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9843
+												}
+											}
+										}
+									}
 								}
 							}
 						}
 					}
-
-					var0.exportIndex(); // L: 377
-					if (var1 != 0) { // L: 378
-						throw new RuntimeException(); // L: 379
-					} else {
-						Players.Players_count = 0; // L: 381
-						Players.Players_emptyIdxCount = 0; // L: 382
-
-						for (var2 = 1; var2 < 2048; ++var2) { // L: 383
-							var10000 = Players.field1370; // L: 384
-							var10000[var2] = (byte)(var10000[var2] >> 1);
-							Player var3 = Client.players[var2]; // L: 385
-							if (var3 != null) { // L: 386
-								Players.Players_indices[++Players.Players_count - 1] = var2;
-							} else {
-								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; // L: 387
-							}
-						}
-
-					}
 				}
 			}
 		}
-	} // L: 389
 
-	@ObfuscatedName("hi")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-572457964"
-	)
-	static final void method786(int var0, int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7618
-			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) { // L: 7619
-				Client.field780[var4] = true;
-			}
-		}
-
-	} // L: 7621
+	} // L: 9848
 }
diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java
index 7112e97092..2ad99c1cbf 100644
--- a/runescape-client/src/main/java/PcmStream.java
+++ b/runescape-client/src/main/java/PcmStream.java
@@ -3,24 +3,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bm")
+@ObfuscatedName("bc")
 @Implements("PcmStream")
 public abstract class PcmStream extends Node {
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lbm;"
+		descriptor = "Lbc;"
 	)
 	@Export("after")
 	PcmStream after;
-	@ObfuscatedName("a")
-	int field494;
-	@ObfuscatedName("k")
+	@ObfuscatedName("x")
+	int field473;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lbp;"
+		descriptor = "Lbj;"
 	)
 	@Export("sound")
 	AbstractSound sound;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("active")
 	volatile boolean active;
 
@@ -28,37 +28,37 @@ public abstract class PcmStream extends Node {
 		this.active = true; // L: 11
 	} // L: 13
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("firstSubStream")
 	protected abstract PcmStream firstSubStream();
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("nextSubStream")
 	protected abstract PcmStream nextSubStream();
 
-	@ObfuscatedName("b")
-	protected abstract int vmethod4610();
+	@ObfuscatedName("r")
+	protected abstract int vmethod4740();
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("fill")
 	protected abstract void fill(int[] var1, int var2, int var3);
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("skip")
 	protected abstract void skip(int var1);
 
-	@ObfuscatedName("ah")
-	int vmethod987() {
+	@ObfuscatedName("ay")
+	int vmethod1099() {
 		return 255; // L: 16
 	}
 
-	@ObfuscatedName("ee")
+	@ObfuscatedName("eu")
 	@Export("update")
 	final void update(int[] var1, int var2, int var3) {
 		if (this.active) { // L: 24
diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java
index acd682b05f..0df163c92a 100644
--- a/runescape-client/src/main/java/PcmStreamMixer.java
+++ b/runescape-client/src/main/java/PcmStreamMixer.java
@@ -3,152 +3,152 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ay")
+@ObfuscatedName("av")
 @Implements("PcmStreamMixer")
 public class PcmStreamMixer extends PcmStream {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("subStreams")
 	NodeDeque subStreams;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
-	NodeDeque field391;
-	@ObfuscatedName("f")
-	int field392;
+	NodeDeque field374;
+	@ObfuscatedName("v")
+	int field373;
 	@ObfuscatedName("y")
-	int field390;
+	int field371;
 
 	public PcmStreamMixer() {
 		this.subStreams = new NodeDeque(); // L: 9
-		this.field391 = new NodeDeque(); // L: 10
-		this.field392 = 0; // L: 11
-		this.field390 = -1; // L: 12
+		this.field374 = new NodeDeque(); // L: 10
+		this.field373 = 0; // L: 11
+		this.field371 = -1; // L: 12
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lbm;)V"
+		descriptor = "(Lbc;)V"
 	)
 	@Export("addSubStream")
 	public final synchronized void addSubStream(PcmStream var1) {
 		this.subStreams.addLast(var1); // L: 15
 	} // L: 16
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lbm;)V"
+		descriptor = "(Lbc;)V"
 	)
 	@Export("removeSubStream")
 	public final synchronized void removeSubStream(PcmStream var1) {
 		var1.remove(); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("f")
-	void method665() {
-		if (this.field392 > 0) { // L: 23
-			for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field391.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field391.previous()) { // L: 24
-				var1.field541 -= this.field392; // L: 25
+	@ObfuscatedName("v")
+	void method778() {
+		if (this.field373 > 0) { // L: 23
+			for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field374.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field374.previous()) { // L: 24
+				var1.field519 -= this.field373; // L: 25
 			}
 
-			this.field390 -= this.field392; // L: 27
-			this.field392 = 0; // L: 28
+			this.field371 -= this.field373; // L: 27
+			this.field373 = 0; // L: 28
 		}
 
 	} // L: 30
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lmw;Lbf;)V"
+		descriptor = "(Lmf;Lbw;)V"
 	)
-	void method654(Node var1, PcmStreamMixerListener var2) {
-		while (this.field391.sentinel != var1 && ((PcmStreamMixerListener)var1).field541 <= var2.field541) { // L: 33
+	void method755(Node var1, PcmStreamMixerListener var2) {
+		while (this.field374.sentinel != var1 && ((PcmStreamMixerListener)var1).field519 <= var2.field519) { // L: 33
 			var1 = var1.previous;
 		}
 
 		NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34
-		this.field390 = ((PcmStreamMixerListener)this.field391.sentinel.previous).field541; // L: 35
+		this.field371 = ((PcmStreamMixerListener)this.field374.sentinel.previous).field519; // L: 35
 	} // L: 36
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lbf;)V"
+		descriptor = "(Lbw;)V"
 	)
-	void method653(PcmStreamMixerListener var1) {
+	void method756(PcmStreamMixerListener var1) {
 		var1.remove(); // L: 39
 		var1.remove2(); // L: 40
-		Node var2 = this.field391.sentinel.previous; // L: 41
-		if (var2 == this.field391.sentinel) {
-			this.field390 = -1; // L: 42
+		Node var2 = this.field374.sentinel.previous; // L: 41
+		if (var2 == this.field374.sentinel) {
+			this.field371 = -1; // L: 42
 		} else {
-			this.field390 = ((PcmStreamMixerListener)var2).field541; // L: 43
+			this.field371 = ((PcmStreamMixerListener)var2).field519; // L: 43
 		}
 
 	} // L: 44
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		return (PcmStream)this.subStreams.last(); // L: 47
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
 		return (PcmStream)this.subStreams.previous(); // L: 51
 	}
 
-	@ObfuscatedName("b")
-	protected int vmethod4610() {
+	@ObfuscatedName("r")
+	protected int vmethod4740() {
 		return 0; // L: 55
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("fill")
 	public final synchronized void fill(int[] var1, int var2, int var3) {
 		do {
-			if (this.field390 < 0) { // L: 60
+			if (this.field371 < 0) { // L: 60
 				this.updateSubStreams(var1, var2, var3); // L: 61
 				return; // L: 62
 			}
 
-			if (var3 + this.field392 < this.field390) { // L: 64
-				this.field392 += var3; // L: 65
+			if (var3 + this.field373 < this.field371) { // L: 64
+				this.field373 += var3; // L: 65
 				this.updateSubStreams(var1, var2, var3); // L: 66
 				return; // L: 67
 			}
 
-			int var4 = this.field390 - this.field392; // L: 69
+			int var4 = this.field371 - this.field373; // L: 69
 			this.updateSubStreams(var1, var2, var4); // L: 70
 			var2 += var4; // L: 71
 			var3 -= var4; // L: 72
-			this.field392 += var4; // L: 73
-			this.method665(); // L: 74
-			PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field391.last(); // L: 75
+			this.field373 += var4; // L: 73
+			this.method778(); // L: 74
+			PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field374.last(); // L: 75
 			synchronized(var5) { // L: 76
 				int var7 = var5.update(); // L: 77
 				if (var7 < 0) { // L: 78
-					var5.field541 = 0; // L: 79
-					this.method653(var5); // L: 80
+					var5.field519 = 0; // L: 79
+					this.method756(var5); // L: 80
 				} else {
-					var5.field541 = var7; // L: 83
-					this.method654(var5.previous, var5); // L: 84
+					var5.field519 = var7; // L: 83
+					this.method755(var5.previous, var5); // L: 84
 				}
 			}
 		} while(var3 != 0); // L: 87
 
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("updateSubStreams")
 	void updateSubStreams(int[] var1, int var2, int var3) {
 		for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92
@@ -157,42 +157,42 @@ public class PcmStreamMixer extends PcmStream {
 
 	} // L: 95
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("skip")
 	public final synchronized void skip(int var1) {
 		do {
-			if (this.field390 < 0) { // L: 99
+			if (this.field371 < 0) { // L: 99
 				this.skipSubStreams(var1); // L: 100
 				return; // L: 101
 			}
 
-			if (this.field392 + var1 < this.field390) { // L: 103
-				this.field392 += var1; // L: 104
+			if (this.field373 + var1 < this.field371) { // L: 103
+				this.field373 += var1; // L: 104
 				this.skipSubStreams(var1); // L: 105
 				return; // L: 106
 			}
 
-			int var2 = this.field390 - this.field392; // L: 108
+			int var2 = this.field371 - this.field373; // L: 108
 			this.skipSubStreams(var2); // L: 109
 			var1 -= var2; // L: 110
-			this.field392 += var2; // L: 111
-			this.method665(); // L: 112
-			PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field391.last(); // L: 113
+			this.field373 += var2; // L: 111
+			this.method778(); // L: 112
+			PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field374.last(); // L: 113
 			synchronized(var3) { // L: 114
 				int var5 = var3.update(); // L: 115
 				if (var5 < 0) { // L: 116
-					var3.field541 = 0; // L: 117
-					this.method653(var3); // L: 118
+					var3.field519 = 0; // L: 117
+					this.method756(var3); // L: 118
 				} else {
-					var3.field541 = var5; // L: 121
-					this.method654(var3.previous, var3); // L: 122
+					var3.field519 = var5; // L: 121
+					this.method755(var3.previous, var3); // L: 122
 				}
 			}
 		} while(var1 != 0); // L: 125
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("skipSubStreams")
 	void skipSubStreams(int var1) {
 		for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130
diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java
index 1c942862d2..2178a1d330 100644
--- a/runescape-client/src/main/java/PcmStreamMixerListener.java
+++ b/runescape-client/src/main/java/PcmStreamMixerListener.java
@@ -3,19 +3,19 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bf")
+@ObfuscatedName("bw")
 @Implements("PcmStreamMixerListener")
 public abstract class PcmStreamMixerListener extends Node {
-	@ObfuscatedName("v")
-	int field541;
+	@ObfuscatedName("f")
+	int field519;
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("remove2")
 	abstract void remove2();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lay;)I"
+		descriptor = "(Lav;)I"
 	)
 	@Export("update")
 	abstract int update();
diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java
index 5e153b2012..90ce3b7910 100644
--- a/runescape-client/src/main/java/PendingSpawn.java
+++ b/runescape-client/src/main/java/PendingSpawn.java
@@ -2,76 +2,89 @@ 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("ch")
+@ObfuscatedName("cr")
 @Implements("PendingSpawn")
 public final class PendingSpawn extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "Lck;"
+	)
+	@Export("loginScreenRunesAnimation")
+	static LoginScreenAnimation loginScreenRunesAnimation;
+	@ObfuscatedName("lj")
 	@ObfuscatedGetter(
-		intValue = -28991277
+		intValue = 957608349
+	)
+	@Export("menuHeight")
+	static int menuHeight;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 857968295
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1769235093
+		intValue = -460142403
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1813016497
+		intValue = -1653690201
 	)
 	@Export("x")
 	int x;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -396145343
+		intValue = 821820447
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -558546627
+		intValue = -299162955
 	)
 	@Export("objectId")
 	int objectId;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1965670795
+		intValue = -1733340657
 	)
-	int field1225;
+	int field1209;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -857810119
+	)
+	int field1210;
 	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1054712157
-	)
-	int field1229;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 56083045
+		intValue = 1775664849
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 343995201
+		intValue = -1304592611
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -990188279
+		intValue = 1665765945
 	)
-	int field1232;
-	@ObfuscatedName("u")
+	int field1213;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -870224069
+		intValue = -259916535
 	)
 	@Export("delay")
 	int delay;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 2028634435
+		intValue = -2001874623
 	)
 	@Export("hitpoints")
 	int hitpoints;
@@ -80,4 +93,38 @@ public final class PendingSpawn extends Node {
 		this.delay = 0; // L: 16
 		this.hitpoints = -1; // L: 17
 	} // L: 19
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(ILla;Ljf;I)V",
+		garbageValue = "1024177105"
+	)
+	static void method2261(int var0, ArchiveDisk var1, Archive var2) {
+		byte[] var3 = null; // L: 40
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 41
+			for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 42
+				if ((long)var0 == var5.key && var1 == var5.archiveDisk && var5.type == 0) { // L: 43
+					var3 = var5.data; // L: 44
+					break; // L: 45
+				}
+			}
+		}
+
+		if (var3 != null) { // L: 49
+			var2.load(var1, var0, var3, true); // L: 50
+		} else {
+			byte[] var4 = var1.read(var0); // L: 53
+			var2.load(var1, var0, var4, true); // L: 54
+		}
+	} // L: 51 55
+
+	@ObfuscatedName("jk")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "450155015"
+	)
+	@Export("getTapToDrop")
+	static boolean getTapToDrop() {
+		return Client.tapToDrop; // L: 10361
+	}
 }
diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java
index 6feb1c8e8f..a2b40d8b1b 100644
--- a/runescape-client/src/main/java/PlatformInfo.java
+++ b/runescape-client/src/main/java/PlatformInfo.java
@@ -1,191 +1,220 @@
+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("my")
+@ObfuscatedName("ms")
 @Implements("PlatformInfo")
 public class PlatformInfo extends Node {
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -1738879851
+		intValue = -1360196685
 	)
-	int field3962;
+	int field3955;
 	@ObfuscatedName("ag")
-	boolean field3960;
-	@ObfuscatedName("ax")
+	boolean field3944;
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -841564613
+		intValue = -478220417
 	)
-	int field3972;
-	@ObfuscatedName("as")
-	@ObfuscatedGetter(
-		intValue = -1817348859
-	)
-	int field3965;
-	@ObfuscatedName("aj")
-	@ObfuscatedGetter(
-		intValue = -664826965
-	)
-	int field3963;
-	@ObfuscatedName("am")
-	@ObfuscatedGetter(
-		intValue = 743323425
-	)
-	int field3977;
-	@ObfuscatedName("az")
-	@ObfuscatedGetter(
-		intValue = -1340740659
-	)
-	int field3967;
-	@ObfuscatedName("av")
-	boolean field3966;
-	@ObfuscatedName("ac")
-	@ObfuscatedGetter(
-		intValue = -862865125
-	)
-	int field3961;
-	@ObfuscatedName("at")
-	@ObfuscatedGetter(
-		intValue = -669385777
-	)
-	int field3981;
-	@ObfuscatedName("ao")
-	@ObfuscatedGetter(
-		intValue = 1636879871
-	)
-	int field3948;
+	int field3957;
 	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -741619897
+		intValue = 2073563121
 	)
-	int field3970;
-	@ObfuscatedName("aw")
-	String field3971;
-	@ObfuscatedName("af")
-	String field3982;
-	@ObfuscatedName("ak")
-	String field3973;
-	@ObfuscatedName("ay")
-	String field3976;
-	@ObfuscatedName("aa")
+	int field3971;
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 945045113
+		intValue = -1289812549
 	)
-	int field3975;
-	@ObfuscatedName("au")
+	int field3959;
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 611587281
+		intValue = 506643985
 	)
-	int field3974;
+	int field3966;
 	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 942702701
+		intValue = 1565324279
 	)
-	int field3956;
-	@ObfuscatedName("bd")
+	int field3961;
+	@ObfuscatedName("al")
+	boolean field3962;
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -2113690795
+		intValue = -1486256621
+	)
+	int field3963;
+	@ObfuscatedName("ac")
+	@ObfuscatedGetter(
+		intValue = -581400105
+	)
+	int field3964;
+	@ObfuscatedName("au")
+	@ObfuscatedGetter(
+		intValue = -2081035797
+	)
+	int field3965;
+	@ObfuscatedName("ay")
+	@ObfuscatedGetter(
+		intValue = 1584067855
+	)
+	int field3973;
+	@ObfuscatedName("am")
+	String field3958;
+	@ObfuscatedName("aa")
+	String field3977;
+	@ObfuscatedName("ai")
+	String field3969;
+	@ObfuscatedName("av")
+	String field3970;
+	@ObfuscatedName("ax")
+	@ObfuscatedGetter(
+		intValue = 2036376595
+	)
+	int field3946;
+	@ObfuscatedName("ar")
+	@ObfuscatedGetter(
+		intValue = 141038615
+	)
+	int field3947;
+	@ObfuscatedName("af")
+	@ObfuscatedGetter(
+		intValue = 1617164359
+	)
+	int field3972;
+	@ObfuscatedName("bq")
+	@ObfuscatedGetter(
+		intValue = -1247214845
+	)
+	int field3974;
+	@ObfuscatedName("bx")
+	String field3975;
+	@ObfuscatedName("bi")
+	String field3949;
+	@ObfuscatedName("bz")
+	int[] field3956;
+	@ObfuscatedName("bb")
+	@ObfuscatedGetter(
+		intValue = -1203517763
 	)
 	int field3978;
-	@ObfuscatedName("bt")
-	String field3979;
-	@ObfuscatedName("bq")
-	String field3980;
-	@ObfuscatedName("bu")
-	int[] field3964;
-	@ObfuscatedName("bl")
-	@ObfuscatedGetter(
-		intValue = 1352170779
-	)
-	int field3983;
 	@ObfuscatedName("bv")
-	String field3952;
+	String field3967;
 
 	PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) {
-		this.field3964 = new int[3]; // L: 62
-		this.field3962 = var1; // L: 67
-		this.field3960 = var2; // L: 68
-		this.field3972 = var3; // L: 69
-		this.field3965 = var4; // L: 70
-		this.field3963 = var5; // L: 71
-		this.field3977 = var6; // L: 72
-		this.field3967 = var7; // L: 73
-		this.field3966 = var8; // L: 74
-		this.field3961 = var9; // L: 75
-		this.field3981 = var10; // L: 76
-		this.field3948 = var11; // L: 77
-		this.field3970 = var12; // L: 78
-		this.field3971 = var13; // L: 79
-		this.field3982 = var14; // L: 80
-		this.field3973 = var15; // L: 81
-		this.field3976 = var16; // L: 82
-		this.field3975 = var17; // L: 83
-		this.field3974 = var18; // L: 84
-		this.field3956 = var19; // L: 85
-		this.field3978 = var20; // L: 86
-		this.field3979 = var21; // L: 87
-		this.field3980 = var22; // L: 88
-		this.field3964 = var23; // L: 89
-		this.field3983 = var24; // L: 90
-		this.field3952 = var25; // L: 91
+		this.field3956 = new int[3]; // L: 62
+		this.field3955 = var1; // L: 67
+		this.field3944 = var2; // L: 68
+		this.field3957 = var3; // L: 69
+		this.field3971 = var4; // L: 70
+		this.field3959 = var5; // L: 71
+		this.field3966 = var6; // L: 72
+		this.field3961 = var7; // L: 73
+		this.field3962 = var8; // L: 74
+		this.field3963 = var9; // L: 75
+		this.field3964 = var10; // L: 76
+		this.field3965 = var11; // L: 77
+		this.field3973 = var12; // L: 78
+		this.field3958 = var13; // L: 79
+		this.field3977 = var14; // L: 80
+		this.field3969 = var15; // L: 81
+		this.field3970 = var16; // L: 82
+		this.field3946 = var17; // L: 83
+		this.field3947 = var18; // L: 84
+		this.field3972 = var19; // L: 85
+		this.field3974 = var20; // L: 86
+		this.field3975 = var21; // L: 87
+		this.field3949 = var22; // L: 88
+		this.field3956 = var23; // L: 89
+		this.field3978 = var24; // L: 90
+		this.field3967 = var25; // L: 91
 	} // L: 92
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-57324099"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "406658197"
 	)
 	@Export("write")
 	public void write(Buffer var1) {
 		var1.writeByte(8); // L: 95
-		var1.writeByte(this.field3962); // L: 96
-		var1.writeByte(this.field3960 ? 1 : 0); // L: 97
-		var1.writeShort(this.field3972); // L: 98
-		var1.writeByte(this.field3965); // L: 99
-		var1.writeByte(this.field3963); // L: 100
-		var1.writeByte(this.field3977); // L: 101
-		var1.writeByte(this.field3967); // L: 102
-		var1.writeByte(this.field3966 ? 1 : 0); // L: 103
-		var1.writeShort(this.field3961); // L: 104
-		var1.writeByte(this.field3981); // L: 105
-		var1.writeMedium(this.field3948); // L: 106
-		var1.writeShort(this.field3970); // L: 107
-		var1.writeStringCp1252NullCircumfixed(this.field3971); // L: 108
-		var1.writeStringCp1252NullCircumfixed(this.field3982); // L: 109
-		var1.writeStringCp1252NullCircumfixed(this.field3973); // L: 110
-		var1.writeStringCp1252NullCircumfixed(this.field3976); // L: 111
-		var1.writeByte(this.field3974); // L: 112
-		var1.writeShort(this.field3975); // L: 113
-		var1.writeStringCp1252NullCircumfixed(this.field3979); // L: 114
-		var1.writeStringCp1252NullCircumfixed(this.field3980); // L: 115
-		var1.writeByte(this.field3956); // L: 116
-		var1.writeByte(this.field3978); // L: 117
+		var1.writeByte(this.field3955); // L: 96
+		var1.writeByte(this.field3944 ? 1 : 0); // L: 97
+		var1.writeShort(this.field3957); // L: 98
+		var1.writeByte(this.field3971); // L: 99
+		var1.writeByte(this.field3959); // L: 100
+		var1.writeByte(this.field3966); // L: 101
+		var1.writeByte(this.field3961); // L: 102
+		var1.writeByte(this.field3962 ? 1 : 0); // L: 103
+		var1.writeShort(this.field3963); // L: 104
+		var1.writeByte(this.field3964); // L: 105
+		var1.writeMedium(this.field3965); // L: 106
+		var1.writeShort(this.field3973); // L: 107
+		var1.writeStringCp1252NullCircumfixed(this.field3958); // L: 108
+		var1.writeStringCp1252NullCircumfixed(this.field3977); // L: 109
+		var1.writeStringCp1252NullCircumfixed(this.field3969); // L: 110
+		var1.writeStringCp1252NullCircumfixed(this.field3970); // L: 111
+		var1.writeByte(this.field3947); // L: 112
+		var1.writeShort(this.field3946); // L: 113
+		var1.writeStringCp1252NullCircumfixed(this.field3975); // L: 114
+		var1.writeStringCp1252NullCircumfixed(this.field3949); // L: 115
+		var1.writeByte(this.field3972); // L: 116
+		var1.writeByte(this.field3974); // L: 117
 
-		for (int var2 = 0; var2 < this.field3964.length; ++var2) { // L: 118
-			var1.writeInt(this.field3964[var2]);
+		for (int var2 = 0; var2 < this.field3956.length; ++var2) { // L: 118
+			var1.writeInt(this.field3956[var2]);
 		}
 
-		var1.writeInt(this.field3983); // L: 119
-		var1.writeStringCp1252NullCircumfixed(this.field3952); // L: 120
+		var1.writeInt(this.field3978); // L: 119
+		var1.writeStringCp1252NullCircumfixed(this.field3967); // L: 120
 	} // L: 121
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1999982360"
+		garbageValue = "97981657"
 	)
 	@Export("size")
 	public int size() {
 		byte var1 = 39; // L: 124
-		int var2 = var1 + BufferedFile.method6418(this.field3971); // L: 125
-		var2 += BufferedFile.method6418(this.field3982); // L: 126
-		var2 += BufferedFile.method6418(this.field3973); // L: 127
-		var2 += BufferedFile.method6418(this.field3976); // L: 128
-		var2 += BufferedFile.method6418(this.field3979); // L: 129
-		var2 += BufferedFile.method6418(this.field3980); // L: 130
-		var2 += BufferedFile.method6418(this.field3952); // L: 131
+		int var2 = var1 + class32.method387(this.field3958); // L: 125
+		var2 += class32.method387(this.field3977); // L: 126
+		var2 += class32.method387(this.field3969); // L: 127
+		var2 += class32.method387(this.field3970); // L: 128
+		var2 += class32.method387(this.field3975); // L: 129
+		var2 += class32.method387(this.field3949); // L: 130
+		var2 += class32.method387(this.field3967); // L: 131
 		return var2; // L: 132
 	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(B)[B",
+		garbageValue = "104"
+	)
+	public static byte[] method6115() {
+		byte[] var0 = new byte[24]; // L: 211
+
+		try {
+			JagexCache.JagexCache_randomDat.seek(0L); // L: 213
+			JagexCache.JagexCache_randomDat.readFully(var0); // L: 214
+
+			int var1;
+			for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { // L: 215 216 217
+			}
+
+			if (var1 >= 24) { // L: 219
+				throw new IOException();
+			}
+		} catch (Exception var4) {
+			for (int var2 = 0; var2 < 24; ++var2) { // L: 222
+				var0[var2] = -1;
+			}
+		}
+
+		return var0; // L: 224
+	}
 }
diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java
index 0d4b81858b..ce196bf3ce 100644
--- a/runescape-client/src/main/java/PlatformInfoProvider.java
+++ b/runescape-client/src/main/java/PlatformInfoProvider.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mh")
+@ObfuscatedName("mz")
 @Implements("PlatformInfoProvider")
 public interface PlatformInfoProvider {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lmy;",
-		garbageValue = "-10"
+		descriptor = "(I)Lms;",
+		garbageValue = "-1968333950"
 	)
 	@Export("get")
 	PlatformInfo get();
diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java
index 53b02c68bb..3abc9a6ae4 100644
--- a/runescape-client/src/main/java/Player.java
+++ b/runescape-client/src/main/java/Player.java
@@ -3,178 +3,167 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ce")
+@ObfuscatedName("cj")
 @Implements("Player")
 public final class Player extends Actor {
-	@ObfuscatedName("hg")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
-	)
-	@Export("scrollBarSprites")
-	static IndexedSprite[] scrollBarSprites;
-	@ObfuscatedName("ix")
-	@ObfuscatedGetter(
-		intValue = 1565845213
-	)
-	@Export("selectedItemWidget")
-	static int selectedItemWidget;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lly;"
+		descriptor = "Llc;"
 	)
 	@Export("username")
 	Username username;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lic;"
+		descriptor = "Lih;"
 	)
 	@Export("appearance")
 	PlayerComposition appearance;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 268049119
+		intValue = -1635688549
 	)
 	@Export("headIconPk")
 	int headIconPk;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1372932469
+		intValue = 586041939
 	)
 	@Export("headIconPrayer")
 	int headIconPrayer;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("actions")
 	String[] actions;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1947441591
+		intValue = -599736859
 	)
 	@Export("combatLevel")
 	int combatLevel;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1658362291
+		intValue = 508020287
 	)
 	@Export("skillLevel")
 	int skillLevel;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -483485189
+		intValue = -1640401775
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1390365133
+		intValue = -653734129
 	)
 	@Export("animationCycleStart")
 	int animationCycleStart;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -2037290909
+		intValue = 730739877
 	)
 	@Export("animationCycleEnd")
 	int animationCycleEnd;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1452650311
+		intValue = -183413097
 	)
-	int field1202;
-	@ObfuscatedName("o")
+	int field1185;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1606153053
+		intValue = -1745122201
 	)
 	@Export("tileHeight2")
 	int tileHeight2;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2065747987
+		intValue = -385569285
 	)
-	int field1220;
-	@ObfuscatedName("e")
+	int field1197;
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lgr;"
+		descriptor = "Lgd;"
 	)
 	@Export("model0")
 	Model model0;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1119093931
+		intValue = 2027010021
 	)
 	@Export("minX")
 	int minX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1402081485
+		intValue = 1785758561
 	)
 	@Export("minY")
 	int minY;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 482792791
+		intValue = 335782101
 	)
 	@Export("maxX")
 	int maxX;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1028292805
+		intValue = -888481785
 	)
 	@Export("maxY")
 	int maxY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("isUnanimated")
 	boolean isUnanimated;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1597353853
+		intValue = 365768385
 	)
 	@Export("team")
 	int team;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("isHidden")
 	boolean isHidden;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 671262203
+		intValue = 1650147117
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -104146557
+		intValue = 1840333455
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("isFriendTriBool")
 	TriBool isFriendTriBool;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("isInFriendsChat")
 	TriBool isInFriendsChat;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("isInClanChat")
 	TriBool isInClanChat;
-	@ObfuscatedName("ap")
-	boolean field1218;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ak")
+	boolean field1201;
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -40810693
+		intValue = 5106261
 	)
 	@Export("tileX")
 	int tileX;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = 1966912699
+		intValue = -769670651
 	)
 	@Export("tileY")
 	int tileY;
@@ -192,19 +181,19 @@ public final class Player extends Actor {
 		this.skillLevel = 0; // L: 29
 		this.animationCycleStart = 0; // L: 31
 		this.animationCycleEnd = 0; // L: 32
-		this.isUnanimated = false;
-		this.team = 0;
-		this.isHidden = false;
-		this.isFriendTriBool = TriBool.TriBool_unknown;
+		this.isUnanimated = false; // L: 41
+		this.team = 0; // L: 42
+		this.isHidden = false; // L: 43
+		this.isFriendTriBool = TriBool.TriBool_unknown; // L: 46
 		this.isInFriendsChat = TriBool.TriBool_unknown; // L: 47
-		this.isInClanChat = TriBool.TriBool_unknown;
-		this.field1218 = false; // L: 49
+		this.isInClanChat = TriBool.TriBool_unknown; // L: 48
+		this.field1201 = false; // L: 49
 	} // L: 53
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;B)V",
-		garbageValue = "1"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1534249292"
 	)
 	@Export("read")
 	final void read(Buffer var1) {
@@ -220,19 +209,19 @@ public final class Player extends Actor {
 		int var7;
 		int var8;
 		for (int var5 = 0; var5 < 12; ++var5) { // L: 63
-			var6 = var1.readUnsignedByte();
-			if (var6 == 0) {
-				var4[var5] = 0;
+			var6 = var1.readUnsignedByte(); // L: 64
+			if (var6 == 0) { // L: 65
+				var4[var5] = 0; // L: 66
 			} else {
-				var7 = var1.readUnsignedByte();
-				var4[var5] = var7 + (var6 << 8);
+				var7 = var1.readUnsignedByte(); // L: 69
+				var4[var5] = var7 + (var6 << 8); // L: 70
 				if (var5 == 0 && var4[0] == 65535) { // L: 71
 					var3 = var1.readUnsignedShort(); // L: 72
 					break;
 				}
 
 				if (var4[var5] >= 512) { // L: 75
-					var8 = class260.ItemDefinition_get(var4[var5] - 512).team; // L: 76
+					var8 = class250.ItemDefinition_get(var4[var5] - 512).team; // L: 76
 					if (var8 != 0) { // L: 77
 						this.team = var8;
 					}
@@ -240,15 +229,15 @@ public final class Player extends Actor {
 			}
 		}
 
-		int[] var24 = new int[5]; // L: 80
+		int[] var11 = new int[5]; // L: 80
 
 		for (var6 = 0; var6 < 5; ++var6) { // L: 81
 			var7 = var1.readUnsignedByte(); // L: 82
-			if (var7 < 0 || var7 >= class15.field137[var6].length) { // L: 83
+			if (var7 < 0 || var7 >= class69.field568[var6].length) { // L: 83
 				var7 = 0;
 			}
 
-			var24[var6] = var7; // L: 84
+			var11[var6] = var7; // L: 84
 		}
 
 		super.idleSequence = var1.readUnsignedShort(); // L: 86
@@ -287,296 +276,508 @@ public final class Player extends Actor {
 			super.runSequence = -1;
 		}
 
-		this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapSection0.loginType); // L: 101
+		this.username = new Username(var1.readStringCp1252NullTerminated(), LoginScreenAnimation.loginType); // L: 101
 		this.clearIsFriend(); // L: 102
 		this.clearIsInFriendsChat(); // L: 103
-		this.method2147();
-		if (this == class93.localPlayer) {
-			RunException.localPlayerName = this.username.getName();
+		this.method2213(); // L: 104
+		if (this == class262.localPlayer) { // L: 105
+			Login.localPlayerName = this.username.getName();
 		}
 
-		this.combatLevel = var1.readUnsignedByte();
-		this.skillLevel = var1.readUnsignedShort();
-		this.isHidden = var1.readUnsignedByte() == 1;
-		if (Client.gameBuild == 0 && Client.staffModLevel >= 2) {
+		this.combatLevel = var1.readUnsignedByte(); // L: 106
+		this.skillLevel = var1.readUnsignedShort(); // L: 107
+		this.isHidden = var1.readUnsignedByte() == 1; // L: 108
+		if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 109
 			this.isHidden = false;
 		}
 
-		class135[] var25 = null;
-		boolean var26 = false;
-		if (var1.offset < var1.array.length) {
-			var8 = var1.readUnsignedShort();
-			var26 = (var8 >> 15 & 1) == 1;
-			if (var8 > 0 && var8 != 32768) {
-				var25 = new class135[12];
+		class136[] var12 = null; // L: 110
+		boolean var13 = false; // L: 111
+		if (var1.offset < var1.array.length) { // L: 112
+			var8 = var1.readUnsignedShort(); // L: 113
+			var13 = (var8 >> 15 & 1) == 1; // L: 114
+			if (var8 > 0 && var8 != 32768) { // L: 115
+				var12 = new class136[12]; // L: 116
 
-				for (int var9 = 0; var9 < 12; ++var9) {
-					int var10 = var8 >> 12 - var9 & 1;
-					if (var10 == 1) {
-						int var14 = var4[var9] - 512;
-						int var15 = var1.readUnsignedByte();
-						boolean var16 = (var15 & 1) != 0;
-						boolean var17 = (var15 & 2) != 0;
-						class135 var18 = new class135(var14);
-						int var19;
-						int[] var20;
-						boolean var21;
-						int var22;
-						short var23;
-						if (var16) {
-							var19 = var1.readUnsignedByte();
-							var20 = new int[]{var19 & 15, var19 >> 4 & 15};
-							var21 = var18.field1537 != null && var20.length == var18.field1537.length;
-
-							for (var22 = 0; var22 < 2; ++var22) {
-								if (var20[var22] != 15) { // L: 136
-									var23 = (short)var1.readUnsignedShort();
-									if (var21) { // L: 138
-										var18.field1537[var20[var22]] = var23; // L: 139
-									}
-								}
-							}
-						}
-
-						if (var17) { // L: 144
-							var19 = var1.readUnsignedByte(); // L: 145
-							var20 = new int[]{var19 & 15, var19 >> 4 & 15}; // L: 146 147 148
-							var21 = var18.field1538 != null && var20.length == var18.field1538.length; // L: 149
-
-							for (var22 = 0; var22 < 2; ++var22) { // L: 150
-								if (var20[var22] != 15) { // L: 151
-									var23 = (short)var1.readUnsignedShort(); // L: 152
-									if (var21) { // L: 153
-										var18.field1538[var20[var22]] = var23; // L: 154
-									}
-								}
-							}
-						}
-
-						var25[var9] = var18; // L: 161
+				for (int var9 = 0; var9 < 12; ++var9) { // L: 117
+					int var10 = var8 >> 12 - var9 & 1; // L: 118
+					if (var10 == 1) { // L: 119
+						var12[var9] = MenuAction.method2027(var4[var9] - 512, var1); // L: 120
 					}
 				}
 			}
 		}
 
-		if (this.appearance == null) { // L: 166
+		if (this.appearance == null) { // L: 125
 			this.appearance = new PlayerComposition();
 		}
 
-		this.appearance.method4704(var4, var25, var26, var24, var2 == 1, var3); // L: 167
-	} // L: 168
+		this.appearance.method4837(var4, var12, var13, var11, var2 == 1, var3); // L: 126
+	} // L: 127
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		if (this.appearance == null) { // L: 223
+		if (this.appearance == null) { // L: 182
 			return null;
 		} else {
-			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? LoginScreenAnimation.SequenceDefinition_get(super.sequence) : null; // L: 224
-			SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : LoginScreenAnimation.SequenceDefinition_get(super.movementSequence); // L: 225
-			Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 226
-			if (var3 == null) { // L: 227
+			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapScaleHandler.SequenceDefinition_get(super.sequence) : null; // L: 183
+			SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapScaleHandler.SequenceDefinition_get(super.movementSequence); // L: 184
+			Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 185
+			if (var3 == null) { // L: 186
 				return null;
 			} else {
-				var3.calculateBoundsCylinder(); // L: 228
-				super.defaultHeight = var3.height; // L: 229
+				var3.calculateBoundsCylinder(); // L: 187
+				super.defaultHeight = var3.height; // L: 188
 				Model var4;
 				Model[] var5;
-				if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 230
-					var4 = VarcInt.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 231
-					if (var4 != null) { // L: 232
-						var4.offsetBy(0, -super.field1277, 0); // L: 233
-						var5 = new Model[]{var3, var4}; // L: 234
-						var3 = new Model(var5, 2); // L: 235
+				if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 189
+					var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 190
+					if (var4 != null) { // L: 191
+						var4.offsetBy(0, -super.field1263, 0); // L: 192
+						var5 = new Model[]{var3, var4}; // L: 193
+						var3 = new Model(var5, 2); // L: 194
 					}
 				}
 
-				if (!this.isUnanimated && this.model0 != null) { // L: 238
-					if (Client.cycle >= this.animationCycleEnd) { // L: 239
+				if (!this.isUnanimated && this.model0 != null) { // L: 197
+					if (Client.cycle >= this.animationCycleEnd) { // L: 198
 						this.model0 = null;
 					}
 
-					if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 240
-						var4 = this.model0; // L: 241
-						var4.offsetBy(this.field1202 - super.x, this.tileHeight2 - this.tileHeight, this.field1220 - super.y); // L: 242
-						if (super.orientation == 512) { // L: 243
-							var4.rotateY90Ccw(); // L: 244
-							var4.rotateY90Ccw(); // L: 245
-							var4.rotateY90Ccw(); // L: 246
-						} else if (super.orientation == 1024) { // L: 248
-							var4.rotateY90Ccw(); // L: 249
-							var4.rotateY90Ccw(); // L: 250
-						} else if (super.orientation == 1536) { // L: 252
+					if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 199
+						var4 = this.model0; // L: 200
+						var4.offsetBy(this.field1185 - super.x, this.tileHeight2 - this.tileHeight, this.field1197 - super.y); // L: 201
+						if (super.orientation == 512) { // L: 202
+							var4.rotateY90Ccw(); // L: 203
+							var4.rotateY90Ccw(); // L: 204
+							var4.rotateY90Ccw(); // L: 205
+						} else if (super.orientation == 1024) { // L: 207
+							var4.rotateY90Ccw(); // L: 208
+							var4.rotateY90Ccw(); // L: 209
+						} else if (super.orientation == 1536) { // L: 211
 							var4.rotateY90Ccw();
 						}
 
-						var5 = new Model[]{var3, var4}; // L: 253
-						var3 = new Model(var5, 2); // L: 254
-						if (super.orientation == 512) { // L: 255
+						var5 = new Model[]{var3, var4};
+						var3 = new Model(var5, 2);
+						if (super.orientation == 512) {
+							var4.rotateY90Ccw();
+						} else if (super.orientation == 1024) { // L: 215
+							var4.rotateY90Ccw(); // L: 216
+							var4.rotateY90Ccw();
+						} else if (super.orientation == 1536) { // L: 219
+							var4.rotateY90Ccw(); // L: 220
+							var4.rotateY90Ccw();
 							var4.rotateY90Ccw();
-						} else if (super.orientation == 1024) { // L: 256
-							var4.rotateY90Ccw(); // L: 257
-							var4.rotateY90Ccw(); // L: 258
-						} else if (super.orientation == 1536) { // L: 260
-							var4.rotateY90Ccw(); // L: 261
-							var4.rotateY90Ccw(); // L: 262
-							var4.rotateY90Ccw(); // L: 263
 						}
 
-						var4.offsetBy(super.x - this.field1202, this.tileHeight - this.tileHeight2, super.y - this.field1220); // L: 265
+						var4.offsetBy(super.x - this.field1185, this.tileHeight - this.tileHeight2, super.y - this.field1197); // L: 224
 					}
 				}
 
-				var3.isSingleTile = true; // L: 268
-				return var3; // L: 269
+				var3.isSingleTile = true;
+				return var3; // L: 228
 			}
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "2031085482"
+		garbageValue = "-1441448466"
 	)
 	@Export("isFriend")
 	boolean isFriend() {
-		if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 171
-			this.checkIsFriend(); // L: 172
+		if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 130
+			this.checkIsFriend(); // L: 131
 		}
 
-		return this.isFriendTriBool == TriBool.TriBool_true; // L: 174
+		return this.isFriendTriBool == TriBool.TriBool_true; // L: 133
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "112"
+		descriptor = "(I)V",
+		garbageValue = "-183277896"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
-		this.isFriendTriBool = TriBool.TriBool_unknown; // L: 178
-	} // L: 179
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-574067295"
-	)
-	@Export("checkIsFriend")
-	void checkIsFriend() {
-		this.isFriendTriBool = NetSocket.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 182
-	} // L: 183
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-78"
-	)
-	@Export("isFriendsChatMember")
-	boolean isFriendsChatMember() {
-		if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 186
-			this.updateIsInFriendsChat(); // L: 187
-		}
-
-		return this.isInFriendsChat == TriBool.TriBool_true; // L: 189
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "4"
-	)
-	@Export("clearIsInFriendsChat")
-	void clearIsInFriendsChat() {
-		this.isInFriendsChat = TriBool.TriBool_unknown; // L: 193
-	} // L: 194
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2108325676"
-	)
-	@Export("updateIsInFriendsChat")
-	void updateIsInFriendsChat() {
-		this.isInFriendsChat = WorldMapRegion.friendsChat != null && WorldMapRegion.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 197
-	} // L: 198
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "50"
-	)
-	@Export("updateIsInClanChat")
-	void updateIsInClanChat() {
-		this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method99(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 201
-	} // L: 202
+		this.isFriendTriBool = TriBool.TriBool_unknown; // L: 137
+	} // L: 138
 
 	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-660230159"
+		garbageValue = "-1895738612"
 	)
-	void method2147() {
-		this.isInClanChat = TriBool.TriBool_unknown; // L: 205
-	} // L: 206
+	@Export("checkIsFriend")
+	void checkIsFriend() {
+		this.isFriendTriBool = DevicePcmPlayerProvider.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 141
+	} // L: 142
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(S)Z",
+		garbageValue = "4663"
+	)
+	@Export("isFriendsChatMember")
+	boolean isFriendsChatMember() {
+		if (this.isInFriendsChat == TriBool.TriBool_unknown) { // L: 145
+			this.updateIsInFriendsChat(); // L: 146
+		}
+
+		return this.isInFriendsChat == TriBool.TriBool_true; // L: 148
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-956688368"
+	)
+	@Export("clearIsInFriendsChat")
+	void clearIsInFriendsChat() {
+		this.isInFriendsChat = TriBool.TriBool_unknown; // L: 152
+	} // L: 153
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1656967848"
+	)
+	@Export("updateIsInFriendsChat")
+	void updateIsInFriendsChat() {
+		this.isInFriendsChat = class289.friendsChat != null && class289.friendsChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 156
+	} // L: 157
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1811167187"
+	)
+	@Export("updateIsInClanChat")
+	void updateIsInClanChat() {
+		this.isInClanChat = Client.currentClanSettings[0] != null && Client.currentClanSettings[0].method196(this.username.getName()) != -1 ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 160
+	} // L: 161
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1587575970"
+	)
+	void method2213() {
+		this.isInClanChat = TriBool.TriBool_unknown; // L: 164
+	} // L: 165
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1964192988"
+		garbageValue = "-1972087508"
 	)
 	@Export("isClanMember")
 	boolean isClanMember() {
-		if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 209
-			this.updateIsInClanChat(); // L: 210
+		if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 168
+			this.updateIsInClanChat(); // L: 169
 		}
 
-		return this.isInClanChat == TriBool.TriBool_true; // L: 212
+		return this.isInClanChat == TriBool.TriBool_true; // L: 171
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1517836125"
+		garbageValue = "-254306857"
 	)
 	@Export("transformedSize")
 	int transformedSize() {
-		return this.appearance != null && this.appearance.npcTransformId != -1 ? StructComposition.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 216 217 219
+		return this.appearance != null && this.appearance.npcTransformId != -1 ? class248.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 175 176 178
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(IIBI)V",
-		garbageValue = "2070611264"
+		garbageValue = "-977769569"
 	)
-	final void method2129(int var1, int var2, byte var3) {
-		if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) { // L: 273
+	final void method2217(int var1, int var2, byte var3) {
+		if (super.sequence != -1 && WorldMapScaleHandler.SequenceDefinition_get(super.sequence).field1893 == 1) { // L: 232
 			super.sequence = -1;
 		}
 
-		super.field1264 = -1; // L: 274
-		if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 275
-			if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 276
-				if (var3 == 2) { // L: 278
-					Player var4 = this; // L: 279
-					int var5 = super.pathX[0]; // L: 281
-					int var6 = super.pathY[0]; // L: 282
-					int var7 = this.transformedSize(); // L: 283
-					if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 284 285
-						int var8 = SoundSystem.method808(var5, var6, this.transformedSize(), class372.method6463(var1, var2), Client.collisionMaps[this.plane], true, Client.field689, Client.field851); // L: 286
-						if (var8 >= 1) { // L: 287
-							for (int var9 = 0; var9 < var8 - 1; ++var9) { // L: 288
-								var4.method2165(Client.field689[var9], Client.field851[var9], (byte)2);
+		super.field1280 = -1;
+		if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) {
+			if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) {
+				if (var3 == 2) { // L: 237
+					Player var4 = this;
+					int var5 = super.pathX[0]; // L: 240
+					int var6 = super.pathY[0];
+					int var7 = this.transformedSize();
+					if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { // L: 244
+						int var9 = this.transformedSize();
+						Client.field733.approxDestinationX = var1;
+						Client.field733.approxDestinationY = var2;
+						Client.field733.approxDestinationSizeX = 1;
+						Client.field733.approxDestinationSizeY = 1;
+						ApproximateRouteStrategy var10 = Client.field733;
+						ApproximateRouteStrategy var11 = var10;
+						CollisionMap var12 = Client.collisionMaps[this.plane];
+						int[] var13 = Client.field739;
+						int[] var14 = Client.field631;
+						int var15 = 0;
+
+						label412:
+						while (true) {
+							int var16;
+							if (var15 >= 128) {
+								int var17;
+								int var18;
+								byte var20;
+								int var21;
+								int var22;
+								int var24;
+								int var26;
+								int var27;
+								int var28;
+								boolean var35;
+								int var37;
+								int var38;
+								int var40;
+								if (var9 == 1) { // L: 267
+									var35 = class126.method2595(var5, var6, var10, var12);
+								} else if (var9 == 2) {
+									var17 = var5;
+									var18 = var6;
+									byte var19 = 64;
+									var20 = 64;
+									var21 = var5 - var19;
+									var22 = var6 - var20; // L: 276
+									class160.directions[var19][var20] = 99;
+									class160.distances[var19][var20] = 0;
+									byte var23 = 0;
+									var24 = 0; // L: 280
+									class160.bufferX[var23] = var5; // L: 281
+									var40 = var23 + 1;
+									class160.bufferY[var23] = var6; // L: 282
+									int[][] var25 = var12.flags; // L: 283
+
+									boolean var36;
+									while (true) {
+										if (var24 == var40) {
+											Login.field1033 = var17;
+											GrandExchangeOfferOwnWorldComparator.field608 = var18;
+											var36 = false;
+											break;
+										}
+
+										var17 = class160.bufferX[var24];
+										var18 = class160.bufferY[var24]; // L: 286
+										var24 = var24 + 1 & 4095;
+										var37 = var17 - var21; // L: 288
+										var38 = var18 - var22;
+										var26 = var17 - var12.xInset;
+										var27 = var18 - var12.yInset;
+										if (var11.hasArrived(2, var17, var18, var12)) {
+											Login.field1033 = var17;
+											GrandExchangeOfferOwnWorldComparator.field608 = var18;
+											var36 = true; // L: 295
+											break;
+										}
+
+										var28 = class160.distances[var37][var38] + 1;
+										if (var37 > 0 && class160.directions[var37 - 1][var38] == 0 && (var25[var26 - 1][var27] & 19136782) == 0 && (var25[var26 - 1][var27 + 1] & 19136824) == 0) {
+											class160.bufferX[var40] = var17 - 1;
+											class160.bufferY[var40] = var18;
+											var40 = var40 + 1 & 4095; // L: 305
+											class160.directions[var37 - 1][var38] = 2;
+											class160.distances[var37 - 1][var38] = var28; // L: 307
+										}
+
+										if (var37 < 126 && class160.directions[var37 + 1][var38] == 0 && (var25[var26 + 2][var27] & 19136899) == 0 && (var25[var26 + 2][var27 + 1] & 19136992) == 0) { // L: 312
+											class160.bufferX[var40] = var17 + 1;
+											class160.bufferY[var40] = var18; // L: 314
+											var40 = var40 + 1 & 4095;
+											class160.directions[var37 + 1][var38] = 8;
+											class160.distances[var37 + 1][var38] = var28;
+										}
+
+										if (var38 > 0 && class160.directions[var37][var38 - 1] == 0 && (var25[var26][var27 - 1] & 19136782) == 0 && (var25[var26 + 1][var27 - 1] & 19136899) == 0) { // L: 319 321
+											class160.bufferX[var40] = var17;
+											class160.bufferY[var40] = var18 - 1;
+											var40 = var40 + 1 & 4095;
+											class160.directions[var37][var38 - 1] = 1; // L: 326
+											class160.distances[var37][var38 - 1] = var28;
+										}
+
+										if (var38 < 126 && class160.directions[var37][var38 + 1] == 0 && (var25[var26][var27 + 2] & 19136824) == 0 && (var25[var26 + 1][var27 + 2] & 19136992) == 0) { // L: 332
+											class160.bufferX[var40] = var17;
+											class160.bufferY[var40] = var18 + 1; // L: 334
+											var40 = var40 + 1 & 4095;
+											class160.directions[var37][var38 + 1] = 4;
+											class160.distances[var37][var38 + 1] = var28;
+										}
+
+										if (var37 > 0 && var38 > 0 && class160.directions[var37 - 1][var38 - 1] == 0 && (var25[var26 - 1][var27] & 19136830) == 0 && (var25[var26 - 1][var27 - 1] & 19136782) == 0 && (var25[var26][var27 - 1] & 19136911) == 0) { // L: 343
+											class160.bufferX[var40] = var17 - 1;
+											class160.bufferY[var40] = var18 - 1;
+											var40 = var40 + 1 & 4095; // L: 346
+											class160.directions[var37 - 1][var38 - 1] = 3;
+											class160.distances[var37 - 1][var38 - 1] = var28;
+										}
+
+										if (var37 < 126 && var38 > 0 && class160.directions[var37 + 1][var38 - 1] == 0 && (var25[var26 + 1][var27 - 1] & 19136911) == 0 && (var25[var26 + 2][var27 - 1] & 19136899) == 0 && (var25[var26 + 2][var27] & 19136995) == 0) { // L: 350 354
+											class160.bufferX[var40] = var17 + 1; // L: 355
+											class160.bufferY[var40] = var18 - 1;
+											var40 = var40 + 1 & 4095;
+											class160.directions[var37 + 1][var38 - 1] = 9; // L: 358
+											class160.distances[var37 + 1][var38 - 1] = var28;
+										}
+
+										if (var37 > 0 && var38 < 126 && class160.directions[var37 - 1][var38 + 1] == 0 && (var25[var26 - 1][var27 + 1] & 19136830) == 0 && (var25[var26 - 1][var27 + 2] & 19136824) == 0 && (var25[var26][var27 + 2] & 19137016) == 0) { // L: 364
+											class160.bufferX[var40] = var17 - 1;
+											class160.bufferY[var40] = var18 + 1;
+											var40 = var40 + 1 & 4095; // L: 368
+											class160.directions[var37 - 1][var38 + 1] = 6;
+											class160.distances[var37 - 1][var38 + 1] = var28;
+										}
+
+										if (var37 < 126 && var38 < 126 && class160.directions[var37 + 1][var38 + 1] == 0 && (var25[var26 + 1][var27 + 2] & 19137016) == 0 && (var25[var26 + 2][var27 + 2] & 19136992) == 0 && (var25[var26 + 2][var27 + 1] & 19136995) == 0) { // L: 372 376
+											class160.bufferX[var40] = var17 + 1; // L: 377
+											class160.bufferY[var40] = var18 + 1;
+											var40 = var40 + 1 & 4095;
+											class160.directions[var37 + 1][var38 + 1] = 12;
+											class160.distances[var37 + 1][var38 + 1] = var28; // L: 381
+										}
+									}
+
+									var35 = var36;
+								} else {
+									var35 = KeyHandler.method475(var5, var6, var9, var10, var12);
+								}
+
+								int var8;
+								label435: {
+									var16 = var5 - 64;
+									var17 = var6 - 64; // L: 392
+									var18 = Login.field1033;
+									var37 = GrandExchangeOfferOwnWorldComparator.field608;
+									if (!var35) { // L: 395
+										var38 = Integer.MAX_VALUE; // L: 397
+										var21 = Integer.MAX_VALUE;
+										byte var39 = 10;
+										var40 = var11.approxDestinationX;
+										var24 = var11.approxDestinationY;
+										int var34 = var11.approxDestinationSizeX;
+										var26 = var11.approxDestinationSizeY;
+
+										for (var27 = var40 - var39; var27 <= var39 + var40; ++var27) { // L: 404
+											for (var28 = var24 - var39; var28 <= var39 + var24; ++var28) {
+												int var29 = var27 - var16; // L: 406
+												int var30 = var28 - var17;
+												if (var29 >= 0 && var30 >= 0 && var29 < 128 && var30 < 128 && class160.distances[var29][var30] < 100) {
+													int var31 = 0;
+													if (var27 < var40) { // L: 411
+														var31 = var40 - var27;
+													} else if (var27 > var34 + var40 - 1) {
+														var31 = var27 - (var34 + var40 - 1);
+													}
+
+													int var32 = 0;
+													if (var28 < var24) {
+														var32 = var24 - var28;
+													} else if (var28 > var26 + var24 - 1) {
+														var32 = var28 - (var24 + var26 - 1);
+													}
+
+													int var33 = var31 * var31 + var32 * var32; // L: 416
+													if (var33 < var38 || var38 == var33 && class160.distances[var29][var30] < var21) {
+														var38 = var33;
+														var21 = class160.distances[var29][var30];
+														var18 = var27;
+														var37 = var28; // L: 421
+													}
+												}
+											}
+										}
+
+										if (var38 == Integer.MAX_VALUE) {
+											var8 = -1;
+											break label435;
+										}
+									}
+
+									if (var18 == var5 && var6 == var37) {
+										var8 = 0;
+									} else {
+										var20 = 0;
+										class160.bufferX[var20] = var18; // L: 444
+										var38 = var20 + 1;
+										class160.bufferY[var20] = var37; // L: 445
+
+										for (var21 = var22 = class160.directions[var18 - var16][var37 - var17]; var18 != var5 || var37 != var6; var21 = class160.directions[var18 - var16][var37 - var17]) { // L: 457
+											if (var21 != var22) {
+												var22 = var21;
+												class160.bufferX[var38] = var18; // L: 450
+												class160.bufferY[var38++] = var37; // L: 451
+											}
+
+											if ((var21 & 2) != 0) {
+												++var18;
+											} else if ((var21 & 8) != 0) { // L: 454
+												--var18;
+											}
+
+											if ((var21 & 1) != 0) {
+												++var37;
+											} else if ((var21 & 4) != 0) {
+												--var37;
+											}
+										}
+
+										var40 = 0; // L: 459
+
+										while (var38-- > 0) { // L: 460
+											var13[var40] = class160.bufferX[var38]; // L: 461
+											var14[var40++] = class160.bufferY[var38]; // L: 462
+											if (var40 >= var13.length) { // L: 463
+												break;
+											}
+										}
+
+										var8 = var40; // L: 465
+									}
+								}
+
+								var15 = var8; // L: 467
+								if (var8 < 1) { // L: 468
+									break;
+								}
+
+								var16 = 0; // L: 469
+
+								while (true) {
+									if (var16 >= var15 - 1) {
+										break label412;
+									}
+
+									var4.method2219(Client.field739[var16], Client.field631[var16], (byte)2);
+									++var16;
+								}
 							}
+
+							for (var16 = 0; var16 < 128; ++var16) {
+								class160.directions[var15][var16] = 0;
+								class160.distances[var15][var16] = 99999999;
+							}
+
+							++var15;
 						}
 					}
 				}
 
-				this.method2165(var1, var2, var3); // L: 291
+				this.method2219(var1, var2, var3); // L: 472
 			} else {
 				this.resetPath(var1, var2);
 			}
@@ -584,177 +785,477 @@ public final class Player extends Actor {
 			this.resetPath(var1, var2);
 		}
 
-	} // L: 293
+	} // L: 474
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "1441238495"
+		garbageValue = "-1775377890"
 	)
 	@Export("resetPath")
 	void resetPath(int var1, int var2) {
-		super.pathLength = 0; // L: 296
-		super.field1274 = 0; // L: 297
-		super.field1294 = 0; // L: 298
-		super.pathX[0] = var1; // L: 299
-		super.pathY[0] = var2; // L: 300
-		int var3 = this.transformedSize(); // L: 301
-		super.x = var3 * 64 + super.pathX[0] * 128; // L: 302
-		super.y = var3 * 64 + super.pathY[0] * 128; // L: 303
-	} // L: 304
+		super.pathLength = 0; // L: 477
+		super.field1281 = 0; // L: 478
+		super.field1242 = 0; // L: 479
+		super.pathX[0] = var1; // L: 480
+		super.pathY[0] = var2; // L: 481
+		int var3 = this.transformedSize(); // L: 482
+		super.x = super.pathX[0] * 128 + var3 * 64; // L: 483
+		super.y = var3 * 64 + super.pathY[0] * 128; // L: 484
+	} // L: 485
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IIBB)V",
-		garbageValue = "-30"
+		descriptor = "(IIBI)V",
+		garbageValue = "1698515856"
 	)
-	final void method2165(int var1, int var2, byte var3) {
-		if (super.pathLength < 9) { // L: 307
+	final void method2219(int var1, int var2, byte var3) {
+		if (super.pathLength < 9) { // L: 488
 			++super.pathLength;
 		}
 
-		for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 308
-			super.pathX[var4] = super.pathX[var4 - 1]; // L: 309
-			super.pathY[var4] = super.pathY[var4 - 1]; // L: 310
-			super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 311
+		for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 489
+			super.pathX[var4] = super.pathX[var4 - 1]; // L: 490
+			super.pathY[var4] = super.pathY[var4 - 1]; // L: 491
+			super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 492
 		}
 
-		super.pathX[0] = var1; // L: 313
-		super.pathY[0] = var2; // L: 314
-		super.pathTraversed[0] = var3; // L: 315
-	} // L: 316
+		super.pathX[0] = var1; // L: 494
+		super.pathY[0] = var2; // L: 495
+		super.pathTraversed[0] = var3; // L: 496
+	} // L: 497
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(B)Z",
-		garbageValue = "-6"
+		garbageValue = "3"
 	)
 	@Export("isVisible")
 	final boolean isVisible() {
-		return this.appearance != null; // L: 319
+		return this.appearance != null; // L: 500
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1258875415"
+		descriptor = "(IIIIIILgp;Lfl;I)V",
+		garbageValue = "1848847926"
 	)
-	public static void method2166() {
-		synchronized(MouseHandler.MouseHandler_instance) { // L: 37
-			MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 38
-			MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 39
-			MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 40
-			MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 41
-			MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 42
-			MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 43
-			MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 44
-			MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 45
-			MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 46
-		}
-	} // L: 48
+	static final void method2258(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
+		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 212 213 214
+			if (var0 < Tiles.Tiles_minPlane) { // L: 217
+				Tiles.Tiles_minPlane = var0;
+			}
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;II[BII)I",
-		garbageValue = "-169882356"
-	)
-	@Export("encodeStringCp1252")
-	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
-		int var5 = var2 - var1; // L: 104
-
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 105
-			char var7 = var0.charAt(var6 + var1); // L: 106
-			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 107
-				var3[var6 + var4] = (byte)var7;
-			} else if (var7 == 8364) { // L: 108
-				var3[var6 + var4] = -128;
-			} else if (var7 == 8218) { // L: 109
-				var3[var6 + var4] = -126;
-			} else if (var7 == 402) { // L: 110
-				var3[var6 + var4] = -125;
-			} else if (var7 == 8222) { // L: 111
-				var3[var6 + var4] = -124;
-			} else if (var7 == 8230) { // L: 112
-				var3[var6 + var4] = -123;
-			} else if (var7 == 8224) { // L: 113
-				var3[var6 + var4] = -122;
-			} else if (var7 == 8225) { // L: 114
-				var3[var6 + var4] = -121;
-			} else if (var7 == 710) {
-				var3[var6 + var4] = -120; // L: 115
-			} else if (var7 == 8240) { // L: 116
-				var3[var6 + var4] = -119;
-			} else if (var7 == 352) { // L: 117
-				var3[var6 + var4] = -118;
-			} else if (var7 == 8249) { // L: 118
-				var3[var6 + var4] = -117;
-			} else if (var7 == 338) { // L: 119
-				var3[var6 + var4] = -116;
-			} else if (var7 == 381) { // L: 120
-				var3[var6 + var4] = -114;
-			} else if (var7 == 8216) { // L: 121
-				var3[var6 + var4] = -111;
-			} else if (var7 == 8217) { // L: 122
-				var3[var6 + var4] = -110;
-			} else if (var7 == 8220) { // L: 123
-				var3[var6 + var4] = -109;
-			} else if (var7 == 8221) { // L: 124
-				var3[var6 + var4] = -108;
-			} else if (var7 == 8226) { // L: 125
-				var3[var6 + var4] = -107;
-			} else if (var7 == 8211) { // L: 126
-				var3[var6 + var4] = -106;
-			} else if (var7 == 8212) { // L: 127
-				var3[var6 + var4] = -105;
-			} else if (var7 == 732) { // L: 128
-				var3[var6 + var4] = -104;
-			} else if (var7 == 8482) { // L: 129
-				var3[var6 + var4] = -103;
-			} else if (var7 == 353) { // L: 130
-				var3[var6 + var4] = -102;
-			} else if (var7 == 8250) { // L: 131
-				var3[var6 + var4] = -101;
-			} else if (var7 == 339) { // L: 132
-				var3[var6 + var4] = -100;
-			} else if (var7 == 382) { // L: 133
-				var3[var6 + var4] = -98;
-			} else if (var7 == 376) { // L: 134
-				var3[var6 + var4] = -97;
+			ObjectComposition var8 = Tiles.getObjectDefinition(var3); // L: 218
+			int var9;
+			int var10;
+			if (var4 != 1 && var4 != 3) { // L: 221
+				var9 = var8.sizeX; // L: 226
+				var10 = var8.sizeY; // L: 227
 			} else {
-				var3[var6 + var4] = 63; // L: 135
+				var9 = var8.sizeY; // L: 222
+				var10 = var8.sizeX; // L: 223
+			}
+
+			int var11;
+			int var12;
+			if (var9 + var1 <= 104) { // L: 233
+				var11 = (var9 >> 1) + var1; // L: 234
+				var12 = (var9 + 1 >> 1) + var1; // L: 235
+			} else {
+				var11 = var1; // L: 238
+				var12 = var1 + 1; // L: 239
+			}
+
+			int var13;
+			int var14;
+			if (var10 + var2 <= 104) { // L: 241
+				var13 = (var10 >> 1) + var2; // L: 242
+				var14 = var2 + (var10 + 1 >> 1); // L: 243
+			} else {
+				var13 = var2; // L: 246
+				var14 = var2 + 1; // L: 247
+			}
+
+			int[][] var15 = Tiles.Tiles_heights[var0]; // L: 249
+			int var16 = var15[var11][var14] + var15[var11][var13] + var15[var12][var13] + var15[var12][var14] >> 2; // L: 250
+			int var17 = (var1 << 7) + (var9 << 6); // L: 251
+			int var18 = (var2 << 7) + (var10 << 6); // L: 252
+			long var19 = UserComparator3.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 253
+			int var21 = var5 + (var4 << 6); // L: 254
+			if (var8.int3 == 1) { // L: 255
+				var21 += 256;
+			}
+
+			if (var8.hasSound()) { // L: 256
+				class171.method3612(var0, var1, var2, var8, var4);
+			}
+
+			Object var29;
+			if (var5 == 22) { // L: 257
+				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 258
+					if (var8.animationId == -1 && var8.transforms == null) { // L: 260
+						var29 = var8.getEntity(22, var4, var15, var17, var16, var18);
+					} else {
+						var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 261
+					}
+
+					var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var29, var19, var21); // L: 262
+					if (var8.interactType == 1 && var7 != null) { // L: 263
+						var7.setBlockedByFloorDec(var1, var2);
+					}
+
+				}
+			} else {
+				int var28;
+				if (var5 != 10 && var5 != 11) { // L: 266
+					int[] var10000;
+					if (var5 >= 12) { // L: 287
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 289
+							var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+						} else {
+							var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 290
+						}
+
+						var6.method4046(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 291
+						if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 292
+							var10000 = Tiles.field1101[var0][var1];
+							var10000[var2] |= 2340;
+						}
+
+						if (var8.interactType != 0 && var7 != null) { // L: 293
+							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+						}
+
+					} else if (var5 == 0) { // L: 296
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 298
+							var29 = var8.getEntity(0, var4, var15, var17, var16, var18);
+						} else {
+							var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 299
+						}
+
+						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1102[var4], 0, var19, var21); // L: 300
+						if (var4 == 0) { // L: 301
+							if (var8.clipped) { // L: 302
+								class43.field307[var0][var1][var2] = 50; // L: 303
+								class43.field307[var0][var1][var2 + 1] = 50; // L: 304
+							}
+
+							if (var8.modelClipped) { // L: 306
+								var10000 = Tiles.field1101[var0][var1];
+								var10000[var2] |= 585;
+							}
+						} else if (var4 == 1) { // L: 308
+							if (var8.clipped) { // L: 309
+								class43.field307[var0][var1][var2 + 1] = 50; // L: 310
+								class43.field307[var0][var1 + 1][var2 + 1] = 50; // L: 311
+							}
+
+							if (var8.modelClipped) { // L: 313
+								var10000 = Tiles.field1101[var0][var1];
+								var10000[var2 + 1] |= 1170;
+							}
+						} else if (var4 == 2) { // L: 315
+							if (var8.clipped) { // L: 316
+								class43.field307[var0][var1 + 1][var2] = 50; // L: 317
+								class43.field307[var0][var1 + 1][var2 + 1] = 50; // L: 318
+							}
+
+							if (var8.modelClipped) { // L: 320
+								var10000 = Tiles.field1101[var0][var1 + 1];
+								var10000[var2] |= 585;
+							}
+						} else if (var4 == 3) { // L: 322
+							if (var8.clipped) { // L: 323
+								class43.field307[var0][var1][var2] = 50; // L: 324
+								class43.field307[var0][var1 + 1][var2] = 50; // L: 325
+							}
+
+							if (var8.modelClipped) { // L: 327
+								var10000 = Tiles.field1101[var0][var1];
+								var10000[var2] |= 1170;
+							}
+						}
+
+						if (var8.interactType != 0 && var7 != null) { // L: 329
+							var7.method3216(var1, var2, var5, var4, var8.boolean1);
+						}
+
+						if (var8.int2 != 16) { // L: 330
+							var6.method4204(var0, var1, var2, var8.int2);
+						}
+
+					} else if (var5 == 1) { // L: 333
+						if (var8.animationId == -1 && var8.transforms == null) { // L: 335
+							var29 = var8.getEntity(1, var4, var15, var17, var16, var18);
+						} else {
+							var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 336
+						}
+
+						var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1107[var4], 0, var19, var21); // L: 337
+						if (var8.clipped) { // L: 338
+							if (var4 == 0) { // L: 339
+								class43.field307[var0][var1][var2 + 1] = 50;
+							} else if (var4 == 1) { // L: 340
+								class43.field307[var0][var1 + 1][var2 + 1] = 50;
+							} else if (var4 == 2) { // L: 341
+								class43.field307[var0][var1 + 1][var2] = 50;
+							} else if (var4 == 3) { // L: 342
+								class43.field307[var0][var1][var2] = 50;
+							}
+						}
+
+						if (var8.interactType != 0 && var7 != null) { // L: 344
+							var7.method3216(var1, var2, var5, var4, var8.boolean1);
+						}
+
+					} else {
+						int var22;
+						if (var5 == 2) { // L: 347
+							var22 = var4 + 1 & 3; // L: 348
+							Object var24;
+							Object var30;
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 351
+								var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 352
+								var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 353
+							} else {
+								var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 356
+								var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 357
+							}
+
+							var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var30, (Renderable)var24, Tiles.field1102[var4], Tiles.field1102[var22], var19, var21); // L: 359
+							if (var8.modelClipped) { // L: 360
+								if (var4 == 0) { // L: 361
+									var10000 = Tiles.field1101[var0][var1]; // L: 362
+									var10000[var2] |= 585;
+									var10000 = Tiles.field1101[var0][var1]; // L: 363
+									var10000[var2 + 1] |= 1170;
+								} else if (var4 == 1) { // L: 365
+									var10000 = Tiles.field1101[var0][var1]; // L: 366
+									var10000[var2 + 1] |= 1170;
+									var10000 = Tiles.field1101[var0][var1 + 1]; // L: 367
+									var10000[var2] |= 585;
+								} else if (var4 == 2) { // L: 369
+									var10000 = Tiles.field1101[var0][var1 + 1]; // L: 370
+									var10000[var2] |= 585;
+									var10000 = Tiles.field1101[var0][var1]; // L: 371
+									var10000[var2] |= 1170;
+								} else if (var4 == 3) { // L: 373
+									var10000 = Tiles.field1101[var0][var1]; // L: 374
+									var10000[var2] |= 1170;
+									var10000 = Tiles.field1101[var0][var1]; // L: 375
+									var10000[var2] |= 585;
+								}
+							}
+
+							if (var8.interactType != 0 && var7 != null) { // L: 378
+								var7.method3216(var1, var2, var5, var4, var8.boolean1);
+							}
+
+							if (var8.int2 != 16) { // L: 379
+								var6.method4204(var0, var1, var2, var8.int2);
+							}
+
+						} else if (var5 == 3) { // L: 382
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 384
+								var29 = var8.getEntity(3, var4, var15, var17, var16, var18);
+							} else {
+								var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 385
+							}
+
+							var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1107[var4], 0, var19, var21); // L: 386
+							if (var8.clipped) { // L: 387
+								if (var4 == 0) { // L: 388
+									class43.field307[var0][var1][var2 + 1] = 50;
+								} else if (var4 == 1) { // L: 389
+									class43.field307[var0][var1 + 1][var2 + 1] = 50;
+								} else if (var4 == 2) { // L: 390
+									class43.field307[var0][var1 + 1][var2] = 50;
+								} else if (var4 == 3) { // L: 391
+									class43.field307[var0][var1][var2] = 50;
+								}
+							}
+
+							if (var8.interactType != 0 && var7 != null) { // L: 393
+								var7.method3216(var1, var2, var5, var4, var8.boolean1);
+							}
+
+						} else if (var5 == 9) { // L: 396
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 398
+								var29 = var8.getEntity(var5, var4, var15, var17, var16, var18);
+							} else {
+								var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 399
+							}
+
+							var6.method4046(var0, var1, var2, var16, 1, 1, (Renderable)var29, 0, var19, var21); // L: 400
+							if (var8.interactType != 0 && var7 != null) { // L: 401
+								var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+							}
+
+							if (var8.int2 != 16) { // L: 402
+								var6.method4204(var0, var1, var2, var8.int2);
+							}
+
+						} else if (var5 == 4) { // L: 405
+							if (var8.animationId == -1 && var8.transforms == null) { // L: 407
+								var29 = var8.getEntity(4, var4, var15, var17, var16, var18);
+							} else {
+								var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 408
+							}
+
+							var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, Tiles.field1102[var4], 0, 0, 0, var19, var21); // L: 409
+						} else {
+							long var23;
+							Object var25;
+							if (var5 == 5) { // L: 412
+								var22 = 16; // L: 413
+								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 414
+								if (var23 != 0L) { // L: 415
+									var22 = Tiles.getObjectDefinition(Message.Entity_unpackID(var23)).int2;
+								}
+
+								if (var8.animationId == -1 && var8.transforms == null) { // L: 417
+									var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
+								} else {
+									var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 418
+								}
+
+								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field1102[var4], 0, var22 * Tiles.field1100[var4], var22 * Tiles.field1105[var4], var19, var21); // L: 419
+							} else if (var5 == 6) { // L: 422
+								var22 = 8; // L: 423
+								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 424
+								if (var23 != 0L) { // L: 425
+									var22 = Tiles.getObjectDefinition(Message.Entity_unpackID(var23)).int2 / 2;
+								}
+
+								if (var8.animationId == -1 && var8.transforms == null) { // L: 427
+									var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
+								} else {
+									var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 428
+								}
+
+								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var22 * Tiles.field1106[var4], var22 * Tiles.field1097[var4], var19, var21); // L: 429
+							} else if (var5 == 7) { // L: 432
+								var28 = var4 + 2 & 3; // L: 434
+								if (var8.animationId == -1 && var8.transforms == null) { // L: 435
+									var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18);
+								} else {
+									var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 436
+								}
+
+								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var29, (Renderable)null, 256, var28, 0, 0, var19, var21); // L: 437
+							} else if (var5 == 8) { // L: 440
+								var22 = 8; // L: 441
+								var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 442
+								if (var23 != 0L) { // L: 443
+									var22 = Tiles.getObjectDefinition(Message.Entity_unpackID(var23)).int2 / 2;
+								}
+
+								int var27 = var4 + 2 & 3; // L: 446
+								Object var26;
+								if (var8.animationId == -1 && var8.transforms == null) { // L: 447
+									var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 448
+									var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 449
+								} else {
+									var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 452
+									var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 453
+								}
+
+								var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var22 * Tiles.field1106[var4], var22 * Tiles.field1097[var4], var19, var21); // L: 455
+							}
+						}
+					}
+				} else {
+					if (var8.animationId == -1 && var8.transforms == null) { // L: 268
+						var29 = var8.getEntity(10, var4, var15, var17, var16, var18);
+					} else {
+						var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field1784, (Renderable)null); // L: 269
+					}
+
+					if (var29 != null && var6.method4046(var0, var1, var2, var16, var9, var10, (Renderable)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 270 271
+						var28 = 15; // L: 272
+						if (var29 instanceof Model) { // L: 273
+							var28 = ((Model)var29).method4331() / 4; // L: 274
+							if (var28 > 30) { // L: 275
+								var28 = 30;
+							}
+						}
+
+						for (int var31 = 0; var31 <= var9; ++var31) { // L: 277
+							for (int var32 = 0; var32 <= var10; ++var32) { // L: 278
+								if (var28 > class43.field307[var0][var31 + var1][var32 + var2]) { // L: 279
+									class43.field307[var0][var31 + var1][var32 + var2] = (byte)var28;
+								}
+							}
+						}
+					}
+
+					if (var8.interactType != 0 && var7 != null) { // L: 284
+						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
+					}
+
+				}
 			}
 		}
+	} // L: 264 285 294 331 345 380 394 403 410 420 430 438 456 458
 
-		return var5; // L: 137
-	}
-
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "130039632"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "879452665"
 	)
-	public static int method2128(int var0) {
-		--var0; // L: 64
-		var0 |= var0 >>> 1; // L: 65
-		var0 |= var0 >>> 2; // L: 66
-		var0 |= var0 >>> 4; // L: 67
-		var0 |= var0 >>> 8; // L: 68
-		var0 |= var0 >>> 16; // L: 69
-		return var0 + 1; // L: 70
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-201107483"
-	)
-	static void method2110() {
-		Players.Players_count = 0; // L: 646
-
-		for (int var0 = 0; var0 < 2048; ++var0) { // L: 647
-			Players.field1374[var0] = null; // L: 648
-			Players.field1373[var0] = 1; // L: 649
+	static int method2235(int var0, Script var1, boolean var2) {
+		Widget var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1295
+		if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1296
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1297
+			return 1; // L: 1298
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1300
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1301
+			return 1; // L: 1302
+		} else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1304
+			Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.text; // L: 1305
+			return 1; // L: 1306
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1308
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1309
+			return 1; // L: 1310
+		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1312
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1313
+			return 1; // L: 1314
+		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1316
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1317
+			return 1; // L: 1318
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1320
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1321
+			return 1; // L: 1322
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1324
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1325
+			return 1; // L: 1326
+		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1328
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1329
+			return 1; // L: 1330
+		} else if (var0 == ScriptOpcodes.IF_GETTRANS) { // L: 1332
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1333
+			return 1; // L: 1334
+		} else if (var0 == 2610) { // L: 1336
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1337
+			return 1; // L: 1338
+		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1340
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color; // L: 1341
+			return 1; // L: 1342
+		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1344
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.color2; // L: 1345
+			return 1; // L: 1346
+		} else if (var0 == 2613) { // L: 1348
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1349
+			return 1; // L: 1350
+		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1352
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1353
+			return 1; // L: 1354
+		} else if (var0 != 2615 && var0 != 2616) { // L: 1356
+			return 2; // L: 1360
+		} else {
+			++ChatChannel.Interpreter_intStackSize; // L: 1357
+			return 1; // L: 1358
 		}
-
-	} // L: 651
+	}
 }
diff --git a/runescape-client/src/main/java/PlayerComposition.java b/runescape-client/src/main/java/PlayerComposition.java
index 74f1f0a4bf..c4b5372113 100644
--- a/runescape-client/src/main/java/PlayerComposition.java
+++ b/runescape-client/src/main/java/PlayerComposition.java
@@ -1,61 +1,54 @@
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("ic")
+@ObfuscatedName("ih")
 @Implements("PlayerComposition")
 public class PlayerComposition {
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("equipmentIndices")
 	static final int[] equipmentIndices;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("PlayerAppearance_cachedModels")
-	static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
-	@ObfuscatedName("go")
-	@Export("regions")
-	static int[] regions;
-	@ObfuscatedName("v")
+	public static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
+	@ObfuscatedName("f")
 	@Export("equipment")
 	int[] equipment;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("bodyColors")
 	int[] bodyColors;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("isFemale")
 	public boolean isFemale;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1525645945
+		intValue = 1143886593
 	)
 	@Export("npcTransformId")
 	public int npcTransformId;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = 3754683323986881495L
+		longValue = 6473412202917111637L
 	)
 	@Export("hash")
 	long hash;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = 488997904210519011L
+		longValue = -8931955685626883585L
 	)
 	long field2933;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "[Led;"
+		descriptor = "[Let;"
 	)
-	class135[] field2937;
-	@ObfuscatedName("b")
-	boolean field2928;
+	class136[] field2939;
+	@ObfuscatedName("r")
+	boolean field2942;
 
 	static {
 		equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26
@@ -63,24 +56,24 @@ public class PlayerComposition {
 	}
 
 	public PlayerComposition() {
-		this.field2928 = false; // L: 21
+		this.field2942 = false; // L: 21
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "([I[Led;Z[IZIB)V",
-		garbageValue = "-36"
+		descriptor = "([I[Let;Z[IZII)V",
+		garbageValue = "196124213"
 	)
-	public void method4704(int[] var1, class135[] var2, boolean var3, int[] var4, boolean var5, int var6) {
-		this.field2937 = var2; // L: 30
-		this.field2928 = var3; // L: 31
+	public void method4837(int[] var1, class136[] var2, boolean var3, int[] var4, boolean var5, int var6) {
+		this.field2939 = var2; // L: 30
+		this.field2942 = var3; // L: 31
 		this.update(var1, var4, var5, var6); // L: 32
 	} // L: 33
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "([I[IZII)V",
-		garbageValue = "1389287024"
+		descriptor = "([I[IZIB)V",
+		garbageValue = "94"
 	)
 	@Export("update")
 	public void update(int[] var1, int[] var2, boolean var3, int var4) {
@@ -88,9 +81,9 @@ public class PlayerComposition {
 			var1 = new int[12]; // L: 37
 
 			for (int var5 = 0; var5 < 7; ++var5) { // L: 38
-				for (int var6 = 0; var6 < ModelData0.KitDefinition_fileCount; ++var6) {
-					KitDefinition var7 = WorldMapIcon_1.KitDefinition_get(var6);
-					if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) {
+				for (int var6 = 0; var6 < TileItem.KitDefinition_fileCount; ++var6) { // L: 39
+					KitDefinition var7 = class23.KitDefinition_get(var6); // L: 40
+					if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { // L: 41
 						var1[equipmentIndices[var5]] = var6 + 256; // L: 42
 						break; // L: 43
 					}
@@ -105,10 +98,10 @@ public class PlayerComposition {
 		this.setHash(); // L: 52
 	} // L: 53
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(IZI)V",
-		garbageValue = "365347894"
+		garbageValue = "1938874220"
 	)
 	@Export("changeAppearance")
 	public void changeAppearance(int var1, boolean var2) {
@@ -122,17 +115,17 @@ public class PlayerComposition {
 					if (!var2) { // L: 61
 						--var3; // L: 62
 						if (var3 < 0) { // L: 63
-							var3 = ModelData0.KitDefinition_fileCount - 1;
+							var3 = TileItem.KitDefinition_fileCount - 1;
 						}
 					} else {
 						++var3; // L: 66
-						if (var3 >= ModelData0.KitDefinition_fileCount) { // L: 67
+						if (var3 >= TileItem.KitDefinition_fileCount) { // L: 67
 							var3 = 0;
 						}
 					}
 
-					var4 = WorldMapIcon_1.KitDefinition_get(var3); // L: 69
-				} while(var4 == null || var4.nonSelectable || (this.isFemale ? 7 : 0) + var1 != var4.bodypartID); // L: 70
+					var4 = class23.KitDefinition_get(var3); // L: 69
+				} while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); // L: 70
 
 				this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72
 				this.setHash(); // L: 73
@@ -143,16 +136,16 @@ public class PlayerComposition {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IZI)V",
-		garbageValue = "-410673716"
+		garbageValue = "1585830935"
 	)
-	public void method4703(int var1, boolean var2) {
+	public void method4820(int var1, boolean var2) {
 		int var3 = this.bodyColors[var1]; // L: 77
 		boolean var4;
 		if (!var2) { // L: 78
 			do {
 				--var3; // L: 80
 				if (var3 < 0) { // L: 81
-					var3 = class15.field137[var1].length - 1; // L: 82
+					var3 = class69.field568[var1].length - 1; // L: 82
 				}
 
 				if (var1 == 4 && var3 >= 8) { // L: 86
@@ -164,7 +157,7 @@ public class PlayerComposition {
 		} else {
 			do {
 				++var3; // L: 97
-				if (var3 >= class15.field137[var1].length) { // L: 98
+				if (var3 >= class69.field568[var1].length) { // L: 98
 					var3 = 0;
 				}
 
@@ -180,10 +173,10 @@ public class PlayerComposition {
 		this.setHash(); // L: 111
 	} // L: 112
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "862010308"
+		descriptor = "(ZB)V",
+		garbageValue = "86"
 	)
 	@Export("changeSex")
 	public void changeSex(boolean var1) {
@@ -192,10 +185,10 @@ public class PlayerComposition {
 		}
 	} // L: 117
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "580596518"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1987316978"
 	)
 	@Export("write")
 	public void write(Buffer var1) {
@@ -217,157 +210,157 @@ public class PlayerComposition {
 
 	} // L: 127
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1440101066"
+		garbageValue = "-1503997487"
 	)
 	@Export("setHash")
 	void setHash() {
 		long var1 = this.hash; // L: 130
 		int var3 = this.equipment[5]; // L: 131
 		int var4 = this.equipment[9]; // L: 132
-		this.equipment[5] = var4;
-		this.equipment[9] = var3;
-		this.hash = 0L;
+		this.equipment[5] = var4; // L: 133
+		this.equipment[9] = var3; // L: 134
+		this.hash = 0L; // L: 135
 
 		int var5;
-		for (var5 = 0; var5 < 12; ++var5) {
-			this.hash <<= 4;
-			if (this.equipment[var5] >= 256) {
+		for (var5 = 0; var5 < 12; ++var5) { // L: 136
+			this.hash <<= 4; // L: 137
+			if (this.equipment[var5] >= 256) { // L: 138
 				this.hash += (long)(this.equipment[var5] - 256);
 			}
 		}
 
-		if (this.equipment[0] >= 256) {
+		if (this.equipment[0] >= 256) { // L: 140
 			this.hash += (long)(this.equipment[0] - 256 >> 4);
 		}
 
-		if (this.equipment[1] >= 256) {
+		if (this.equipment[1] >= 256) { // L: 141
 			this.hash += (long)(this.equipment[1] - 256 >> 8);
 		}
 
-		for (var5 = 0; var5 < 5; ++var5) {
+		for (var5 = 0; var5 < 5; ++var5) { // L: 142
 			this.hash <<= 3; // L: 143
-			this.hash += (long)this.bodyColors[var5];
+			this.hash += (long)this.bodyColors[var5]; // L: 144
 		}
 
-		this.hash <<= 1;
-		this.hash += (long)(this.isFemale ? 1 : 0);
-		this.equipment[5] = var3;
-		this.equipment[9] = var4;
-		if (0L != var1 && this.hash != var1 || this.field2928) {
+		this.hash <<= 1; // L: 146
+		this.hash += (long)(this.isFemale ? 1 : 0); // L: 147
+		this.equipment[5] = var3; // L: 148
+		this.equipment[9] = var4; // L: 149
+		if (var1 != 0L && this.hash != var1 || this.field2942) { // L: 150
 			PlayerAppearance_cachedModels.remove(var1);
 		}
 
-	}
+	} // L: 151
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lfl;ILfl;II)Lgr;",
-		garbageValue = "1850715119"
+		descriptor = "(Lfm;ILfm;IB)Lgd;",
+		garbageValue = "16"
 	)
 	@Export("getModel")
 	public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
 		if (this.npcTransformId != -1) { // L: 154
-			return StructComposition.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4);
+			return class248.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155
 		} else {
-			long var5 = this.hash;
-			int[] var7 = this.equipment;
-			if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
-				var7 = new int[12];
+			long var5 = this.hash; // L: 157
+			int[] var7 = this.equipment; // L: 158
+			if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 159
+				var7 = new int[12]; // L: 160
 
-				for (int var8 = 0; var8 < 12; ++var8) {
+				for (int var8 = 0; var8 < 12; ++var8) { // L: 161
 					var7[var8] = this.equipment[var8];
 				}
 
-				if (var1.shield >= 0) {
-					var5 += (long)(var1.shield - this.equipment[5] << 40);
-					var7[5] = var1.shield;
+				if (var1.shield >= 0) { // L: 162
+					var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163
+					var7[5] = var1.shield; // L: 164
 				}
 
-				if (var1.weapon >= 0) {
-					var5 += (long)(var1.weapon - this.equipment[3] << 48);
+				if (var1.weapon >= 0) { // L: 166
+					var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167
 					var7[3] = var1.weapon; // L: 168
 				}
 			}
 
-			Model var18 = (Model)PlayerAppearance_cachedModels.get(var5);
-			if (var18 == null) {
-				boolean var9 = false;
+			Model var18 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 171
+			if (var18 == null) { // L: 172
+				boolean var9 = false; // L: 173
 
 				int var11;
-				for (int var10 = 0; var10 < 12; ++var10) {
-					var11 = var7[var10];
-					if (var11 >= 256 && var11 < 512 && !WorldMapIcon_1.KitDefinition_get(var11 - 256).ready()) { // L: 176
+				for (int var10 = 0; var10 < 12; ++var10) { // L: 174
+					var11 = var7[var10]; // L: 175
+					if (var11 >= 256 && var11 < 512 && !class23.KitDefinition_get(var11 - 256).ready()) { // L: 176 177
 						var9 = true;
 					}
 
-					if (var11 >= 512 && !class260.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 180
+					if (var11 >= 512 && !class250.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180
 						var9 = true;
 					}
 				}
 
-				if (var9) {
-					if (-1L != this.field2933) {
+				if (var9) { // L: 183
+					if (this.field2933 != -1L) { // L: 184
 						var18 = (Model)PlayerAppearance_cachedModels.get(this.field2933);
 					}
 
-					if (var18 == null) {
+					if (var18 == null) { // L: 185
 						return null;
 					}
 				}
 
-				if (var18 == null) {
-					ModelData[] var19 = new ModelData[12];
+				if (var18 == null) { // L: 187
+					ModelData[] var19 = new ModelData[12]; // L: 188
 					var11 = 0; // L: 189
 
 					int var13;
 					for (int var12 = 0; var12 < 12; ++var12) { // L: 190
-						var13 = var7[var12];
-						if (var13 >= 256 && var13 < 512) {
-							ModelData var14 = WorldMapIcon_1.KitDefinition_get(var13 - 256).getModelData(); // L: 193
+						var13 = var7[var12]; // L: 191
+						if (var13 >= 256 && var13 < 512) { // L: 192
+							ModelData var14 = class23.KitDefinition_get(var13 - 256).getModelData(); // L: 193
 							if (var14 != null) { // L: 194
 								var19[var11++] = var14;
 							}
 						}
 
 						if (var13 >= 512) { // L: 196
-							ItemComposition var22 = class260.ItemDefinition_get(var13 - 512); // L: 197
-							ModelData var15 = var22.method3018(this.isFemale); // L: 198
-							if (var15 != null) {
-								if (this.field2937 != null) { // L: 200
-									class135 var16 = this.field2937[var12]; // L: 201
-									if (var16 != null) {
+							ItemComposition var22 = class250.ItemDefinition_get(var13 - 512); // L: 197
+							ModelData var15 = var22.method3070(this.isFemale); // L: 198
+							if (var15 != null) { // L: 199
+								if (this.field2939 != null) { // L: 200
+									class136 var16 = this.field2939[var12]; // L: 201
+									if (var16 != null) { // L: 202
 										int var17;
-										if (var16.field1537 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1537.length) {
+										if (var16.field1542 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1542.length) { // L: 203
 											for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204
-												var15.recolor(var22.recolorTo[var17], var16.field1537[var17]);
+												var15.recolor(var22.recolorTo[var17], var16.field1542[var17]); // L: 205
 											}
 										}
 
-										if (var16.field1538 != null && var22.retextureFrom != null && var16.field1538.length == var22.retextureTo.length) {
-											for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) {
-												var15.retexture(var22.retextureTo[var17], var16.field1538[var17]); // L: 210
+										if (var16.field1541 != null && var22.retextureFrom != null && var16.field1541.length == var22.retextureTo.length) { // L: 208
+											for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209
+												var15.retexture(var22.retextureTo[var17], var16.field1541[var17]); // L: 210
 											}
 										}
 									}
 								}
 
-								var19[var11++] = var15;
+								var19[var11++] = var15; // L: 215
 							}
 						}
 					}
 
-					ModelData var20 = new ModelData(var19, var11);
+					ModelData var20 = new ModelData(var19, var11); // L: 219
 
 					for (var13 = 0; var13 < 5; ++var13) { // L: 220
-						if (this.bodyColors[var13] < class15.field137[var13].length) { // L: 221
-							var20.recolor(class29.field233[var13], class15.field137[var13][this.bodyColors[var13]]);
+						if (this.bodyColors[var13] < class69.field568[var13].length) { // L: 221
+							var20.recolor(VarcInt.field1581[var13], class69.field568[var13][this.bodyColors[var13]]);
 						}
 
-						if (this.bodyColors[var13] < VarbitComposition.field1708[var13].length) { // L: 222
-							var20.recolor(UserComparator5.field1442[var13], VarbitComposition.field1708[var13][this.bodyColors[var13]]);
+						if (this.bodyColors[var13] < Skills.field3175[var13].length) { // L: 222
+							var20.recolor(ModelData0.field2517[var13], Skills.field3175[var13][this.bodyColors[var13]]);
 						}
 					}
 
@@ -394,26 +387,26 @@ public class PlayerComposition {
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgm;",
-		garbageValue = "-45031641"
+		descriptor = "(I)Lga;",
+		garbageValue = "-1528210123"
 	)
 	@Export("getModelData")
 	ModelData getModelData() {
 		if (this.npcTransformId != -1) { // L: 238
-			return StructComposition.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
+			return class248.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
 		} else {
 			boolean var1 = false; // L: 241
 
 			int var3;
 			for (int var2 = 0; var2 < 12; ++var2) { // L: 242
 				var3 = this.equipment[var2]; // L: 243
-				if (var3 >= 256 && var3 < 512 && !WorldMapIcon_1.KitDefinition_get(var3 - 256).method2684()) { // L: 244 245
+				if (var3 >= 256 && var3 < 512 && !class23.KitDefinition_get(var3 - 256).method2754()) { // L: 244 245
 					var1 = true;
 				}
 
-				if (var3 >= 512 && !class260.ItemDefinition_get(var3 - 512).method3019(this.isFemale)) { // L: 247 248
+				if (var3 >= 512 && !class250.ItemDefinition_get(var3 - 512).method3102(this.isFemale)) { // L: 247 248
 					var1 = true;
 				}
 			}
@@ -429,14 +422,14 @@ public class PlayerComposition {
 					var5 = this.equipment[var4]; // L: 255
 					ModelData var6;
 					if (var5 >= 256 && var5 < 512) { // L: 256
-						var6 = WorldMapIcon_1.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
+						var6 = class23.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
 						if (var6 != null) { // L: 258
 							var7[var3++] = var6;
 						}
 					}
 
 					if (var5 >= 512) { // L: 260
-						var6 = class260.ItemDefinition_get(var5 - 512).method3020(this.isFemale); // L: 261
+						var6 = class250.ItemDefinition_get(var5 - 512).method3082(this.isFemale); // L: 261
 						if (var6 != null) { // L: 262
 							var7[var3++] = var6;
 						}
@@ -446,12 +439,12 @@ public class PlayerComposition {
 				ModelData var8 = new ModelData(var7, var3); // L: 265
 
 				for (var5 = 0; var5 < 5; ++var5) { // L: 266
-					if (this.bodyColors[var5] < class15.field137[var5].length) { // L: 267
-						var8.recolor(class29.field233[var5], class15.field137[var5][this.bodyColors[var5]]);
+					if (this.bodyColors[var5] < class69.field568[var5].length) { // L: 267
+						var8.recolor(VarcInt.field1581[var5], class69.field568[var5][this.bodyColors[var5]]);
 					}
 
-					if (this.bodyColors[var5] < VarbitComposition.field1708[var5].length) { // L: 268
-						var8.recolor(UserComparator5.field1442[var5], VarbitComposition.field1708[var5][this.bodyColors[var5]]);
+					if (this.bodyColors[var5] < Skills.field3175[var5].length) { // L: 268
+						var8.recolor(ModelData0.field2517[var5], Skills.field3175[var5][this.bodyColors[var5]]);
 					}
 				}
 
@@ -460,148 +453,79 @@ public class PlayerComposition {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1167283796"
+		garbageValue = "-2124364299"
 	)
 	@Export("getChatHeadId")
 	public int getChatHeadId() {
-		return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + StructComposition.getNpcDefinition(this.npcTransformId).id; // L: 274 275
+		return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + class248.getNpcDefinition(this.npcTransformId).id; // L: 274 275
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("jc")
 	@ObfuscatedSignature(
-		descriptor = "(B)[Lha;",
-		garbageValue = "-90"
+		descriptor = "(IIIIIIS)V",
+		garbageValue = "7586"
 	)
-	public static class225[] method4705() {
-		return new class225[]{class225.field2686, class225.field2680, class225.field2682, class225.field2683, class225.field2681, class225.field2685, class225.field2687, class225.field2684, class225.field2688, class225.field2689}; // L: 17
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/security/SecureRandom;",
-		garbageValue = "-1490609257"
-	)
-	static SecureRandom method4711() {
-		SecureRandom var0 = new SecureRandom(); // L: 39
-		var0.nextInt(); // L: 40
-		return var0; // L: 41
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "14"
-	)
-	@Export("readReflectionCheck")
-	public static void readReflectionCheck(Buffer var0, int var1) {
-		ReflectionCheck var2 = new ReflectionCheck(); // L: 133
-		var2.size = var0.readUnsignedByte(); // L: 134
-		var2.id = var0.readInt(); // L: 135
-		var2.operations = new int[var2.size]; // L: 136
-		var2.creationErrors = new int[var2.size]; // L: 137
-		var2.fields = new Field[var2.size]; // L: 138
-		var2.intReplaceValues = new int[var2.size]; // L: 139
-		var2.methods = new Method[var2.size]; // L: 140
-		var2.arguments = new byte[var2.size][][]; // L: 141
-
-		for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142
-			try {
-				int var4 = var0.readUnsignedByte(); // L: 144
-				String var5;
-				String var6;
-				int var7;
-				if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145
-					if (var4 == 3 || var4 == 4) { // L: 155
-						var5 = var0.readStringCp1252NullTerminated(); // L: 156
-						var6 = var0.readStringCp1252NullTerminated(); // L: 157
-						var7 = var0.readUnsignedByte(); // L: 158
-						String[] var8 = new String[var7]; // L: 159
-
-						for (int var9 = 0; var9 < var7; ++var9) { // L: 160
-							var8[var9] = var0.readStringCp1252NullTerminated();
-						}
-
-						String var20 = var0.readStringCp1252NullTerminated(); // L: 161
-						byte[][] var10 = new byte[var7][]; // L: 162
-						int var12;
-						if (var4 == 3) { // L: 163
-							for (int var11 = 0; var11 < var7; ++var11) { // L: 164
-								var12 = var0.readInt(); // L: 165
-								var10[var11] = new byte[var12]; // L: 166
-								var0.readBytes(var10[var11], 0, var12); // L: 167
-							}
-						}
-
-						var2.operations[var3] = var4; // L: 170
-						Class[] var21 = new Class[var7]; // L: 171
-
-						for (var12 = 0; var12 < var7; ++var12) { // L: 172
-							var21[var12] = UserComparator6.loadClassFromDescriptor(var8[var12]);
-						}
-
-						Class var22 = UserComparator6.loadClassFromDescriptor(var20); // L: 173
-						if (UserComparator6.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174
-							throw new SecurityException();
-						}
-
-						Method[] var13 = UserComparator6.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175
-						Method[] var14 = var13; // L: 177
-
-						for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178
-							Method var16 = var14[var15]; // L: 179
-							if (Reflection.getMethodName(var16).equals(var6)) { // L: 181
-								Class[] var17 = Reflection.getParameterTypes(var16); // L: 182
-								if (var17.length == var21.length) { // L: 183
-									boolean var18 = true; // L: 184
-
-									for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185
-										if (var17[var19] != var21[var19]) { // L: 186
-											var18 = false; // L: 187
-											break; // L: 188
-										}
-									}
-
-									if (var18 && var22 == var16.getReturnType()) { // L: 191
-										var2.methods[var3] = var16; // L: 192
-									}
-								}
-							}
-						}
-
-						var2.arguments[var3] = var10; // L: 199
-					}
-				} else {
-					var5 = var0.readStringCp1252NullTerminated(); // L: 146
-					var6 = var0.readStringCp1252NullTerminated(); // L: 147
-					var7 = 0; // L: 148
-					if (var4 == 1) { // L: 149
-						var7 = var0.readInt();
-					}
-
-					var2.operations[var3] = var4; // L: 150
-					var2.intReplaceValues[var3] = var7; // L: 151
-					if (UserComparator6.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152
-						throw new SecurityException();
-					}
-
-					var2.fields[var3] = Reflection.findField(UserComparator6.loadClassFromDescriptor(var5), var6); // L: 153
-				}
-			} catch (ClassNotFoundException var24) { // L: 202
-				var2.creationErrors[var3] = -1; // L: 203
-			} catch (SecurityException var25) { // L: 205
-				var2.creationErrors[var3] = -2; // L: 206
-			} catch (NullPointerException var26) { // L: 208
-				var2.creationErrors[var3] = -3; // L: 209
-			} catch (Exception var27) { // L: 211
-				var2.creationErrors[var3] = -4; // L: 212
-			} catch (Throwable var28) { // L: 214
-				var2.creationErrors[var3] = -5; // L: 215
-			}
+	static final void method4850(int var0, int var1, int var2, int var3, int var4, int var5) {
+		int var6 = var2 - var0; // L: 9851
+		int var7 = var3 - var1; // L: 9852
+		int var8 = var6 >= 0 ? var6 : -var6; // L: 9853
+		int var9 = var7 >= 0 ? var7 : -var7; // L: 9854
+		int var10 = var8; // L: 9855
+		if (var8 < var9) { // L: 9856
+			var10 = var9;
 		}
 
-		class69.reflectionChecks.addFirst(var2); // L: 218
-	} // L: 219
+		if (var10 != 0) { // L: 9857
+			int var11 = (var6 << 16) / var10; // L: 9858
+			int var12 = (var7 << 16) / var10; // L: 9859
+			if (var12 <= var11) { // L: 9860
+				var11 = -var11;
+			} else {
+				var12 = -var12; // L: 9861
+			}
+
+			int var13 = var5 * var12 >> 17; // L: 9862
+			int var14 = var5 * var12 + 1 >> 17; // L: 9863
+			int var15 = var5 * var11 >> 17; // L: 9864
+			int var16 = var5 * var11 + 1 >> 17; // L: 9865
+			var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9866
+			var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9867
+			int var17 = var0 + var13; // L: 9868
+			int var18 = var0 - var14; // L: 9869
+			int var19 = var0 + var6 - var14; // L: 9870
+			int var20 = var0 + var13 + var6; // L: 9871
+			int var21 = var15 + var1; // L: 9872
+			int var22 = var1 - var16; // L: 9873
+			int var23 = var7 + var1 - var16; // L: 9874
+			int var24 = var15 + var7 + var1; // L: 9875
+			Rasterizer3D.method3959(var17, var18, var19); // L: 9876
+			Rasterizer3D.method3962(var21, var22, var23, var17, var18, var19, var4); // L: 9877
+			Rasterizer3D.method3959(var17, var19, var20); // L: 9878
+			Rasterizer3D.method3962(var21, var23, var24, var17, var19, var20, var4); // L: 9879
+		}
+	} // L: 9880
+
+	@ObfuscatedName("lp")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;B)Liv;",
+		garbageValue = "-77"
+	)
+	static Widget method4851(Widget var0) {
+		int var1 = class8.method104(class22.getWidgetFlags(var0)); // L: 11552
+		if (var1 == 0) { // L: 11553
+			return null;
+		} else {
+			for (int var2 = 0; var2 < var1; ++var2) { // L: 11554
+				var0 = WorldMapData_1.getWidget(var0.parentId); // L: 11555
+				if (var0 == null) { // L: 11556
+					return null;
+				}
+			}
+
+			return var0; // L: 11558
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java
index 41e4bc4cbd..94a5d16146 100644
--- a/runescape-client/src/main/java/PlayerProvider.java
+++ b/runescape-client/src/main/java/PlayerProvider.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bh")
+@ObfuscatedName("ba")
 @Implements("PlayerProvider")
 public interface PlayerProvider {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lbd;",
-		garbageValue = "-597712139"
+		descriptor = "(I)Lbq;",
+		garbageValue = "2087332852"
 	)
 	@Export("player")
 	PcmPlayer player();
diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java
index 417dc34f4a..2fa40bc0c6 100644
--- a/runescape-client/src/main/java/PlayerType.java
+++ b/runescape-client/src/main/java/PlayerType.java
@@ -6,20 +6,21 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ja")
 @Implements("PlayerType")
-public enum PlayerType implements Enumerated {
-	@ObfuscatedName("v")
+public enum PlayerType implements Enumerated
+{
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "Lja;"
 	)
 	@Export("PlayerType_normal")
 	PlayerType_normal(0, -1, true, false, true),
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "Lja;"
 	)
 	@Export("PlayerType_playerModerator")
 	PlayerType_playerModerator(1, 0, true, true, true),
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "Lja;"
 	)
@@ -31,43 +32,40 @@ public enum PlayerType implements Enumerated {
 	)
 	@Export("PlayerType_ironman")
 	PlayerType_ironman(3, 2, false, false, true),
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "Lja;"
 	)
 	@Export("PlayerType_ultimateIronman")
 	PlayerType_ultimateIronman(4, 3, false, false, true),
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "Lja;"
 	)
 	@Export("PlayerType_hardcoreIronman")
 	PlayerType_hardcoreIronman(5, 10, false, false, true),
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "Lja;"
 	)
-	field3548(6, 22, false, false, true);
+	field3544(6, 22, false, false, true);
 
-	@ObfuscatedName("k")
-	@Export("cacheSubPaths")
-	public static String[] cacheSubPaths;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -614053173
+		intValue = -1170932769
 	)
 	@Export("id")
 	final int id;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 417414069
+		intValue = -1972754767
 	)
 	@Export("modIcon")
 	public final int modIcon;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("isPrivileged")
 	public final boolean isPrivileged;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("isUser")
 	public final boolean isUser;
 
@@ -78,24 +76,13 @@ public enum PlayerType implements Enumerated {
 		this.isUser = var7; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id; // L: 31
 	}
-
-	@ObfuscatedName("jw")
-	@ObfuscatedSignature(
-		descriptor = "(IIIZB)V",
-		garbageValue = "77"
-	)
-	static final void method4857(int var0, int var1, int var2, boolean var3) {
-		if (Clock.loadInterface(var0)) { // L: 9766
-			class27.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); // L: 9767
-		}
-	} // L: 9768
 }
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index a59895c023..dd964d88cb 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -1,117 +1,85 @@
-import java.awt.Desktop;
-import java.awt.Desktop.Action;
-import java.net.URI;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("di")
+@ObfuscatedName("ds")
 @Implements("Players")
 public class Players {
-	@ObfuscatedName("f")
-	static byte[] field1370;
+	@ObfuscatedName("v")
+	static byte[] field1372;
 	@ObfuscatedName("y")
-	static byte[] field1373;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "[Lnd;"
-	)
-	static Buffer[] field1374;
+	static byte[] field1361;
 	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "[Lnt;"
+	)
+	static Buffer[] field1362;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1143549299
+		intValue = 1407274759
 	)
 	@Export("Players_count")
 	static int Players_count;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("Players_indices")
 	static int[] Players_indices;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1936837699
+		intValue = 1572681721
 	)
 	@Export("Players_emptyIdxCount")
 	static int Players_emptyIdxCount;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("Players_emptyIndices")
 	static int[] Players_emptyIndices;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("Players_regions")
 	static int[] Players_regions;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("Players_orientations")
 	static int[] Players_orientations;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("Players_targetIndices")
 	static int[] Players_targetIndices;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1149592963
+		intValue = -1672795699
 	)
 	@Export("Players_pendingUpdateCount")
 	static int Players_pendingUpdateCount;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("Players_pendingUpdateIndices")
 	static int[] Players_pendingUpdateIndices;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lnt;"
 	)
-	static Buffer field1384;
+	static Buffer field1373;
 
 	static {
-		field1370 = new byte[2048]; // L: 18
-		field1373 = new byte[2048]; // L: 19
-		field1374 = new Buffer[2048]; // L: 20
+		field1372 = new byte[2048]; // L: 18
+		field1361 = new byte[2048]; // L: 19
+		field1362 = new Buffer[2048]; // L: 20
 		Players_count = 0; // L: 21
 		Players_indices = new int[2048]; // L: 22
-		Players_emptyIdxCount = 0;
-		Players_emptyIndices = new int[2048];
+		Players_emptyIdxCount = 0; // L: 23
+		Players_emptyIndices = new int[2048]; // L: 24
 		Players_regions = new int[2048]; // L: 25
-		Players_orientations = new int[2048];
+		Players_orientations = new int[2048]; // L: 26
 		Players_targetIndices = new int[2048]; // L: 27
 		Players_pendingUpdateCount = 0; // L: 28
-		Players_pendingUpdateIndices = new int[2048];
-		field1384 = new Buffer(new byte[5000]); // L: 30
+		Players_pendingUpdateIndices = new int[2048]; // L: 29
+		field1373 = new Buffer(new byte[5000]); // L: 30
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ZZI)V",
-		garbageValue = "-1331673664"
+		descriptor = "(I)V",
+		garbageValue = "-1219077649"
 	)
-	@Export("openURL")
-	public static void openURL(String var0, boolean var1, boolean var2) {
-		if (var1) { // L: 23
-			if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 24
-				try {
-					Desktop.getDesktop().browse(new URI(var0)); // L: 26
-					return; // L: 47
-				} catch (Exception var4) { // L: 29
-				}
-			}
-
-			if (class44.field318.startsWith("win")) { // L: 31
-				class249.method4792(var0, 0); // L: 33
-			} else if (class44.field318.startsWith("mac")) { // L: 37
-				Script.method1996(var0, 1, "openjs"); // L: 38
-			} else {
-				class249.method4792(var0, 2); // L: 41
-			}
-		} else {
-			class249.method4792(var0, 3); // L: 44
-		}
-
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "2094559510"
-	)
-	static final int method2311() {
-		return ViewportMouse.ViewportMouse_y; // L: 116
-	}
+	public static void method2402() {
+		ParamComposition.ParamDefinition_cached.clear(); // L: 68
+	} // L: 69
 }
diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java
index dd3d83b5d3..95e355f0df 100644
--- a/runescape-client/src/main/java/PrivateChatMode.java
+++ b/runescape-client/src/main/java/PrivateChatMode.java
@@ -3,37 +3,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lm")
+@ObfuscatedName("ls")
 @Implements("PrivateChatMode")
 public class PrivateChatMode {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Llm;"
-	)
-	static final PrivateChatMode field3888;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Llm;"
-	)
-	public static final PrivateChatMode field3887;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Llm;"
+		descriptor = "Lls;"
 	)
-	static final PrivateChatMode field3889;
+	static final PrivateChatMode field3885;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lls;"
+	)
+	public static final PrivateChatMode field3886;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lls;"
+	)
+	static final PrivateChatMode field3881;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -767370613
+		intValue = -1188638191
 	)
-	public final int field3890;
+	public final int field3884;
 
 	static {
-		field3888 = new PrivateChatMode(0); // L: 5
-		field3887 = new PrivateChatMode(1); // L: 6
-		field3889 = new PrivateChatMode(2);
+		field3885 = new PrivateChatMode(0); // L: 5
+		field3886 = new PrivateChatMode(1); // L: 6
+		field3881 = new PrivateChatMode(2);
 	} // L: 7
 
 	PrivateChatMode(int var1) {
-		this.field3890 = var1; // L: 11
+		this.field3884 = var1; // L: 11
 	} // L: 12
 }
diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java
index 4f7bd077f8..e68ea6ee20 100644
--- a/runescape-client/src/main/java/Projectile.java
+++ b/runescape-client/src/main/java/Projectile.java
@@ -4,129 +4,135 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cq")
+@ObfuscatedName("cp")
 @Implements("Projectile")
 public final class Projectile extends Renderable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("oq")
+	@ObfuscatedSignature(
+		descriptor = "Lei;"
+	)
+	@Export("mouseWheel")
+	static MouseWheel mouseWheel;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 914973851
+		intValue = -620929205
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1185495603
+		intValue = 1503104185
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1975154263
+		intValue = 1281749377
 	)
 	@Export("sourceX")
 	int sourceX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1770224161
+		intValue = -856181149
 	)
 	@Export("sourceY")
 	int sourceY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1880458377
+		intValue = -2061408833
 	)
 	@Export("sourceZ")
 	int sourceZ;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 460279713
+		intValue = -722624469
 	)
 	@Export("endHeight")
 	int endHeight;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1894077723
+		intValue = -578493745
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1817230173
+		intValue = -1349240519
 	)
 	@Export("cycleEnd")
 	int cycleEnd;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1395984447
+		intValue = 383721093
 	)
 	@Export("slope")
 	int slope;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -692803357
+		intValue = -1902000949
 	)
 	@Export("startHeight")
 	int startHeight;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 319116855
+		intValue = -770535721
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("isMoving")
 	boolean isMoving;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("x")
 	double x;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("y")
 	double y;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("z")
 	double z;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("speedX")
 	double speedX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("speedY")
 	double speedY;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("speed")
 	double speed;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("speedZ")
 	double speedZ;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("accelerationZ")
 	double accelerationZ;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 2013686209
+		intValue = -9873959
 	)
 	@Export("yaw")
 	int yaw;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1708799041
+		intValue = -909606039
 	)
 	@Export("pitch")
 	int pitch;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lfl;"
+		descriptor = "Lfm;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -774931897
+		intValue = -2026775219
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1812825413
+		intValue = -472667051
 	)
 	@Export("frameCycle")
 	int frameCycle;
@@ -145,21 +151,21 @@ public final class Projectile extends Renderable {
 		this.slope = var8; // L: 43
 		this.startHeight = var9; // L: 44
 		this.targetIndex = var10; // L: 45
-		this.endHeight = var11;
-		this.isMoving = false;
-		int var12 = VarcInt.SpotAnimationDefinition_get(this.id).sequence;
-		if (var12 != -1) {
-			this.sequenceDefinition = LoginScreenAnimation.SequenceDefinition_get(var12);
+		this.endHeight = var11; // L: 46
+		this.isMoving = false; // L: 47
+		int var12 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 48
+		if (var12 != -1) { // L: 49
+			this.sequenceDefinition = WorldMapScaleHandler.SequenceDefinition_get(var12);
 		} else {
-			this.sequenceDefinition = null;
+			this.sequenceDefinition = null; // L: 50
 		}
 
-	}
+	} // L: 51
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-1589443362"
+		descriptor = "(IIIIB)V",
+		garbageValue = "-4"
 	)
 	@Export("setDestination")
 	final void setDestination(int var1, int var2, int var3, int var4) {
@@ -167,31 +173,31 @@ public final class Projectile extends Renderable {
 		if (!this.isMoving) { // L: 54
 			var5 = (double)(var1 - this.sourceX); // L: 55
 			double var7 = (double)(var2 - this.sourceY); // L: 56
-			double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57
+			double var9 = Math.sqrt(var5 * var5 + var7 * var7); // L: 57
 			this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58
-			this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; // L: 59
+			this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9; // L: 59
 			this.z = (double)this.sourceZ; // L: 60
 		}
 
 		var5 = (double)(this.cycleEnd + 1 - var4); // L: 62
 		this.speedX = ((double)var1 - this.x) / var5; // L: 63
 		this.speedY = ((double)var2 - this.y) / var5; // L: 64
-		this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); // L: 65
+		this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65
 		if (!this.isMoving) { // L: 66
-			this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D);
+			this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope);
 		}
 
-		this.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); // L: 67
+		this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); // L: 67
 	} // L: 68
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = VarcInt.SpotAnimationDefinition_get(this.id); // L: 92
+		SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 92
 		Model var2 = var1.getModel(this.frame); // L: 93
 		if (var2 == null) { // L: 94
 			return null;
@@ -201,18 +207,18 @@ public final class Projectile extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-602839745"
+		garbageValue = "-1411274037"
 	)
 	@Export("advance")
 	final void advance(int var1) {
 		this.isMoving = true; // L: 71
-		this.x += this.speedX * (double)var1; // L: 72
-		this.y += (double)var1 * this.speedY; // L: 73
-		this.z += (double)var1 * this.speedZ + (double)var1 * 0.5D * this.accelerationZ * (double)var1; // L: 74
-		this.speedZ += this.accelerationZ * (double)var1; // L: 75
+		this.x += (double)var1 * this.speedX; // L: 72
+		this.y += this.speedY * (double)var1; // L: 73
+		this.z += this.speedZ * (double)var1 + 0.5D * this.accelerationZ * (double)var1 * (double)var1; // L: 74
+		this.speedZ += (double)var1 * this.accelerationZ; // L: 75
 		this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76
 		this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77
 		if (this.sequenceDefinition != null) { // L: 78
@@ -237,24 +243,82 @@ public final class Projectile extends Renderable {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lev;",
-		garbageValue = "-1277280984"
+		descriptor = "(I)V",
+		garbageValue = "-530547820"
 	)
-	public static HitSplatDefinition method1966(int var0) {
-		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46
-		if (var1 != null) { // L: 47
-			return var1;
-		} else {
-			byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48
-			var1 = new HitSplatDefinition(); // L: 49
-			if (var2 != null) { // L: 50
-				var1.decode(new Buffer(var2));
+	public static void method2075() {
+		ItemComposition.ItemDefinition_cached.clear(); // L: 555
+		ItemComposition.ItemDefinition_cachedModels.clear(); // L: 556
+		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 557
+	} // L: 558
+
+	@ObfuscatedName("fq")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "-114"
+	)
+	@Export("updateGameState")
+	static void updateGameState(int var0) {
+		if (var0 != Client.gameState) { // L: 1388
+			if (Client.gameState == 0) { // L: 1389
+				class1.client.method672();
 			}
 
-			HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51
-			return var1; // L: 52
+			if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1390
+				Client.loginState = 0; // L: 1391
+				Client.field811 = 0; // L: 1392
+				Client.field654 = 0; // L: 1393
+				Client.timer.method5675(var0); // L: 1394
+				if (var0 != 20) { // L: 1395
+					class19.method281(false);
+				}
+			}
+
+			if (var0 != 20 && var0 != 40 && DefaultsGroup.field3887 != null) { // L: 1397 1398
+				DefaultsGroup.field3887.close(); // L: 1399
+				DefaultsGroup.field3887 = null; // L: 1400
+			}
+
+			if (Client.gameState == 25) { // L: 1403
+				Client.field678 = 0; // L: 1404
+				Client.field618 = 0; // L: 1405
+				Client.field789 = 1; // L: 1406
+				Client.field742 = 0; // L: 1407
+				Client.field677 = 1; // L: 1408
+			}
+
+			if (var0 != 5 && var0 != 10) { // L: 1410
+				if (var0 == 20) { // L: 1413
+					DesktopPlatformInfoProvider.method6109(JagexCache.archive10, ModeWhere.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1414
+				} else if (var0 == 11) { // L: 1416
+					DesktopPlatformInfoProvider.method6109(JagexCache.archive10, ModeWhere.archive8, false, 4); // L: 1417
+				} else if (class377.clearLoginScreen) { // L: 1420
+					Coord.titleboxSprite = null; // L: 1421
+					class289.titlebuttonSprite = null; // L: 1422
+					Login.runesSprite = null; // L: 1423
+					class339.leftTitleSprite = null; // L: 1424
+					class377.rightTitleSprite = null; // L: 1425
+					Messages.logoSprite = null; // L: 1426
+					GrandExchangeEvents.title_muteSprite = null; // L: 1427
+					Login.options_buttons_0Sprite = null; // L: 1428
+					WorldMapCacheName.options_buttons_2Sprite = null; // L: 1429
+					Varcs.worldSelectBackSprites = null; // L: 1430
+					class364.worldSelectFlagSprites = null; // L: 1431
+					class10.worldSelectArrows = null; // L: 1432
+					Huffman.worldSelectStars = null; // L: 1433
+					class35.field244 = null; // L: 1434
+					PendingSpawn.loginScreenRunesAnimation.method2296(); // L: 1435
+					PcmPlayer.method856(2); // L: 1436
+					class105.method2358(true); // L: 1437
+					class377.clearLoginScreen = false; // L: 1438
+				}
+			} else {
+				DesktopPlatformInfoProvider.method6109(JagexCache.archive10, ModeWhere.archive8, true, 0); // L: 1411
+			}
+
+			Client.gameState = var0; // L: 1440
 		}
-	}
+	} // L: 1441
 }
diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java
index 7d6972a983..df1d5af79a 100644
--- a/runescape-client/src/main/java/RasterProvider.java
+++ b/runescape-client/src/main/java/RasterProvider.java
@@ -14,13 +14,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aw")
+@ObfuscatedName("am")
 @Implements("RasterProvider")
 public final class RasterProvider extends AbstractRasterProvider {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("component")
 	Component component;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("image")
 	Image image;
 
@@ -36,30 +36,30 @@ public final class RasterProvider extends AbstractRasterProvider {
 		this.apply(); // L: 31
 	} // L: 32
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Component;I)V",
-		garbageValue = "-401885377"
+		descriptor = "(Ljava/awt/Component;B)V",
+		garbageValue = "1"
 	)
 	@Export("setComponent")
 	final void setComponent(Component var1) {
 		this.component = var1; // L: 35
 	} // L: 36
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "-974946505"
+		garbageValue = "-474214385"
 	)
 	@Export("drawFull")
 	public final void drawFull(int var1, int var2) {
 		this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39
 	} // L: 40
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "331056379"
+		descriptor = "(IIIIS)V",
+		garbageValue = "640"
 	)
 	@Export("draw")
 	public final void draw(int var1, int var2, int var3, int var4) {
@@ -69,7 +69,7 @@ public final class RasterProvider extends AbstractRasterProvider {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/awt/Graphics;III)V",
-		garbageValue = "1867252423"
+		garbageValue = "-941399356"
 	)
 	@Export("drawFull0")
 	final void drawFull0(Graphics var1, int var2, int var3) {
@@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider {
 
 	} // L: 53
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Graphics;IIIIB)V",
-		garbageValue = "51"
+		descriptor = "(Ljava/awt/Graphics;IIIII)V",
+		garbageValue = "-1413696470"
 	)
 	@Export("draw0")
 	final void draw0(Graphics var1, int var2, int var3, int var4, int var5) {
diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java
index 17b1fbaf25..f221f94982 100644
--- a/runescape-client/src/main/java/Rasterizer2D.java
+++ b/runescape-client/src/main/java/Rasterizer2D.java
@@ -3,25 +3,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oi")
+@ObfuscatedName("og")
 @Implements("Rasterizer2D")
 public class Rasterizer2D extends DualNode {
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("Rasterizer2D_pixels")
 	public static int[] Rasterizer2D_pixels;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("Rasterizer2D_width")
 	public static int Rasterizer2D_width;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("Rasterizer2D_height")
 	public static int Rasterizer2D_height;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@Export("Rasterizer2D_yClipStart")
 	public static int Rasterizer2D_yClipStart;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@Export("Rasterizer2D_yClipEnd")
 	public static int Rasterizer2D_yClipEnd;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("Rasterizer2D_xClipStart")
 	public static int Rasterizer2D_xClipStart;
 	@ObfuscatedName("ag")
@@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode {
 	protected Rasterizer2D() {
 	} // L: 16
 
-	@ObfuscatedName("dk")
+	@ObfuscatedName("ct")
 	@Export("Rasterizer2D_replace")
 	public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
 		Rasterizer2D_pixels = var0; // L: 19
@@ -47,7 +47,7 @@ public class Rasterizer2D extends DualNode {
 		Rasterizer2D_setClip(0, 0, var1, var2); // L: 22
 	} // L: 23
 
-	@ObfuscatedName("ds")
+	@ObfuscatedName("ci")
 	@Export("Rasterizer2D_resetClip")
 	public static void Rasterizer2D_resetClip() {
 		Rasterizer2D_xClipStart = 0; // L: 26
@@ -56,7 +56,7 @@ public class Rasterizer2D extends DualNode {
 		Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29
 	} // L: 30
 
-	@ObfuscatedName("do")
+	@ObfuscatedName("cs")
 	@Export("Rasterizer2D_setClip")
 	public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) {
 		if (var0 < 0) { // L: 33
@@ -81,7 +81,7 @@ public class Rasterizer2D extends DualNode {
 		Rasterizer2D_yClipEnd = var3; // L: 40
 	} // L: 41
 
-	@ObfuscatedName("df")
+	@ObfuscatedName("co")
 	@Export("Rasterizer2D_expandClip")
 	public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) {
 		if (Rasterizer2D_xClipStart < var0) { // L: 44
@@ -102,7 +102,7 @@ public class Rasterizer2D extends DualNode {
 
 	} // L: 48
 
-	@ObfuscatedName("dv")
+	@ObfuscatedName("cj")
 	@Export("Rasterizer2D_getClipArray")
 	public static void Rasterizer2D_getClipArray(int[] var0) {
 		var0[0] = Rasterizer2D_xClipStart; // L: 51
@@ -111,7 +111,7 @@ public class Rasterizer2D extends DualNode {
 		var0[3] = Rasterizer2D_yClipEnd; // L: 54
 	} // L: 55
 
-	@ObfuscatedName("dy")
+	@ObfuscatedName("cr")
 	@Export("Rasterizer2D_setClipArray")
 	public static void Rasterizer2D_setClipArray(int[] var0) {
 		Rasterizer2D_xClipStart = var0[0]; // L: 58
@@ -120,7 +120,7 @@ public class Rasterizer2D extends DualNode {
 		Rasterizer2D_yClipEnd = var0[3]; // L: 61
 	} // L: 62
 
-	@ObfuscatedName("dd")
+	@ObfuscatedName("cl")
 	@Export("Rasterizer2D_clear")
 	public static void Rasterizer2D_clear() {
 		int var0 = 0; // L: 65
@@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode {
 
 	} // L: 79
 
-	@ObfuscatedName("da")
+	@ObfuscatedName("cw")
 	@Export("drawCircle")
 	static void drawCircle(int var0, int var1, int var2, int var3) {
 		if (var2 == 0) { // L: 82
@@ -236,7 +236,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 84 133
 
-	@ObfuscatedName("dx")
+	@ObfuscatedName("ck")
 	@Export("Rasterizer2D_drawCircleAlpha")
 	public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) {
 		if (var4 != 0) { // L: 136
@@ -349,7 +349,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 139 207
 
-	@ObfuscatedName("dg")
+	@ObfuscatedName("cn")
 	@Export("Rasterizer2D_fillRectangleAlpha")
 	public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
 		if (var0 < Rasterizer2D_xClipStart) { // L: 210
@@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode {
 
 	} // L: 232
 
-	@ObfuscatedName("du")
+	@ObfuscatedName("ch")
 	@Export("Rasterizer2D_fillRectangle")
 	public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) {
 		if (var0 < Rasterizer2D_xClipStart) { // L: 235
@@ -421,7 +421,7 @@ public class Rasterizer2D extends DualNode {
 
 	} // L: 253
 
-	@ObfuscatedName("dt")
+	@ObfuscatedName("du")
 	@Export("Rasterizer2D_fillRectangleGradient")
 	public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) {
 		if (var2 > 0 && var3 > 0) { // L: 256
@@ -465,7 +465,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 282
 
-	@ObfuscatedName("dn")
+	@ObfuscatedName("db")
 	@Export("Rasterizer2D_fillRectangleGradientAlpha")
 	public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var2 > 0 && var3 > 0) { // L: 285
@@ -523,7 +523,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 326
 
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIII[BIZ)V",
 		garbageValue = "1"
@@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 380
 
-	@ObfuscatedName("dl")
+	@ObfuscatedName("dh")
 	@Export("Rasterizer2D_drawRectangle")
 	public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
 		Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383
@@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode {
 		Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386
 	} // L: 387
 
-	@ObfuscatedName("dq")
+	@ObfuscatedName("di")
 	@Export("Rasterizer2D_drawRectangleAlpha")
 	public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
 		Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390
@@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode {
 
 	} // L: 396
 
-	@ObfuscatedName("de")
+	@ObfuscatedName("ds")
 	@Export("Rasterizer2D_drawHorizontalLine")
 	public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
 		if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399
@@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 407
 
-	@ObfuscatedName("dp")
+	@ObfuscatedName("df")
 	@Export("Rasterizer2D_drawHorizontalLineAlpha")
 	static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
 		if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410
@@ -677,7 +677,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 431
 
-	@ObfuscatedName("dm")
+	@ObfuscatedName("dg")
 	@Export("Rasterizer2D_drawVerticalLine")
 	public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
 		if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434
@@ -699,7 +699,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 442
 
-	@ObfuscatedName("dw")
+	@ObfuscatedName("dq")
 	@Export("Rasterizer2D_drawVerticalLineAlpha")
 	static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
 		if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445
@@ -730,7 +730,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 467
 
-	@ObfuscatedName("ec")
+	@ObfuscatedName("dz")
 	@Export("Rasterizer2D_drawLine")
 	public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) {
 		var2 -= var0; // L: 470
@@ -812,7 +812,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 475 480 524
 
-	@ObfuscatedName("ea")
+	@ObfuscatedName("dc")
 	@Export("Rasterizer2D_setPixel")
 	static void Rasterizer2D_setPixel(int var0, int var1, int var2) {
 		if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527
@@ -820,7 +820,7 @@ public class Rasterizer2D extends DualNode {
 		}
 	} // L: 529
 
-	@ObfuscatedName("ek")
+	@ObfuscatedName("dt")
 	@Export("Rasterizer2D_fillMaskedRectangle")
 	public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) {
 		int var5 = var0 + Rasterizer2D_width * var1; // L: 532
diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java
index 1e3ad9e636..330f97420d 100644
--- a/runescape-client/src/main/java/Rasterizer3D.java
+++ b/runescape-client/src/main/java/Rasterizer3D.java
@@ -3,92 +3,92 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gj")
+@ObfuscatedName("gn")
 @Implements("Rasterizer3D")
 public class Rasterizer3D extends Rasterizer2D {
-	@ObfuscatedName("v")
-	static boolean field2262;
-	@ObfuscatedName("n")
-	static boolean field2260;
 	@ObfuscatedName("f")
+	static boolean field2262;
+	@ObfuscatedName("e")
+	static boolean field2259;
+	@ObfuscatedName("v")
 	@Export("Rasterizer3D_isLowDetailTexture")
 	static boolean Rasterizer3D_isLowDetailTexture;
 	@ObfuscatedName("y")
-	public static boolean field2282;
-	@ObfuscatedName("p")
+	public static boolean field2281;
+	@ObfuscatedName("j")
 	@Export("Rasterizer3D_alpha")
 	static int Rasterizer3D_alpha;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("Rasterizer3D_zoom")
 	public static int Rasterizer3D_zoom;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("Rasterizer3D_clipMidX")
 	static int Rasterizer3D_clipMidX;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("Rasterizer3D_clipMidY")
 	static int Rasterizer3D_clipMidY;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("Rasterizer3D_clipWidth")
 	static int Rasterizer3D_clipWidth;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("Rasterizer3D_clipHeight")
 	static int Rasterizer3D_clipHeight;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("Rasterizer3D_clipNegativeMidX")
 	static int Rasterizer3D_clipNegativeMidX;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("Rasterizer3D_clipMidX2")
 	static int Rasterizer3D_clipMidX2;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Rasterizer3D_clipNegativeMidY")
 	static int Rasterizer3D_clipNegativeMidY;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("Rasterizer3D_clipMidY2")
 	static int Rasterizer3D_clipMidY2;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("Rasterizer3D_rowOffsets")
 	static int[] Rasterizer3D_rowOffsets;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("Rasterizer3D_colorPalette")
 	public static int[] Rasterizer3D_colorPalette;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lhb;"
+		descriptor = "Lhy;"
 	)
 	@Export("Rasterizer3D_textureLoader")
 	public static TextureLoader Rasterizer3D_textureLoader;
-	@ObfuscatedName("h")
-	static int[] field2284;
-	@ObfuscatedName("q")
-	static int[] field2283;
-	@ObfuscatedName("i")
+	@ObfuscatedName("l")
+	static int[] field2280;
+	@ObfuscatedName("w")
+	static int[] field2282;
+	@ObfuscatedName("a")
 	@Export("Rasterizer3D_sine")
 	public static int[] Rasterizer3D_sine;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@Export("Rasterizer3D_cosine")
 	public static int[] Rasterizer3D_cosine;
 
 	static {
 		field2262 = false; // L: 8
-		field2260 = false; // L: 9
+		field2259 = false; // L: 9
 		Rasterizer3D_isLowDetailTexture = false; // L: 10
-		field2282 = true; // L: 11
+		field2281 = true; // L: 11
 		Rasterizer3D_alpha = 0; // L: 12
 		Rasterizer3D_zoom = 512; // L: 19
 		Rasterizer3D_rowOffsets = new int[1024]; // L: 28
 		Rasterizer3D_colorPalette = new int[65536]; // L: 29
-		field2284 = new int[512]; // L: 31
-		field2283 = new int[2048]; // L: 32
+		field2280 = new int[512]; // L: 31
+		field2282 = new int[2048]; // L: 32
 		Rasterizer3D_sine = new int[2048]; // L: 33
 		Rasterizer3D_cosine = new int[2048]; // L: 34
 
 		int var0;
 		for (var0 = 1; var0 < 512; ++var0) { // L: 37
-			field2284[var0] = 32768 / var0; // L: 38
+			field2280[var0] = 32768 / var0; // L: 38
 		}
 
 		for (var0 = 1; var0 < 2048; ++var0) { // L: 40
-			field2283[var0] = 65536 / var0; // L: 41
+			field2282[var0] = 65536 / var0; // L: 41
 		}
 
 		for (var0 = 0; var0 < 2048; ++var0) { // L: 43
@@ -98,20 +98,20 @@ public class Rasterizer3D extends Rasterizer2D {
 
 	} // L: 47
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("Rasterizer3D_setClipFromRasterizer2D")
 	public static final void Rasterizer3D_setClipFromRasterizer2D() {
 		Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54
 	} // L: 55
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("Rasterizer3D_setClip")
 	static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) {
 		Rasterizer3D_clipWidth = var2 - var0; // L: 58
 		Rasterizer3D_clipHeight = var3 - var1; // L: 59
 		Rasterizer3D_method3(); // L: 60
 		if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61
-			Rasterizer3D_rowOffsets = new int[Player.method2128(Rasterizer3D_clipHeight)];
+			Rasterizer3D_rowOffsets = new int[UrlRequester.method2504(Rasterizer3D_clipHeight)];
 		}
 
 		int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62
@@ -123,7 +123,7 @@ public class Rasterizer3D extends Rasterizer2D {
 
 	} // L: 67
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("Rasterizer3D_method3")
 	public static final void Rasterizer3D_method3() {
 		Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70
@@ -135,7 +135,7 @@ public class Rasterizer3D extends Rasterizer2D {
 	} // L: 76
 
 	@ObfuscatedName("y")
-	public static final void method3848(int var0, int var1) {
+	public static final void method3950(int var0, int var1) {
 		int var2 = Rasterizer3D_rowOffsets[0]; // L: 79
 		int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80
 		int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81
@@ -147,22 +147,22 @@ public class Rasterizer3D extends Rasterizer2D {
 		Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87
 	} // L: 88
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lhb;)V"
+		descriptor = "(Lhy;)V"
 	)
 	@Export("Rasterizer3D_setTextureLoader")
 	public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) {
 		Rasterizer3D_textureLoader = var0; // L: 91
 	} // L: 92
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("Rasterizer3D_setBrightness")
 	public static final void Rasterizer3D_setBrightness(double var0) {
 		Rasterizer3D_buildPalette(var0, 0, 512); // L: 95
 	} // L: 96
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("Rasterizer3D_buildPalette")
 	static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) {
 		int var4 = var2 * 128; // L: 99
@@ -241,7 +241,7 @@ public class Rasterizer3D extends Rasterizer2D {
 
 	} // L: 140
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("Rasterizer3D_brighten")
 	static int Rasterizer3D_brighten(int var0, double var1) {
 		double var3 = (double)(var0 >> 16) / 256.0D; // L: 143
@@ -256,13 +256,13 @@ public class Rasterizer3D extends Rasterizer2D {
 		return var11 + (var10 << 8) + (var9 << 16); // L: 152
 	}
 
-	@ObfuscatedName("d")
-	public static void method3856(int var0, int var1, int var2) {
+	@ObfuscatedName("h")
+	public static void method3959(int var0, int var1, int var2) {
 		field2262 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156
 	} // L: 157
 
-	@ObfuscatedName("s")
-	static final void method3854(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+	@ObfuscatedName("d")
+	static final void method3960(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = var4 - var3; // L: 160
 		int var10 = var1 - var0; // L: 161
 		int var11 = var5 - var3; // L: 162
@@ -767,7 +767,7 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("Rasterizer3D_vertAlpha")
 	static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (field2262) { // L: 524
@@ -786,7 +786,7 @@ public class Rasterizer3D extends Rasterizer2D {
 			int var8;
 			int var9;
 			int var10;
-			if (field2282) { // L: 531
+			if (field2281) { // L: 531
 				var3 = var5 - var4 >> 2; // L: 532
 				var7 <<= 2; // L: 533
 				if (Rasterizer3D_alpha == 0) { // L: 534
@@ -870,8 +870,8 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	} // L: 581 602
 
-	@ObfuscatedName("l")
-	public static final void method3919(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+	@ObfuscatedName("b")
+	public static final void method3962(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = 0; // L: 607
 		if (var0 != var1) { // L: 608
 			var7 = (var4 - var3 << 14) / (var1 - var0);
@@ -1326,7 +1326,7 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("Rasterizer3D_horizAlpha")
 	static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) {
 		if (field2262) { // L: 925
@@ -1421,16 +1421,16 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("c")
-	static final void method3877(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
+	@ObfuscatedName("k")
+	static final void method3964(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
 		int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 979
 		int var20;
 		if (var19 == null) { // L: 980
 			var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981
-			method3854(var0, var1, var2, var3, var4, var5, method3881(var20, var6), method3881(var20, var7), method3881(var20, var8)); // L: 982
+			method3960(var0, var1, var2, var3, var4, var5, method3968(var20, var6), method3968(var20, var7), method3968(var20, var8)); // L: 982
 		} else {
 			Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985
-			field2260 = Rasterizer3D_textureLoader.vmethod4276(var18); // L: 986
+			field2259 = Rasterizer3D_textureLoader.vmethod4428(var18); // L: 986
 			var20 = var4 - var3; // L: 987
 			int var21 = var1 - var0; // L: 988
 			int var22 = var5 - var3; // L: 989
@@ -1502,41 +1502,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var32 += var34 * var41; // L: 1037
 							var35 += var37 * var41; // L: 1038
 							var38 += var40 * var41; // L: 1039
-							if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1040
-								var2 -= var1; // L: 1067
-								var1 -= var0; // L: 1068
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069
-
-								while (true) {
-									--var1; // L: 1070
-									if (var1 < 0) {
-										while (true) {
-											--var2; // L: 1080
-											if (var2 < 0) {
-												return; // L: 1090
-											}
-
-											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081
-											var5 += var28; // L: 1082
-											var4 += var27; // L: 1083
-											var6 += var31; // L: 1084
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085
-											var32 += var34; // L: 1086
-											var35 += var37; // L: 1087
-											var38 += var40; // L: 1088
-										}
-									}
-
-									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071
-									var5 += var28; // L: 1072
-									var3 += var26; // L: 1073
-									var6 += var31; // L: 1074
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075
-									var32 += var34; // L: 1076
-									var35 += var37; // L: 1077
-									var38 += var40; // L: 1078
-								}
-							} else {
+							if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1040
 								var2 -= var1; // L: 1041
 								var1 -= var0; // L: 1042
 								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1043
@@ -1570,6 +1536,40 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37; // L: 1051
 									var38 += var40; // L: 1052
 								}
+							} else {
+								var2 -= var1; // L: 1067
+								var1 -= var0; // L: 1068
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069
+
+								while (true) {
+									--var1; // L: 1070
+									if (var1 < 0) {
+										while (true) {
+											--var2; // L: 1080
+											if (var2 < 0) {
+												return; // L: 1090
+											}
+
+											Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081
+											var5 += var28; // L: 1082
+											var4 += var27; // L: 1083
+											var6 += var31; // L: 1084
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085
+											var32 += var34; // L: 1086
+											var35 += var37; // L: 1087
+											var38 += var40; // L: 1088
+										}
+									}
+
+									Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071
+									var5 += var28; // L: 1072
+									var3 += var26; // L: 1073
+									var6 += var31; // L: 1074
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075
+									var32 += var34; // L: 1076
+									var35 += var37; // L: 1077
+									var38 += var40; // L: 1078
+								}
 							}
 						} else {
 							var4 = var3 <<= 14; // L: 1094
@@ -2042,7 +2042,7 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	} // L: 983
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("Rasterizer3D_iDontKnow")
 	static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) {
 		if (field2262) { // L: 1461
@@ -2109,7 +2109,7 @@ public class Rasterizer3D extends Rasterizer2D {
 				var17 >>= 3; // L: 1506
 				var8 <<= 3; // L: 1507
 				var15 = var7 >> 8; // L: 1508
-				if (field2260) { // L: 1509
+				if (field2259) { // L: 1509
 					if (var17 > 0) { // L: 1510
 						do {
 							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512
@@ -2304,7 +2304,7 @@ public class Rasterizer3D extends Rasterizer2D {
 				var17 >>= 3; // L: 1681
 				var8 <<= 3; // L: 1682
 				var15 = var7 >> 8; // L: 1683
-				if (field2260) { // L: 1684
+				if (field2259) { // L: 1684
 					if (var17 > 0) { // L: 1685
 						do {
 							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687
@@ -2463,17 +2463,17 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	} // L: 1819
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("drawTexturedTile")
 	static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
 		int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1822
 		int var20;
 		if (var19 == null) { // L: 1823
 			var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824
-			method3854(var0, var1, var2, var3, var4, var5, method3881(var20, var6), method3881(var20, var7), method3881(var20, var8)); // L: 1825
+			method3960(var0, var1, var2, var3, var4, var5, method3968(var20, var6), method3968(var20, var7), method3968(var20, var8)); // L: 1825
 		} else {
 			Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828
-			field2260 = Rasterizer3D_textureLoader.vmethod4276(var18); // L: 1829
+			field2259 = Rasterizer3D_textureLoader.vmethod4428(var18); // L: 1829
 			var20 = var4 - var3; // L: 1830
 			int var21 = var1 - var0; // L: 1831
 			int var22 = var5 - var3; // L: 1832
@@ -2545,41 +2545,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var32 += var34 * var41; // L: 1880
 							var35 += var37 * var41; // L: 1881
 							var38 += var40 * var41; // L: 1882
-							if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1883
-								var2 -= var1; // L: 1910
-								var1 -= var0; // L: 1911
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912
-
-								while (true) {
-									--var1; // L: 1913
-									if (var1 < 0) {
-										while (true) {
-											--var2; // L: 1923
-											if (var2 < 0) {
-												return; // L: 1933
-											}
-
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1924
-											var5 += var28; // L: 1925
-											var4 += var27; // L: 1926
-											var6 += var31; // L: 1927
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1928
-											var32 += var34; // L: 1929
-											var35 += var37; // L: 1930
-											var38 += var40; // L: 1931
-										}
-									}
-
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1914
-									var5 += var28; // L: 1915
-									var3 += var26; // L: 1916
-									var6 += var31; // L: 1917
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1918
-									var32 += var34; // L: 1919
-									var35 += var37; // L: 1920
-									var38 += var40; // L: 1921
-								}
-							} else {
+							if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1883
 								var2 -= var1; // L: 1884
 								var1 -= var0; // L: 1885
 								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886
@@ -2613,6 +2579,40 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37; // L: 1894
 									var38 += var40; // L: 1895
 								}
+							} else {
+								var2 -= var1; // L: 1910
+								var1 -= var0; // L: 1911
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912
+
+								while (true) {
+									--var1; // L: 1913
+									if (var1 < 0) {
+										while (true) {
+											--var2; // L: 1923
+											if (var2 < 0) {
+												return; // L: 1933
+											}
+
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1924
+											var5 += var28; // L: 1925
+											var4 += var27; // L: 1926
+											var6 += var31; // L: 1927
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1928
+											var32 += var34; // L: 1929
+											var35 += var37; // L: 1930
+											var38 += var40; // L: 1931
+										}
+									}
+
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1914
+									var5 += var28; // L: 1915
+									var3 += var26; // L: 1916
+									var6 += var31; // L: 1917
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1918
+									var32 += var34; // L: 1919
+									var35 += var37; // L: 1920
+									var38 += var40; // L: 1921
+								}
 							}
 						} else {
 							var4 = var3 <<= 14; // L: 1937
@@ -2633,41 +2633,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var32 += var34 * var41; // L: 1950
 							var35 += var37 * var41; // L: 1951
 							var38 += var40 * var41; // L: 1952
-							if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1953
-								var1 -= var2; // L: 1980
-								var2 -= var0; // L: 1981
-								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982
-
-								while (true) {
-									--var2; // L: 1983
-									if (var2 < 0) {
-										while (true) {
-											--var1; // L: 1993
-											if (var1 < 0) {
-												return; // L: 2003
-											}
-
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1994
-											var5 += var27; // L: 1995
-											var3 += var26; // L: 1996
-											var6 += var31; // L: 1997
-											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1998
-											var32 += var34; // L: 1999
-											var35 += var37; // L: 2000
-											var38 += var40; // L: 2001
-										}
-									}
-
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1984
-									var4 += var28; // L: 1985
-									var3 += var26; // L: 1986
-									var6 += var31; // L: 1987
-									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1988
-									var32 += var34; // L: 1989
-									var35 += var37; // L: 1990
-									var38 += var40; // L: 1991
-								}
-							} else {
+							if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1953
 								var1 -= var2; // L: 1954
 								var2 -= var0; // L: 1955
 								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956
@@ -2701,6 +2667,40 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37; // L: 1964
 									var38 += var40; // L: 1965
 								}
+							} else {
+								var1 -= var2; // L: 1980
+								var2 -= var0; // L: 1981
+								var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982
+
+								while (true) {
+									--var2; // L: 1983
+									if (var2 < 0) {
+										while (true) {
+											--var1; // L: 1993
+											if (var1 < 0) {
+												return; // L: 2003
+											}
+
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1994
+											var5 += var27; // L: 1995
+											var3 += var26; // L: 1996
+											var6 += var31; // L: 1997
+											var0 += Rasterizer2D.Rasterizer2D_width; // L: 1998
+											var32 += var34; // L: 1999
+											var35 += var37; // L: 2000
+											var38 += var40; // L: 2001
+										}
+									}
+
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1984
+									var4 += var28; // L: 1985
+									var3 += var26; // L: 1986
+									var6 += var31; // L: 1987
+									var0 += Rasterizer2D.Rasterizer2D_width; // L: 1988
+									var32 += var34; // L: 1989
+									var35 += var37; // L: 1990
+									var38 += var40; // L: 1991
+								}
 							}
 						}
 					}
@@ -2734,41 +2734,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var32 += var34 * var41; // L: 2026
 							var35 += var37 * var41; // L: 2027
 							var38 += var40 * var41; // L: 2028
-							if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 2029
-								var0 -= var2; // L: 2030
-								var2 -= var1; // L: 2031
-								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032
-
-								while (true) {
-									--var2; // L: 2033
-									if (var2 < 0) {
-										while (true) {
-											--var0; // L: 2043
-											if (var0 < 0) {
-												return; // L: 2053
-											}
-
-											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2044
-											var3 += var26; // L: 2045
-											var5 += var28; // L: 2046
-											var7 += var31; // L: 2047
-											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2048
-											var32 += var34; // L: 2049
-											var35 += var37; // L: 2050
-											var38 += var40; // L: 2051
-										}
-									}
-
-									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2034
-									var3 += var26; // L: 2035
-									var4 += var27; // L: 2036
-									var7 += var31; // L: 2037
-									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2038
-									var32 += var34; // L: 2039
-									var35 += var37; // L: 2040
-									var38 += var40; // L: 2041
-								}
-							} else {
+							if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2029
 								var0 -= var2; // L: 2056
 								var2 -= var1; // L: 2057
 								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058
@@ -2802,6 +2768,40 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37; // L: 2066
 									var38 += var40; // L: 2067
 								}
+							} else {
+								var0 -= var2; // L: 2030
+								var2 -= var1; // L: 2031
+								var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032
+
+								while (true) {
+									--var2; // L: 2033
+									if (var2 < 0) {
+										while (true) {
+											--var0; // L: 2043
+											if (var0 < 0) {
+												return; // L: 2053
+											}
+
+											Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2044
+											var3 += var26; // L: 2045
+											var5 += var28; // L: 2046
+											var7 += var31; // L: 2047
+											var1 += Rasterizer2D.Rasterizer2D_width; // L: 2048
+											var32 += var34; // L: 2049
+											var35 += var37; // L: 2050
+											var38 += var40; // L: 2051
+										}
+									}
+
+									Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2034
+									var3 += var26; // L: 2035
+									var4 += var27; // L: 2036
+									var7 += var31; // L: 2037
+									var1 += Rasterizer2D.Rasterizer2D_width; // L: 2038
+									var32 += var34; // L: 2039
+									var35 += var37; // L: 2040
+									var38 += var40; // L: 2041
+								}
 							}
 						} else {
 							var5 = var4 <<= 14; // L: 2083
@@ -3085,7 +3085,7 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	} // L: 1826
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("Rasterizer3D_textureAlpha")
 	static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) {
 		if (field2262) { // L: 2304
@@ -3141,7 +3141,7 @@ public class Rasterizer3D extends Rasterizer2D {
 				var17 >>= 3; // L: 2346
 				var8 <<= 3; // L: 2347
 				var15 = var7 >> 8; // L: 2348
-				if (field2260) { // L: 2350
+				if (field2259) { // L: 2350
 					if (var17 > 0) { // L: 2351
 						do {
 							var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2353
@@ -3284,7 +3284,7 @@ public class Rasterizer3D extends Rasterizer2D {
 				var17 >>= 3; // L: 2483
 				var8 <<= 3; // L: 2484
 				var15 = var7 >> 8; // L: 2485
-				if (field2260) { // L: 2487
+				if (field2259) { // L: 2487
 					if (var17 > 0) { // L: 2488
 						do {
 							var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2490
@@ -3401,8 +3401,8 @@ public class Rasterizer3D extends Rasterizer2D {
 		}
 	} // L: 2586
 
-	@ObfuscatedName("k")
-	static final int method3881(int var0, int var1) {
+	@ObfuscatedName("u")
+	static final int method3968(int var0, int var1) {
 		var1 = (var0 & 127) * var1 >> 7; // L: 2589
 		if (var1 < 2) { // L: 2590
 			var1 = 2;
@@ -3413,33 +3413,33 @@ public class Rasterizer3D extends Rasterizer2D {
 		return (var0 & 65408) + var1; // L: 2592
 	}
 
-	@ObfuscatedName("m")
-	static final int method3863(int var0, int var1, int var2, int var3) {
+	@ObfuscatedName("q")
+	static final int method3969(int var0, int var1, int var2, int var3) {
 		return var0 * var2 + var3 * var1 >> 16; // L: 2596
 	}
 
-	@ObfuscatedName("x")
-	static final int method3864(int var0, int var1, int var2, int var3) {
+	@ObfuscatedName("s")
+	static final int method3970(int var0, int var1, int var2, int var3) {
 		return var2 * var1 - var3 * var0 >> 16; // L: 2600
 	}
 
-	@ObfuscatedName("z")
-	static final int method3865(int var0, int var1, int var2, int var3) {
+	@ObfuscatedName("p")
+	static final int method3992(int var0, int var1, int var2, int var3) {
 		return var0 * var2 - var3 * var1 >> 16; // L: 2604
 	}
 
-	@ObfuscatedName("w")
-	static final int method3866(int var0, int var1, int var2, int var3) {
+	@ObfuscatedName("c")
+	static final int method4000(int var0, int var1, int var2, int var3) {
 		return var3 * var0 + var2 * var1 >> 16; // L: 2608
 	}
 
-	@ObfuscatedName("t")
-	static final int method3867(int var0, int var1, int var2, int var3) {
+	@ObfuscatedName("n")
+	static final int method3973(int var0, int var1, int var2, int var3) {
 		return var0 * var2 + var3 * var1 >> 16; // L: 2612
 	}
 
-	@ObfuscatedName("h")
-	static final int method3897(int var0, int var1, int var2, int var3) {
+	@ObfuscatedName("l")
+	static final int method4031(int var0, int var1, int var2, int var3) {
 		return var2 * var1 - var3 * var0 >> 16; // L: 2616
 	}
 }
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index 3315c48c15..0b7527a210 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -6,104 +6,104 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("bv")
 @Implements("RawPcmStream")
 public class RawPcmStream extends PcmStream {
-	@ObfuscatedName("v")
-	int field480;
-	@ObfuscatedName("n")
-	int field479;
 	@ObfuscatedName("f")
-	int field481;
+	int field469;
+	@ObfuscatedName("e")
+	int field457;
+	@ObfuscatedName("v")
+	int field458;
 	@ObfuscatedName("y")
-	int field478;
-	@ObfuscatedName("p")
-	int field488;
+	int field459;
 	@ObfuscatedName("j")
-	int field483;
+	int field460;
+	@ObfuscatedName("o")
+	int field461;
+	@ObfuscatedName("m")
+	int field456;
 	@ObfuscatedName("r")
-	int field484;
-	@ObfuscatedName("b")
 	@Export("numLoops")
 	int numLoops;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("start")
 	int start;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("end")
 	int end;
-	@ObfuscatedName("u")
-	boolean field482;
-	@ObfuscatedName("l")
-	int field489;
-	@ObfuscatedName("o")
-	int field490;
-	@ObfuscatedName("c")
-	int field491;
-	@ObfuscatedName("e")
-	int field492;
+	@ObfuscatedName("z")
+	boolean field466;
+	@ObfuscatedName("b")
+	int field462;
+	@ObfuscatedName("i")
+	int field468;
+	@ObfuscatedName("k")
+	int field467;
+	@ObfuscatedName("g")
+	int field470;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lau;III)V"
+		descriptor = "(Lar;III)V"
 	)
 	RawPcmStream(RawSound var1, int var2, int var3, int var4) {
 		super.sound = var1; // L: 51
 		this.start = var1.start; // L: 52
 		this.end = var1.end; // L: 53
-		this.field482 = var1.field399; // L: 54
-		this.field479 = var2; // L: 55
-		this.field481 = var3; // L: 56
-		this.field478 = var4; // L: 57
-		this.field480 = 0; // L: 58
-		this.method843(); // L: 59
+		this.field466 = var1.field380; // L: 54
+		this.field457 = var2; // L: 55
+		this.field458 = var3; // L: 56
+		this.field459 = var4; // L: 57
+		this.field469 = 0; // L: 58
+		this.method943(); // L: 59
 	} // L: 60
 
 	@ObfuscatedSignature(
-		descriptor = "(Lau;II)V"
+		descriptor = "(Lar;II)V"
 	)
 	RawPcmStream(RawSound var1, int var2, int var3) {
 		super.sound = var1; // L: 39
 		this.start = var1.start; // L: 40
 		this.end = var1.end; // L: 41
-		this.field482 = var1.field399; // L: 42
-		this.field479 = var2; // L: 43
-		this.field481 = var3; // L: 44
-		this.field478 = 8192; // L: 45
-		this.field480 = 0; // L: 46
-		this.method843(); // L: 47
+		this.field466 = var1.field380; // L: 42
+		this.field457 = var2; // L: 43
+		this.field458 = var3; // L: 44
+		this.field459 = 8192; // L: 45
+		this.field469 = 0; // L: 46
+		this.method943(); // L: 47
 	} // L: 48
 
-	@ObfuscatedName("p")
-	void method843() {
-		this.field488 = this.field481; // L: 73
-		this.field483 = method892(this.field481, this.field478); // L: 74
-		this.field484 = method949(this.field481, this.field478); // L: 75
+	@ObfuscatedName("j")
+	void method943() {
+		this.field460 = this.field458; // L: 73
+		this.field461 = method1056(this.field458, this.field459); // L: 74
+		this.field456 = method1043(this.field458, this.field459); // L: 75
 	} // L: 76
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		return null; // L: 200
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "()Lbm;"
+		descriptor = "()Lbc;"
 	)
 	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
 		return null; // L: 204
 	}
 
-	@ObfuscatedName("b")
-	protected int vmethod4610() {
-		return this.field481 == 0 && this.field489 == 0 ? 0 : 1; // L: 208 209
+	@ObfuscatedName("r")
+	protected int vmethod4740() {
+		return this.field458 == 0 && this.field462 == 0 ? 0 : 1; // L: 208 209
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("fill")
 	public synchronized void fill(int[] var1, int var2, int var3) {
-		if (this.field481 == 0 && this.field489 == 0) { // L: 213
+		if (this.field458 == 0 && this.field462 == 0) { // L: 213
 			this.skip(var3); // L: 214
 		} else {
 			RawSound var4 = (RawSound)super.sound; // L: 217
@@ -117,163 +117,163 @@ public class RawPcmStream extends PcmStream {
 
 			int var9 = var2; // L: 223
 			var3 += var2; // L: 224
-			if (this.field480 < 0) { // L: 225
-				if (this.field479 <= 0) { // L: 226
-					this.method852(); // L: 228
+			if (this.field469 < 0) { // L: 225
+				if (this.field457 <= 0) { // L: 226
+					this.method945(); // L: 228
 					this.remove(); // L: 229
 					return; // L: 230
 				}
 
-				this.field480 = 0;
+				this.field469 = 0;
 			}
 
-			if (this.field480 >= var7) { // L: 233
-				if (this.field479 >= 0) { // L: 234
-					this.method852(); // L: 236
+			if (this.field469 >= var7) { // L: 233
+				if (this.field457 >= 0) { // L: 234
+					this.method945(); // L: 236
 					this.remove(); // L: 237
 					return; // L: 238
 				}
 
-				this.field480 = var7 - 1;
+				this.field469 = var7 - 1;
 			}
 
 			if (this.numLoops < 0) { // L: 241
-				if (this.field482) { // L: 242
-					if (this.field479 < 0) { // L: 243
-						var9 = this.method866(var1, var2, var5, var3, var4.samples[this.start]); // L: 244
-						if (this.field480 >= var5) { // L: 245
+				if (this.field466) { // L: 242
+					if (this.field457 < 0) { // L: 243
+						var9 = this.method966(var1, var2, var5, var3, var4.samples[this.start]); // L: 244
+						if (this.field469 >= var5) { // L: 245
 							return;
 						}
 
-						this.field480 = var5 + var5 - 1 - this.field480; // L: 246
-						this.field479 = -this.field479; // L: 247
+						this.field469 = var5 + var5 - 1 - this.field469; // L: 246
+						this.field457 = -this.field457; // L: 247
 					}
 
 					while (true) {
-						var9 = this.method865(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250
-						if (this.field480 < var6) { // L: 251
+						var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250
+						if (this.field469 < var6) { // L: 251
 							return;
 						}
 
-						this.field480 = var6 + var6 - 1 - this.field480; // L: 252
-						this.field479 = -this.field479; // L: 253
-						var9 = this.method866(var1, var9, var5, var3, var4.samples[this.start]); // L: 254
-						if (this.field480 >= var5) { // L: 255
+						this.field469 = var6 + var6 - 1 - this.field469; // L: 252
+						this.field457 = -this.field457; // L: 253
+						var9 = this.method966(var1, var9, var5, var3, var4.samples[this.start]); // L: 254
+						if (this.field469 >= var5) { // L: 255
 							return;
 						}
 
-						this.field480 = var5 + var5 - 1 - this.field480; // L: 256
-						this.field479 = -this.field479; // L: 257
+						this.field469 = var5 + var5 - 1 - this.field469; // L: 256
+						this.field457 = -this.field457; // L: 257
 					}
-				} else if (this.field479 < 0) { // L: 260
+				} else if (this.field457 < 0) { // L: 260
 					while (true) {
-						var9 = this.method866(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262
-						if (this.field480 >= var5) { // L: 263
+						var9 = this.method966(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262
+						if (this.field469 >= var5) { // L: 263
 							return;
 						}
 
-						this.field480 = var6 - 1 - (var6 - 1 - this.field480) % var8; // L: 264
+						this.field469 = var6 - 1 - (var6 - 1 - this.field469) % var8; // L: 264
 					}
 				} else {
 					while (true) {
-						var9 = this.method865(var1, var9, var6, var3, var4.samples[this.start]); // L: 269
-						if (this.field480 < var6) { // L: 270
+						var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.start]); // L: 269
+						if (this.field469 < var6) { // L: 270
 							return;
 						}
 
-						this.field480 = var5 + (this.field480 - var5) % var8; // L: 271
+						this.field469 = var5 + (this.field469 - var5) % var8; // L: 271
 					}
 				}
 			} else {
 				if (this.numLoops > 0) { // L: 275
-					if (this.field482) { // L: 276
+					if (this.field466) { // L: 276
 						label127: {
-							if (this.field479 < 0) { // L: 277
-								var9 = this.method866(var1, var2, var5, var3, var4.samples[this.start]); // L: 278
-								if (this.field480 >= var5) { // L: 279
+							if (this.field457 < 0) { // L: 277
+								var9 = this.method966(var1, var2, var5, var3, var4.samples[this.start]); // L: 278
+								if (this.field469 >= var5) { // L: 279
 									return;
 								}
 
-								this.field480 = var5 + var5 - 1 - this.field480; // L: 280
-								this.field479 = -this.field479; // L: 281
+								this.field469 = var5 + var5 - 1 - this.field469; // L: 280
+								this.field457 = -this.field457; // L: 281
 								if (--this.numLoops == 0) { // L: 282
 									break label127;
 								}
 							}
 
 							do {
-								var9 = this.method865(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285
-								if (this.field480 < var6) { // L: 286
+								var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285
+								if (this.field469 < var6) { // L: 286
 									return;
 								}
 
-								this.field480 = var6 + var6 - 1 - this.field480; // L: 287
-								this.field479 = -this.field479; // L: 288
+								this.field469 = var6 + var6 - 1 - this.field469; // L: 287
+								this.field457 = -this.field457; // L: 288
 								if (--this.numLoops == 0) { // L: 289
 									break;
 								}
 
-								var9 = this.method866(var1, var9, var5, var3, var4.samples[this.start]); // L: 290
-								if (this.field480 >= var5) { // L: 291
+								var9 = this.method966(var1, var9, var5, var3, var4.samples[this.start]); // L: 290
+								if (this.field469 >= var5) { // L: 291
 									return;
 								}
 
-								this.field480 = var5 + var5 - 1 - this.field480; // L: 292
-								this.field479 = -this.field479; // L: 293
+								this.field469 = var5 + var5 - 1 - this.field469; // L: 292
+								this.field457 = -this.field457; // L: 293
 							} while(--this.numLoops != 0); // L: 294
 						}
 					} else {
 						int var10;
-						if (this.field479 < 0) { // L: 297
+						if (this.field457 < 0) { // L: 297
 							while (true) {
-								var9 = this.method866(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299
-								if (this.field480 >= var5) { // L: 300
+								var9 = this.method966(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299
+								if (this.field469 >= var5) { // L: 300
 									return;
 								}
 
-								var10 = (var6 - 1 - this.field480) / var8; // L: 301
+								var10 = (var6 - 1 - this.field469) / var8; // L: 301
 								if (var10 >= this.numLoops) { // L: 302
-									this.field480 += var8 * this.numLoops; // L: 303
+									this.field469 += var8 * this.numLoops; // L: 303
 									this.numLoops = 0; // L: 304
 									break; // L: 305
 								}
 
-								this.field480 += var8 * var10; // L: 307
+								this.field469 += var8 * var10; // L: 307
 								this.numLoops -= var10; // L: 308
 							}
 						} else {
 							while (true) {
-								var9 = this.method865(var1, var9, var6, var3, var4.samples[this.start]); // L: 313
-								if (this.field480 < var6) { // L: 314
+								var9 = this.method1080(var1, var9, var6, var3, var4.samples[this.start]); // L: 313
+								if (this.field469 < var6) { // L: 314
 									return;
 								}
 
-								var10 = (this.field480 - var5) / var8; // L: 315
+								var10 = (this.field469 - var5) / var8; // L: 315
 								if (var10 >= this.numLoops) { // L: 316
-									this.field480 -= var8 * this.numLoops; // L: 317
+									this.field469 -= var8 * this.numLoops; // L: 317
 									this.numLoops = 0; // L: 318
 									break; // L: 319
 								}
 
-								this.field480 -= var8 * var10; // L: 321
+								this.field469 -= var8 * var10; // L: 321
 								this.numLoops -= var10; // L: 322
 							}
 						}
 					}
 				}
 
-				if (this.field479 < 0) { // L: 326
-					this.method866(var1, var9, 0, var3, 0); // L: 327
-					if (this.field480 < 0) { // L: 328
-						this.field480 = -1; // L: 329
-						this.method852(); // L: 330
+				if (this.field457 < 0) { // L: 326
+					this.method966(var1, var9, 0, var3, 0); // L: 327
+					if (this.field469 < 0) { // L: 328
+						this.field469 = -1; // L: 329
+						this.method945(); // L: 330
 						this.remove(); // L: 331
 					}
 				} else {
-					this.method865(var1, var9, var7, var3, 0); // L: 335
-					if (this.field480 >= var7) { // L: 336
-						this.field480 = var7; // L: 337
-						this.method852(); // L: 338
+					this.method1080(var1, var9, var7, var3, 0); // L: 335
+					if (this.field469 >= var7) { // L: 336
+						this.field469 = var7; // L: 337
+						this.method945(); // L: 338
 						this.remove(); // L: 339
 					}
 				}
@@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream {
 		}
 	} // L: 215 342
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("setNumLoops")
 	public synchronized void setNumLoops(int var1) {
 		this.numLoops = var1; // L: 79
 	} // L: 80
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("skip")
 	public synchronized void skip(int var1) {
-		if (this.field489 > 0) { // L: 345
-			if (var1 >= this.field489) { // L: 346
-				if (this.field481 == Integer.MIN_VALUE) { // L: 347
-					this.field481 = 0; // L: 348
-					this.field484 = 0; // L: 349
-					this.field483 = 0; // L: 350
-					this.field488 = 0; // L: 351
+		if (this.field462 > 0) { // L: 345
+			if (var1 >= this.field462) { // L: 346
+				if (this.field458 == Integer.MIN_VALUE) { // L: 347
+					this.field458 = 0; // L: 348
+					this.field456 = 0; // L: 349
+					this.field461 = 0; // L: 350
+					this.field460 = 0; // L: 351
 					this.remove(); // L: 352
-					var1 = this.field489; // L: 353
+					var1 = this.field462; // L: 353
 				}
 
-				this.field489 = 0; // L: 355
-				this.method843(); // L: 356
+				this.field462 = 0; // L: 355
+				this.method943(); // L: 356
 			} else {
-				this.field488 += this.field490 * var1; // L: 359
-				this.field483 += this.field491 * var1; // L: 360
-				this.field484 += this.field492 * var1; // L: 361
-				this.field489 -= var1; // L: 362
+				this.field460 += this.field468 * var1; // L: 359
+				this.field461 += this.field467 * var1; // L: 360
+				this.field456 += this.field470 * var1; // L: 361
+				this.field462 -= var1; // L: 362
 			}
 		}
 
@@ -321,130 +321,130 @@ public class RawPcmStream extends PcmStream {
 			this.numLoops = 0;
 		}
 
-		if (this.field480 < 0) { // L: 371
-			if (this.field479 <= 0) { // L: 372
-				this.method852(); // L: 374
+		if (this.field469 < 0) { // L: 371
+			if (this.field457 <= 0) { // L: 372
+				this.method945(); // L: 374
 				this.remove(); // L: 375
 				return; // L: 376
 			}
 
-			this.field480 = 0;
+			this.field469 = 0;
 		}
 
-		if (this.field480 >= var5) { // L: 379
-			if (this.field479 >= 0) { // L: 380
-				this.method852(); // L: 382
+		if (this.field469 >= var5) { // L: 379
+			if (this.field457 >= 0) { // L: 380
+				this.method945(); // L: 382
 				this.remove(); // L: 383
 				return; // L: 384
 			}
 
-			this.field480 = var5 - 1;
+			this.field469 = var5 - 1;
 		}
 
-		this.field480 += this.field479 * var1; // L: 387
+		this.field469 += this.field457 * var1; // L: 387
 		if (this.numLoops < 0) { // L: 388
-			if (!this.field482) { // L: 389
-				if (this.field479 < 0) { // L: 404
-					if (this.field480 >= var3) { // L: 405
+			if (!this.field466) { // L: 389
+				if (this.field457 < 0) { // L: 404
+					if (this.field469 >= var3) { // L: 405
 						return;
 					}
 
-					this.field480 = var4 - 1 - (var4 - 1 - this.field480) % var6; // L: 406
+					this.field469 = var4 - 1 - (var4 - 1 - this.field469) % var6; // L: 406
 				} else {
-					if (this.field480 < var4) { // L: 409
+					if (this.field469 < var4) { // L: 409
 						return;
 					}
 
-					this.field480 = var3 + (this.field480 - var3) % var6; // L: 410
+					this.field469 = var3 + (this.field469 - var3) % var6; // L: 410
 				}
 
 			} else {
-				if (this.field479 < 0) { // L: 390
-					if (this.field480 >= var3) { // L: 391
+				if (this.field457 < 0) { // L: 390
+					if (this.field469 >= var3) { // L: 391
 						return;
 					}
 
-					this.field480 = var3 + var3 - 1 - this.field480; // L: 392
-					this.field479 = -this.field479; // L: 393
+					this.field469 = var3 + var3 - 1 - this.field469; // L: 392
+					this.field457 = -this.field457; // L: 393
 				}
 
-				while (this.field480 >= var4) { // L: 396
-					this.field480 = var4 + var4 - 1 - this.field480; // L: 397
-					this.field479 = -this.field479; // L: 398
-					if (this.field480 >= var3) { // L: 399
+				while (this.field469 >= var4) { // L: 396
+					this.field469 = var4 + var4 - 1 - this.field469; // L: 397
+					this.field457 = -this.field457; // L: 398
+					if (this.field469 >= var3) { // L: 399
 						return;
 					}
 
-					this.field480 = var3 + var3 - 1 - this.field480; // L: 400
-					this.field479 = -this.field479; // L: 401
+					this.field469 = var3 + var3 - 1 - this.field469; // L: 400
+					this.field457 = -this.field457; // L: 401
 				}
 
 			}
 		} else {
 			if (this.numLoops > 0) { // L: 414
-				if (this.field482) { // L: 415
+				if (this.field466) { // L: 415
 					label129: {
-						if (this.field479 < 0) { // L: 416
-							if (this.field480 >= var3) { // L: 417
+						if (this.field457 < 0) { // L: 416
+							if (this.field469 >= var3) { // L: 417
 								return;
 							}
 
-							this.field480 = var3 + var3 - 1 - this.field480; // L: 418
-							this.field479 = -this.field479; // L: 419
+							this.field469 = var3 + var3 - 1 - this.field469; // L: 418
+							this.field457 = -this.field457; // L: 419
 							if (--this.numLoops == 0) { // L: 420
 								break label129;
 							}
 						}
 
 						do {
-							if (this.field480 < var4) { // L: 423
+							if (this.field469 < var4) { // L: 423
 								return;
 							}
 
-							this.field480 = var4 + var4 - 1 - this.field480; // L: 424
-							this.field479 = -this.field479; // L: 425
+							this.field469 = var4 + var4 - 1 - this.field469; // L: 424
+							this.field457 = -this.field457; // L: 425
 							if (--this.numLoops == 0) { // L: 426
 								break;
 							}
 
-							if (this.field480 >= var3) { // L: 427
+							if (this.field469 >= var3) { // L: 427
 								return;
 							}
 
-							this.field480 = var3 + var3 - 1 - this.field480; // L: 428
-							this.field479 = -this.field479; // L: 429
+							this.field469 = var3 + var3 - 1 - this.field469; // L: 428
+							this.field457 = -this.field457; // L: 429
 						} while(--this.numLoops != 0); // L: 430
 					}
 				} else {
 					label161: {
 						int var7;
-						if (this.field479 < 0) { // L: 433
-							if (this.field480 >= var3) { // L: 434
+						if (this.field457 < 0) { // L: 433
+							if (this.field469 >= var3) { // L: 434
 								return;
 							}
 
-							var7 = (var4 - 1 - this.field480) / var6; // L: 435
+							var7 = (var4 - 1 - this.field469) / var6; // L: 435
 							if (var7 >= this.numLoops) { // L: 436
-								this.field480 += var6 * this.numLoops; // L: 437
+								this.field469 += var6 * this.numLoops; // L: 437
 								this.numLoops = 0; // L: 438
 								break label161; // L: 439
 							}
 
-							this.field480 += var6 * var7; // L: 441
+							this.field469 += var6 * var7; // L: 441
 							this.numLoops -= var7; // L: 442
 						} else {
-							if (this.field480 < var4) { // L: 445
+							if (this.field469 < var4) { // L: 445
 								return;
 							}
 
-							var7 = (this.field480 - var3) / var6; // L: 446
+							var7 = (this.field469 - var3) / var6; // L: 446
 							if (var7 >= this.numLoops) { // L: 447
-								this.field480 -= var6 * this.numLoops; // L: 448
+								this.field469 -= var6 * this.numLoops; // L: 448
 								this.numLoops = 0; // L: 449
 								break label161; // L: 450
 							}
 
-							this.field480 -= var6 * var7; // L: 452
+							this.field469 -= var6 * var7; // L: 452
 							this.numLoops -= var7; // L: 453
 						}
 
@@ -453,51 +453,51 @@ public class RawPcmStream extends PcmStream {
 				}
 			}
 
-			if (this.field479 < 0) { // L: 457
-				if (this.field480 < 0) { // L: 458
-					this.field480 = -1; // L: 459
-					this.method852(); // L: 460
+			if (this.field457 < 0) { // L: 457
+				if (this.field469 < 0) { // L: 458
+					this.field469 = -1; // L: 459
+					this.method945(); // L: 460
 					this.remove(); // L: 461
 				}
-			} else if (this.field480 >= var5) { // L: 465
-				this.field480 = var5; // L: 466
-				this.method852(); // L: 467
+			} else if (this.field469 >= var5) { // L: 465
+				this.field469 = var5; // L: 466
+				this.method945(); // L: 467
 				this.remove(); // L: 468
 			}
 
 		}
 	} // L: 412 471
 
-	@ObfuscatedName("l")
-	public synchronized void method845(int var1) {
-		this.method847(var1 << 6, this.method971()); // L: 83
+	@ObfuscatedName("b")
+	public synchronized void method936(int var1) {
+		this.method947(var1 << 6, this.method949()); // L: 83
 	} // L: 84
 
-	@ObfuscatedName("o")
-	synchronized void method846(int var1) {
-		this.method847(var1, this.method971()); // L: 87
+	@ObfuscatedName("i")
+	synchronized void method1001(int var1) {
+		this.method947(var1, this.method949()); // L: 87
 	} // L: 88
 
-	@ObfuscatedName("c")
-	synchronized void method847(int var1, int var2) {
-		this.field481 = var1; // L: 91
-		this.field478 = var2; // L: 92
-		this.field489 = 0; // L: 93
-		this.method843(); // L: 94
+	@ObfuscatedName("k")
+	synchronized void method947(int var1, int var2) {
+		this.field458 = var1; // L: 91
+		this.field459 = var2; // L: 92
+		this.field462 = 0; // L: 93
+		this.method943(); // L: 94
 	} // L: 95
 
-	@ObfuscatedName("e")
-	public synchronized int method914() {
-		return this.field481 == Integer.MIN_VALUE ? 0 : this.field481; // L: 98
-	}
-
 	@ObfuscatedName("g")
-	public synchronized int method971() {
-		return this.field478 < 0 ? -1 : this.field478; // L: 102
+	public synchronized int method948() {
+		return this.field458 == Integer.MIN_VALUE ? 0 : this.field458; // L: 98
 	}
 
-	@ObfuscatedName("a")
-	public synchronized void method900(int var1) {
+	@ObfuscatedName("t")
+	public synchronized int method949() {
+		return this.field459 < 0 ? -1 : this.field459; // L: 102
+	}
+
+	@ObfuscatedName("x")
+	public synchronized void method950(int var1) {
 		int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106
 		if (var1 < -1) { // L: 107
 			var1 = -1;
@@ -507,254 +507,254 @@ public class RawPcmStream extends PcmStream {
 			var1 = var2;
 		}
 
-		this.field480 = var1; // L: 109
+		this.field469 = var1; // L: 109
 	} // L: 110
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		descriptor = "(Z)V",
 		garbageValue = "1"
 	)
-	public synchronized void method888() {
-		this.field479 = (this.field479 ^ this.field479 >> 31) + (this.field479 >>> 31); // L: 113
-		this.field479 = -this.field479; // L: 114
+	public synchronized void method941() {
+		this.field457 = (this.field457 ^ this.field457 >> 31) + (this.field457 >>> 31); // L: 113
+		this.field457 = -this.field457; // L: 114
 	} // L: 115
 
-	@ObfuscatedName("m")
-	void method852() {
-		if (this.field489 != 0) { // L: 118
-			if (this.field481 == Integer.MIN_VALUE) {
-				this.field481 = 0; // L: 119
+	@ObfuscatedName("q")
+	void method945() {
+		if (this.field462 != 0) { // L: 118
+			if (this.field458 == Integer.MIN_VALUE) {
+				this.field458 = 0; // L: 119
 			}
 
-			this.field489 = 0; // L: 120
-			this.method843(); // L: 121
+			this.field462 = 0; // L: 120
+			this.method943(); // L: 121
 		}
 
 	} // L: 123
 
-	@ObfuscatedName("x")
-	public synchronized void method853(int var1, int var2) {
-		this.method983(var1, var2, this.method971()); // L: 126
+	@ObfuscatedName("s")
+	public synchronized void method953(int var1, int var2) {
+		this.method954(var1, var2, this.method949()); // L: 126
 	} // L: 127
 
-	@ObfuscatedName("z")
-	public synchronized void method983(int var1, int var2, int var3) {
+	@ObfuscatedName("p")
+	public synchronized void method954(int var1, int var2, int var3) {
 		if (var1 == 0) { // L: 130
-			this.method847(var2, var3); // L: 131
+			this.method947(var2, var3); // L: 131
 		} else {
-			int var4 = method892(var2, var3); // L: 134
-			int var5 = method949(var2, var3); // L: 135
-			if (var4 == this.field483 && var5 == this.field484) { // L: 136
-				this.field489 = 0; // L: 137
+			int var4 = method1056(var2, var3); // L: 134
+			int var5 = method1043(var2, var3); // L: 135
+			if (var4 == this.field461 && var5 == this.field456) { // L: 136
+				this.field462 = 0; // L: 137
 			} else {
-				int var6 = var2 - this.field488; // L: 140
-				if (this.field488 - var2 > var6) { // L: 141
-					var6 = this.field488 - var2;
+				int var6 = var2 - this.field460; // L: 140
+				if (this.field460 - var2 > var6) { // L: 141
+					var6 = this.field460 - var2;
 				}
 
-				if (var4 - this.field483 > var6) { // L: 142
-					var6 = var4 - this.field483;
+				if (var4 - this.field461 > var6) { // L: 142
+					var6 = var4 - this.field461;
 				}
 
-				if (this.field483 - var4 > var6) { // L: 143
-					var6 = this.field483 - var4;
+				if (this.field461 - var4 > var6) { // L: 143
+					var6 = this.field461 - var4;
 				}
 
-				if (var5 - this.field484 > var6) {
-					var6 = var5 - this.field484; // L: 144
+				if (var5 - this.field456 > var6) {
+					var6 = var5 - this.field456; // L: 144
 				}
 
-				if (this.field484 - var5 > var6) { // L: 145
-					var6 = this.field484 - var5;
+				if (this.field456 - var5 > var6) { // L: 145
+					var6 = this.field456 - var5;
 				}
 
 				if (var1 > var6) { // L: 146
 					var1 = var6;
 				}
 
-				this.field489 = var1; // L: 147
-				this.field481 = var2; // L: 148
-				this.field478 = var3; // L: 149
-				this.field490 = (var2 - this.field488) / var1; // L: 150
-				this.field491 = (var4 - this.field483) / var1; // L: 151
-				this.field492 = (var5 - this.field484) / var1; // L: 152
+				this.field462 = var1; // L: 147
+				this.field458 = var2; // L: 148
+				this.field459 = var3; // L: 149
+				this.field468 = (var2 - this.field460) / var1; // L: 150
+				this.field467 = (var4 - this.field461) / var1; // L: 151
+				this.field470 = (var5 - this.field456) / var1; // L: 152
 			}
 		}
 	} // L: 132 138 153
 
-	@ObfuscatedName("w")
-	public synchronized void method855(int var1) {
+	@ObfuscatedName("c")
+	public synchronized void method955(int var1) {
 		if (var1 == 0) { // L: 156
-			this.method846(0); // L: 157
+			this.method1001(0); // L: 157
 			this.remove(); // L: 158
-		} else if (this.field483 == 0 && this.field484 == 0) { // L: 161
-			this.field489 = 0; // L: 162
-			this.field481 = 0; // L: 163
-			this.field488 = 0; // L: 164
+		} else if (this.field461 == 0 && this.field456 == 0) { // L: 161
+			this.field462 = 0; // L: 162
+			this.field458 = 0; // L: 163
+			this.field460 = 0; // L: 164
 			this.remove(); // L: 165
 		} else {
-			int var2 = -this.field488; // L: 168
-			if (this.field488 > var2) { // L: 169
-				var2 = this.field488;
+			int var2 = -this.field460; // L: 168
+			if (this.field460 > var2) { // L: 169
+				var2 = this.field460;
 			}
 
-			if (-this.field483 > var2) { // L: 170
-				var2 = -this.field483;
+			if (-this.field461 > var2) { // L: 170
+				var2 = -this.field461;
 			}
 
-			if (this.field483 > var2) { // L: 171
-				var2 = this.field483;
+			if (this.field461 > var2) { // L: 171
+				var2 = this.field461;
 			}
 
-			if (-this.field484 > var2) { // L: 172
-				var2 = -this.field484;
+			if (-this.field456 > var2) { // L: 172
+				var2 = -this.field456;
 			}
 
-			if (this.field484 > var2) { // L: 173
-				var2 = this.field484;
+			if (this.field456 > var2) { // L: 173
+				var2 = this.field456;
 			}
 
 			if (var1 > var2) { // L: 174
 				var1 = var2;
 			}
 
-			this.field489 = var1; // L: 175
-			this.field481 = Integer.MIN_VALUE; // L: 176
-			this.field490 = -this.field488 / var1; // L: 177
-			this.field491 = -this.field483 / var1; // L: 178
-			this.field492 = -this.field484 / var1; // L: 179
+			this.field462 = var1; // L: 175
+			this.field458 = Integer.MIN_VALUE; // L: 176
+			this.field468 = -this.field460 / var1; // L: 177
+			this.field467 = -this.field461 / var1; // L: 178
+			this.field470 = -this.field456 / var1; // L: 179
 		}
 	} // L: 159 166 180
 
-	@ObfuscatedName("t")
-	public synchronized void method959(int var1) {
-		if (this.field479 < 0) { // L: 183
-			this.field479 = -var1;
+	@ObfuscatedName("n")
+	public synchronized void method1052(int var1) {
+		if (this.field457 < 0) { // L: 183
+			this.field457 = -var1;
 		} else {
-			this.field479 = var1; // L: 184
+			this.field457 = var1; // L: 184
 		}
 
 	} // L: 185
 
-	@ObfuscatedName("h")
-	public synchronized int method857() {
-		return this.field479 < 0 ? -this.field479 : this.field479; // L: 188
+	@ObfuscatedName("l")
+	public synchronized int method957() {
+		return this.field457 < 0 ? -this.field457 : this.field457; // L: 188
 	}
 
-	@ObfuscatedName("ag")
-	public boolean method848() {
-		return this.field480 < 0 || this.field480 >= ((RawSound)super.sound).samples.length << 8; // L: 192
+	@ObfuscatedName("w")
+	public boolean method1065() {
+		return this.field469 < 0 || this.field469 >= ((RawSound)super.sound).samples.length << 8; // L: 192
 	}
 
-	@ObfuscatedName("ax")
-	public boolean method859() {
-		return this.field489 != 0; // L: 196
+	@ObfuscatedName("ae")
+	public boolean method959() {
+		return this.field462 != 0; // L: 196
 	}
 
-	@ObfuscatedName("as")
-	int method865(int[] var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("ac")
+	int method1080(int[] var1, int var2, int var3, int var4, int var5) {
 		while (true) {
-			if (this.field489 > 0) { // L: 474
-				int var6 = var2 + this.field489; // L: 475
+			if (this.field462 > 0) { // L: 474
+				int var6 = var2 + this.field462; // L: 475
 				if (var6 > var4) { // L: 476
 					var6 = var4;
 				}
 
-				this.field489 += var2; // L: 477
-				if (this.field479 == 256 && (this.field480 & 255) == 0) { // L: 478
+				this.field462 += var2; // L: 477
+				if (this.field457 == 256 && (this.field469 & 255) == 0) { // L: 478
 					if (PcmPlayer.PcmPlayer_stereo) { // L: 479
-						var2 = method877(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this);
+						var2 = method977(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this);
 					} else {
-						var2 = method876(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this); // L: 480
+						var2 = method976(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this); // L: 480
 					}
 				} else if (PcmPlayer.PcmPlayer_stereo) { // L: 483
-					var2 = method962(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this, this.field479, var5);
+					var2 = method981(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this, this.field457, var5);
 				} else {
-					var2 = method966(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this, this.field479, var5); // L: 484
+					var2 = method965(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this, this.field457, var5); // L: 484
 				}
 
-				this.field489 -= var2; // L: 486
-				if (this.field489 != 0) { // L: 487
+				this.field462 -= var2; // L: 486
+				if (this.field462 != 0) { // L: 487
 					return var2;
 				}
 
-				if (!this.method867()) { // L: 488
+				if (!this.method1057()) { // L: 488
 					continue;
 				}
 
 				return var4;
 			}
 
-			if (this.field479 == 256 && (this.field480 & 255) == 0) { // L: 490
+			if (this.field457 == 256 && (this.field469 & 255) == 0) { // L: 490
 				if (PcmPlayer.PcmPlayer_stereo) { // L: 491
-					return method869(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this);
+					return method984(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this);
 				}
 
-				return method868(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this); // L: 492
+				return method968(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this); // L: 492
 			}
 
 			if (PcmPlayer.PcmPlayer_stereo) { // L: 495
-				return method873(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this, this.field479, var5);
+				return method1006(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this, this.field457, var5);
 			}
 
-			return method872(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this, this.field479, var5); // L: 496
+			return method972(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this, this.field457, var5); // L: 496
 		}
 	}
 
-	@ObfuscatedName("av")
-	int method866(int[] var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("as")
+	int method966(int[] var1, int var2, int var3, int var4, int var5) {
 		while (true) {
-			if (this.field489 > 0) { // L: 501
-				int var6 = var2 + this.field489; // L: 502
+			if (this.field462 > 0) { // L: 501
+				int var6 = var2 + this.field462; // L: 502
 				if (var6 > var4) { // L: 503
 					var6 = var4;
 				}
 
-				this.field489 += var2; // L: 504
-				if (this.field479 == -256 && (this.field480 & 255) == 0) { // L: 505
+				this.field462 += var2; // L: 504
+				if (this.field457 == -256 && (this.field469 & 255) == 0) { // L: 505
 					if (PcmPlayer.PcmPlayer_stereo) { // L: 506
-						var2 = method879(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this);
+						var2 = method979(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this);
 					} else {
-						var2 = method878(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this); // L: 507
+						var2 = method978(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this); // L: 507
 					}
 				} else if (PcmPlayer.PcmPlayer_stereo) { // L: 510
-					var2 = method917(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, this.field491, this.field492, 0, var6, var3, this, this.field479, var5);
+					var2 = method983(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, this.field467, this.field470, 0, var6, var3, this, this.field457, var5);
 				} else {
-					var2 = method856(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, this.field490, 0, var6, var3, this, this.field479, var5); // L: 511
+					var2 = method982(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, this.field468, 0, var6, var3, this, this.field457, var5); // L: 511
 				}
 
-				this.field489 -= var2; // L: 513
-				if (this.field489 != 0) { // L: 514
+				this.field462 -= var2; // L: 513
+				if (this.field462 != 0) { // L: 514
 					return var2;
 				}
 
-				if (!this.method867()) { // L: 515
+				if (!this.method1057()) { // L: 515
 					continue;
 				}
 
 				return var4;
 			}
 
-			if (this.field479 == -256 && (this.field480 & 255) == 0) { // L: 517
+			if (this.field457 == -256 && (this.field469 & 255) == 0) { // L: 517
 				if (PcmPlayer.PcmPlayer_stereo) { // L: 518
-					return method871(0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this);
+					return method971(0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this);
 				}
 
-				return method870(((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this); // L: 519
+				return method970(((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this); // L: 519
 			}
 
 			if (PcmPlayer.PcmPlayer_stereo) { // L: 522
-				return method875(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field483, this.field484, 0, var4, var3, this, this.field479, var5);
+				return method975(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field461, this.field456, 0, var4, var3, this, this.field457, var5);
 			}
 
-			return method840(0, 0, ((RawSound)super.sound).samples, var1, this.field480, var2, this.field488, 0, var4, var3, this, this.field479, var5); // L: 523
+			return method974(0, 0, ((RawSound)super.sound).samples, var1, this.field469, var2, this.field460, 0, var4, var3, this, this.field457, var5); // L: 523
 		}
 	}
 
-	@ObfuscatedName("ac")
-	boolean method867() {
-		int var1 = this.field481; // L: 528
+	@ObfuscatedName("au")
+	boolean method1057() {
+		int var1 = this.field458; // L: 528
 		int var2;
 		int var3;
 		if (var1 == Integer.MIN_VALUE) { // L: 531
@@ -762,71 +762,71 @@ public class RawPcmStream extends PcmStream {
 			var2 = 0; // L: 533
 			var1 = 0; // L: 534
 		} else {
-			var2 = method892(var1, this.field478); // L: 537
-			var3 = method949(var1, this.field478); // L: 538
+			var2 = method1056(var1, this.field459); // L: 537
+			var3 = method1043(var1, this.field459); // L: 538
 		}
 
-		if (var1 == this.field488 && var2 == this.field483 && var3 == this.field484) { // L: 540
-			if (this.field481 == Integer.MIN_VALUE) { // L: 570
-				this.field481 = 0; // L: 571
-				this.field484 = 0; // L: 572
-				this.field483 = 0; // L: 573
-				this.field488 = 0; // L: 574
+		if (var1 == this.field460 && var2 == this.field461 && var3 == this.field456) { // L: 540
+			if (this.field458 == Integer.MIN_VALUE) { // L: 570
+				this.field458 = 0; // L: 571
+				this.field456 = 0; // L: 572
+				this.field461 = 0; // L: 573
+				this.field460 = 0; // L: 574
 				this.remove(); // L: 575
 				return true; // L: 576
 			} else {
-				this.method843(); // L: 578
+				this.method943(); // L: 578
 				return false; // L: 579
 			}
 		} else {
-			if (this.field488 < var1) { // L: 541
-				this.field490 = 1; // L: 542
-				this.field489 = var1 - this.field488; // L: 543
-			} else if (this.field488 > var1) { // L: 545
-				this.field490 = -1; // L: 546
-				this.field489 = this.field488 - var1; // L: 547
+			if (this.field460 < var1) { // L: 541
+				this.field468 = 1; // L: 542
+				this.field462 = var1 - this.field460; // L: 543
+			} else if (this.field460 > var1) { // L: 545
+				this.field468 = -1; // L: 546
+				this.field462 = this.field460 - var1; // L: 547
 			} else {
-				this.field490 = 0; // L: 549
+				this.field468 = 0; // L: 549
 			}
 
-			if (this.field483 < var2) { // L: 550
-				this.field491 = 1; // L: 551
-				if (this.field489 == 0 || this.field489 > var2 - this.field483) { // L: 552
-					this.field489 = var2 - this.field483;
+			if (this.field461 < var2) { // L: 550
+				this.field467 = 1; // L: 551
+				if (this.field462 == 0 || this.field462 > var2 - this.field461) { // L: 552
+					this.field462 = var2 - this.field461;
 				}
-			} else if (this.field483 > var2) { // L: 554
-				this.field491 = -1; // L: 555
-				if (this.field489 == 0 || this.field489 > this.field483 - var2) { // L: 556
-					this.field489 = this.field483 - var2;
+			} else if (this.field461 > var2) { // L: 554
+				this.field467 = -1; // L: 555
+				if (this.field462 == 0 || this.field462 > this.field461 - var2) { // L: 556
+					this.field462 = this.field461 - var2;
 				}
 			} else {
-				this.field491 = 0; // L: 558
+				this.field467 = 0; // L: 558
 			}
 
-			if (this.field484 < var3) { // L: 559
-				this.field492 = 1; // L: 560
-				if (this.field489 == 0 || this.field489 > var3 - this.field484) { // L: 561
-					this.field489 = var3 - this.field484;
+			if (this.field456 < var3) { // L: 559
+				this.field470 = 1; // L: 560
+				if (this.field462 == 0 || this.field462 > var3 - this.field456) { // L: 561
+					this.field462 = var3 - this.field456;
 				}
-			} else if (this.field484 > var3) { // L: 563
-				this.field492 = -1; // L: 564
-				if (this.field489 == 0 || this.field489 > this.field484 - var3) { // L: 565
-					this.field489 = this.field484 - var3;
+			} else if (this.field456 > var3) { // L: 563
+				this.field470 = -1; // L: 564
+				if (this.field462 == 0 || this.field462 > this.field456 - var3) { // L: 565
+					this.field462 = this.field456 - var3;
 				}
 			} else {
-				this.field492 = 0; // L: 567
+				this.field470 = 0; // L: 567
 			}
 
 			return false; // L: 568
 		}
 	}
 
-	@ObfuscatedName("ah")
-	int vmethod987() {
-		int var1 = this.field488 * 3 >> 6; // L: 31
+	@ObfuscatedName("ay")
+	int vmethod1099() {
+		int var1 = this.field460 * 3 >> 6; // L: 31
 		var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32
 		if (this.numLoops == 0) { // L: 33
-			var1 -= var1 * this.field480 / (((RawSound)super.sound).samples.length << 8);
+			var1 -= var1 * this.field469 / (((RawSound)super.sound).samples.length << 8);
 		} else if (this.numLoops >= 0) {
 			var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34
 		}
@@ -834,38 +834,38 @@ public class RawPcmStream extends PcmStream {
 		return var1 > 255 ? 255 : var1; // L: 35
 	}
 
-	@ObfuscatedName("v")
-	static int method892(int var0, int var1) {
+	@ObfuscatedName("f")
+	static int method1056(int var0, int var1) {
 		return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23
 	}
 
-	@ObfuscatedName("n")
-	static int method949(int var0, int var1) {
+	@ObfuscatedName("e")
+	static int method1043(int var0, int var1) {
 		return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lau;II)Lbv;"
+		descriptor = "(Lar;II)Lbv;"
 	)
 	@Export("createRawPcmStream")
 	public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) {
-		return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field428 * 100)), var2 << 6) : null; // L: 63 64
+		return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class341.field3921 * 100)), var2 << 6) : null; // L: 63 64
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lau;III)Lbv;"
+		descriptor = "(Lar;III)Lbv;"
 	)
-	public static RawPcmStream method842(RawSound var0, int var1, int var2, int var3) {
+	public static RawPcmStream method937(RawSound var0, int var1, int var2, int var3) {
 		return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		descriptor = "([B[IIIIIIILbv;)I"
 	)
-	static int method868(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
+	static int method968(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
 		var2 >>= 8; // L: 583
 		var7 >>= 8; // L: 584
 		var4 <<= 2; // L: 585
@@ -888,15 +888,15 @@ public class RawPcmStream extends PcmStream {
 			var10001 = var3++; // L: 596
 		}
 
-		var8.field480 = var2 << 8; // L: 598
+		var8.field469 = var2 << 8; // L: 598
 		return var3; // L: 599
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
 		descriptor = "(I[B[IIIIIIIILbv;)I"
 	)
-	static int method869(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
+	static int method984(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
 		var3 >>= 8; // L: 603
 		var9 >>= 8; // L: 604
 		var5 <<= 2; // L: 605
@@ -939,15 +939,15 @@ public class RawPcmStream extends PcmStream {
 			var10001 = var4++;
 		}
 
-		var10.field480 = var3 << 8; // L: 631
+		var10.field469 = var3 << 8; // L: 631
 		return var4 >> 1; // L: 632
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
 		descriptor = "([B[IIIIIIILbv;)I"
 	)
-	static int method870(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
+	static int method970(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) {
 		var2 >>= 8; // L: 636
 		var7 >>= 8; // L: 637
 		var4 <<= 2; // L: 638
@@ -970,15 +970,15 @@ public class RawPcmStream extends PcmStream {
 			var10001 = var3++; // L: 649
 		}
 
-		var8.field480 = var2 << 8; // L: 651
+		var8.field469 = var2 << 8; // L: 651
 		return var3; // L: 652
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		descriptor = "(I[B[IIIIIIIILbv;)I"
 	)
-	static int method871(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
+	static int method971(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) {
 		var3 >>= 8; // L: 656
 		var9 >>= 8; // L: 657
 		var5 <<= 2; // L: 658
@@ -1021,15 +1021,15 @@ public class RawPcmStream extends PcmStream {
 			var10001 = var4++;
 		}
 
-		var10.field480 = var3 << 8; // L: 684
+		var10.field469 = var3 << 8; // L: 684
 		return var4 >> 1; // L: 685
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIILbv;II)I"
 	)
-	static int method872(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
+	static int method972(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
 		if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689
 			var7 = var8;
 		}
@@ -1054,15 +1054,15 @@ public class RawPcmStream extends PcmStream {
 			var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700
 		}
 
-		var10.field480 = var4; // L: 703
+		var10.field469 = var4; // L: 703
 		return var5; // L: 704
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIIILbv;II)I"
 	)
-	static int method873(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+	static int method1006(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
 		if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708
 			var8 = var9;
 		}
@@ -1096,15 +1096,15 @@ public class RawPcmStream extends PcmStream {
 			var3[var10001] += var0 * var7 >> 6;
 		}
 
-		var11.field480 = var4; // L: 729
+		var11.field469 = var4; // L: 729
 		return var5 >> 1; // L: 730
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIILbv;II)I"
 	)
-	static int method840(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
+	static int method974(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) {
 		if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734
 			var7 = var8;
 		}
@@ -1129,15 +1129,15 @@ public class RawPcmStream extends PcmStream {
 			var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745
 		}
 
-		var10.field480 = var4; // L: 748
+		var10.field469 = var4; // L: 748
 		return var5; // L: 749
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("bq")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIIILbv;II)I"
 	)
-	static int method875(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+	static int method975(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
 		if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753
 			var8 = var9;
 		}
@@ -1169,15 +1169,15 @@ public class RawPcmStream extends PcmStream {
 			var3[var10001] += var0 * var7 >> 6;
 		}
 
-		var11.field480 = var4; // L: 773
+		var11.field469 = var4; // L: 773
 		return var5 >> 1; // L: 774
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("bx")
 	@ObfuscatedSignature(
 		descriptor = "([B[IIIIIIIILbv;)I"
 	)
-	static int method876(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
+	static int method976(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
 		var2 >>= 8; // L: 778
 		var8 >>= 8; // L: 779
 		var4 <<= 2; // L: 780
@@ -1186,8 +1186,8 @@ public class RawPcmStream extends PcmStream {
 			var6 = var7;
 		}
 
-		var9.field483 += var9.field491 * (var6 - var3); // L: 783
-		var9.field484 += var9.field492 * (var6 - var3); // L: 784
+		var9.field461 += var9.field467 * (var6 - var3); // L: 783
+		var9.field456 += var9.field470 * (var6 - var3); // L: 784
 
 		int var10001;
 		for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794
@@ -1209,16 +1209,16 @@ public class RawPcmStream extends PcmStream {
 			var1[var10001] += var0[var2++] * var4;
 		}
 
-		var9.field488 = var4 >> 2; // L: 801
-		var9.field480 = var2 << 8; // L: 802
+		var9.field460 = var4 >> 2; // L: 801
+		var9.field469 = var2 << 8; // L: 802
 		return var3; // L: 803
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
 		descriptor = "(I[B[IIIIIIIIIILbv;)I"
 	)
-	static int method877(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
+	static int method977(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
 		var3 >>= 8; // L: 807
 		var11 >>= 8; // L: 808
 		var5 <<= 2; // L: 809
@@ -1229,7 +1229,7 @@ public class RawPcmStream extends PcmStream {
 			var9 = var10;
 		}
 
-		var12.field488 += var12.field490 * (var9 - var4); // L: 814
+		var12.field460 += var12.field468 * (var9 - var4); // L: 814
 		var4 <<= 1; // L: 815
 		var9 <<= 1; // L: 816
 
@@ -1274,17 +1274,17 @@ public class RawPcmStream extends PcmStream {
 			var2[var10001] += var13 * var6;
 		}
 
-		var12.field483 = var5 >> 2; // L: 848
-		var12.field484 = var6 >> 2; // L: 849
-		var12.field480 = var3 << 8; // L: 850
+		var12.field461 = var5 >> 2; // L: 848
+		var12.field456 = var6 >> 2; // L: 849
+		var12.field469 = var3 << 8; // L: 850
 		return var4 >> 1; // L: 851
 	}
 
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
 		descriptor = "([B[IIIIIIIILbv;)I"
 	)
-	static int method878(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
+	static int method978(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) {
 		var2 >>= 8; // L: 855
 		var8 >>= 8; // L: 856
 		var4 <<= 2; // L: 857
@@ -1293,8 +1293,8 @@ public class RawPcmStream extends PcmStream {
 			var6 = var7;
 		}
 
-		var9.field483 += var9.field491 * (var6 - var3); // L: 860
-		var9.field484 += var9.field492 * (var6 - var3); // L: 861
+		var9.field461 += var9.field467 * (var6 - var3); // L: 860
+		var9.field456 += var9.field470 * (var6 - var3); // L: 861
 
 		int var10001;
 		for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871
@@ -1316,16 +1316,16 @@ public class RawPcmStream extends PcmStream {
 			var1[var10001] += var0[var2--] * var4;
 		}
 
-		var9.field488 = var4 >> 2; // L: 878
-		var9.field480 = var2 << 8; // L: 879
+		var9.field460 = var4 >> 2; // L: 878
+		var9.field469 = var2 << 8; // L: 879
 		return var3; // L: 880
 	}
 
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
 		descriptor = "(I[B[IIIIIIIIIILbv;)I"
 	)
-	static int method879(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
+	static int method979(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) {
 		var3 >>= 8; // L: 884
 		var11 >>= 8; // L: 885
 		var5 <<= 2; // L: 886
@@ -1336,7 +1336,7 @@ public class RawPcmStream extends PcmStream {
 			var9 = var10;
 		}
 
-		var12.field488 += var12.field490 * (var9 - var4); // L: 891
+		var12.field460 += var12.field468 * (var9 - var4); // L: 891
 		var4 <<= 1; // L: 892
 		var9 <<= 1; // L: 893
 
@@ -1381,19 +1381,19 @@ public class RawPcmStream extends PcmStream {
 			var2[var10001] += var13 * var6;
 		}
 
-		var12.field483 = var5 >> 2; // L: 925
-		var12.field484 = var6 >> 2; // L: 926
-		var12.field480 = var3 << 8; // L: 927
+		var12.field461 = var5 >> 2; // L: 925
+		var12.field456 = var6 >> 2; // L: 926
+		var12.field469 = var3 << 8; // L: 927
 		return var4 >> 1; // L: 928
 	}
 
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIIILbv;II)I"
 	)
-	static int method966(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-		var11.field483 -= var11.field491 * var5; // L: 932
-		var11.field484 -= var11.field492 * var5; // L: 933
+	static int method965(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+		var11.field461 -= var11.field467 * var5; // L: 932
+		var11.field456 -= var11.field470 * var5; // L: 933
 		if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934
 			var8 = var9;
 		}
@@ -1420,19 +1420,19 @@ public class RawPcmStream extends PcmStream {
 			var6 += var7; // L: 947
 		}
 
-		var11.field483 += var11.field491 * var5; // L: 950
-		var11.field484 += var11.field492 * var5; // L: 951
-		var11.field488 = var6; // L: 952
-		var11.field480 = var4; // L: 953
+		var11.field461 += var11.field467 * var5; // L: 950
+		var11.field456 += var11.field470 * var5; // L: 951
+		var11.field460 = var6; // L: 952
+		var11.field469 = var4; // L: 953
 		return var5; // L: 954
 	}
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIIIIILbv;II)I"
 	)
-	static int method962(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
-		var13.field488 -= var5 * var13.field490; // L: 958
+	static int method981(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
+		var13.field460 -= var5 * var13.field468; // L: 958
 		if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959
 			var10 = var11;
 		}
@@ -1471,20 +1471,20 @@ public class RawPcmStream extends PcmStream {
 		}
 
 		var5 >>= 1; // L: 984
-		var13.field488 += var13.field490 * var5; // L: 985
-		var13.field483 = var6; // L: 986
-		var13.field484 = var7; // L: 987
-		var13.field480 = var4; // L: 988
+		var13.field460 += var13.field468 * var5; // L: 985
+		var13.field461 = var6; // L: 986
+		var13.field456 = var7; // L: 987
+		var13.field469 = var4; // L: 988
 		return var5; // L: 989
 	}
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("be")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIIILbv;II)I"
 	)
-	static int method856(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
-		var11.field483 -= var11.field491 * var5; // L: 993
-		var11.field484 -= var11.field492 * var5; // L: 994
+	static int method982(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) {
+		var11.field461 -= var11.field467 * var5; // L: 993
+		var11.field456 -= var11.field470 * var5; // L: 994
 		if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995
 			var8 = var9;
 		}
@@ -1511,19 +1511,19 @@ public class RawPcmStream extends PcmStream {
 			var6 += var7; // L: 1008
 		}
 
-		var11.field483 += var11.field491 * var5; // L: 1011
-		var11.field484 += var11.field492 * var5; // L: 1012
-		var11.field488 = var6; // L: 1013
-		var11.field480 = var4; // L: 1014
+		var11.field461 += var11.field467 * var5; // L: 1011
+		var11.field456 += var11.field470 * var5; // L: 1012
+		var11.field460 = var6; // L: 1013
+		var11.field469 = var4; // L: 1014
 		return var5; // L: 1015
 	}
 
-	@ObfuscatedName("bv")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
 		descriptor = "(II[B[IIIIIIIIIILbv;II)I"
 	)
-	static int method917(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
-		var13.field488 -= var5 * var13.field490; // L: 1019
+	static int method983(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) {
+		var13.field460 -= var5 * var13.field468; // L: 1019
 		if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020
 			var10 = var11;
 		}
@@ -1560,10 +1560,10 @@ public class RawPcmStream extends PcmStream {
 		}
 
 		var5 >>= 1; // L: 1044
-		var13.field488 += var13.field490 * var5; // L: 1045
-		var13.field483 = var6; // L: 1046
-		var13.field484 = var7; // L: 1047
-		var13.field480 = var4; // L: 1048
+		var13.field460 += var13.field468 * var5; // L: 1045
+		var13.field461 = var6; // L: 1046
+		var13.field456 = var7; // L: 1047
+		var13.field469 = var4; // L: 1048
 		return var5; // L: 1049
 	}
 }
diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java
index 136ff8d2ab..cbce23717f 100644
--- a/runescape-client/src/main/java/RawSound.java
+++ b/runescape-client/src/main/java/RawSound.java
@@ -3,23 +3,23 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("au")
+@ObfuscatedName("ar")
 @Implements("RawSound")
 public class RawSound extends AbstractSound {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("sampleRate")
 	public int sampleRate;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("samples")
 	public byte[] samples;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("start")
 	public int start;
 	@ObfuscatedName("y")
 	@Export("end")
 	int end;
-	@ObfuscatedName("p")
-	public boolean field399;
+	@ObfuscatedName("j")
+	public boolean field380;
 
 	RawSound(int var1, byte[] var2, int var3, int var4) {
 		this.sampleRate = var1; // L: 13
@@ -33,12 +33,12 @@ public class RawSound extends AbstractSound {
 		this.samples = var2; // L: 21
 		this.start = var3; // L: 22
 		this.end = var4; // L: 23
-		this.field399 = var5; // L: 24
+		this.field380 = var5; // L: 24
 	} // L: 25
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lbe;)Lau;"
+		descriptor = "(Lbt;)Lar;"
 	)
 	@Export("resample")
 	public RawSound resample(Decimator var1) {
diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java
index 140205fe39..a2221a17f3 100644
--- a/runescape-client/src/main/java/ReflectionCheck.java
+++ b/runescape-client/src/main/java/ReflectionCheck.java
@@ -6,147 +6,108 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bo")
+@ObfuscatedName("bn")
 @Implements("ReflectionCheck")
 public class ReflectionCheck extends Node {
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1538307343
+		intValue = 1718223303
 	)
-	@Export("canvasHeight")
-	public static int canvasHeight;
-	@ObfuscatedName("lz")
-	@ObfuscatedSignature(
-		descriptor = "Lcp;"
-	)
-	@Export("tempMenuAction")
-	static MenuAction tempMenuAction;
-	@ObfuscatedName("ld")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	static Widget field609;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -848582505
-	)
-	@Export("id")
-	int id;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -637285787
-	)
-	@Export("size")
-	int size;
+	@Export("graphicsTickTimeIdx")
+	static int graphicsTickTimeIdx;
 	@ObfuscatedName("f")
 	@Export("intReplaceValues")
 	int[] intReplaceValues;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -1554436787
+	)
+	@Export("id")
+	int id;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1579568443
+	)
+	@Export("size")
+	int size;
 	@ObfuscatedName("y")
 	@Export("operations")
 	int[] operations;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("creationErrors")
 	int[] creationErrors;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("fields")
 	Field[] fields;
+	@ObfuscatedName("m")
+	@Export("arguments")
+	byte[][][] arguments;
 	@ObfuscatedName("r")
 	@Export("methods")
 	Method[] methods;
-	@ObfuscatedName("b")
-	@Export("arguments")
-	byte[][][] arguments;
 
 	ReflectionCheck() {
 	} // L: 17
 
-	@ObfuscatedName("in")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-372153509"
+		descriptor = "(II)Ljs;",
+		garbageValue = "1563707266"
 	)
-	static void method1126(int var0, int var1) {
-		int var2 = Widget.fontBold12.stringWidth("Choose Option"); // L: 7744
+	public static GameBuild method1228(int var0) {
+		GameBuild[] var1 = UserComparator8.method2538(); // L: 23
 
-		int var3;
-		int var4;
-		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7745
-			var4 = Widget.fontBold12.stringWidth(MouseRecorder.method2098(var3)); // L: 7746
-			if (var4 > var2) { // L: 7747
-				var2 = var4;
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24
+			GameBuild var3 = var1[var2]; // L: 25
+			if (var0 == var3.buildId) {
+				return var3; // L: 27
 			}
 		}
 
-		var2 += 8; // L: 7749
-		var3 = Client.menuOptionsCount * 15 + 22; // L: 7750
-		var4 = var0 - var2 / 2; // L: 7751
-		if (var2 + var4 > class32.canvasWidth) { // L: 7752
-			var4 = class32.canvasWidth - var2;
-		}
+		return null; // L: 31
+	}
 
-		if (var4 < 0) { // L: 7753
-			var4 = 0;
-		}
-
-		int var5 = var1; // L: 7754
-		if (var1 + var3 > canvasHeight) { // L: 7755
-			var5 = canvasHeight - var3;
-		}
-
-		if (var5 < 0) { // L: 7756
-			var5 = 0;
-		}
-
-		class14.menuX = var4; // L: 7757
-		class243.menuY = var5; // L: 7758
-		class29.menuWidth = var2; // L: 7759
-		class24.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7760
-	} // L: 7761
-
-	@ObfuscatedName("jr")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "([Lio;II)V",
-		garbageValue = "2064427541"
+		descriptor = "(Lbk;Lbk;IZIZB)I",
+		garbageValue = "88"
 	)
-	@Export("runComponentCloseListeners")
-	static final void runComponentCloseListeners(Widget[] var0, int var1) {
-		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10664
-			Widget var3 = var0[var2]; // L: 10665
-			if (var3 != null) { // L: 10666
-				if (var3.type == 0) { // L: 10667
-					if (var3.children != null) { // L: 10668
-						runComponentCloseListeners(var3.children, var1);
-					}
+	static int method1227(World var0, World var1, int var2, boolean var3, int var4, boolean var5) {
+		int var6 = WorldMapRectangle.compareWorlds(var0, var1, var2, var3); // L: 199
+		if (var6 != 0) { // L: 200
+			return var3 ? -var6 : var6; // L: 201
+		} else if (var4 == -1) { // L: 204
+			return 0;
+		} else {
+			int var7 = WorldMapRectangle.compareWorlds(var0, var1, var4, var5); // L: 205
+			return var5 ? -var7 : var7; // L: 206
+		}
+	}
 
-					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10669
-					if (var4 != null) { // L: 10670
-						Login.runIntfCloseListeners(var4.group, var1);
-					}
-				}
+	@ObfuscatedName("fk")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "111"
+	)
+	static void method1230(int var0, int var1) {
+		if (class4.clientPreferences.musicVolume != 0 && var0 != -1) { // L: 3795
+			class105.method2357(class160.archive11, var0, 0, class4.clientPreferences.musicVolume, false); // L: 3796
+			Client.field862 = true; // L: 3797
+		}
 
-				ScriptEvent var5;
-				if (var1 == 0 && var3.onDialogAbort != null) { // L: 10672
-					var5 = new ScriptEvent(); // L: 10673
-					var5.widget = var3; // L: 10674
-					var5.args = var3.onDialogAbort; // L: 10675
-					PacketWriter.runScriptEvent(var5); // L: 10676
-				}
+	} // L: 3799
 
-				if (var1 == 1 && var3.onSubChange != null) { // L: 10678
-					if (var3.childIndex >= 0) { // L: 10679
-						Widget var6 = Frames.getWidget(var3.id); // L: 10680
-						if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10681
-							continue;
-						}
-					}
-
-					var5 = new ScriptEvent(); // L: 10685
-					var5.widget = var3; // L: 10686
-					var5.args = var3.onSubChange; // L: 10687
-					PacketWriter.runScriptEvent(var5); // L: 10688
-				}
+	@ObfuscatedName("il")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIB)V",
+		garbageValue = "0"
+	)
+	static final void method1229(int var0, int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7766
+			if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7767
+				Client.field712[var4] = true;
 			}
 		}
 
-	} // L: 10691
+	} // L: 7769
 }
diff --git a/runescape-client/src/main/java/Renderable.java b/runescape-client/src/main/java/Renderable.java
index 4531421587..e855aef683 100644
--- a/runescape-client/src/main/java/Renderable.java
+++ b/runescape-client/src/main/java/Renderable.java
@@ -1,15 +1,25 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gl")
+@ObfuscatedName("gr")
 @Implements("Renderable")
 public abstract class Renderable extends DualNode {
-	@ObfuscatedName("cj")
+	@ObfuscatedName("ju")
+	@ObfuscatedSignature(
+		descriptor = "Lgj;"
+	)
+	@Export("textureProvider")
+	static TextureProvider textureProvider;
+	@ObfuscatedName("ct")
 	@ObfuscatedGetter(
-		intValue = 267422413
+		intValue = -1816711147
 	)
 	@Export("height")
 	public int height;
@@ -18,24 +28,351 @@ public abstract class Renderable extends DualNode {
 		this.height = 1000; // L: 6
 	} // L: 8
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected Model getModel() {
-		return null; // L: 19
+		return null;
 	}
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("bh")
 	@Export("draw")
 	void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
-		Model var11 = this.getModel(); // L: 11
-		if (var11 != null) { // L: 12
-			this.height = var11.height; // L: 13
-			var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); // L: 14
+		Model var11 = this.getModel();
+		if (var11 != null) {
+			this.height = var11.height;
+			var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9);
 		}
 
-	} // L: 16
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
+		garbageValue = "1767289693"
+	)
+	public static File method4244(String var0, String var1, int var2) {
+		String var3 = var2 == 0 ? "" : "" + var2; // L: 40
+		SecureRandomCallable.JagexCache_locationFile = new File(JagexCache.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); // L: 41
+		String var4 = null; // L: 42
+		String var5 = null; // L: 43
+		boolean var6 = false; // L: 44
+		Buffer var8;
+		int var11;
+		File var27;
+		if (SecureRandomCallable.JagexCache_locationFile.exists()) { // L: 45
+			try {
+				AccessFile var7 = new AccessFile(SecureRandomCallable.JagexCache_locationFile, "rw", 10000L); // L: 48
+
+				int var9;
+				for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) { // L: 49 50 53
+					var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset); // L: 51
+					if (var9 == -1) { // L: 52
+						throw new IOException();
+					}
+				}
+
+				var8.offset = 0; // L: 55
+				var9 = var8.readUnsignedByte(); // L: 56
+				if (var9 < 1 || var9 > 3) { // L: 57
+					throw new IOException("" + var9);
+				}
+
+				int var10 = 0; // L: 58
+				if (var9 > 1) { // L: 59
+					var10 = var8.readUnsignedByte();
+				}
+
+				if (var9 <= 2) { // L: 60
+					var4 = var8.readStringCp1252NullCircumfixed(); // L: 61
+					if (var10 == 1) { // L: 62
+						var5 = var8.readStringCp1252NullCircumfixed();
+					}
+				} else {
+					var4 = var8.readCESU8(); // L: 65
+					if (var10 == 1) { // L: 66
+						var5 = var8.readCESU8();
+					}
+				}
+
+				var7.close(); // L: 68
+			} catch (IOException var25) { // L: 70
+				var25.printStackTrace(); // L: 71
+			}
+
+			if (var4 != null) { // L: 73
+				var27 = new File(var4); // L: 74
+				if (!var27.exists()) { // L: 75
+					var4 = null; // L: 76
+				}
+			}
+
+			if (var4 != null) { // L: 79
+				var27 = new File(var4, "test.dat"); // L: 80
+
+				boolean var28;
+				try {
+					RandomAccessFile var15 = new RandomAccessFile(var27, "rw"); // L: 84
+					var11 = var15.read(); // L: 85
+					var15.seek(0L); // L: 86
+					var15.write(var11); // L: 87
+					var15.seek(0L); // L: 88
+					var15.close(); // L: 89
+					var27.delete(); // L: 90
+					var28 = true; // L: 91
+				} catch (Exception var23) { // L: 93
+					var28 = false; // L: 94
+				}
+
+				if (!var28) { // L: 97
+					var4 = null; // L: 98
+				}
+			}
+		}
+
+		if (var4 == null && var2 == 0) { // L: 102
+			label153:
+			for (int var16 = 0; var16 < JagexCache.cacheSubPaths.length; ++var16) { // L: 103
+				for (int var17 = 0; var17 < ArchiveLoader.cacheParentPaths.length; ++var17) { // L: 104
+					File var18 = new File(ArchiveLoader.cacheParentPaths[var17] + JagexCache.cacheSubPaths[var16] + File.separatorChar + var0 + File.separatorChar); // L: 105
+					if (var18.exists()) { // L: 106
+						File var19 = new File(var18, "test.dat"); // L: 108
+
+						boolean var29;
+						try {
+							RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); // L: 111
+							int var13 = var12.read(); // L: 112
+							var12.seek(0L); // L: 113
+							var12.write(var13); // L: 114
+							var12.seek(0L); // L: 115
+							var12.close(); // L: 116
+							var19.delete(); // L: 117
+							var29 = true; // L: 118
+						} catch (Exception var22) { // L: 120
+							var29 = false; // L: 121
+						}
+
+						if (var29) { // L: 124
+							var4 = var18.toString(); // L: 125
+							var6 = true; // L: 126
+							break label153; // L: 127
+						}
+					}
+				}
+			}
+		}
+
+		if (var4 == null) { // L: 133
+			var4 = JagexCache.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 134
+			var6 = true; // L: 135
+		}
+
+		File var26;
+		if (var5 != null) { // L: 137
+			var26 = new File(var5); // L: 138
+			var27 = new File(var4); // L: 139
+
+			try {
+				File[] var33 = var26.listFiles(); // L: 141
+				File[] var31 = var33; // L: 143
+
+				for (var11 = 0; var11 < var31.length; ++var11) { // L: 144
+					File var30 = var31[var11]; // L: 145
+					File var20 = new File(var27, var30.getName()); // L: 147
+					boolean var14 = var30.renameTo(var20); // L: 148
+					if (!var14) { // L: 149
+						throw new IOException();
+					}
+				}
+			} catch (Exception var24) { // L: 154
+				var24.printStackTrace(); // L: 155
+			}
+
+			var6 = true; // L: 157
+		}
+
+		if (var6) { // L: 159
+			var26 = new File(var4); // L: 160
+			var8 = null; // L: 161
+
+			try {
+				AccessFile var34 = new AccessFile(SecureRandomCallable.JagexCache_locationFile, "rw", 10000L); // L: 165
+				Buffer var32 = new Buffer(500); // L: 166
+				var32.writeByte(3); // L: 167
+				var32.writeByte(var8 != null ? 1 : 0); // L: 168
+				var32.writeCESU8(var26.getPath()); // L: 169
+				if (var8 != null) { // L: 170
+					var32.writeCESU8("");
+				}
+
+				var34.write(var32.array, 0, var32.offset); // L: 171
+				var34.close(); // L: 172
+			} catch (IOException var21) { // L: 174
+				var21.printStackTrace(); // L: 175
+			}
+		}
+
+		return new File(var4); // L: 179
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+		garbageValue = "-768574216"
+	)
+	public static String method4251(CharSequence var0) {
+		int var1 = var0.length(); // L: 11
+		StringBuilder var2 = new StringBuilder(var1); // L: 12
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 13
+			char var4 = var0.charAt(var3); // L: 14
+			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15
+				if (var4 == ' ') { // L: 16
+					var2.append('+');
+				} else {
+					byte var5 = class125.charToByteCp1252(var4); // L: 18
+					var2.append('%'); // L: 19
+					int var6 = var5 >> 4 & 15; // L: 20
+					if (var6 >= 10) { // L: 21
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48)); // L: 22
+					}
+
+					var6 = var5 & 15; // L: 23
+					if (var6 >= 10) { // L: 24
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48));
+					}
+				}
+			} else {
+				var2.append(var4); // L: 25
+			}
+		}
+
+		return var2.toString(); // L: 28
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-2101430297"
+	)
+	static int method4250(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) { // L: 1017
+			var0 -= 1000; // L: 1018
+			var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1019
+		} else {
+			var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1021
+		}
+
+		String var4 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1022
+		int[] var5 = null; // L: 1023
+		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1024
+			int var6 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1025
+			if (var6 > 0) { // L: 1026
+				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]) { // L: 1027 1028
+				}
+			}
+
+			var4 = var4.substring(0, var4.length() - 1); // L: 1030
+		}
+
+		Object[] var8 = new Object[var4.length() + 1]; // L: 1032
+
+		int var7;
+		for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1033
+			if (var4.charAt(var7 - 1) == 's') { // L: 1034
+				var8[var7] = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize];
+			} else {
+				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1035
+			}
+		}
+
+		var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1037
+		if (var7 != -1) { // L: 1038
+			var8[0] = new Integer(var7);
+		} else {
+			var8 = null; // L: 1039
+		}
+
+		if (var0 == ScriptOpcodes.CC_SETONCLICK) {
+			var3.onClick = var8; // L: 1040
+		} else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1041
+			var3.onHold = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1042
+			var3.onRelease = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1043
+			var3.onMouseOver = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1044
+			var3.onMouseLeave = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1045
+			var3.onDrag = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1046
+			var3.onTargetLeave = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1047
+			var3.onVarTransmit = var8; // L: 1048
+			var3.varTransmitTriggers = var5; // L: 1049
+		} else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1051
+			var3.onTimer = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1052
+			var3.onOp = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1053
+			var3.onDragComplete = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1054
+			var3.onClickRepeat = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1055
+			var3.onMouseRepeat = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1056
+			var3.onInvTransmit = var8; // L: 1057
+			var3.invTransmitTriggers = var5; // L: 1058
+		} else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1060
+			var3.onStatTransmit = var8; // L: 1061
+			var3.statTransmitTriggers = var5; // L: 1062
+		} else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1064
+			var3.onTargetEnter = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1065
+			var3.onScroll = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1066
+			var3.onChatTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1067
+			var3.onKey = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1068
+			var3.onFriendTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1069
+			var3.onClanTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1070
+			var3.onMiscTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1071
+			var3.onDialogAbort = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1072
+			var3.onSubChange = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1073
+			var3.onStockTransmit = var8;
+		} else if (var0 == 1426) { // L: 1074
+			var3.field3082 = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1075
+			var3.onResize = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANSETTINGSTRANSMIT) { // L: 1076
+			var3.field3075 = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANCHANNELTRANSMIT) { // L: 1077
+			var3.field3076 = var8;
+		} else if (var0 == 1430) {
+			var3.field3071 = var8; // L: 1078
+		} else {
+			if (var0 != 1431) { // L: 1079
+				return 2; // L: 1080
+			}
+
+			var3.field3000 = var8;
+		}
+
+		var3.hasListener = true; // L: 1081
+		return 1; // L: 1082
+	}
 }
diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java
index 7c5841225f..890873906c 100644
--- a/runescape-client/src/main/java/RouteStrategy.java
+++ b/runescape-client/src/main/java/RouteStrategy.java
@@ -4,36 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fc")
+@ObfuscatedName("fv")
 @Implements("RouteStrategy")
 public abstract class RouteStrategy {
-	@ObfuscatedName("ih")
+	@ObfuscatedName("gt")
 	@ObfuscatedGetter(
-		intValue = -1113352723
+		intValue = 1174607755
 	)
-	@Export("oculusOrbFocalPointX")
-	static int oculusOrbFocalPointX;
-	@ObfuscatedName("v")
+	static int field1919;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1931856815
+		intValue = -2064726811
 	)
 	@Export("approxDestinationX")
 	public int approxDestinationX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2132337773
+		intValue = -801377261
 	)
 	@Export("approxDestinationY")
 	public int approxDestinationY;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 203403193
+		intValue = -1579448573
 	)
 	@Export("approxDestinationSizeX")
 	public int approxDestinationSizeX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 308023697
+		intValue = 1110365195
 	)
 	@Export("approxDestinationSizeY")
 	public int approxDestinationSizeY;
@@ -41,11 +40,53 @@ public abstract class RouteStrategy {
 	protected RouteStrategy() {
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIILfz;I)Z",
-		garbageValue = "496202097"
+		descriptor = "(IIILfl;B)Z",
+		garbageValue = "11"
 	)
 	@Export("hasArrived")
-	protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4);
+	public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4);
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "87"
+	)
+	public static boolean method3252() {
+		try {
+			if (class233.musicPlayerStatus == 2) { // L: 104
+				if (ArchiveLoader.musicTrack == null) { // L: 105
+					ArchiveLoader.musicTrack = MusicTrack.readTrack(InvDefinition.musicTrackArchive, class233.musicTrackGroupId, class233.musicTrackFileId); // L: 106
+					if (ArchiveLoader.musicTrack == null) { // L: 107
+						return false;
+					}
+				}
+
+				if (class215.soundCache == null) { // L: 109
+					class215.soundCache = new SoundCache(class230.soundEffectsArchive, class233.musicSamplesArchive);
+				}
+
+				if (class233.midiPcmStream.loadMusicTrack(ArchiveLoader.musicTrack, class233.musicPatchesArchive, class215.soundCache, 22050)) { // L: 110
+					class233.midiPcmStream.clearAll(); // L: 111
+					class233.midiPcmStream.setPcmStreamVolume(class233.musicTrackVolume); // L: 112
+					class233.midiPcmStream.setMusicTrack(ArchiveLoader.musicTrack, GrandExchangeOfferUnitPriceComparator.musicTrackBoolean); // L: 113
+					class233.musicPlayerStatus = 0; // L: 114
+					ArchiveLoader.musicTrack = null; // L: 115
+					class215.soundCache = null; // L: 116
+					InvDefinition.musicTrackArchive = null; // L: 117
+					return true; // L: 118
+				}
+			}
+		} catch (Exception var1) { // L: 122
+			var1.printStackTrace(); // L: 123
+			class233.midiPcmStream.clear(); // L: 124
+			class233.musicPlayerStatus = 0; // L: 125
+			ArchiveLoader.musicTrack = null; // L: 126
+			class215.soundCache = null; // L: 127
+			InvDefinition.musicTrackArchive = null; // L: 128
+		}
+
+		return false; // L: 130
+	}
 }
diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java
index bee5a3667b..007f6115e1 100644
--- a/runescape-client/src/main/java/RunException.java
+++ b/runescape-client/src/main/java/RunException.java
@@ -4,31 +4,22 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("oz")
+@ObfuscatedName("oc")
 @Implements("RunException")
 public class RunException extends RuntimeException {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("RunException_applet")
 	public static Applet RunException_applet;
-	@ObfuscatedName("n")
-	@Export("localPlayerName")
-	public static String localPlayerName;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1454650143
+		intValue = 1440253205
 	)
 	@Export("RunException_revision")
 	public static int RunException_revision;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = 2094073605
-	)
-	@Export("clientType")
-	public static int clientType;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("message")
 	String message;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("throwable")
 	Throwable throwable;
 
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index 0e2cac7904..bb06d0a445 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -3,132 +3,132 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gt")
+@ObfuscatedName("gp")
 @Implements("Scene")
 public class Scene {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("Scene_isLowDetail")
 	public static boolean Scene_isLowDetail;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("tileUpdateCount")
 	static int tileUpdateCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("Scene_plane")
 	static int Scene_plane;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("Scene_drawnCount")
 	static int Scene_drawnCount;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("Scene_cameraXTileMin")
 	static int Scene_cameraXTileMin;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Scene_cameraXTileMax")
 	static int Scene_cameraXTileMax;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("Scene_cameraYTileMin")
 	static int Scene_cameraYTileMin;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("Scene_cameraYTileMax")
 	static int Scene_cameraYTileMax;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@Export("Scene_cameraXTile")
 	static int Scene_cameraXTile;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("Scene_cameraYTile")
 	static int Scene_cameraYTile;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@Export("Scene_cameraX")
 	static int Scene_cameraX;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@Export("Scene_cameraY")
 	static int Scene_cameraY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@Export("Scene_cameraZ")
 	static int Scene_cameraZ;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@Export("Scene_cameraPitchSine")
 	static int Scene_cameraPitchSine;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("Scene_cameraPitchCosine")
 	static int Scene_cameraPitchCosine;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("Scene_cameraYawSine")
 	static int Scene_cameraYawSine;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("Scene_cameraYawCosine")
 	static int Scene_cameraYawCosine;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "[Lhj;"
+		descriptor = "[Lhf;"
 	)
 	@Export("gameObjects")
 	static GameObject[] gameObjects;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@Export("checkClick")
 	static boolean checkClick;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("Scene_selectedPlane")
 	static int Scene_selectedPlane;
 	@ObfuscatedName("ag")
 	@Export("Scene_selectedScreenX")
 	static int Scene_selectedScreenX;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("Scene_selectedScreenY")
 	static int Scene_selectedScreenY;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@Export("Scene_selectedX")
 	public static int Scene_selectedX;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@Export("Scene_selectedY")
 	public static int Scene_selectedY;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("viewportWalking")
 	static boolean viewportWalking;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aj")
 	@Export("Scene_planesCount")
 	static int Scene_planesCount;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@Export("Scene_planeOccluderCounts")
 	static int[] Scene_planeOccluderCounts;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "[[Lgn;"
+		descriptor = "[[Lgc;"
 	)
 	@Export("Scene_planeOccluders")
 	static Occluder[][] Scene_planeOccluders;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@Export("Scene_currentOccludersCount")
 	static int Scene_currentOccludersCount;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "[Lgn;"
+		descriptor = "[Lgc;"
 	)
 	@Export("Scene_currentOccluders")
 	static Occluder[] Scene_currentOccluders;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("Scene_tilesDeque")
 	static NodeDeque Scene_tilesDeque;
-	@ObfuscatedName("af")
-	static final int[] field2338;
-	@ObfuscatedName("ak")
-	static final int[] field2352;
-	@ObfuscatedName("ay")
-	static final int[] field2340;
 	@ObfuscatedName("aa")
-	static final int[] field2341;
-	@ObfuscatedName("au")
+	static final int[] field2336;
+	@ObfuscatedName("ai")
+	static final int[] field2314;
+	@ObfuscatedName("av")
+	static final int[] field2338;
+	@ObfuscatedName("ax")
+	static final int[] field2339;
+	@ObfuscatedName("ar")
+	static final int[] field2340;
+	@ObfuscatedName("af")
+	static final int[] field2295;
+	@ObfuscatedName("bq")
 	static final int[] field2342;
-	@ObfuscatedName("an")
-	static final int[] field2305;
-	@ObfuscatedName("bd")
-	static final int[] field2344;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@Export("visibilityMap")
 	static boolean[][][][] visibilityMap;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("ba")
 	@Export("visibleTiles")
 	static boolean[][] visibleTiles;
 	@ObfuscatedName("bs")
@@ -137,54 +137,54 @@ public class Scene {
 	@ObfuscatedName("br")
 	@Export("Scene_viewportYCenter")
 	static int Scene_viewportYCenter;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bw")
 	@Export("Scene_viewportXMin")
 	static int Scene_viewportXMin;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("by")
 	@Export("Scene_viewportYMin")
 	static int Scene_viewportYMin;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bt")
 	@Export("Scene_viewportXMax")
 	static int Scene_viewportXMax;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bg")
 	@Export("Scene_viewportYMax")
 	static int Scene_viewportYMax;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("xSize")
 	int xSize;
 	@ObfuscatedName("y")
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("tileHeights")
 	int[][][] tileHeights;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[[[Lgx;"
+		descriptor = "[[[Lgf;"
 	)
 	@Export("tiles")
 	Tile[][][] tiles;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("tempGameObjectsCount")
 	int tempGameObjectsCount;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "[Lhj;"
+		descriptor = "[Lhf;"
 	)
 	@Export("tempGameObjects")
 	GameObject[] tempGameObjects;
-	@ObfuscatedName("s")
-	int[][][] field2301;
+	@ObfuscatedName("d")
+	int[][][] field2299;
 	@ObfuscatedName("bv")
 	@Export("tileShape2D")
 	int[][] tileShape2D;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@Export("tileRotation2D")
 	int[][] tileRotation2D;
 
@@ -206,13 +206,13 @@ public class Scene {
 		Scene_currentOccludersCount = 0; // L: 51
 		Scene_currentOccluders = new Occluder[500]; // L: 52
 		Scene_tilesDeque = new NodeDeque(); // L: 53
-		field2338 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54
-		field2352 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55
-		field2340 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56
-		field2341 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57
-		field2342 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58
-		field2305 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59
-		field2344 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60
+		field2336 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54
+		field2314 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55
+		field2338 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56
+		field2339 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57
+		field2340 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58
+		field2295 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59
+		field2342 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60
 		visibilityMap = new boolean[8][32][51][51]; // L: 86
 	}
 
@@ -226,12 +226,12 @@ public class Scene {
 		this.xSize = var2; // L: 97
 		this.ySize = var3; // L: 98
 		this.tiles = new Tile[var1][var2][var3]; // L: 99
-		this.field2301 = new int[var1][var2 + 1][var3 + 1]; // L: 100
+		this.field2299 = new int[var1][var2 + 1][var3 + 1]; // L: 100
 		this.tileHeights = var4; // L: 101
 		this.clear(); // L: 102
 	} // L: 103
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("clear")
 	public void clear() {
 		int var1;
@@ -264,7 +264,7 @@ public class Scene {
 
 	} // L: 120
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("init")
 	public void init(int var1) {
 		this.minPlane = var1; // L: 123
@@ -279,7 +279,7 @@ public class Scene {
 
 	} // L: 129
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("setLinkBelow")
 	public void setLinkBelow(int var1, int var2) {
 		Tile var3 = this.tiles[0][var1][var2]; // L: 132
@@ -291,677 +291,668 @@ public class Scene {
 
 				for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137
 					GameObject var7 = var5.gameObjects[var6]; // L: 138
-					long var9 = var7.tag; // L: 140
-					int var11 = (int)(var9 >>> 14 & 3L); // L: 144
-					boolean var8 = var11 == 2; // L: 146
-					if (var8 && var7.startX == var1 && var2 == var7.startY) { // L: 148
+					if (FileSystem.method2644(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139
 						--var7.plane;
 					}
 				}
 			}
 		}
 
-		if (this.tiles[0][var1][var2] == null) { // L: 152
+		if (this.tiles[0][var1][var2] == null) { // L: 143
 			this.tiles[0][var1][var2] = new Tile(0, var1, var2);
 		}
 
-		this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 153
-		this.tiles[3][var1][var2] = null; // L: 154
-	} // L: 155
-
-	@ObfuscatedName("p")
-	@Export("setTileMinPlane")
-	public void setTileMinPlane(int var1, int var2, int var3, int var4) {
-		Tile var5 = this.tiles[var1][var2][var3]; // L: 174
-		if (var5 != null) { // L: 175
-			this.tiles[var1][var2][var3].minPlane = var4; // L: 176
-		}
-	} // L: 177
+		this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144
+		this.tiles[3][var1][var2] = null; // L: 145
+	} // L: 146
 
 	@ObfuscatedName("j")
+	@Export("setTileMinPlane")
+	public void setTileMinPlane(int var1, int var2, int var3, int var4) {
+		Tile var5 = this.tiles[var1][var2][var3]; // L: 165
+		if (var5 != null) { // L: 166
+			this.tiles[var1][var2][var3].minPlane = var4; // L: 167
+		}
+	} // L: 168
+
+	@ObfuscatedName("o")
 	@Export("addTile")
 	public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) {
 		SceneTilePaint var21;
 		int var22;
-		if (var4 == 0) { // L: 180
-			var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 181
+		if (var4 == 0) { // L: 171
+			var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172
 
-			for (var22 = var1; var22 >= 0; --var22) { // L: 182
+			for (var22 = var1; var22 >= 0; --var22) { // L: 173
 				if (this.tiles[var22][var2][var3] == null) {
 					this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
 				}
 			}
 
-			this.tiles[var1][var2][var3].paint = var21; // L: 183
-		} else if (var4 != 1) { // L: 186
-			SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 192
+			this.tiles[var1][var2][var3].paint = var21; // L: 174
+		} else if (var4 != 1) { // L: 177
+			SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183
 
-			for (var22 = var1; var22 >= 0; --var22) { // L: 193
+			for (var22 = var1; var22 >= 0; --var22) { // L: 184
 				if (this.tiles[var22][var2][var3] == null) {
 					this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
 				}
 			}
 
-			this.tiles[var1][var2][var3].model = var23; // L: 194
+			this.tiles[var1][var2][var3].model = var23; // L: 185
 		} else {
-			var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 187
+			var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178
 
-			for (var22 = var1; var22 >= 0; --var22) { // L: 188
+			for (var22 = var1; var22 >= 0; --var22) { // L: 179
 				if (this.tiles[var22][var2][var3] == null) {
 					this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
 				}
 			}
 
-			this.tiles[var1][var2][var3].paint = var21; // L: 189
+			this.tiles[var1][var2][var3].paint = var21; // L: 180
 		}
-	} // L: 184 190 195
+	} // L: 175 181 186
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILgl;JI)V"
+		descriptor = "(IIIILgr;JI)V"
 	)
 	@Export("newFloorDecoration")
 	public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) {
-		if (var5 != null) { // L: 198
-			FloorDecoration var9 = new FloorDecoration(); // L: 199
-			var9.renderable = var5; // L: 200
-			var9.x = var2 * 128 + 64; // L: 201
-			var9.y = var3 * 128 + 64; // L: 202
-			var9.tileHeight = var4; // L: 203
-			var9.tag = var6; // L: 204
-			var9.flags = var8; // L: 205
-			if (this.tiles[var1][var2][var3] == null) { // L: 206
+		if (var5 != null) { // L: 189
+			FloorDecoration var9 = new FloorDecoration(); // L: 190
+			var9.renderable = var5; // L: 191
+			var9.x = var2 * 128 + 64; // L: 192
+			var9.y = var3 * 128 + 64; // L: 193
+			var9.tileHeight = var4; // L: 194
+			var9.tag = var6; // L: 195
+			var9.flags = var8; // L: 196
+			if (this.tiles[var1][var2][var3] == null) { // L: 197
 				this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
 			}
 
-			this.tiles[var1][var2][var3].floorDecoration = var9; // L: 207
+			this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198
 		}
-	} // L: 208
+	} // L: 199
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILgl;JLgl;Lgl;)V"
+		descriptor = "(IIIILgr;JLgr;Lgr;)V"
 	)
 	@Export("newGroundItemPile")
 	public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) {
-		ItemLayer var10 = new ItemLayer(); // L: 211
-		var10.first = var5; // L: 212
-		var10.x = var2 * 128 + 64; // L: 213
-		var10.y = var3 * 128 + 64; // L: 214
-		var10.tileHeight = var4; // L: 215
-		var10.tag = var6; // L: 216
-		var10.second = var8; // L: 217
-		var10.third = var9; // L: 218
-		int var11 = 0; // L: 219
-		Tile var12 = this.tiles[var1][var2][var3]; // L: 220
-		if (var12 != null) { // L: 221
-			for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 222
-				if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 223
-					Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 224
-					var14.calculateBoundsCylinder(); // L: 225
-					if (var14.height > var11) { // L: 226
+		ItemLayer var10 = new ItemLayer(); // L: 202
+		var10.first = var5; // L: 203
+		var10.x = var2 * 128 + 64; // L: 204
+		var10.y = var3 * 128 + 64; // L: 205
+		var10.tileHeight = var4; // L: 206
+		var10.tag = var6; // L: 207
+		var10.second = var8; // L: 208
+		var10.third = var9; // L: 209
+		int var11 = 0; // L: 210
+		Tile var12 = this.tiles[var1][var2][var3]; // L: 211
+		if (var12 != null) { // L: 212
+			for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213
+				if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214
+					Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215
+					var14.calculateBoundsCylinder(); // L: 216
+					if (var14.height > var11) { // L: 217
 						var11 = var14.height;
 					}
 				}
 			}
 		}
 
-		var10.height = var11; // L: 230
+		var10.height = var11; // L: 221
 		if (this.tiles[var1][var2][var3] == null) {
-			this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 231
+			this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222
 		}
 
-		this.tiles[var1][var2][var3].itemLayer = var10; // L: 232
-	} // L: 233
+		this.tiles[var1][var2][var3].itemLayer = var10; // L: 223
+	} // L: 224
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILgl;Lgl;IIJI)V"
+		descriptor = "(IIIILgr;Lgr;IIJI)V"
 	)
 	@Export("newBoundaryObject")
 	public void newBoundaryObject(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) {
-		if (var5 != null || var6 != null) { // L: 236
-			BoundaryObject var12 = new BoundaryObject(); // L: 237
-			var12.tag = var9; // L: 238
-			var12.flags = var11; // L: 239
-			var12.x = var2 * 128 + 64; // L: 240
-			var12.y = var3 * 128 + 64; // L: 241
-			var12.tileHeight = var4; // L: 242
-			var12.renderable1 = var5; // L: 243
-			var12.renderable2 = var6; // L: 244
-			var12.orientationA = var7; // L: 245
-			var12.orientationB = var8; // L: 246
+		if (var5 != null || var6 != null) { // L: 227
+			BoundaryObject var12 = new BoundaryObject(); // L: 228
+			var12.tag = var9; // L: 229
+			var12.flags = var11; // L: 230
+			var12.x = var2 * 128 + 64; // L: 231
+			var12.y = var3 * 128 + 64; // L: 232
+			var12.tileHeight = var4; // L: 233
+			var12.renderable1 = var5; // L: 234
+			var12.renderable2 = var6; // L: 235
+			var12.orientationA = var7; // L: 236
+			var12.orientationB = var8; // L: 237
 
 			for (int var13 = var1; var13 >= 0; --var13) {
 				if (this.tiles[var13][var2][var3] == null) {
-					this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 247
+					this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238
 				}
 			}
 
-			this.tiles[var1][var2][var3].boundaryObject = var12; // L: 248
+			this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239
 		}
-	} // L: 249
+	} // L: 240
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILgl;Lgl;IIIIJI)V"
+		descriptor = "(IIIILgr;Lgr;IIIIJI)V"
 	)
 	@Export("newWallDecoration")
 	public void newWallDecoration(int var1, int var2, int var3, int var4, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) {
-		if (var5 != null) { // L: 252
-			WallDecoration var14 = new WallDecoration(); // L: 253
-			var14.tag = var11; // L: 254
-			var14.flags = var13; // L: 255
-			var14.x = var2 * 128 + 64; // L: 256
-			var14.y = var3 * 128 + 64; // L: 257
-			var14.tileHeight = var4; // L: 258
-			var14.renderable1 = var5; // L: 259
-			var14.renderable2 = var6; // L: 260
-			var14.orientation = var7; // L: 261
-			var14.orientation2 = var8; // L: 262
-			var14.xOffset = var9; // L: 263
-			var14.yOffset = var10; // L: 264
+		if (var5 != null) { // L: 243
+			WallDecoration var14 = new WallDecoration(); // L: 244
+			var14.tag = var11; // L: 245
+			var14.flags = var13; // L: 246
+			var14.x = var2 * 128 + 64; // L: 247
+			var14.y = var3 * 128 + 64; // L: 248
+			var14.tileHeight = var4; // L: 249
+			var14.renderable1 = var5; // L: 250
+			var14.renderable2 = var6; // L: 251
+			var14.orientation = var7; // L: 252
+			var14.orientation2 = var8; // L: 253
+			var14.xOffset = var9; // L: 254
+			var14.yOffset = var10; // L: 255
 
 			for (int var15 = var1; var15 >= 0; --var15) {
 				if (this.tiles[var15][var2][var3] == null) {
-					this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 265
+					this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256
 				}
 			}
 
-			this.tiles[var1][var2][var3].wallDecoration = var14; // L: 266
+			this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257
 		}
-	} // L: 267
+	} // L: 258
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIILgl;IJI)Z"
+		descriptor = "(IIIIIILgr;IJI)Z"
 	)
-	public boolean method4007(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
-		if (var7 == null) { // L: 270
+	public boolean method4046(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
+		if (var7 == null) { // L: 261
 			return true;
 		} else {
-			int var12 = var5 * 64 + var2 * 128; // L: 271
-			int var13 = var6 * 64 + var3 * 128; // L: 272
-			return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 273
+			int var12 = var5 * 64 + var2 * 128; // L: 262
+			int var13 = var6 * 64 + var3 * 128; // L: 263
+			return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIILgl;IJZ)Z"
+		descriptor = "(IIIIILgr;IJZ)Z"
 	)
 	@Export("drawEntity")
 	public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) {
-		if (var6 == null) { // L: 277
+		if (var6 == null) { // L: 268
 			return true;
 		} else {
-			int var11 = var2 - var5; // L: 278
-			int var12 = var3 - var5; // L: 279
-			int var13 = var5 + var2; // L: 280
-			int var14 = var3 + var5; // L: 281
-			if (var10) { // L: 282
-				if (var7 > 640 && var7 < 1408) { // L: 283
+			int var11 = var2 - var5; // L: 269
+			int var12 = var3 - var5; // L: 270
+			int var13 = var5 + var2; // L: 271
+			int var14 = var3 + var5; // L: 272
+			if (var10) { // L: 273
+				if (var7 > 640 && var7 < 1408) { // L: 274
 					var14 += 128;
 				}
 
-				if (var7 > 1152 && var7 < 1920) { // L: 284
+				if (var7 > 1152 && var7 < 1920) { // L: 275
 					var13 += 128;
 				}
 
-				if (var7 > 1664 || var7 < 384) { // L: 285
+				if (var7 > 1664 || var7 < 384) { // L: 276
 					var12 -= 128;
 				}
 
-				if (var7 > 128 && var7 < 896) { // L: 286
+				if (var7 > 128 && var7 < 896) { // L: 277
 					var11 -= 128;
 				}
 			}
 
-			var11 /= 128; // L: 288
-			var12 /= 128; // L: 289
-			var13 /= 128; // L: 290
-			var14 /= 128; // L: 291
-			return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 292
-		}
-	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIILgl;IJIIII)Z"
-	)
-	@Export("addNullableObject")
-	public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) {
-		return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 296 297
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIILgl;IZJI)Z"
-	)
-	@Export("newGameObject")
-	boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) {
-		int var16;
-		for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 301
-			for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 302
-				if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 303
-					return false;
-				}
-
-				Tile var23 = this.tiles[var1][var15][var16]; // L: 304
-				if (var23 != null && var23.gameObjectsCount >= 5) { // L: 305
-					return false;
-				}
-			}
-		}
-
-		GameObject var21 = new GameObject(); // L: 308
-		var21.tag = var12; // L: 309
-		var21.flags = var14; // L: 310
-		var21.plane = var1; // L: 311
-		var21.centerX = var6; // L: 312
-		var21.centerY = var7; // L: 313
-		var21.height = var8; // L: 314
-		var21.renderable = var9; // L: 315
-		var21.orientation = var10; // L: 316
-		var21.startX = var2; // L: 317
-		var21.startY = var3; // L: 318
-		var21.endX = var2 + var4 - 1; // L: 319
-		var21.endY = var3 + var5 - 1; // L: 320
-
-		for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 321
-			for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 322
-				int var18 = 0; // L: 323
-				if (var16 > var2) { // L: 324
-					++var18;
-				}
-
-				if (var16 < var2 + var4 - 1) { // L: 325
-					var18 += 4;
-				}
-
-				if (var17 > var3) { // L: 326
-					var18 += 8;
-				}
-
-				if (var17 < var3 + var5 - 1) { // L: 327
-					var18 += 2;
-				}
-
-				for (int var19 = var1; var19 >= 0; --var19) {
-					if (this.tiles[var19][var16][var17] == null) {
-						this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 328
-					}
-				}
-
-				Tile var22 = this.tiles[var1][var16][var17]; // L: 329
-				var22.gameObjects[var22.gameObjectsCount] = var21; // L: 330
-				var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 331
-				var22.gameObjectsEdgeMask |= var18; // L: 333
-				++var22.gameObjectsCount; // L: 334
-			}
-		}
-
-		if (var11) { // L: 337
-			this.tempGameObjects[this.tempGameObjectsCount++] = var21;
-		}
-
-		return true; // L: 338
-	}
-
-	@ObfuscatedName("e")
-	@Export("clearTempGameObjects")
-	public void clearTempGameObjects() {
-		for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 342
-			GameObject var2 = this.tempGameObjects[var1]; // L: 343
-			this.removeGameObject(var2); // L: 344
-			this.tempGameObjects[var1] = null; // L: 345
-		}
-
-		this.tempGameObjectsCount = 0; // L: 347
-	} // L: 348
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(Lhj;)V"
-	)
-	@Export("removeGameObject")
-	void removeGameObject(GameObject var1) {
-		for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 351
-			for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 352
-				Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 353
-				if (var4 != null) { // L: 354
-					int var5;
-					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 355
-						if (var4.gameObjects[var5] == var1) { // L: 356
-							--var4.gameObjectsCount; // L: 357
-
-							for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 358
-								var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 359
-								var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 360
-							}
-
-							var4.gameObjects[var4.gameObjectsCount] = null; // L: 362
-							break;
-						}
-					}
-
-					var4.gameObjectsEdgeMask = 0; // L: 366
-
-					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 367
-						var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 369
-					}
-				}
-			}
-		}
-
-	} // L: 374
-
-	@ObfuscatedName("a")
-	public void method3967(int var1, int var2, int var3, int var4) {
-		Tile var5 = this.tiles[var1][var2][var3]; // L: 377
-		if (var5 != null) { // L: 378
-			WallDecoration var6 = var5.wallDecoration; // L: 379
-			if (var6 != null) { // L: 380
-				var6.xOffset = var4 * var6.xOffset / 16; // L: 381
-				var6.yOffset = var4 * var6.yOffset / 16; // L: 382
-			}
-		}
-	} // L: 383
-
-	@ObfuscatedName("k")
-	@Export("removeBoundaryObject")
-	public void removeBoundaryObject(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 386
-		if (var4 != null) {
-			var4.boundaryObject = null; // L: 388
-		}
-	} // L: 387 389
-
-	@ObfuscatedName("m")
-	@Export("removeWallDecoration")
-	public void removeWallDecoration(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 392
-		if (var4 != null) {
-			var4.wallDecoration = null; // L: 394
-		}
-	} // L: 393 395
-
-	@ObfuscatedName("x")
-	@Export("removeGameObject")
-	public void removeGameObject(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 398
-		if (var4 != null) { // L: 399
-			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 400
-				GameObject var6 = var4.gameObjects[var5]; // L: 401
-				if (UserComparator8.method2437(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 402
-					this.removeGameObject(var6); // L: 403
-					return; // L: 404
-				}
-			}
-
-		}
-	} // L: 407
-
-	@ObfuscatedName("z")
-	@Export("removeFloorDecoration")
-	public void removeFloorDecoration(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 410
-		if (var4 != null) {
-			var4.floorDecoration = null; // L: 412
-		}
-	} // L: 411 413
-
-	@ObfuscatedName("w")
-	@Export("removeGroundItemPile")
-	public void removeGroundItemPile(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 416
-		if (var4 != null) {
-			var4.itemLayer = null; // L: 418
-		}
-	} // L: 417 419
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lhw;"
-	)
-	public BoundaryObject method4089(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 422
-		return var4 == null ? null : var4.boundaryObject; // L: 423 424
-	}
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lho;"
-	)
-	public WallDecoration method3948(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 428
-		return var4 == null ? null : var4.wallDecoration; // L: 429 430
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lhj;"
-	)
-	public GameObject method3926(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 434
-		if (var4 == null) { // L: 435
-			return null;
-		} else {
-			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 436
-				GameObject var6 = var4.gameObjects[var5]; // L: 437
-				long var8 = var6.tag; // L: 439
-				int var10 = (int)(var8 >>> 14 & 3L); // L: 443
-				boolean var7 = var10 == 2; // L: 445
-				if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 447
-					return var6;
-				}
-			}
-
-			return null; // L: 449
+			var11 /= 128; // L: 279
+			var12 /= 128; // L: 280
+			var13 /= 128; // L: 281
+			var14 /= 128; // L: 282
+			return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283
 		}
 	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lgo;"
+		descriptor = "(IIIIILgr;IJIIII)Z"
+	)
+	@Export("addNullableObject")
+	public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) {
+		return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288
+	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIIILgr;IZJI)Z"
+	)
+	@Export("newGameObject")
+	boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) {
+		int var16;
+		for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292
+			for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293
+				if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294
+					return false;
+				}
+
+				Tile var23 = this.tiles[var1][var15][var16]; // L: 295
+				if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296
+					return false;
+				}
+			}
+		}
+
+		GameObject var21 = new GameObject(); // L: 299
+		var21.tag = var12; // L: 300
+		var21.flags = var14; // L: 301
+		var21.plane = var1; // L: 302
+		var21.centerX = var6; // L: 303
+		var21.centerY = var7; // L: 304
+		var21.height = var8; // L: 305
+		var21.renderable = var9; // L: 306
+		var21.orientation = var10; // L: 307
+		var21.startX = var2; // L: 308
+		var21.startY = var3; // L: 309
+		var21.endX = var2 + var4 - 1; // L: 310
+		var21.endY = var3 + var5 - 1; // L: 311
+
+		for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312
+			for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313
+				int var18 = 0; // L: 314
+				if (var16 > var2) { // L: 315
+					++var18;
+				}
+
+				if (var16 < var2 + var4 - 1) { // L: 316
+					var18 += 4;
+				}
+
+				if (var17 > var3) { // L: 317
+					var18 += 8;
+				}
+
+				if (var17 < var3 + var5 - 1) { // L: 318
+					var18 += 2;
+				}
+
+				for (int var19 = var1; var19 >= 0; --var19) {
+					if (this.tiles[var19][var16][var17] == null) {
+						this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319
+					}
+				}
+
+				Tile var22 = this.tiles[var1][var16][var17]; // L: 320
+				var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321
+				var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322
+				var22.gameObjectsEdgeMask |= var18; // L: 324
+				++var22.gameObjectsCount; // L: 325
+			}
+		}
+
+		if (var11) { // L: 328
+			this.tempGameObjects[this.tempGameObjectsCount++] = var21;
+		}
+
+		return true; // L: 329
+	}
+
+	@ObfuscatedName("g")
+	@Export("clearTempGameObjects")
+	public void clearTempGameObjects() {
+		for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333
+			GameObject var2 = this.tempGameObjects[var1]; // L: 334
+			this.removeGameObject(var2); // L: 335
+			this.tempGameObjects[var1] = null; // L: 336
+		}
+
+		this.tempGameObjectsCount = 0; // L: 338
+	} // L: 339
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(Lhf;)V"
+	)
+	@Export("removeGameObject")
+	void removeGameObject(GameObject var1) {
+		for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342
+			for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343
+				Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344
+				if (var4 != null) { // L: 345
+					int var5;
+					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346
+						if (var4.gameObjects[var5] == var1) { // L: 347
+							--var4.gameObjectsCount; // L: 348
+
+							for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349
+								var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350
+								var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351
+							}
+
+							var4.gameObjects[var4.gameObjectsCount] = null; // L: 353
+							break;
+						}
+					}
+
+					var4.gameObjectsEdgeMask = 0; // L: 357
+
+					for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358
+						var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360
+					}
+				}
+			}
+		}
+
+	} // L: 365
+
+	@ObfuscatedName("x")
+	public void method4204(int var1, int var2, int var3, int var4) {
+		Tile var5 = this.tiles[var1][var2][var3]; // L: 368
+		if (var5 != null) { // L: 369
+			WallDecoration var6 = var5.wallDecoration; // L: 370
+			if (var6 != null) { // L: 371
+				var6.xOffset = var4 * var6.xOffset / 16; // L: 372
+				var6.yOffset = var4 * var6.yOffset / 16; // L: 373
+			}
+		}
+	} // L: 374
+
+	@ObfuscatedName("u")
+	@Export("removeBoundaryObject")
+	public void removeBoundaryObject(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 377
+		if (var4 != null) {
+			var4.boundaryObject = null; // L: 379
+		}
+	} // L: 378 380
+
+	@ObfuscatedName("q")
+	@Export("removeWallDecoration")
+	public void removeWallDecoration(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 383
+		if (var4 != null) {
+			var4.wallDecoration = null; // L: 385
+		}
+	} // L: 384 386
+
+	@ObfuscatedName("s")
+	@Export("removeGameObject")
+	public void removeGameObject(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 389
+		if (var4 != null) { // L: 390
+			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391
+				GameObject var6 = var4.gameObjects[var5]; // L: 392
+				if (FileSystem.method2644(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393
+					this.removeGameObject(var6); // L: 394
+					return; // L: 395
+				}
+			}
+
+		}
+	} // L: 398
+
+	@ObfuscatedName("p")
+	@Export("removeFloorDecoration")
+	public void removeFloorDecoration(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 401
+		if (var4 != null) {
+			var4.floorDecoration = null; // L: 403
+		}
+	} // L: 402 404
+
+	@ObfuscatedName("c")
+	@Export("removeGroundItemPile")
+	public void removeGroundItemPile(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 407
+		if (var4 != null) {
+			var4.itemLayer = null; // L: 409
+		}
+	} // L: 408 410
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(III)Lhr;"
+	)
+	public BoundaryObject method4058(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 413
+		return var4 == null ? null : var4.boundaryObject; // L: 414 415
+	}
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(III)Lhd;"
+	)
+	public WallDecoration method4059(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 419
+		return var4 == null ? null : var4.wallDecoration; // L: 420 421
+	}
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(III)Lhf;"
+	)
+	public GameObject method4094(int var1, int var2, int var3) {
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 425
+		if (var4 == null) { // L: 426
+			return null;
+		} else {
+			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427
+				GameObject var6 = var4.gameObjects[var5]; // L: 428
+				if (FileSystem.method2644(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429
+					return var6;
+				}
+			}
+
+			return null; // L: 431
+		}
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(III)Lgq;"
 	)
 	@Export("getFloorDecoration")
 	public FloorDecoration getFloorDecoration(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 453
-		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 454 455
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 435
+		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@Export("getBoundaryObjectTag")
 	public long getBoundaryObjectTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 459
-		return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 460 461
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 441
+		return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@Export("getWallDecorationTag")
 	public long getWallDecorationTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 465
-		return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 466 467
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 447
+		return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("getGameObjectTag")
 	public long getGameObjectTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 471
-		if (var4 == null) { // L: 472
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 453
+		if (var4 == null) { // L: 454
 			return 0L;
 		} else {
-			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 473
-				GameObject var6 = var4.gameObjects[var5]; // L: 474
-				long var8 = var6.tag; // L: 476
-				int var10 = (int)(var8 >>> 14 & 3L); // L: 480
-				boolean var7 = var10 == 2; // L: 482
-				if (var7 && var2 == var6.startX && var3 == var6.startY) { // L: 484
+			for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455
+				GameObject var6 = var4.gameObjects[var5]; // L: 456
+				if (FileSystem.method2644(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457
 					return var6.tag;
 				}
 			}
 
-			return 0L; // L: 486
+			return 0L; // L: 459
 		}
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@Export("getFloorDecorationTag")
 	public long getFloorDecorationTag(int var1, int var2, int var3) {
-		Tile var4 = this.tiles[var1][var2][var3]; // L: 490
-		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 491 492
+		Tile var4 = this.tiles[var1][var2][var3]; // L: 463
+		return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465
 	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@Export("getObjectFlags")
 	public int getObjectFlags(int var1, int var2, int var3, long var4) {
-		Tile var6 = this.tiles[var1][var2][var3]; // L: 496
-		if (var6 == null) { // L: 497
+		Tile var6 = this.tiles[var1][var2][var3]; // L: 469
+		if (var6 == null) { // L: 470
 			return -1;
-		} else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 498
+		} else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471
 			return var6.boundaryObject.flags & 255;
-		} else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 499
+		} else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472
 			return var6.wallDecoration.flags & 255;
-		} else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 500
+		} else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473
 			return var6.floorDecoration.flags & 255;
 		} else {
-			for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 501
-				if (var6.gameObjects[var7].tag == var4) { // L: 502
+			for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474
+				if (var6.gameObjects[var7].tag == var4) { // L: 475
 					return var6.gameObjects[var7].flags & 255;
 				}
 			}
 
-			return -1; // L: 504
+			return -1; // L: 477
 		}
 	}
 
-	@ObfuscatedName("ai")
-	public void method3955(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < this.planes; ++var4) { // L: 508
-			for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 509
-				for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 510
-					Tile var7 = this.tiles[var4][var5][var6]; // L: 511
-					if (var7 != null) { // L: 512
-						BoundaryObject var8 = var7.boundaryObject; // L: 513
+	@ObfuscatedName("az")
+	public void method4067(int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481
+			for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482
+				for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483
+					Tile var7 = this.tiles[var4][var5][var6]; // L: 484
+					if (var7 != null) { // L: 485
+						BoundaryObject var8 = var7.boundaryObject; // L: 486
 						ModelData var10;
-						if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 514
-							ModelData var9 = (ModelData)var8.renderable1; // L: 515
-							this.method3957(var9, var4, var5, var6, 1, 1); // L: 516
-							if (var8.renderable2 instanceof ModelData) { // L: 517
-								var10 = (ModelData)var8.renderable2; // L: 518
-								this.method3957(var10, var4, var5, var6, 1, 1); // L: 519
-								ModelData.method3774(var9, var10, 0, 0, 0, false); // L: 520
-								var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 521
+						if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487
+							ModelData var9 = (ModelData)var8.renderable1; // L: 488
+							this.method4238(var9, var4, var5, var6, 1, 1); // L: 489
+							if (var8.renderable2 instanceof ModelData) { // L: 490
+								var10 = (ModelData)var8.renderable2; // L: 491
+								this.method4238(var10, var4, var5, var6, 1, 1); // L: 492
+								ModelData.method3885(var9, var10, 0, 0, 0, false); // L: 493
+								var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494
 							}
 
-							var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 523
+							var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496
 						}
 
-						for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 525
-							GameObject var14 = var7.gameObjects[var12]; // L: 526
-							if (var14 != null && var14.renderable instanceof ModelData) { // L: 527
-								ModelData var11 = (ModelData)var14.renderable; // L: 528
-								this.method3957(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 529
-								var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 530
+						for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498
+							GameObject var14 = var7.gameObjects[var12]; // L: 499
+							if (var14 != null && var14.renderable instanceof ModelData) { // L: 500
+								ModelData var11 = (ModelData)var14.renderable; // L: 501
+								this.method4238(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502
+								var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503
 							}
 						}
 
-						FloorDecoration var13 = var7.floorDecoration; // L: 533
-						if (var13 != null && var13.renderable instanceof ModelData) { // L: 534
-							var10 = (ModelData)var13.renderable; // L: 535
-							this.method4076(var10, var4, var5, var6); // L: 536
-							var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 537
+						FloorDecoration var13 = var7.floorDecoration; // L: 506
+						if (var13 != null && var13.renderable instanceof ModelData) { // L: 507
+							var10 = (ModelData)var13.renderable; // L: 508
+							this.method4068(var10, var4, var5, var6); // L: 509
+							var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 543
+	} // L: 516
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;III)V"
+		descriptor = "(Lga;III)V"
 	)
-	void method4076(ModelData var1, int var2, int var3, int var4) {
+	void method4068(ModelData var1, int var2, int var3, int var4) {
 		Tile var5;
 		ModelData var6;
-		if (var3 < this.xSize) { // L: 546
-			var5 = this.tiles[var2][var3 + 1][var4]; // L: 547
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 548
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 549
-				ModelData.method3774(var1, var6, 128, 0, 0, true); // L: 550
+		if (var3 < this.xSize) { // L: 519
+			var5 = this.tiles[var2][var3 + 1][var4]; // L: 520
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 522
+				ModelData.method3885(var1, var6, 128, 0, 0, true); // L: 523
 			}
 		}
 
-		if (var4 < this.xSize) { // L: 553
-			var5 = this.tiles[var2][var3][var4 + 1]; // L: 554
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 555
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 556
-				ModelData.method3774(var1, var6, 0, 0, 128, true); // L: 557
+		if (var4 < this.xSize) { // L: 526
+			var5 = this.tiles[var2][var3][var4 + 1]; // L: 527
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 529
+				ModelData.method3885(var1, var6, 0, 0, 128, true); // L: 530
 			}
 		}
 
-		if (var3 < this.xSize && var4 < this.ySize) { // L: 560
-			var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 561
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 562
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 563
-				ModelData.method3774(var1, var6, 128, 0, 128, true); // L: 564
+		if (var3 < this.xSize && var4 < this.ySize) { // L: 533
+			var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 536
+				ModelData.method3885(var1, var6, 128, 0, 128, true); // L: 537
 			}
 		}
 
-		if (var3 < this.xSize && var4 > 0) { // L: 567
-			var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 568
-			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 569
-				var6 = (ModelData)var5.floorDecoration.renderable; // L: 570
-				ModelData.method3774(var1, var6, 128, 0, -128, true); // L: 571
+		if (var3 < this.xSize && var4 > 0) { // L: 540
+			var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541
+			if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542
+				var6 = (ModelData)var5.floorDecoration.renderable; // L: 543
+				ModelData.method3885(var1, var6, 128, 0, -128, true); // L: 544
 			}
 		}
 
-	} // L: 574
+	} // L: 547
 
 	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		descriptor = "(Lgm;IIIII)V"
+		descriptor = "(Lga;IIIII)V"
 	)
-	void method3957(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
-		boolean var7 = true; // L: 577
-		int var8 = var3; // L: 578
-		int var9 = var3 + var5; // L: 579
-		int var10 = var4 - 1; // L: 580
-		int var11 = var4 + var6; // L: 581
+	void method4238(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
+		boolean var7 = true; // L: 550
+		int var8 = var3; // L: 551
+		int var9 = var3 + var5; // L: 552
+		int var10 = var4 - 1; // L: 553
+		int var11 = var4 + var6; // L: 554
 
-		for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 582
-			if (var12 != this.planes) { // L: 583
-				for (int var13 = var8; var13 <= var9; ++var13) { // L: 584
-					if (var13 >= 0 && var13 < this.xSize) { // L: 585
-						for (int var14 = var10; var14 <= var11; ++var14) { // L: 586
-							if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 587 588
-								Tile var15 = this.tiles[var12][var13][var14]; // L: 589
-								if (var15 != null) { // L: 590
-									int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 591
-									BoundaryObject var17 = var15.boundaryObject; // L: 592
-									if (var17 != null) { // L: 593
+		for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555
+			if (var12 != this.planes) { // L: 556
+				for (int var13 = var8; var13 <= var9; ++var13) { // L: 557
+					if (var13 >= 0 && var13 < this.xSize) { // L: 558
+						for (int var14 = var10; var14 <= var11; ++var14) { // L: 559
+							if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561
+								Tile var15 = this.tiles[var12][var13][var14]; // L: 562
+								if (var15 != null) { // L: 563
+									int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564
+									BoundaryObject var17 = var15.boundaryObject; // L: 565
+									if (var17 != null) { // L: 566
 										ModelData var18;
-										if (var17.renderable1 instanceof ModelData) { // L: 594
-											var18 = (ModelData)var17.renderable1; // L: 595
-											ModelData.method3774(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 596
+										if (var17.renderable1 instanceof ModelData) { // L: 567
+											var18 = (ModelData)var17.renderable1; // L: 568
+											ModelData.method3885(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569
 										}
 
-										if (var17.renderable2 instanceof ModelData) { // L: 598
-											var18 = (ModelData)var17.renderable2; // L: 599
-											ModelData.method3774(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 600
+										if (var17.renderable2 instanceof ModelData) { // L: 571
+											var18 = (ModelData)var17.renderable2; // L: 572
+											ModelData.method3885(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573
 										}
 									}
 
-									for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 603
-										GameObject var19 = var15.gameObjects[var23]; // L: 604
-										if (var19 != null && var19.renderable instanceof ModelData) { // L: 605
-											ModelData var20 = (ModelData)var19.renderable; // L: 606
-											int var21 = var19.endX - var19.startX + 1; // L: 607
-											int var22 = var19.endY - var19.startY + 1; // L: 608
-											ModelData.method3774(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 609
+									for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576
+										GameObject var19 = var15.gameObjects[var23]; // L: 577
+										if (var19 != null && var19.renderable instanceof ModelData) { // L: 578
+											ModelData var20 = (ModelData)var19.renderable; // L: 579
+											int var21 = var19.endX - var19.startX + 1; // L: 580
+											int var22 = var19.endY - var19.startY + 1; // L: 581
+											ModelData.method3885(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582
 										}
 									}
 								}
@@ -970,179 +961,179 @@ public class Scene {
 					}
 				}
 
-				--var8; // L: 614
-				var7 = false; // L: 615
+				--var8; // L: 587
+				var7 = false; // L: 588
 			}
 		}
 
-	} // L: 617
+	} // L: 590
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("drawTileMinimap")
 	public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
-		Tile var7 = this.tiles[var4][var5][var6]; // L: 620
-		if (var7 != null) { // L: 621
-			SceneTilePaint var8 = var7.paint; // L: 622
+		Tile var7 = this.tiles[var4][var5][var6]; // L: 593
+		if (var7 != null) { // L: 594
+			SceneTilePaint var8 = var7.paint; // L: 595
 			int var10;
-			if (var8 != null) { // L: 623
-				int var18 = var8.rgb; // L: 624
-				if (var18 != 0) { // L: 625
-					for (var10 = 0; var10 < 4; ++var10) { // L: 626
-						var1[var2] = var18; // L: 627
-						var1[var2 + 1] = var18; // L: 628
-						var1[var2 + 2] = var18; // L: 629
-						var1[var2 + 3] = var18; // L: 630
-						var2 += var3; // L: 631
+			if (var8 != null) { // L: 596
+				int var18 = var8.rgb; // L: 597
+				if (var18 != 0) { // L: 598
+					for (var10 = 0; var10 < 4; ++var10) { // L: 599
+						var1[var2] = var18; // L: 600
+						var1[var2 + 1] = var18; // L: 601
+						var1[var2 + 2] = var18; // L: 602
+						var1[var2 + 3] = var18; // L: 603
+						var2 += var3; // L: 604
 					}
 
 				}
 			} else {
-				SceneTileModel var9 = var7.model; // L: 635
-				if (var9 != null) { // L: 636
-					var10 = var9.shape; // L: 637
-					int var11 = var9.rotation; // L: 638
-					int var12 = var9.underlayRgb; // L: 639
-					int var13 = var9.overlayRgb; // L: 640
-					int[] var14 = this.tileShape2D[var10]; // L: 641
-					int[] var15 = this.tileRotation2D[var11]; // L: 642
-					int var16 = 0; // L: 643
+				SceneTileModel var9 = var7.model; // L: 608
+				if (var9 != null) { // L: 609
+					var10 = var9.shape; // L: 610
+					int var11 = var9.rotation; // L: 611
+					int var12 = var9.underlayRgb; // L: 612
+					int var13 = var9.overlayRgb; // L: 613
+					int[] var14 = this.tileShape2D[var10]; // L: 614
+					int[] var15 = this.tileRotation2D[var11]; // L: 615
+					int var16 = 0; // L: 616
 					int var17;
-					if (var12 != 0) { // L: 644
-						for (var17 = 0; var17 < 4; ++var17) { // L: 645
-							var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 646
-							var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 647
-							var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 648
-							var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 649
-							var2 += var3; // L: 650
+					if (var12 != 0) { // L: 617
+						for (var17 = 0; var17 < 4; ++var17) { // L: 618
+							var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619
+							var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620
+							var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621
+							var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622
+							var2 += var3; // L: 623
 						}
 					} else {
-						for (var17 = 0; var17 < 4; ++var17) { // L: 654
-							if (var14[var15[var16++]] != 0) { // L: 655
+						for (var17 = 0; var17 < 4; ++var17) { // L: 627
+							if (var14[var15[var16++]] != 0) { // L: 628
 								var1[var2] = var13;
 							}
 
-							if (var14[var15[var16++]] != 0) { // L: 656
+							if (var14[var15[var16++]] != 0) { // L: 629
 								var1[var2 + 1] = var13;
 							}
 
-							if (var14[var15[var16++]] != 0) { // L: 657
+							if (var14[var15[var16++]] != 0) { // L: 630
 								var1[var2 + 2] = var13;
 							}
 
-							if (var14[var15[var16++]] != 0) { // L: 658
+							if (var14[var15[var16++]] != 0) { // L: 631
 								var1[var2 + 3] = var13;
 							}
 
-							var2 += var3; // L: 659
+							var2 += var3; // L: 632
 						}
 					}
 
 				}
 			}
 		}
-	} // L: 633 662
+	} // L: 606 635
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ao")
 	@Export("menuOpen")
 	public void menuOpen(int var1, int var2, int var3, boolean var4) {
-		if (!shouldSendWalk() || var4) { // L: 741
-			checkClick = true; // L: 742
-			viewportWalking = var4; // L: 743
-			Scene_selectedPlane = var1; // L: 744
-			Scene_selectedScreenX = var2; // L: 745
-			Scene_selectedScreenY = var3; // L: 746
-			Scene_selectedX = -1; // L: 747
-			Scene_selectedY = -1; // L: 748
+		if (!shouldSendWalk() || var4) { // L: 714
+			checkClick = true; // L: 715
+			viewportWalking = var4; // L: 716
+			Scene_selectedPlane = var1; // L: 717
+			Scene_selectedScreenX = var2; // L: 718
+			Scene_selectedScreenY = var3; // L: 719
+			Scene_selectedX = -1; // L: 720
+			Scene_selectedY = -1; // L: 721
 		}
-	} // L: 749
+	} // L: 722
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@Export("setViewportWalking")
 	public void setViewportWalking() {
-		viewportWalking = true; // L: 752
-	} // L: 753
+		viewportWalking = true; // L: 725
+	} // L: 726
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@Export("draw")
 	public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (var1 < 0) { // L: 765
+		if (var1 < 0) { // L: 738
 			var1 = 0;
-		} else if (var1 >= this.xSize * 128) { // L: 766
+		} else if (var1 >= this.xSize * 128) { // L: 739
 			var1 = this.xSize * 128 - 1;
 		}
 
-		if (var3 < 0) { // L: 767
+		if (var3 < 0) { // L: 740
 			var3 = 0;
-		} else if (var3 >= this.ySize * 128) { // L: 768
+		} else if (var3 >= this.ySize * 128) { // L: 741
 			var3 = this.ySize * 128 - 1;
 		}
 
-		if (var4 < 128) { // L: 769
+		if (var4 < 128) { // L: 742
 			var4 = 128;
-		} else if (var4 > 383) { // L: 770
+		} else if (var4 > 383) { // L: 743
 			var4 = 383;
 		}
 
-		++Scene_drawnCount; // L: 771
-		Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 772
-		Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 773
-		Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 774
-		Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 775
-		visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 776
-		Scene_cameraX = var1; // L: 777
-		Scene_cameraY = var2; // L: 778
-		Scene_cameraZ = var3; // L: 779
-		Scene_cameraXTile = var1 / 128; // L: 780
-		Scene_cameraYTile = var3 / 128; // L: 781
-		Scene_plane = var6; // L: 782
-		Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 783
-		if (Scene_cameraXTileMin < 0) { // L: 784
+		++Scene_drawnCount; // L: 744
+		Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745
+		Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746
+		Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747
+		Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748
+		visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749
+		Scene_cameraX = var1; // L: 750
+		Scene_cameraY = var2; // L: 751
+		Scene_cameraZ = var3; // L: 752
+		Scene_cameraXTile = var1 / 128; // L: 753
+		Scene_cameraYTile = var3 / 128; // L: 754
+		Scene_plane = var6; // L: 755
+		Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756
+		if (Scene_cameraXTileMin < 0) { // L: 757
 			Scene_cameraXTileMin = 0;
 		}
 
-		Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 785
-		if (Scene_cameraYTileMin < 0) { // L: 786
+		Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758
+		if (Scene_cameraYTileMin < 0) { // L: 759
 			Scene_cameraYTileMin = 0;
 		}
 
-		Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 787
-		if (Scene_cameraXTileMax > this.xSize) { // L: 788
+		Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760
+		if (Scene_cameraXTileMax > this.xSize) { // L: 761
 			Scene_cameraXTileMax = this.xSize;
 		}
 
-		Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 789
-		if (Scene_cameraYTileMax > this.ySize) { // L: 790
+		Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762
+		if (Scene_cameraYTileMax > this.ySize) { // L: 763
 			Scene_cameraYTileMax = this.ySize;
 		}
 
-		this.occlude(); // L: 791
-		tileUpdateCount = 0; // L: 792
+		this.occlude(); // L: 764
+		tileUpdateCount = 0; // L: 765
 
 		int var7;
 		Tile[][] var8;
 		int var9;
 		int var10;
-		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 793
-			var8 = this.tiles[var7]; // L: 794
+		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766
+			var8 = this.tiles[var7]; // L: 767
 
-			for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 795
-				for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 796
-					Tile var16 = var8[var9][var10]; // L: 797
-					if (var16 != null) { // L: 798
-						if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 799
-							var16.drawPrimary = true; // L: 805
-							var16.drawSecondary = true; // L: 806
-							if (var16.gameObjectsCount > 0) { // L: 807
+			for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768
+				for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769
+					Tile var16 = var8[var9][var10]; // L: 770
+					if (var16 != null) { // L: 771
+						if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772
+							var16.drawPrimary = true; // L: 778
+							var16.drawSecondary = true; // L: 779
+							if (var16.gameObjectsCount > 0) { // L: 780
 								var16.drawGameObjects = true;
 							} else {
-								var16.drawGameObjects = false; // L: 808
+								var16.drawGameObjects = false; // L: 781
 							}
 
-							++tileUpdateCount; // L: 809
+							++tileUpdateCount; // L: 782
 						} else {
-							var16.drawPrimary = false; // L: 800
-							var16.drawSecondary = false; // L: 801
-							var16.drawGameObjectEdges = 0; // L: 802
+							var16.drawPrimary = false; // L: 773
+							var16.drawSecondary = false; // L: 774
+							var16.drawGameObjectEdges = 0; // L: 775
 						}
 					}
 				}
@@ -1154,118 +1145,118 @@ public class Scene {
 		int var13;
 		int var14;
 		Tile var15;
-		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 815
-			var8 = this.tiles[var7]; // L: 816
+		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788
+			var8 = this.tiles[var7]; // L: 789
 
-			for (var9 = -25; var9 <= 0; ++var9) { // L: 817
-				var10 = var9 + Scene_cameraXTile; // L: 818
-				var11 = Scene_cameraXTile - var9; // L: 819
-				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 820
-					for (var12 = -25; var12 <= 0; ++var12) { // L: 821
-						var13 = var12 + Scene_cameraYTile; // L: 822
-						var14 = Scene_cameraYTile - var12; // L: 823
-						if (var10 >= Scene_cameraXTileMin) { // L: 824
-							if (var13 >= Scene_cameraYTileMin) { // L: 825
-								var15 = var8[var10][var13]; // L: 826
-								if (var15 != null && var15.drawPrimary) { // L: 827
+			for (var9 = -25; var9 <= 0; ++var9) { // L: 790
+				var10 = var9 + Scene_cameraXTile; // L: 791
+				var11 = Scene_cameraXTile - var9; // L: 792
+				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793
+					for (var12 = -25; var12 <= 0; ++var12) { // L: 794
+						var13 = var12 + Scene_cameraYTile; // L: 795
+						var14 = Scene_cameraYTile - var12; // L: 796
+						if (var10 >= Scene_cameraXTileMin) { // L: 797
+							if (var13 >= Scene_cameraYTileMin) { // L: 798
+								var15 = var8[var10][var13]; // L: 799
+								if (var15 != null && var15.drawPrimary) { // L: 800
 									this.drawTile(var15, true);
 								}
 							}
 
-							if (var14 < Scene_cameraYTileMax) { // L: 829
-								var15 = var8[var10][var14]; // L: 830
-								if (var15 != null && var15.drawPrimary) { // L: 831
+							if (var14 < Scene_cameraYTileMax) { // L: 802
+								var15 = var8[var10][var14]; // L: 803
+								if (var15 != null && var15.drawPrimary) { // L: 804
 									this.drawTile(var15, true);
 								}
 							}
 						}
 
-						if (var11 < Scene_cameraXTileMax) { // L: 834
-							if (var13 >= Scene_cameraYTileMin) { // L: 835
-								var15 = var8[var11][var13]; // L: 836
-								if (var15 != null && var15.drawPrimary) { // L: 837
+						if (var11 < Scene_cameraXTileMax) { // L: 807
+							if (var13 >= Scene_cameraYTileMin) { // L: 808
+								var15 = var8[var11][var13]; // L: 809
+								if (var15 != null && var15.drawPrimary) { // L: 810
 									this.drawTile(var15, true);
 								}
 							}
 
+							if (var14 < Scene_cameraYTileMax) { // L: 812
+								var15 = var8[var11][var14]; // L: 813
+								if (var15 != null && var15.drawPrimary) { // L: 814
+									this.drawTile(var15, true);
+								}
+							}
+						}
+
+						if (tileUpdateCount == 0) { // L: 817
+							checkClick = false; // L: 818
+							return; // L: 819
+						}
+					}
+				}
+			}
+		}
+
+		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825
+			var8 = this.tiles[var7]; // L: 826
+
+			for (var9 = -25; var9 <= 0; ++var9) { // L: 827
+				var10 = var9 + Scene_cameraXTile; // L: 828
+				var11 = Scene_cameraXTile - var9; // L: 829
+				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830
+					for (var12 = -25; var12 <= 0; ++var12) { // L: 831
+						var13 = var12 + Scene_cameraYTile; // L: 832
+						var14 = Scene_cameraYTile - var12; // L: 833
+						if (var10 >= Scene_cameraXTileMin) { // L: 834
+							if (var13 >= Scene_cameraYTileMin) { // L: 835
+								var15 = var8[var10][var13]; // L: 836
+								if (var15 != null && var15.drawPrimary) { // L: 837
+									this.drawTile(var15, false);
+								}
+							}
+
 							if (var14 < Scene_cameraYTileMax) { // L: 839
-								var15 = var8[var11][var14]; // L: 840
+								var15 = var8[var10][var14]; // L: 840
 								if (var15 != null && var15.drawPrimary) { // L: 841
-									this.drawTile(var15, true);
+									this.drawTile(var15, false);
 								}
 							}
 						}
 
-						if (tileUpdateCount == 0) { // L: 844
-							checkClick = false; // L: 845
-							return; // L: 846
+						if (var11 < Scene_cameraXTileMax) { // L: 844
+							if (var13 >= Scene_cameraYTileMin) { // L: 845
+								var15 = var8[var11][var13]; // L: 846
+								if (var15 != null && var15.drawPrimary) { // L: 847
+									this.drawTile(var15, false);
+								}
+							}
+
+							if (var14 < Scene_cameraYTileMax) { // L: 849
+								var15 = var8[var11][var14]; // L: 850
+								if (var15 != null && var15.drawPrimary) { // L: 851
+									this.drawTile(var15, false);
+								}
+							}
+						}
+
+						if (tileUpdateCount == 0) { // L: 854
+							checkClick = false; // L: 855
+							return; // L: 856
 						}
 					}
 				}
 			}
 		}
 
-		for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 852
-			var8 = this.tiles[var7]; // L: 853
+		checkClick = false; // L: 862
+	} // L: 863
 
-			for (var9 = -25; var9 <= 0; ++var9) { // L: 854
-				var10 = var9 + Scene_cameraXTile; // L: 855
-				var11 = Scene_cameraXTile - var9; // L: 856
-				if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 857
-					for (var12 = -25; var12 <= 0; ++var12) { // L: 858
-						var13 = var12 + Scene_cameraYTile; // L: 859
-						var14 = Scene_cameraYTile - var12; // L: 860
-						if (var10 >= Scene_cameraXTileMin) { // L: 861
-							if (var13 >= Scene_cameraYTileMin) { // L: 862
-								var15 = var8[var10][var13]; // L: 863
-								if (var15 != null && var15.drawPrimary) { // L: 864
-									this.drawTile(var15, false);
-								}
-							}
-
-							if (var14 < Scene_cameraYTileMax) { // L: 866
-								var15 = var8[var10][var14]; // L: 867
-								if (var15 != null && var15.drawPrimary) {
-									this.drawTile(var15, false); // L: 868
-								}
-							}
-						}
-
-						if (var11 < Scene_cameraXTileMax) { // L: 871
-							if (var13 >= Scene_cameraYTileMin) { // L: 872
-								var15 = var8[var11][var13]; // L: 873
-								if (var15 != null && var15.drawPrimary) { // L: 874
-									this.drawTile(var15, false);
-								}
-							}
-
-							if (var14 < Scene_cameraYTileMax) { // L: 876
-								var15 = var8[var11][var14]; // L: 877
-								if (var15 != null && var15.drawPrimary) { // L: 878
-									this.drawTile(var15, false);
-								}
-							}
-						}
-
-						if (tileUpdateCount == 0) { // L: 881
-							checkClick = false; // L: 882
-							return; // L: 883
-						}
-					}
-				}
-			}
-		}
-
-		checkClick = false; // L: 889
-	} // L: 890
-
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(Lgx;Z)V"
+		descriptor = "(Lgf;Z)V"
 	)
 	@Export("drawTile")
 	void drawTile(Tile var1, boolean var2) {
-		Scene_tilesDeque.addFirst(var1); // L: 893
+		Scene_tilesDeque.addFirst(var1); // L: 866
 
 		while (true) {
 			Tile var3;
@@ -1297,227 +1288,227 @@ public class Scene {
 										Tile var36;
 										while (true) {
 											do {
-												var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 895
-												if (var3 == null) { // L: 896
+												var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868
+												if (var3 == null) { // L: 869
 													return;
 												}
-											} while(!var3.drawSecondary); // L: 897
+											} while(!var3.drawSecondary); // L: 870
 
-											var4 = var3.x; // L: 898
-											var5 = var3.y; // L: 899
-											var6 = var3.plane; // L: 900
-											var7 = var3.originalPlane; // L: 901
-											var8 = this.tiles[var6]; // L: 902
-											if (!var3.drawPrimary) { // L: 903
+											var4 = var3.x; // L: 871
+											var5 = var3.y; // L: 872
+											var6 = var3.plane; // L: 873
+											var7 = var3.originalPlane; // L: 874
+											var8 = this.tiles[var6]; // L: 875
+											if (!var3.drawPrimary) { // L: 876
 												break;
 											}
 
-											if (var2) { // L: 904
-												if (var6 > 0) { // L: 905
-													var9 = this.tiles[var6 - 1][var4][var5]; // L: 906
-													if (var9 != null && var9.drawSecondary) { // L: 907
+											if (var2) { // L: 877
+												if (var6 > 0) { // L: 878
+													var9 = this.tiles[var6 - 1][var4][var5]; // L: 879
+													if (var9 != null && var9.drawSecondary) { // L: 880
 														continue;
 													}
 												}
 
-												if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 909
-													var9 = var8[var4 - 1][var5]; // L: 910
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 911
+												if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882
+													var9 = var8[var4 - 1][var5]; // L: 883
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884
 														continue;
 													}
 												}
 
-												if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 913
-													var9 = var8[var4 + 1][var5]; // L: 914
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 915
+												if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886
+													var9 = var8[var4 + 1][var5]; // L: 887
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888
 														continue;
 													}
 												}
 
-												if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 917
-													var9 = var8[var4][var5 - 1]; // L: 918
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 919
+												if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890
+													var9 = var8[var4][var5 - 1]; // L: 891
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892
 														continue;
 													}
 												}
 
-												if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 921
-													var9 = var8[var4][var5 + 1]; // L: 922
-													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 923
+												if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894
+													var9 = var8[var4][var5 + 1]; // L: 895
+													if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896
 														continue;
 													}
 												}
 											} else {
-												var2 = true; // L: 926
+												var2 = true; // L: 899
 											}
 
-											var3.drawPrimary = false; // L: 927
-											if (var3.linkedBelowTile != null) { // L: 928
-												var9 = var3.linkedBelowTile; // L: 929
-												if (var9.paint != null) { // L: 930
-													if (!this.method3972(0, var4, var5)) { // L: 931
+											var3.drawPrimary = false; // L: 900
+											if (var3.linkedBelowTile != null) { // L: 901
+												var9 = var3.linkedBelowTile; // L: 902
+												if (var9.paint != null) { // L: 903
+													if (!this.method4084(0, var4, var5)) { // L: 904
 														this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
 													}
-												} else if (var9.model != null && !this.method3972(0, var4, var5)) { // L: 933 934
+												} else if (var9.model != null && !this.method4084(0, var4, var5)) { // L: 906 907
 													this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
 												}
 
-												var10 = var9.boundaryObject; // L: 936
-												if (var10 != null) { // L: 937
+												var10 = var9.boundaryObject; // L: 909
+												if (var10 != null) { // L: 910
 													var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
 												}
 
-												for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 938
-													var12 = var9.gameObjects[var11]; // L: 939
-													if (var12 != null) { // L: 940
+												for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911
+													var12 = var9.gameObjects[var11]; // L: 912
+													if (var12 != null) { // L: 913
 														var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
 													}
 												}
 											}
 
-											var20 = false; // L: 943
-											if (var3.paint != null) { // L: 944
-												if (!this.method3972(var7, var4, var5)) { // L: 945
-													var20 = true; // L: 946
-													if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 947
+											var20 = false; // L: 916
+											if (var3.paint != null) { // L: 917
+												if (!this.method4084(var7, var4, var5)) { // L: 918
+													var20 = true; // L: 919
+													if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920
 														this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
 													}
 												}
-											} else if (var3.model != null && !this.method3972(var7, var4, var5)) { // L: 950 951
-												var20 = true; // L: 952
-												this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 953
+											} else if (var3.model != null && !this.method4084(var7, var4, var5)) { // L: 923 924
+												var20 = true; // L: 925
+												this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926
 											}
 
-											var21 = 0; // L: 956
-											var11 = 0; // L: 957
-											BoundaryObject var31 = var3.boundaryObject; // L: 958
-											WallDecoration var13 = var3.wallDecoration; // L: 959
-											if (var31 != null || var13 != null) { // L: 960
-												if (var4 == Scene_cameraXTile) { // L: 961
+											var21 = 0; // L: 929
+											var11 = 0; // L: 930
+											BoundaryObject var31 = var3.boundaryObject; // L: 931
+											WallDecoration var13 = var3.wallDecoration; // L: 932
+											if (var31 != null || var13 != null) { // L: 933
+												if (var4 == Scene_cameraXTile) { // L: 934
 													++var21;
-												} else if (Scene_cameraXTile < var4) { // L: 962
+												} else if (Scene_cameraXTile < var4) { // L: 935
 													var21 += 2;
 												}
 
-												if (var5 == Scene_cameraYTile) { // L: 963
+												if (var5 == Scene_cameraYTile) { // L: 936
 													var21 += 3;
-												} else if (Scene_cameraYTile > var5) { // L: 964
+												} else if (Scene_cameraYTile > var5) { // L: 937
 													var21 += 6;
 												}
 
-												var11 = field2338[var21]; // L: 965
-												var3.field2235 = field2340[var21]; // L: 966
+												var11 = field2336[var21]; // L: 938
+												var3.field2256 = field2338[var21]; // L: 939
 											}
 
-											if (var31 != null) { // L: 968
-												if ((var31.orientationA & field2352[var21]) != 0) { // L: 969
-													if (var31.orientationA == 16) { // L: 970
-														var3.drawGameObjectEdges = 3; // L: 971
-														var3.field2254 = field2341[var21]; // L: 972
-														var3.field2244 = 3 - var3.field2254; // L: 973
-													} else if (var31.orientationA == 32) { // L: 975
-														var3.drawGameObjectEdges = 6; // L: 976
-														var3.field2254 = field2342[var21]; // L: 977
-														var3.field2244 = 6 - var3.field2254; // L: 978
-													} else if (var31.orientationA == 64) { // L: 980
-														var3.drawGameObjectEdges = 12; // L: 981
-														var3.field2254 = field2305[var21]; // L: 982
-														var3.field2244 = 12 - var3.field2254; // L: 983
+											if (var31 != null) { // L: 941
+												if ((var31.orientationA & field2314[var21]) != 0) { // L: 942
+													if (var31.orientationA == 16) { // L: 943
+														var3.drawGameObjectEdges = 3; // L: 944
+														var3.field2247 = field2339[var21]; // L: 945
+														var3.field2255 = 3 - var3.field2247; // L: 946
+													} else if (var31.orientationA == 32) { // L: 948
+														var3.drawGameObjectEdges = 6; // L: 949
+														var3.field2247 = field2340[var21]; // L: 950
+														var3.field2255 = 6 - var3.field2247; // L: 951
+													} else if (var31.orientationA == 64) { // L: 953
+														var3.drawGameObjectEdges = 12; // L: 954
+														var3.field2247 = field2295[var21]; // L: 955
+														var3.field2255 = 12 - var3.field2247; // L: 956
 													} else {
-														var3.drawGameObjectEdges = 9; // L: 986
-														var3.field2254 = field2344[var21]; // L: 987
-														var3.field2244 = 9 - var3.field2254; // L: 988
+														var3.drawGameObjectEdges = 9; // L: 959
+														var3.field2247 = field2342[var21]; // L: 960
+														var3.field2255 = 9 - var3.field2247; // L: 961
 													}
 												} else {
-													var3.drawGameObjectEdges = 0; // L: 991
+													var3.drawGameObjectEdges = 0; // L: 964
 												}
 
-												if ((var31.orientationA & var11) != 0 && !this.method3973(var7, var4, var5, var31.orientationA)) { // L: 992
+												if ((var31.orientationA & var11) != 0 && !this.method4073(var7, var4, var5, var31.orientationA)) { // L: 965
 													var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
 												}
 
-												if ((var31.orientationB & var11) != 0 && !this.method3973(var7, var4, var5, var31.orientationB)) { // L: 993
+												if ((var31.orientationB & var11) != 0 && !this.method4073(var7, var4, var5, var31.orientationB)) { // L: 966
 													var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
 												}
 											}
 
-											if (var13 != null && !this.method3974(var7, var4, var5, var13.renderable1.height)) { // L: 995
-												if ((var13.orientation & var11) != 0) { // L: 996
-													var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 997
-												} else if (var13.orientation == 256) { // L: 999
-													var14 = var13.x - Scene_cameraX; // L: 1000
-													var15 = var13.tileHeight - Scene_cameraY; // L: 1001
-													var16 = var13.y - Scene_cameraZ; // L: 1002
-													var17 = var13.orientation2; // L: 1003
-													if (var17 != 1 && var17 != 2) { // L: 1005
-														var18 = var14; // L: 1006
+											if (var13 != null && !this.method4086(var7, var4, var5, var13.renderable1.height)) { // L: 968
+												if ((var13.orientation & var11) != 0) { // L: 969
+													var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970
+												} else if (var13.orientation == 256) { // L: 972
+													var14 = var13.x - Scene_cameraX; // L: 973
+													var15 = var13.tileHeight - Scene_cameraY; // L: 974
+													var16 = var13.y - Scene_cameraZ; // L: 975
+													var17 = var13.orientation2; // L: 976
+													if (var17 != 1 && var17 != 2) { // L: 978
+														var18 = var14; // L: 979
 													} else {
 														var18 = -var14;
 													}
 
 													int var19;
-													if (var17 != 2 && var17 != 3) { // L: 1008
-														var19 = var16; // L: 1009
+													if (var17 != 2 && var17 != 3) { // L: 981
+														var19 = var16; // L: 982
 													} else {
 														var19 = -var16;
 													}
 
-													if (var19 < var18) { // L: 1010
-														var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 1011
-													} else if (var13.renderable2 != null) { // L: 1013
-														var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 1014
+													if (var19 < var18) { // L: 983
+														var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984
+													} else if (var13.renderable2 != null) { // L: 986
+														var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987
 													}
 												}
 											}
 
-											if (var20) { // L: 1018
-												FloorDecoration var22 = var3.floorDecoration; // L: 1019
-												if (var22 != null) { // L: 1020
+											if (var20) { // L: 991
+												FloorDecoration var22 = var3.floorDecoration; // L: 992
+												if (var22 != null) { // L: 993
 													var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
 												}
 
-												ItemLayer var23 = var3.itemLayer; // L: 1021
-												if (var23 != null && var23.height == 0) { // L: 1022
-													if (var23.second != null) { // L: 1023
+												ItemLayer var23 = var3.itemLayer; // L: 994
+												if (var23 != null && var23.height == 0) { // L: 995
+													if (var23.second != null) { // L: 996
 														var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
 													}
 
-													if (var23.third != null) { // L: 1024
+													if (var23.third != null) { // L: 997
 														var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
 													}
 
-													if (var23.first != null) { // L: 1025
+													if (var23.first != null) { // L: 998
 														var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
 													}
 												}
 											}
 
-											var14 = var3.gameObjectsEdgeMask; // L: 1028
-											if (var14 != 0) { // L: 1029
-												if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1030
-													var36 = var8[var4 + 1][var5]; // L: 1031
-													if (var36 != null && var36.drawSecondary) { // L: 1032
+											var14 = var3.gameObjectsEdgeMask; // L: 1001
+											if (var14 != 0) { // L: 1002
+												if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003
+													var36 = var8[var4 + 1][var5]; // L: 1004
+													if (var36 != null && var36.drawSecondary) { // L: 1005
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
 
-												if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1034
-													var36 = var8[var4][var5 + 1]; // L: 1035
-													if (var36 != null && var36.drawSecondary) { // L: 1036
+												if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007
+													var36 = var8[var4][var5 + 1]; // L: 1008
+													if (var36 != null && var36.drawSecondary) { // L: 1009
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
 
-												if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1038
-													var36 = var8[var4 - 1][var5]; // L: 1039
-													if (var36 != null && var36.drawSecondary) { // L: 1040
+												if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011
+													var36 = var8[var4 - 1][var5]; // L: 1012
+													if (var36 != null && var36.drawSecondary) { // L: 1013
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
 
-												if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1042
-													var36 = var8[var4][var5 - 1]; // L: 1043
-													if (var36 != null && var36.drawSecondary) { // L: 1044
+												if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015
+													var36 = var8[var4][var5 - 1]; // L: 1016
+													if (var36 != null && var36.drawSecondary) { // L: 1017
 														Scene_tilesDeque.addFirst(var36);
 													}
 												}
@@ -1525,372 +1516,372 @@ public class Scene {
 											break;
 										}
 
-										if (var3.drawGameObjectEdges != 0) { // L: 1048
-											var20 = true; // L: 1049
+										if (var3.drawGameObjectEdges != 0) { // L: 1021
+											var20 = true; // L: 1022
 
-											for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1050
-												if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2254) { // L: 1051
-													var20 = false; // L: 1052
-													break; // L: 1053
+											for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023
+												if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field2247) { // L: 1024
+													var20 = false; // L: 1025
+													break; // L: 1026
 												}
 											}
 
-											if (var20) { // L: 1056
-												var10 = var3.boundaryObject; // L: 1057
-												if (!this.method3973(var7, var4, var5, var10.orientationA)) { // L: 1058
+											if (var20) { // L: 1029
+												var10 = var3.boundaryObject; // L: 1030
+												if (!this.method4073(var7, var4, var5, var10.orientationA)) { // L: 1031
 													var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
 												}
 
-												var3.drawGameObjectEdges = 0; // L: 1059
+												var3.drawGameObjectEdges = 0; // L: 1032
 											}
 										}
 
-										if (!var3.drawGameObjects) { // L: 1062
+										if (!var3.drawGameObjects) { // L: 1035
 											break;
 										}
 
 										try {
-											int var34 = var3.gameObjectsCount; // L: 1064
-											var3.drawGameObjects = false; // L: 1065
-											var21 = 0; // L: 1066
+											int var34 = var3.gameObjectsCount; // L: 1037
+											var3.drawGameObjects = false; // L: 1038
+											var21 = 0; // L: 1039
 
 											label563:
-											for (var11 = 0; var11 < var34; ++var11) { // L: 1067
-												var12 = var3.gameObjects[var11]; // L: 1068
-												if (var12.lastDrawn != Scene_drawnCount) { // L: 1069
-													for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1070
-														for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1071
-															var36 = var8[var24][var14]; // L: 1072
-															if (var36.drawPrimary) { // L: 1073
-																var3.drawGameObjects = true; // L: 1074
-																continue label563; // L: 1075
+											for (var11 = 0; var11 < var34; ++var11) { // L: 1040
+												var12 = var3.gameObjects[var11]; // L: 1041
+												if (var12.lastDrawn != Scene_drawnCount) { // L: 1042
+													for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043
+														for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044
+															var36 = var8[var24][var14]; // L: 1045
+															if (var36.drawPrimary) { // L: 1046
+																var3.drawGameObjects = true; // L: 1047
+																continue label563; // L: 1048
 															}
 
-															if (var36.drawGameObjectEdges != 0) { // L: 1077
-																var16 = 0; // L: 1078
-																if (var24 > var12.startX) { // L: 1079
+															if (var36.drawGameObjectEdges != 0) { // L: 1050
+																var16 = 0; // L: 1051
+																if (var24 > var12.startX) { // L: 1052
 																	++var16;
 																}
 
-																if (var24 < var12.endX) { // L: 1080
+																if (var24 < var12.endX) { // L: 1053
 																	var16 += 4;
 																}
 
-																if (var14 > var12.startY) { // L: 1081
+																if (var14 > var12.startY) { // L: 1054
 																	var16 += 8;
 																}
 
-																if (var14 < var12.endY) { // L: 1082
+																if (var14 < var12.endY) { // L: 1055
 																	var16 += 2;
 																}
 
-																if ((var16 & var36.drawGameObjectEdges) == var3.field2244) { // L: 1083
-																	var3.drawGameObjects = true; // L: 1084
-																	continue label563; // L: 1085
+																if ((var16 & var36.drawGameObjectEdges) == var3.field2255) { // L: 1056
+																	var3.drawGameObjects = true; // L: 1057
+																	continue label563; // L: 1058
 																}
 															}
 														}
 													}
 
-													gameObjects[var21++] = var12; // L: 1090
-													var24 = Scene_cameraXTile - var12.startX; // L: 1091
-													var14 = var12.endX - Scene_cameraXTile; // L: 1092
-													if (var14 > var24) { // L: 1093
+													gameObjects[var21++] = var12; // L: 1063
+													var24 = Scene_cameraXTile - var12.startX; // L: 1064
+													var14 = var12.endX - Scene_cameraXTile; // L: 1065
+													if (var14 > var24) { // L: 1066
 														var24 = var14;
 													}
 
-													var15 = Scene_cameraYTile - var12.startY; // L: 1094
-													var16 = var12.endY - Scene_cameraYTile; // L: 1095
-													if (var16 > var15) { // L: 1096
-														var12.field2554 = var24 + var16;
+													var15 = Scene_cameraYTile - var12.startY; // L: 1067
+													var16 = var12.endY - Scene_cameraYTile; // L: 1068
+													if (var16 > var15) { // L: 1069
+														var12.field2552 = var24 + var16;
 													} else {
-														var12.field2554 = var24 + var15; // L: 1097
+														var12.field2552 = var24 + var15; // L: 1070
 													}
 												}
 											}
 
-											while (var21 > 0) { // L: 1100
-												var11 = -50; // L: 1101
-												var25 = -1; // L: 1102
+											while (var21 > 0) { // L: 1073
+												var11 = -50; // L: 1074
+												var25 = -1; // L: 1075
 
-												for (var24 = 0; var24 < var21; ++var24) { // L: 1103
-													GameObject var35 = gameObjects[var24]; // L: 1104
-													if (var35.lastDrawn != Scene_drawnCount) { // L: 1105
-														if (var35.field2554 > var11) { // L: 1106
-															var11 = var35.field2554; // L: 1107
-															var25 = var24; // L: 1108
-														} else if (var11 == var35.field2554) { // L: 1110
-															var15 = var35.centerX - Scene_cameraX; // L: 1111
-															var16 = var35.centerY - Scene_cameraZ; // L: 1112
-															var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1113
-															var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1114
-															if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1115
+												for (var24 = 0; var24 < var21; ++var24) { // L: 1076
+													GameObject var35 = gameObjects[var24]; // L: 1077
+													if (var35.lastDrawn != Scene_drawnCount) { // L: 1078
+														if (var35.field2552 > var11) { // L: 1079
+															var11 = var35.field2552; // L: 1080
+															var25 = var24; // L: 1081
+														} else if (var11 == var35.field2552) { // L: 1083
+															var15 = var35.centerX - Scene_cameraX; // L: 1084
+															var16 = var35.centerY - Scene_cameraZ; // L: 1085
+															var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086
+															var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087
+															if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088
 																var25 = var24;
 															}
 														}
 													}
 												}
 
-												if (var25 == -1) { // L: 1119
+												if (var25 == -1) { // L: 1092
 													break;
 												}
 
-												GameObject var33 = gameObjects[var25]; // L: 1120
-												var33.lastDrawn = Scene_drawnCount; // L: 1121
-												if (!this.method3975(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1122
-													var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1123
+												GameObject var33 = gameObjects[var25]; // L: 1093
+												var33.lastDrawn = Scene_drawnCount; // L: 1094
+												if (!this.method4087(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095
+													var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096
 												}
 
-												for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1125
-													for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1126
-														Tile var26 = var8[var14][var15]; // L: 1127
-														if (var26.drawGameObjectEdges != 0) { // L: 1128
+												for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098
+													for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099
+														Tile var26 = var8[var14][var15]; // L: 1100
+														if (var26.drawGameObjectEdges != 0) { // L: 1101
 															Scene_tilesDeque.addFirst(var26);
-														} else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1129
+														} else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102
 															Scene_tilesDeque.addFirst(var26);
 														}
 													}
 												}
 											}
 
-											if (!var3.drawGameObjects) { // L: 1133
+											if (!var3.drawGameObjects) { // L: 1106
 												break;
 											}
-										} catch (Exception var28) { // L: 1135
-											var3.drawGameObjects = false; // L: 1136
+										} catch (Exception var28) { // L: 1108
+											var3.drawGameObjects = false; // L: 1109
 											break;
 										}
 									}
-								} while(!var3.drawSecondary); // L: 1139
-							} while(var3.drawGameObjectEdges != 0); // L: 1140
+								} while(!var3.drawSecondary); // L: 1112
+							} while(var3.drawGameObjectEdges != 0); // L: 1113
 
-							if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1141
+							if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114
 								break;
 							}
 
-							var9 = var8[var4 - 1][var5]; // L: 1142
-						} while(var9 != null && var9.drawSecondary); // L: 1143
+							var9 = var8[var4 - 1][var5]; // L: 1115
+						} while(var9 != null && var9.drawSecondary); // L: 1116
 
-						if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1145
+						if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118
 							break;
 						}
 
-						var9 = var8[var4 + 1][var5]; // L: 1146
-					} while(var9 != null && var9.drawSecondary); // L: 1147
+						var9 = var8[var4 + 1][var5]; // L: 1119
+					} while(var9 != null && var9.drawSecondary); // L: 1120
 
-					if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1149
+					if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122
 						break;
 					}
 
-					var9 = var8[var4][var5 - 1]; // L: 1150
-				} while(var9 != null && var9.drawSecondary); // L: 1151
+					var9 = var8[var4][var5 - 1]; // L: 1123
+				} while(var9 != null && var9.drawSecondary); // L: 1124
 
-				if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1153
+				if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126
 					break;
 				}
 
-				var9 = var8[var4][var5 + 1]; // L: 1154
-			} while(var9 != null && var9.drawSecondary); // L: 1155
+				var9 = var8[var4][var5 + 1]; // L: 1127
+			} while(var9 != null && var9.drawSecondary); // L: 1128
 
-			var3.drawSecondary = false; // L: 1157
-			--tileUpdateCount; // L: 1158
-			ItemLayer var32 = var3.itemLayer; // L: 1159
-			if (var32 != null && var32.height != 0) { // L: 1160
-				if (var32.second != null) { // L: 1161
+			var3.drawSecondary = false; // L: 1130
+			--tileUpdateCount; // L: 1131
+			ItemLayer var32 = var3.itemLayer; // L: 1132
+			if (var32 != null && var32.height != 0) { // L: 1133
+				if (var32.second != null) { // L: 1134
 					var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
 				}
 
-				if (var32.third != null) { // L: 1162
+				if (var32.third != null) { // L: 1135
 					var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
 				}
 
-				if (var32.first != null) { // L: 1163
+				if (var32.first != null) { // L: 1136
 					var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag);
 				}
 			}
 
-			if (var3.field2235 != 0) { // L: 1165
-				WallDecoration var29 = var3.wallDecoration; // L: 1166
-				if (var29 != null && !this.method3974(var7, var4, var5, var29.renderable1.height)) { // L: 1167
-					if ((var29.orientation & var3.field2235) != 0) { // L: 1168
-						var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1169
-					} else if (var29.orientation == 256) { // L: 1171
-						var11 = var29.x - Scene_cameraX; // L: 1172
-						var25 = var29.tileHeight - Scene_cameraY; // L: 1173
-						var24 = var29.y - Scene_cameraZ; // L: 1174
-						var14 = var29.orientation2; // L: 1175
-						if (var14 != 1 && var14 != 2) { // L: 1177
-							var15 = var11; // L: 1178
+			if (var3.field2256 != 0) { // L: 1138
+				WallDecoration var29 = var3.wallDecoration; // L: 1139
+				if (var29 != null && !this.method4086(var7, var4, var5, var29.renderable1.height)) { // L: 1140
+					if ((var29.orientation & var3.field2256) != 0) { // L: 1141
+						var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142
+					} else if (var29.orientation == 256) { // L: 1144
+						var11 = var29.x - Scene_cameraX; // L: 1145
+						var25 = var29.tileHeight - Scene_cameraY; // L: 1146
+						var24 = var29.y - Scene_cameraZ; // L: 1147
+						var14 = var29.orientation2; // L: 1148
+						if (var14 != 1 && var14 != 2) { // L: 1150
+							var15 = var11; // L: 1151
 						} else {
 							var15 = -var11;
 						}
 
-						if (var14 != 2 && var14 != 3) { // L: 1180
-							var16 = var24; // L: 1181
+						if (var14 != 2 && var14 != 3) { // L: 1153
+							var16 = var24; // L: 1154
 						} else {
 							var16 = -var24;
 						}
 
-						if (var16 >= var15) { // L: 1182
-							var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1183
-						} else if (var29.renderable2 != null) { // L: 1185
-							var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1186
+						if (var16 >= var15) { // L: 1155
+							var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156
+						} else if (var29.renderable2 != null) { // L: 1158
+							var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159
 						}
 					}
 				}
 
-				BoundaryObject var27 = var3.boundaryObject; // L: 1190
-				if (var27 != null) { // L: 1191
-					if ((var27.orientationB & var3.field2235) != 0 && !this.method3973(var7, var4, var5, var27.orientationB)) { // L: 1192
+				BoundaryObject var27 = var3.boundaryObject; // L: 1163
+				if (var27 != null) { // L: 1164
+					if ((var27.orientationB & var3.field2256) != 0 && !this.method4073(var7, var4, var5, var27.orientationB)) { // L: 1165
 						var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
 					}
 
-					if ((var27.orientationA & var3.field2235) != 0 && !this.method3973(var7, var4, var5, var27.orientationA)) { // L: 1193
+					if ((var27.orientationA & var3.field2256) != 0 && !this.method4073(var7, var4, var5, var27.orientationA)) { // L: 1166
 						var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
 					}
 				}
 			}
 
 			Tile var30;
-			if (var6 < this.planes - 1) { // L: 1196
-				var30 = this.tiles[var6 + 1][var4][var5]; // L: 1197
-				if (var30 != null && var30.drawSecondary) { // L: 1198
+			if (var6 < this.planes - 1) { // L: 1169
+				var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170
+				if (var30 != null && var30.drawSecondary) { // L: 1171
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var4 < Scene_cameraXTile) { // L: 1200
-				var30 = var8[var4 + 1][var5]; // L: 1201
-				if (var30 != null && var30.drawSecondary) { // L: 1202
+			if (var4 < Scene_cameraXTile) { // L: 1173
+				var30 = var8[var4 + 1][var5]; // L: 1174
+				if (var30 != null && var30.drawSecondary) { // L: 1175
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var5 < Scene_cameraYTile) { // L: 1204
-				var30 = var8[var4][var5 + 1]; // L: 1205
-				if (var30 != null && var30.drawSecondary) { // L: 1206
+			if (var5 < Scene_cameraYTile) { // L: 1177
+				var30 = var8[var4][var5 + 1]; // L: 1178
+				if (var30 != null && var30.drawSecondary) { // L: 1179
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var4 > Scene_cameraXTile) { // L: 1208
-				var30 = var8[var4 - 1][var5]; // L: 1209
-				if (var30 != null && var30.drawSecondary) { // L: 1210
+			if (var4 > Scene_cameraXTile) { // L: 1181
+				var30 = var8[var4 - 1][var5]; // L: 1182
+				if (var30 != null && var30.drawSecondary) { // L: 1183
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 
-			if (var5 > Scene_cameraYTile) { // L: 1212
-				var30 = var8[var4][var5 - 1]; // L: 1213
-				if (var30 != null && var30.drawSecondary) { // L: 1214
+			if (var5 > Scene_cameraYTile) { // L: 1185
+				var30 = var8[var4][var5 - 1]; // L: 1186
+				if (var30 != null && var30.drawSecondary) { // L: 1187
 					Scene_tilesDeque.addFirst(var30);
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(Lga;IIIIIII)V"
+		descriptor = "(Lhp;IIIIIII)V"
 	)
 	@Export("drawTileUnderlay")
 	void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9;
-		int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1222
+		int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195
 		int var11;
-		int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1224
+		int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197
 		int var13;
-		int var14 = var13 = var10 + 128; // L: 1226
+		int var14 = var13 = var10 + 128; // L: 1199
 		int var15;
-		int var16 = var15 = var12 + 128; // L: 1228
-		int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1229
-		int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1230
-		int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1231
-		int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1232
-		int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1233
-		var12 = var12 * var6 - var5 * var10 >> 16; // L: 1234
-		var10 = var21; // L: 1235
-		var21 = var17 * var4 - var3 * var12 >> 16; // L: 1236
-		var12 = var3 * var17 + var12 * var4 >> 16; // L: 1237
-		var17 = var21; // L: 1238
-		if (var12 >= 50) { // L: 1239
-			var21 = var14 * var6 + var5 * var11 >> 16; // L: 1240
-			var11 = var11 * var6 - var5 * var14 >> 16; // L: 1241
-			var14 = var21; // L: 1242
-			var21 = var18 * var4 - var3 * var11 >> 16; // L: 1243
-			var11 = var3 * var18 + var11 * var4 >> 16; // L: 1244
-			var18 = var21; // L: 1245
-			if (var11 >= 50) { // L: 1246
-				var21 = var13 * var6 + var5 * var16 >> 16; // L: 1247
-				var16 = var16 * var6 - var5 * var13 >> 16; // L: 1248
-				var13 = var21; // L: 1249
-				var21 = var19 * var4 - var3 * var16 >> 16; // L: 1250
-				var16 = var3 * var19 + var16 * var4 >> 16; // L: 1251
-				var19 = var21; // L: 1252
-				if (var16 >= 50) { // L: 1253
-					var21 = var9 * var6 + var5 * var15 >> 16; // L: 1254
-					var15 = var15 * var6 - var5 * var9 >> 16; // L: 1255
-					var9 = var21; // L: 1256
-					var21 = var20 * var4 - var3 * var15 >> 16; // L: 1257
-					var15 = var3 * var20 + var15 * var4 >> 16; // L: 1258
-					if (var15 >= 50) { // L: 1260
-						int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1261
-						int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1262
-						int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1263
-						int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1264
-						int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1265
-						int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1266
-						int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1267
-						int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1268
-						Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1269
+		int var16 = var15 = var12 + 128; // L: 1201
+		int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202
+		int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203
+		int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204
+		int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205
+		int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206
+		var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207
+		var10 = var21; // L: 1208
+		var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209
+		var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210
+		var17 = var21; // L: 1211
+		if (var12 >= 50) { // L: 1212
+			var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213
+			var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214
+			var14 = var21; // L: 1215
+			var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216
+			var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217
+			var18 = var21; // L: 1218
+			if (var11 >= 50) { // L: 1219
+				var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220
+				var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221
+				var13 = var21; // L: 1222
+				var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223
+				var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224
+				var19 = var21; // L: 1225
+				if (var16 >= 50) { // L: 1226
+					var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227
+					var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228
+					var9 = var21; // L: 1229
+					var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230
+					var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231
+					if (var15 >= 50) { // L: 1233
+						int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234
+						int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235
+						int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236
+						int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237
+						int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238
+						int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239
+						int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240
+						int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241
+						Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242
 						int var30;
-						if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1270
-							Rasterizer3D.field2262 = false; // L: 1271
-							if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1272
+						if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243
+							Rasterizer3D.field2262 = false; // L: 1244
+							if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245
 								Rasterizer3D.field2262 = true;
 							}
 
-							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1273
-								Scene_selectedX = var7; // L: 1274
-								Scene_selectedY = var8; // L: 1275
+							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246
+								Scene_selectedX = var7; // L: 1247
+								Scene_selectedY = var8; // L: 1248
 							}
 
-							if (var1.texture == -1) { // L: 1277
-								if (var1.neColor != 12345678) { // L: 1278
-									Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
+							if (var1.texture == -1) { // L: 1250
+								if (var1.neColor != 12345678) { // L: 1251
+									Rasterizer3D.method3960(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
 								}
-							} else if (!Scene_isLowDetail) { // L: 1280
-								if (var1.isFlat) { // L: 1281
+							} else if (!Scene_isLowDetail) { // L: 1253
+								if (var1.isFlat) { // L: 1254
 									Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
 								} else {
-									Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1282
+									Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255
 								}
 							} else {
-								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1285
-								Rasterizer3D.method3854(var27, var29, var25, var26, var28, var24, method3969(var30, var1.neColor), method3969(var30, var1.nwColor), method3969(var30, var1.seColor)); // L: 1286
+								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258
+								Rasterizer3D.method3960(var27, var29, var25, var26, var28, var24, method4113(var30, var1.neColor), method4113(var30, var1.nwColor), method4113(var30, var1.seColor)); // L: 1259
 							}
 						}
 
-						if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1289
-							Rasterizer3D.field2262 = false; // L: 1290
-							if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1291
+						if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262
+							Rasterizer3D.field2262 = false; // L: 1263
+							if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264
 								Rasterizer3D.field2262 = true;
 							}
 
-							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1292
-								Scene_selectedX = var7; // L: 1293
-								Scene_selectedY = var8; // L: 1294
+							if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265
+								Scene_selectedX = var7; // L: 1266
+								Scene_selectedY = var8; // L: 1267
 							}
 
-							if (var1.texture == -1) { // L: 1296
-								if (var1.swColor != 12345678) { // L: 1297
-									Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
+							if (var1.texture == -1) { // L: 1269
+								if (var1.swColor != 12345678) { // L: 1270
+									Rasterizer3D.method3960(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
 								}
-							} else if (!Scene_isLowDetail) { // L: 1299
-								Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1300
+							} else if (!Scene_isLowDetail) { // L: 1272
+								Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273
 							} else {
-								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1303
-								Rasterizer3D.method3854(var23, var25, var29, var22, var24, var28, method3969(var30, var1.swColor), method3969(var30, var1.seColor), method3969(var30, var1.nwColor)); // L: 1304
+								var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276
+								Rasterizer3D.method3960(var23, var25, var29, var22, var24, var28, method4113(var30, var1.swColor), method4113(var30, var1.seColor), method4113(var30, var1.nwColor)); // L: 1277
 							}
 						}
 
@@ -1898,566 +1889,566 @@ public class Scene {
 				}
 			}
 		}
-	} // L: 1307
+	} // L: 1280
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "(Lgp;IIIIII)V"
+		descriptor = "(Lgo;IIIIII)V"
 	)
 	@Export("drawTileOverlay")
 	void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		int var8 = var1.vertexX.length; // L: 1310
+		int var8 = var1.vertexX.length; // L: 1283
 
 		int var9;
 		int var10;
 		int var11;
 		int var12;
 		int var13;
-		for (var9 = 0; var9 < var8; ++var9) { // L: 1311
-			var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1312
-			var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1313
-			var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1314
-			var13 = var12 * var4 + var5 * var10 >> 16; // L: 1315
-			var12 = var5 * var12 - var10 * var4 >> 16; // L: 1316
-			var10 = var13; // L: 1317
-			var13 = var3 * var11 - var12 * var2 >> 16; // L: 1318
-			var12 = var11 * var2 + var3 * var12 >> 16; // L: 1319
-			if (var12 < 50) { // L: 1321
+		for (var9 = 0; var9 < var8; ++var9) { // L: 1284
+			var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285
+			var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286
+			var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287
+			var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288
+			var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289
+			var10 = var13; // L: 1290
+			var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291
+			var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292
+			if (var12 < 50) { // L: 1294
 				return;
 			}
 
-			if (var1.triangleTextureId != null) { // L: 1322
-				SceneTileModel.field2417[var9] = var10; // L: 1323
-				SceneTileModel.field2418[var9] = var13; // L: 1324
-				SceneTileModel.field2419[var9] = var12; // L: 1325
+			if (var1.triangleTextureId != null) { // L: 1295
+				SceneTileModel.field2413[var9] = var10; // L: 1296
+				SceneTileModel.field2414[var9] = var13; // L: 1297
+				SceneTileModel.field2404[var9] = var12; // L: 1298
 			}
 
-			SceneTileModel.field2402[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1327
-			SceneTileModel.field2416[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1328
+			SceneTileModel.field2410[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300
+			SceneTileModel.field2412[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301
 		}
 
-		Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1330
-		var8 = var1.faceX.length; // L: 1331
+		Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303
+		var8 = var1.faceX.length; // L: 1304
 
-		for (var9 = 0; var9 < var8; ++var9) { // L: 1332
-			var10 = var1.faceX[var9]; // L: 1333
-			var11 = var1.faceY[var9]; // L: 1334
-			var12 = var1.faceZ[var9]; // L: 1335
-			var13 = SceneTileModel.field2402[var10]; // L: 1336
-			int var14 = SceneTileModel.field2402[var11]; // L: 1337
-			int var15 = SceneTileModel.field2402[var12]; // L: 1338
-			int var16 = SceneTileModel.field2416[var10]; // L: 1339
-			int var17 = SceneTileModel.field2416[var11]; // L: 1340
-			int var18 = SceneTileModel.field2416[var12]; // L: 1341
-			if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1342
-				Rasterizer3D.field2262 = false; // L: 1343
-				if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1344
+		for (var9 = 0; var9 < var8; ++var9) { // L: 1305
+			var10 = var1.faceX[var9]; // L: 1306
+			var11 = var1.faceY[var9]; // L: 1307
+			var12 = var1.faceZ[var9]; // L: 1308
+			var13 = SceneTileModel.field2410[var10]; // L: 1309
+			int var14 = SceneTileModel.field2410[var11]; // L: 1310
+			int var15 = SceneTileModel.field2410[var12]; // L: 1311
+			int var16 = SceneTileModel.field2412[var10]; // L: 1312
+			int var17 = SceneTileModel.field2412[var11]; // L: 1313
+			int var18 = SceneTileModel.field2412[var12]; // L: 1314
+			if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315
+				Rasterizer3D.field2262 = false; // L: 1316
+				if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317
 					Rasterizer3D.field2262 = true;
 				}
 
-				if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1345
-					Scene_selectedX = var6; // L: 1346
-					Scene_selectedY = var7; // L: 1347
+				if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318
+					Scene_selectedX = var6; // L: 1319
+					Scene_selectedY = var7; // L: 1320
 				}
 
-				if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1349
-					if (!Scene_isLowDetail) { // L: 1353
-						if (var1.isFlat) { // L: 1354
-							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2417[0], SceneTileModel.field2417[1], SceneTileModel.field2417[3], SceneTileModel.field2418[0], SceneTileModel.field2418[1], SceneTileModel.field2418[3], SceneTileModel.field2419[0], SceneTileModel.field2419[1], SceneTileModel.field2419[3], var1.triangleTextureId[var9]);
+				if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322
+					if (!Scene_isLowDetail) { // L: 1326
+						if (var1.isFlat) { // L: 1327
+							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2413[0], SceneTileModel.field2413[1], SceneTileModel.field2413[3], SceneTileModel.field2414[0], SceneTileModel.field2414[1], SceneTileModel.field2414[3], SceneTileModel.field2404[0], SceneTileModel.field2404[1], SceneTileModel.field2404[3], var1.triangleTextureId[var9]);
 						} else {
-							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2417[var10], SceneTileModel.field2417[var11], SceneTileModel.field2417[var12], SceneTileModel.field2418[var10], SceneTileModel.field2418[var11], SceneTileModel.field2418[var12], SceneTileModel.field2419[var10], SceneTileModel.field2419[var11], SceneTileModel.field2419[var12], var1.triangleTextureId[var9]); // L: 1355
+							Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field2413[var10], SceneTileModel.field2413[var11], SceneTileModel.field2413[var12], SceneTileModel.field2414[var10], SceneTileModel.field2414[var11], SceneTileModel.field2414[var12], SceneTileModel.field2404[var10], SceneTileModel.field2404[var11], SceneTileModel.field2404[var12], var1.triangleTextureId[var9]); // L: 1328
 						}
 					} else {
-						int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1358
-						Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, method3969(var19, var1.triangleColorA[var9]), method3969(var19, var1.triangleColorB[var9]), method3969(var19, var1.triangleColorC[var9])); // L: 1359
+						int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331
+						Rasterizer3D.method3960(var16, var17, var18, var13, var14, var15, method4113(var19, var1.triangleColorA[var9]), method4113(var19, var1.triangleColorB[var9]), method4113(var19, var1.triangleColorC[var9])); // L: 1332
 					}
-				} else if (var1.triangleColorA[var9] != 12345678) { // L: 1350
-					Rasterizer3D.method3854(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
+				} else if (var1.triangleColorA[var9] != 12345678) { // L: 1323
+					Rasterizer3D.method3960(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
 				}
 			}
 		}
 
-	} // L: 1364
+	} // L: 1337
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ai")
 	@Export("occlude")
 	void occlude() {
-		int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1391
-		Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1392
-		Scene_currentOccludersCount = 0; // L: 1393
+		int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364
+		Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365
+		Scene_currentOccludersCount = 0; // L: 1366
 
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 1394
-			Occluder var4 = var2[var3]; // L: 1395
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 1367
+			Occluder var4 = var2[var3]; // L: 1368
 			int var5;
 			int var6;
 			int var7;
 			int var9;
 			boolean var13;
-			if (var4.type == 1) { // L: 1396
-				var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1397
-				if (var5 >= 0 && var5 <= 50) { // L: 1398
-					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399
-					if (var6 < 0) { // L: 1400
+			if (var4.type == 1) { // L: 1369
+				var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370
+				if (var5 >= 0 && var5 <= 50) { // L: 1371
+					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372
+					if (var6 < 0) { // L: 1373
 						var6 = 0;
 					}
 
-					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1401
-					if (var7 > 50) { // L: 1402
+					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374
+					if (var7 > 50) { // L: 1375
 						var7 = 50;
 					}
 
-					var13 = false; // L: 1403
+					var13 = false; // L: 1376
 
-					while (var6 <= var7) { // L: 1404
-						if (visibleTiles[var5][var6++]) { // L: 1405
-							var13 = true; // L: 1406
+					while (var6 <= var7) { // L: 1377
+						if (visibleTiles[var5][var6++]) { // L: 1378
+							var13 = true; // L: 1379
 							break;
 						}
 					}
 
-					if (var13) { // L: 1410
-						var9 = Scene_cameraX - var4.minX; // L: 1411
-						if (var9 > 32) { // L: 1412
-							var4.field2380 = 1;
+					if (var13) { // L: 1383
+						var9 = Scene_cameraX - var4.minX; // L: 1384
+						if (var9 > 32) { // L: 1385
+							var4.field2378 = 1;
 						} else {
-							if (var9 >= -32) { // L: 1413
+							if (var9 >= -32) { // L: 1386
 								continue;
 							}
 
-							var4.field2380 = 2; // L: 1414
-							var9 = -var9; // L: 1415
+							var4.field2378 = 2; // L: 1387
+							var9 = -var9; // L: 1388
 						}
 
-						var4.field2382 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1418
-						var4.field2384 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1419
-						var4.field2369 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1420
-						var4.field2386 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1421
-						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1422
+						var4.field2383 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391
+						var4.field2382 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392
+						var4.field2385 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393
+						var4.field2384 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394
+						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395
 					}
 				}
-			} else if (var4.type == 2) { // L: 1425
-				var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1426
-				if (var5 >= 0 && var5 <= 50) { // L: 1427
-					var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1428
-					if (var6 < 0) { // L: 1429
+			} else if (var4.type == 2) { // L: 1398
+				var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399
+				if (var5 >= 0 && var5 <= 50) { // L: 1400
+					var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401
+					if (var6 < 0) { // L: 1402
 						var6 = 0;
 					}
 
-					var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1430
-					if (var7 > 50) { // L: 1431
+					var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403
+					if (var7 > 50) { // L: 1404
 						var7 = 50;
 					}
 
-					var13 = false; // L: 1432
+					var13 = false; // L: 1405
 
-					while (var6 <= var7) { // L: 1433
-						if (visibleTiles[var6++][var5]) { // L: 1434
-							var13 = true; // L: 1435
+					while (var6 <= var7) { // L: 1406
+						if (visibleTiles[var6++][var5]) { // L: 1407
+							var13 = true; // L: 1408
 							break;
 						}
 					}
 
-					if (var13) { // L: 1439
-						var9 = Scene_cameraZ - var4.minZ; // L: 1440
-						if (var9 > 32) { // L: 1441
-							var4.field2380 = 3;
+					if (var13) { // L: 1412
+						var9 = Scene_cameraZ - var4.minZ; // L: 1413
+						if (var9 > 32) { // L: 1414
+							var4.field2378 = 3;
 						} else {
-							if (var9 >= -32) { // L: 1442
+							if (var9 >= -32) { // L: 1415
 								continue;
 							}
 
-							var4.field2380 = 4; // L: 1443
-							var9 = -var9; // L: 1444
+							var4.field2378 = 4; // L: 1416
+							var9 = -var9; // L: 1417
 						}
 
-						var4.field2385 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1447
-						var4.field2372 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1448
-						var4.field2369 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1449
-						var4.field2386 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1450
-						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1451
+						var4.field2370 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420
+						var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421
+						var4.field2385 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422
+						var4.field2384 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423
+						Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424
 					}
 				}
-			} else if (var4.type == 4) { // L: 1454
-				var5 = var4.minY - Scene_cameraY; // L: 1455
-				if (var5 > 128) { // L: 1456
-					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1457
-					if (var6 < 0) { // L: 1458
+			} else if (var4.type == 4) { // L: 1427
+				var5 = var4.minY - Scene_cameraY; // L: 1428
+				if (var5 > 128) { // L: 1429
+					var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430
+					if (var6 < 0) { // L: 1431
 						var6 = 0;
 					}
 
-					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1459
-					if (var7 > 50) { // L: 1460
+					var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432
+					if (var7 > 50) { // L: 1433
 						var7 = 50;
 					}
 
-					if (var6 <= var7) { // L: 1461
-						int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1462
-						if (var8 < 0) { // L: 1463
+					if (var6 <= var7) { // L: 1434
+						int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435
+						if (var8 < 0) { // L: 1436
 							var8 = 0;
 						}
 
-						var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1464
-						if (var9 > 50) { // L: 1465
+						var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437
+						if (var9 > 50) { // L: 1438
 							var9 = 50;
 						}
 
-						boolean var10 = false; // L: 1466
+						boolean var10 = false; // L: 1439
 
-						label148:
-						for (int var11 = var8; var11 <= var9; ++var11) { // L: 1467
-							for (int var12 = var6; var12 <= var7; ++var12) { // L: 1468
-								if (visibleTiles[var11][var12]) { // L: 1469
-									var10 = true; // L: 1470
-									break label148;
+						label150:
+						for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440
+							for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441
+								if (visibleTiles[var11][var12]) { // L: 1442
+									var10 = true; // L: 1443
+									break label150;
 								}
 							}
 						}
 
-						if (var10) { // L: 1475
-							var4.field2380 = 5; // L: 1476
-							var4.field2385 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1477
-							var4.field2372 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1478
-							var4.field2382 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1479
-							var4.field2384 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1480
-							Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1481
+						if (var10) { // L: 1448
+							var4.field2378 = 5; // L: 1449
+							var4.field2370 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450
+							var4.field2380 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451
+							var4.field2383 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452
+							var4.field2382 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453
+							Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 1485
+	} // L: 1458
 
-	@ObfuscatedName("ay")
-	boolean method3972(int var1, int var2, int var3) {
-		int var4 = this.field2301[var1][var2][var3]; // L: 1488
-		if (var4 == -Scene_drawnCount) { // L: 1489
+	@ObfuscatedName("av")
+	boolean method4084(int var1, int var2, int var3) {
+		int var4 = this.field2299[var1][var2][var3]; // L: 1461
+		if (var4 == -Scene_drawnCount) { // L: 1462
 			return false;
-		} else if (var4 == Scene_drawnCount) { // L: 1490
+		} else if (var4 == Scene_drawnCount) { // L: 1463
 			return true;
 		} else {
-			int var5 = var2 << 7; // L: 1491
-			int var6 = var3 << 7; // L: 1492
-			if (this.method3976(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3976(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1493
-				this.field2301[var1][var2][var3] = Scene_drawnCount; // L: 1494
-				return true; // L: 1495
+			int var5 = var2 << 7; // L: 1464
+			int var6 = var3 << 7; // L: 1465
+			if (this.method4088(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method4088(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466
+				this.field2299[var1][var2][var3] = Scene_drawnCount; // L: 1467
+				return true; // L: 1468
 			} else {
-				this.field2301[var1][var2][var3] = -Scene_drawnCount; // L: 1498
-				return false; // L: 1499
+				this.field2299[var1][var2][var3] = -Scene_drawnCount; // L: 1471
+				return false; // L: 1472
 			}
 		}
 	}
 
-	@ObfuscatedName("aa")
-	boolean method3973(int var1, int var2, int var3, int var4) {
-		if (!this.method3972(var1, var2, var3)) { // L: 1504
+	@ObfuscatedName("ax")
+	boolean method4073(int var1, int var2, int var3, int var4) {
+		if (!this.method4084(var1, var2, var3)) { // L: 1477
 			return false;
 		} else {
-			int var5 = var2 << 7; // L: 1505
-			int var6 = var3 << 7; // L: 1506
-			int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1507
-			int var8 = var7 - 120; // L: 1508
-			int var9 = var7 - 230; // L: 1509
-			int var10 = var7 - 238; // L: 1510
-			if (var4 < 16) { // L: 1511
-				if (var4 == 1) { // L: 1512
-					if (var5 > Scene_cameraX) { // L: 1513
-						if (!this.method3976(var5, var7, var6)) { // L: 1514
+			int var5 = var2 << 7; // L: 1478
+			int var6 = var3 << 7; // L: 1479
+			int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480
+			int var8 = var7 - 120; // L: 1481
+			int var9 = var7 - 230; // L: 1482
+			int var10 = var7 - 238; // L: 1483
+			if (var4 < 16) { // L: 1484
+				if (var4 == 1) { // L: 1485
+					if (var5 > Scene_cameraX) { // L: 1486
+						if (!this.method4088(var5, var7, var6)) { // L: 1487
 							return false;
 						}
 
-						if (!this.method3976(var5, var7, var6 + 128)) { // L: 1515
+						if (!this.method4088(var5, var7, var6 + 128)) { // L: 1488
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1517
-						if (!this.method3976(var5, var8, var6)) { // L: 1518
+					if (var1 > 0) { // L: 1490
+						if (!this.method4088(var5, var8, var6)) { // L: 1491
 							return false;
 						}
 
-						if (!this.method3976(var5, var8, var6 + 128)) { // L: 1519
+						if (!this.method4088(var5, var8, var6 + 128)) { // L: 1492
 							return false;
 						}
 					}
 
-					if (!this.method3976(var5, var9, var6)) { // L: 1521
+					if (!this.method4088(var5, var9, var6)) { // L: 1494
 						return false;
 					}
 
-					if (!this.method3976(var5, var9, var6 + 128)) { // L: 1522
+					if (!this.method4088(var5, var9, var6 + 128)) { // L: 1495
 						return false;
 					}
 
-					return true; // L: 1523
+					return true; // L: 1496
 				}
 
-				if (var4 == 2) { // L: 1525
-					if (var6 < Scene_cameraZ) { // L: 1526
-						if (!this.method3976(var5, var7, var6 + 128)) { // L: 1527
+				if (var4 == 2) { // L: 1498
+					if (var6 < Scene_cameraZ) { // L: 1499
+						if (!this.method4088(var5, var7, var6 + 128)) { // L: 1500
 							return false;
 						}
 
-						if (!this.method3976(var5 + 128, var7, var6 + 128)) { // L: 1528
+						if (!this.method4088(var5 + 128, var7, var6 + 128)) { // L: 1501
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1530
-						if (!this.method3976(var5, var8, var6 + 128)) { // L: 1531
+					if (var1 > 0) { // L: 1503
+						if (!this.method4088(var5, var8, var6 + 128)) { // L: 1504
 							return false;
 						}
 
-						if (!this.method3976(var5 + 128, var8, var6 + 128)) { // L: 1532
+						if (!this.method4088(var5 + 128, var8, var6 + 128)) { // L: 1505
 							return false;
 						}
 					}
 
-					if (!this.method3976(var5, var9, var6 + 128)) { // L: 1534
+					if (!this.method4088(var5, var9, var6 + 128)) { // L: 1507
 						return false;
 					}
 
-					if (!this.method3976(var5 + 128, var9, var6 + 128)) { // L: 1535
+					if (!this.method4088(var5 + 128, var9, var6 + 128)) { // L: 1508
 						return false;
 					}
 
-					return true; // L: 1536
+					return true; // L: 1509
 				}
 
-				if (var4 == 4) { // L: 1538
-					if (var5 < Scene_cameraX) { // L: 1539
-						if (!this.method3976(var5 + 128, var7, var6)) { // L: 1540
+				if (var4 == 4) { // L: 1511
+					if (var5 < Scene_cameraX) { // L: 1512
+						if (!this.method4088(var5 + 128, var7, var6)) { // L: 1513
 							return false;
 						}
 
-						if (!this.method3976(var5 + 128, var7, var6 + 128)) { // L: 1541
+						if (!this.method4088(var5 + 128, var7, var6 + 128)) { // L: 1514
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1543
-						if (!this.method3976(var5 + 128, var8, var6)) { // L: 1544
+					if (var1 > 0) { // L: 1516
+						if (!this.method4088(var5 + 128, var8, var6)) { // L: 1517
 							return false;
 						}
 
-						if (!this.method3976(var5 + 128, var8, var6 + 128)) { // L: 1545
+						if (!this.method4088(var5 + 128, var8, var6 + 128)) { // L: 1518
 							return false;
 						}
 					}
 
-					if (!this.method3976(var5 + 128, var9, var6)) { // L: 1547
+					if (!this.method4088(var5 + 128, var9, var6)) { // L: 1520
 						return false;
 					}
 
-					if (!this.method3976(var5 + 128, var9, var6 + 128)) { // L: 1548
+					if (!this.method4088(var5 + 128, var9, var6 + 128)) { // L: 1521
 						return false;
 					}
 
-					return true; // L: 1549
+					return true; // L: 1522
 				}
 
-				if (var4 == 8) { // L: 1551
-					if (var6 > Scene_cameraZ) { // L: 1552
-						if (!this.method3976(var5, var7, var6)) { // L: 1553
+				if (var4 == 8) { // L: 1524
+					if (var6 > Scene_cameraZ) { // L: 1525
+						if (!this.method4088(var5, var7, var6)) { // L: 1526
 							return false;
 						}
 
-						if (!this.method3976(var5 + 128, var7, var6)) { // L: 1554
+						if (!this.method4088(var5 + 128, var7, var6)) { // L: 1527
 							return false;
 						}
 					}
 
-					if (var1 > 0) { // L: 1556
-						if (!this.method3976(var5, var8, var6)) { // L: 1557
+					if (var1 > 0) { // L: 1529
+						if (!this.method4088(var5, var8, var6)) { // L: 1530
 							return false;
 						}
 
-						if (!this.method3976(var5 + 128, var8, var6)) { // L: 1558
+						if (!this.method4088(var5 + 128, var8, var6)) { // L: 1531
 							return false;
 						}
 					}
 
-					if (!this.method3976(var5, var9, var6)) { // L: 1560
+					if (!this.method4088(var5, var9, var6)) { // L: 1533
 						return false;
 					}
 
-					if (!this.method3976(var5 + 128, var9, var6)) { // L: 1561
+					if (!this.method4088(var5 + 128, var9, var6)) { // L: 1534
 						return false;
 					}
 
-					return true; // L: 1562
+					return true; // L: 1535
 				}
 			}
 
-			if (!this.method3976(var5 + 64, var10, var6 + 64)) { // L: 1565
+			if (!this.method4088(var5 + 64, var10, var6 + 64)) { // L: 1538
 				return false;
-			} else if (var4 == 16) { // L: 1566
-				return this.method3976(var5, var9, var6 + 128); // L: 1567
-			} else if (var4 == 32) { // L: 1570
-				return this.method3976(var5 + 128, var9, var6 + 128); // L: 1571
-			} else if (var4 == 64) { // L: 1574
-				return this.method3976(var5 + 128, var9, var6); // L: 1575
-			} else if (var4 == 128) { // L: 1578
-				return this.method3976(var5, var9, var6); // L: 1579
+			} else if (var4 == 16) { // L: 1539
+				return this.method4088(var5, var9, var6 + 128); // L: 1540
+			} else if (var4 == 32) { // L: 1543
+				return this.method4088(var5 + 128, var9, var6 + 128); // L: 1544
+			} else if (var4 == 64) { // L: 1547
+				return this.method4088(var5 + 128, var9, var6); // L: 1548
+			} else if (var4 == 128) { // L: 1551
+				return this.method4088(var5, var9, var6); // L: 1552
 			} else {
-				return true; // L: 1582
+				return true; // L: 1555
 			}
 		}
 	}
 
-	@ObfuscatedName("au")
-	boolean method3974(int var1, int var2, int var3, int var4) {
-		if (!this.method3972(var1, var2, var3)) { // L: 1586
+	@ObfuscatedName("ar")
+	boolean method4086(int var1, int var2, int var3, int var4) {
+		if (!this.method4084(var1, var2, var3)) { // L: 1559
 			return false;
 		} else {
-			int var5 = var2 << 7; // L: 1587
-			int var6 = var3 << 7; // L: 1588
-			return this.method3976(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3976(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3976(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1589
+			int var5 = var2 << 7; // L: 1560
+			int var6 = var3 << 7; // L: 1561
+			return this.method4088(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method4088(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method4088(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562
 		}
 	}
 
-	@ObfuscatedName("an")
-	boolean method3975(int var1, int var2, int var3, int var4, int var5, int var6) {
+	@ObfuscatedName("af")
+	boolean method4087(int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7;
 		int var8;
-		if (var3 == var2 && var5 == var4) { // L: 1594
-			if (!this.method3972(var1, var2, var4)) { // L: 1595
+		if (var3 == var2 && var5 == var4) { // L: 1567
+			if (!this.method4084(var1, var2, var4)) { // L: 1568
 				return false;
 			} else {
-				var7 = var2 << 7; // L: 1596
-				var8 = var4 << 7; // L: 1597
-				return this.method3976(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3976(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3976(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3976(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1598
+				var7 = var2 << 7; // L: 1569
+				var8 = var4 << 7; // L: 1570
+				return this.method4088(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method4088(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method4088(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method4088(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571
 			}
 		} else {
-			for (var7 = var2; var7 <= var3; ++var7) { // L: 1601
-				for (var8 = var4; var8 <= var5; ++var8) { // L: 1602
-					if (this.field2301[var1][var7][var8] == -Scene_drawnCount) { // L: 1603
+			for (var7 = var2; var7 <= var3; ++var7) { // L: 1574
+				for (var8 = var4; var8 <= var5; ++var8) { // L: 1575
+					if (this.field2299[var1][var7][var8] == -Scene_drawnCount) { // L: 1576
 						return false;
 					}
 				}
 			}
 
-			var7 = (var2 << 7) + 1; // L: 1606
-			var8 = (var4 << 7) + 2; // L: 1607
-			int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1608
-			if (!this.method3976(var7, var9, var8)) { // L: 1609
+			var7 = (var2 << 7) + 1; // L: 1579
+			var8 = (var4 << 7) + 2; // L: 1580
+			int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581
+			if (!this.method4088(var7, var9, var8)) { // L: 1582
 				return false;
 			} else {
-				int var10 = (var3 << 7) - 1; // L: 1610
-				if (!this.method3976(var10, var9, var8)) { // L: 1611
+				int var10 = (var3 << 7) - 1; // L: 1583
+				if (!this.method4088(var10, var9, var8)) { // L: 1584
 					return false;
 				} else {
-					int var11 = (var5 << 7) - 1; // L: 1612
-					if (!this.method3976(var7, var9, var11)) { // L: 1613
+					int var11 = (var5 << 7) - 1; // L: 1585
+					if (!this.method4088(var7, var9, var11)) { // L: 1586
 						return false;
-					} else if (!this.method3976(var10, var9, var11)) { // L: 1614
+					} else if (!this.method4088(var10, var9, var11)) { // L: 1587
 						return false;
 					} else {
-						return true; // L: 1615
+						return true; // L: 1588
 					}
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("bd")
-	boolean method3976(int var1, int var2, int var3) {
-		for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1619
-			Occluder var5 = Scene_currentOccluders[var4]; // L: 1620
+	@ObfuscatedName("bq")
+	boolean method4088(int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592
+			Occluder var5 = Scene_currentOccluders[var4]; // L: 1593
 			int var6;
 			int var7;
 			int var8;
 			int var9;
 			int var10;
-			if (var5.field2380 == 1) { // L: 1621
-				var6 = var5.minX - var1; // L: 1622
-				if (var6 > 0) { // L: 1623
-					var7 = (var6 * var5.field2382 >> 8) + var5.minZ; // L: 1624
-					var8 = (var6 * var5.field2384 >> 8) + var5.maxZ; // L: 1625
-					var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1626
-					var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1627
-					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1628
+			if (var5.field2378 == 1) { // L: 1594
+				var6 = var5.minX - var1; // L: 1595
+				if (var6 > 0) { // L: 1596
+					var7 = (var6 * var5.field2383 >> 8) + var5.minZ; // L: 1597
+					var8 = (var6 * var5.field2382 >> 8) + var5.maxZ; // L: 1598
+					var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1599
+					var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1600
+					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601
 						return true;
 					}
 				}
-			} else if (var5.field2380 == 2) { // L: 1632
-				var6 = var1 - var5.minX; // L: 1633
-				if (var6 > 0) { // L: 1634
-					var7 = (var6 * var5.field2382 >> 8) + var5.minZ; // L: 1635
-					var8 = (var6 * var5.field2384 >> 8) + var5.maxZ; // L: 1636
-					var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1637
-					var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1638
-					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1639
+			} else if (var5.field2378 == 2) { // L: 1605
+				var6 = var1 - var5.minX; // L: 1606
+				if (var6 > 0) { // L: 1607
+					var7 = (var6 * var5.field2383 >> 8) + var5.minZ; // L: 1608
+					var8 = (var6 * var5.field2382 >> 8) + var5.maxZ; // L: 1609
+					var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1610
+					var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1611
+					if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612
 						return true;
 					}
 				}
-			} else if (var5.field2380 == 3) { // L: 1643
-				var6 = var5.minZ - var3; // L: 1644
-				if (var6 > 0) { // L: 1645
-					var7 = (var6 * var5.field2385 >> 8) + var5.minX; // L: 1646
-					var8 = (var6 * var5.field2372 >> 8) + var5.maxX; // L: 1647
-					var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1648
-					var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1649
-					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1650
+			} else if (var5.field2378 == 3) { // L: 1616
+				var6 = var5.minZ - var3; // L: 1617
+				if (var6 > 0) { // L: 1618
+					var7 = (var6 * var5.field2370 >> 8) + var5.minX; // L: 1619
+					var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1620
+					var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1621
+					var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1622
+					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623
 						return true;
 					}
 				}
-			} else if (var5.field2380 == 4) { // L: 1654
-				var6 = var3 - var5.minZ; // L: 1655
-				if (var6 > 0) { // L: 1656
-					var7 = (var6 * var5.field2385 >> 8) + var5.minX; // L: 1657
-					var8 = (var6 * var5.field2372 >> 8) + var5.maxX; // L: 1658
-					var9 = (var6 * var5.field2369 >> 8) + var5.minY; // L: 1659
-					var10 = (var6 * var5.field2386 >> 8) + var5.maxY; // L: 1660
-					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1661
+			} else if (var5.field2378 == 4) { // L: 1627
+				var6 = var3 - var5.minZ; // L: 1628
+				if (var6 > 0) { // L: 1629
+					var7 = (var6 * var5.field2370 >> 8) + var5.minX; // L: 1630
+					var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1631
+					var9 = (var6 * var5.field2385 >> 8) + var5.minY; // L: 1632
+					var10 = (var6 * var5.field2384 >> 8) + var5.maxY; // L: 1633
+					if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634
 						return true;
 					}
 				}
-			} else if (var5.field2380 == 5) { // L: 1665
-				var6 = var2 - var5.minY; // L: 1666
-				if (var6 > 0) { // L: 1667
-					var7 = (var6 * var5.field2385 >> 8) + var5.minX; // L: 1668
-					var8 = (var6 * var5.field2372 >> 8) + var5.maxX; // L: 1669
-					var9 = (var6 * var5.field2382 >> 8) + var5.minZ; // L: 1670
-					var10 = (var6 * var5.field2384 >> 8) + var5.maxZ; // L: 1671
-					if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1672
+			} else if (var5.field2378 == 5) { // L: 1638
+				var6 = var2 - var5.minY; // L: 1639
+				if (var6 > 0) { // L: 1640
+					var7 = (var6 * var5.field2370 >> 8) + var5.minX; // L: 1641
+					var8 = (var6 * var5.field2380 >> 8) + var5.maxX; // L: 1642
+					var9 = (var6 * var5.field2383 >> 8) + var5.minZ; // L: 1643
+					var10 = (var6 * var5.field2382 >> 8) + var5.maxZ; // L: 1644
+					if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645
 						return true;
 					}
 				}
 			}
 		}
 
-		return false; // L: 1677
+		return false; // L: 1650
 	}
 
 	@ObfuscatedName("y")
 	@Export("Scene_addOccluder")
 	public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		Occluder var8 = new Occluder(); // L: 158
-		var8.minTileX = var2 / 128; // L: 159
-		var8.maxTileX = var3 / 128; // L: 160
-		var8.minTileY = var4 / 128; // L: 161
-		var8.maxTileY = var5 / 128; // L: 162
-		var8.type = var1; // L: 163
-		var8.minX = var2; // L: 164
-		var8.maxX = var3; // L: 165
-		var8.minZ = var4; // L: 166
-		var8.maxZ = var5; // L: 167
-		var8.minY = var6; // L: 168
-		var8.maxY = var7; // L: 169
-		Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 170
-	} // L: 171
+		Occluder var8 = new Occluder(); // L: 149
+		var8.minTileX = var2 / 128; // L: 150
+		var8.maxTileX = var3 / 128; // L: 151
+		var8.minTileY = var4 / 128; // L: 152
+		var8.maxTileY = var5 / 128; // L: 153
+		var8.type = var1; // L: 154
+		var8.minX = var2; // L: 155
+		var8.maxX = var3; // L: 156
+		var8.minZ = var4; // L: 157
+		var8.maxZ = var5; // L: 158
+		var8.minY = var6; // L: 159
+		var8.maxY = var7; // L: 160
+		Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161
+	} // L: 162
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@Export("Scene_buildVisiblityMap")
 	public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) {
-		Scene_viewportXMin = 0; // L: 665
-		Scene_viewportYMin = 0; // L: 666
-		Scene_viewportXMax = var3; // L: 667
-		Scene_viewportYMax = var4; // L: 668
-		Scene_viewportXCenter = var3 / 2; // L: 669
-		Scene_viewportYCenter = var4 / 2; // L: 670
-		boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 671
+		Scene_viewportXMin = 0; // L: 638
+		Scene_viewportYMin = 0; // L: 639
+		Scene_viewportXMax = var3; // L: 640
+		Scene_viewportYMax = var4; // L: 641
+		Scene_viewportXCenter = var3 / 2; // L: 642
+		Scene_viewportYCenter = var4 / 2; // L: 643
+		boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644
 
 		int var6;
 		int var7;
@@ -2465,135 +2456,135 @@ public class Scene {
 		int var9;
 		int var11;
 		int var12;
-		for (var6 = 128; var6 <= 383; var6 += 32) { // L: 672
-			for (var7 = 0; var7 < 2048; var7 += 64) { // L: 673
-				Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 674
-				Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 675
-				Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 676
-				Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 677
-				var8 = (var6 - 128) / 32; // L: 678
-				var9 = var7 / 64; // L: 679
+		for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645
+			for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646
+				Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647
+				Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648
+				Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649
+				Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650
+				var8 = (var6 - 128) / 32; // L: 651
+				var9 = var7 / 64; // L: 652
 
-				for (int var10 = -26; var10 < 26; ++var10) { // L: 680
-					for (var11 = -26; var11 < 26; ++var11) { // L: 681
-						var12 = var10 * 128; // L: 682
-						int var13 = var11 * 128; // L: 683
-						boolean var14 = false; // L: 684
+				for (int var10 = -26; var10 < 26; ++var10) { // L: 653
+					for (var11 = -26; var11 < 26; ++var11) { // L: 654
+						var12 = var10 * 128; // L: 655
+						int var13 = var11 * 128; // L: 656
+						boolean var14 = false; // L: 657
 
-						for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 685
-							if (method3960(var12, var0[var8] + var15, var13)) { // L: 686
-								var14 = true; // L: 687
+						for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658
+							if (method4072(var12, var0[var8] + var15, var13)) { // L: 659
+								var14 = true; // L: 660
 								break;
 							}
 						}
 
-						var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 691
+						var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664
 					}
 				}
 			}
 		}
 
-		for (var6 = 0; var6 < 8; ++var6) { // L: 696
-			for (var7 = 0; var7 < 32; ++var7) { // L: 697
-				for (var8 = -25; var8 < 25; ++var8) { // L: 698
-					for (var9 = -25; var9 < 25; ++var9) { // L: 699
-						boolean var16 = false; // L: 700
+		for (var6 = 0; var6 < 8; ++var6) { // L: 669
+			for (var7 = 0; var7 < 32; ++var7) { // L: 670
+				for (var8 = -25; var8 < 25; ++var8) { // L: 671
+					for (var9 = -25; var9 < 25; ++var9) { // L: 672
+						boolean var16 = false; // L: 673
 
 						label84:
-						for (var11 = -1; var11 <= 1; ++var11) { // L: 701
-							for (var12 = -1; var12 <= 1; ++var12) { // L: 702
-								if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 703
-									var16 = true; // L: 704
+						for (var11 = -1; var11 <= 1; ++var11) { // L: 674
+							for (var12 = -1; var12 <= 1; ++var12) { // L: 675
+								if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676
+									var16 = true; // L: 677
 									break label84;
 								}
 
-								if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 707
-									var16 = true; // L: 708
-									break label84;
+								if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680
+									var16 = true; // L: 681
+									break label84; // L: 682
 								}
 
-								if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 711
-									var16 = true; // L: 712
-									break label84; // L: 713
+								if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684
+									var16 = true; // L: 685
+									break label84; // L: 686
 								}
 
-								if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 715
-									var16 = true; // L: 716
-									break label84; // L: 717
+								if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688
+									var16 = true; // L: 689
+									break label84; // L: 690
 								}
 							}
 						}
 
-						visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 721
+						visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694
 					}
 				}
 			}
 		}
 
-	} // L: 726
+	} // L: 699
 
-	@ObfuscatedName("aj")
-	static boolean method3960(int var0, int var1, int var2) {
-		int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 729
-		int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 730
-		int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 731
-		int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 732
-		if (var5 >= 50 && var5 <= 3500) { // L: 733
-			int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 734
-			int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 735
-			return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 736
+	@ObfuscatedName("ae")
+	static boolean method4072(int var0, int var1, int var2) {
+		int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702
+		int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703
+		int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704
+		int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705
+		if (var5 >= 50 && var5 <= 3500) { // L: 706
+			int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707
+			int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708
+			return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709
 		} else {
-			return false; // L: 737
+			return false; // L: 710
 		}
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@Export("shouldSendWalk")
 	public static boolean shouldSendWalk() {
-		return viewportWalking && Scene_selectedX != -1; // L: 756
+		return viewportWalking && Scene_selectedX != -1; // L: 729
 	}
 
-	@ObfuscatedName("ac")
-	public static void method4047() {
-		Scene_selectedX = -1; // L: 760
-		viewportWalking = false; // L: 761
-	} // L: 762
+	@ObfuscatedName("aj")
+	public static void method4069() {
+		Scene_selectedX = -1; // L: 733
+		viewportWalking = false; // L: 734
+	} // L: 735
 
-	@ObfuscatedName("aw")
-	static final int method3969(int var0, int var1) {
-		var1 = (var0 & 127) * var1 >> 7; // L: 1367
-		if (var1 < 2) { // L: 1368
+	@ObfuscatedName("am")
+	static final int method4113(int var0, int var1) {
+		var1 = (var0 & 127) * var1 >> 7; // L: 1340
+		if (var1 < 2) { // L: 1341
 			var1 = 2;
-		} else if (var1 > 126) { // L: 1369
+		} else if (var1 > 126) { // L: 1342
 			var1 = 126;
 		}
 
-		return (var0 & 65408) + var1; // L: 1370
+		return (var0 & 65408) + var1; // L: 1343
 	}
 
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@Export("containsBounds")
 	static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1374
+		if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347
 			return false;
-		} else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1375
+		} else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348
 			return false;
-		} else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1376
+		} else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349
 			return false;
-		} else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1377
+		} else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350
 			return false;
 		} else {
-			int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1378
-			int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1379
-			int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1380
-			if (var8 == 0) { // L: 1381
-				if (var9 != 0) { // L: 1384
-					return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1385
+			int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351
+			int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352
+			int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353
+			if (var8 == 0) { // L: 1354
+				if (var9 != 0) { // L: 1357
+					return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358
 				} else {
-					return true; // L: 1387
+					return true; // L: 1360
 				}
 			} else {
-				return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1382
+				return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355
 			}
 		}
 	}
diff --git a/runescape-client/src/main/java/SceneTileModel.java b/runescape-client/src/main/java/SceneTileModel.java
index 6fd92408ea..18c616b6d5 100644
--- a/runescape-client/src/main/java/SceneTileModel.java
+++ b/runescape-client/src/main/java/SceneTileModel.java
@@ -2,77 +2,77 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("gp")
+@ObfuscatedName("go")
 @Implements("SceneTileModel")
 public final class SceneTileModel {
-	@ObfuscatedName("g")
-	static int[] field2402;
-	@ObfuscatedName("a")
-	static int[] field2416;
-	@ObfuscatedName("k")
-	static int[] field2417;
-	@ObfuscatedName("m")
-	static int[] field2418;
+	@ObfuscatedName("t")
+	static int[] field2410;
 	@ObfuscatedName("x")
-	static int[] field2419;
-	@ObfuscatedName("z")
-	static final int[][] field2420;
-	@ObfuscatedName("w")
-	static final int[][] field2421;
-	@ObfuscatedName("v")
+	static int[] field2412;
+	@ObfuscatedName("u")
+	static int[] field2413;
+	@ObfuscatedName("q")
+	static int[] field2414;
+	@ObfuscatedName("s")
+	static int[] field2404;
+	@ObfuscatedName("p")
+	static final int[][] field2416;
+	@ObfuscatedName("c")
+	static final int[][] field2396;
+	@ObfuscatedName("f")
 	@Export("vertexX")
 	int[] vertexX;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("vertexY")
 	int[] vertexY;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("vertexZ")
 	int[] vertexZ;
 	@ObfuscatedName("y")
 	@Export("triangleColorA")
 	int[] triangleColorA;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("triangleColorB")
 	int[] triangleColorB;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("triangleColorC")
 	int[] triangleColorC;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("faceX")
 	int[] faceX;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("faceY")
 	int[] faceY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("faceZ")
 	int[] faceZ;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("triangleTextureId")
 	int[] triangleTextureId;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("isFlat")
 	boolean isFlat;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("shape")
 	int shape;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("underlayRgb")
 	int underlayRgb;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("overlayRgb")
 	int overlayRgb;
 
 	static {
-		field2402 = new int[6]; // L: 21
-		field2416 = new int[6]; // L: 22
-		field2417 = new int[6]; // L: 23
-		field2418 = new int[6]; // L: 24
-		field2419 = new int[6]; // L: 25
-		field2420 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26
-		field2421 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
+		field2410 = new int[6]; // L: 21
+		field2412 = new int[6]; // L: 22
+		field2413 = new int[6]; // L: 23
+		field2414 = new int[6]; // L: 24
+		field2404 = new int[6]; // L: 25
+		field2416 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26
+		field2396 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
 	}
 
 	SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) {
@@ -89,7 +89,7 @@ public final class SceneTileModel {
 		int var21 = var20 / 2; // L: 64
 		int var22 = var20 / 4; // L: 65
 		int var23 = var20 * 3 / 4; // L: 66
-		int[] var24 = field2420[var1]; // L: 67
+		int[] var24 = field2416[var1]; // L: 67
 		int var25 = var24.length; // L: 68
 		this.vertexX = new int[var25]; // L: 69
 		this.vertexY = new int[var25]; // L: 70
@@ -224,7 +224,7 @@ public final class SceneTileModel {
 			var27[var30] = var36; // L: 202
 		}
 
-		int[] var38 = field2421[var1]; // L: 204
+		int[] var38 = field2396[var1]; // L: 204
 		var31 = var38.length / 4; // L: 205
 		this.faceX = new int[var31]; // L: 206
 		this.faceY = new int[var31]; // L: 207
diff --git a/runescape-client/src/main/java/SceneTilePaint.java b/runescape-client/src/main/java/SceneTilePaint.java
index 81bac04e37..6241cd250c 100644
--- a/runescape-client/src/main/java/SceneTilePaint.java
+++ b/runescape-client/src/main/java/SceneTilePaint.java
@@ -2,48 +2,46 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ga")
+@ObfuscatedName("hp")
 @Implements("SceneTilePaint")
 public final class SceneTilePaint {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1657490379
+		intValue = -1060365903
 	)
 	@Export("swColor")
 	int swColor;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -338901479
+		intValue = 1024115467
 	)
 	@Export("seColor")
 	int seColor;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 74746585
+		intValue = 1904939773
 	)
 	@Export("neColor")
 	int neColor;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1630451137
+		intValue = 2128770803
 	)
 	@Export("nwColor")
 	int nwColor;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -80564939
+		intValue = 1045696483
 	)
 	@Export("texture")
 	int texture;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("isFlat")
 	boolean isFlat;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 426134523
+		intValue = 437021985
 	)
 	@Export("rgb")
 	int rgb;
@@ -58,101 +56,4 @@ public final class SceneTilePaint {
 		this.rgb = var6; // L: 18
 		this.isFlat = var7; // L: 19
 	} // L: 20
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "1"
-	)
-	static int method4258(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1074
-		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1075
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.x; // L: 1076
-			return 1; // L: 1077
-		} else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1079
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.y; // L: 1080
-			return 1; // L: 1081
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1083
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.width; // L: 1084
-			return 1; // L: 1085
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1087
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.height; // L: 1088
-			return 1; // L: 1089
-		} else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1091
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1092
-			return 1; // L: 1093
-		} else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1095
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.parentId; // L: 1096
-			return 1; // L: 1097
-		} else {
-			return 2; // L: 1099
-		}
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1201682368"
-	)
-	public static void method4259() {
-		ItemComposition.ItemDefinition_cached.clear(); // L: 536
-		ItemComposition.ItemDefinition_cachedModels.clear(); // L: 537
-		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 538
-	} // L: 539
-
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-1626936369"
-	)
-	static int method4260(int var0, Script var1, boolean var2) {
-		if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4217
-			if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4221
-				if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4225
-					if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4229
-						if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4233
-							if (var0 != 7031 && var0 != 7032) { // L: 4237
-								if (var0 == 7033) { // L: 4242
-									--Interpreter.Interpreter_stringStackSize; // L: 4243
-									return 1; // L: 4244
-								} else if (var0 != 7036 && var0 != 7037) { // L: 4246
-									if (var0 == 7038) { // L: 4250
-										--class44.Interpreter_intStackSize; // L: 4251
-										return 1; // L: 4252
-									} else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4254
-										return 2; // L: 4258
-									} else {
-										--class44.Interpreter_intStackSize; // L: 4255
-										return 1; // L: 4256
-									}
-								} else {
-									class44.Interpreter_intStackSize -= 2; // L: 4247
-									return 1; // L: 4248
-								}
-							} else {
-								--Interpreter.Interpreter_stringStackSize; // L: 4238
-								--class44.Interpreter_intStackSize; // L: 4239
-								return 1; // L: 4240
-							}
-						} else {
-							--class44.Interpreter_intStackSize; // L: 4234
-							return 1; // L: 4235
-						}
-					} else {
-						class44.Interpreter_intStackSize -= 2; // L: 4230
-						return 1; // L: 4231
-					}
-				} else {
-					class44.Interpreter_intStackSize -= 2; // L: 4226
-					return 1; // L: 4227
-				}
-			} else {
-				class44.Interpreter_intStackSize -= 3; // L: 4222
-				return 1; // L: 4223
-			}
-		} else {
-			class44.Interpreter_intStackSize -= 5; // L: 4218
-			return 1; // L: 4219
-		}
-	}
 }
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index dbc86b465c..dace251cb2 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -1,4 +1,3 @@
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -8,61 +7,50 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("cf")
 @Implements("Script")
 public class Script extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("Script_cached")
 	static EvictingDualNodeHashTable Script_cached;
-	@ObfuscatedName("bf")
-	@ObfuscatedGetter(
-		intValue = 1575006245
-	)
-	static int field1094;
-	@ObfuscatedName("jx")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("dragInventoryWidget")
-	static Widget dragInventoryWidget;
-	@ObfuscatedName("n")
-	String field1084;
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
+	String field1069;
+	@ObfuscatedName("v")
 	@Export("opcodes")
 	int[] opcodes;
 	@ObfuscatedName("y")
 	@Export("intOperands")
 	int[] intOperands;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("stringOperands")
 	String[] stringOperands;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1356584441
+		intValue = -1160704097
 	)
 	@Export("localIntCount")
 	int localIntCount;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -2056602721
+		intValue = 622564641
 	)
 	@Export("localStringCount")
 	int localStringCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1265512819
+		intValue = -2125275351
 	)
 	@Export("intArgumentCount")
 	int intArgumentCount;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -162786155
+		intValue = -1075522957
 	)
 	@Export("stringArgumentCount")
 	int stringArgumentCount;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "[Lmr;"
+		descriptor = "[Lmo;"
 	)
 	@Export("switches")
 	IterableNodeHashTable[] switches;
@@ -76,910 +64,39 @@ public class Script extends DualNode {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Lmr;",
-		garbageValue = "920031088"
+		descriptor = "(II)[Lmo;",
+		garbageValue = "-592819583"
 	)
 	@Export("newIterableNodeHashTable")
 	IterableNodeHashTable[] newIterableNodeHashTable(int var1) {
-		return new IterableNodeHashTable[var1]; // L: 158
+		return new IterableNodeHashTable[var1]; // L: 150
 	}
 
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Z",
-		garbageValue = "2094340190"
-	)
-	static boolean method1996(String var0, int var1, String var2) {
-		if (var1 == 0) { // L: 54
-			try {
-				if (!class44.field318.startsWith("win")) { // L: 56
-					throw new Exception();
-				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 57
-					throw new Exception();
-				} else {
-					String var10 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 58
-
-					for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 59
-						if (var10.indexOf(var0.charAt(var4)) == -1) { // L: 60
-							throw new Exception();
-						}
-					}
-
-					Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 62
-					return true; // L: 63
-				}
-			} catch (Throwable var5) { // L: 65
-				return false; // L: 66
-			}
-		} else if (var1 == 1) { // L: 69
-			try {
-				Object var3 = class42.method422(class44.applet, var2, new Object[]{(new URL(class44.applet.getCodeBase(), var0)).toString()}); // L: 71
-				return var3 != null; // L: 72
-			} catch (Throwable var6) { // L: 74
-				return false; // L: 75
-			}
-		} else if (var1 == 2) { // L: 78
-			try {
-				class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_blank"); // L: 80
-				return true; // L: 81
-			} catch (Exception var7) { // L: 83
-				return false; // L: 84
-			}
-		} else if (var1 == 3) { // L: 87
-			try {
-				class42.method421(class44.applet, "loggedout"); // L: 89
-			} catch (Throwable var9) { // L: 91
-			}
-
-			try {
-				class44.applet.getAppletContext().showDocument(new URL(class44.applet.getCodeBase(), var0), "_top"); // L: 93
-				return true; // L: 94
-			} catch (Exception var8) { // L: 96
-				return false; // L: 97
-			}
-		} else {
-			throw new IllegalArgumentException(); // L: 100
-		}
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(ZZI)Lop;",
-		garbageValue = "-488222672"
-	)
-	static IndexedSprite method1995(boolean var0, boolean var1) {
-		return var0 ? (var1 ? ClanChannel.field33 : GrandExchangeOffer.options_buttons_2Sprite) : (var1 ? Decimator.field553 : FriendSystem.options_buttons_0Sprite); // L: 184
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(IIZB)Ljava/lang/String;",
-		garbageValue = "-128"
-	)
-	static String method1998(int var0, int var1, boolean var2) {
-		if (var1 >= 2 && var1 <= 36) { // L: 106
-			if (var2 && var0 >= 0) { // L: 107
-				int var3 = 2; // L: 108
-
-				for (int var4 = var0 / var1; var4 != 0; ++var3) { // L: 109 110 112
-					var4 /= var1; // L: 111
-				}
-
-				char[] var5 = new char[var3]; // L: 114
-				var5[0] = '+'; // L: 115
-
-				for (int var6 = var3 - 1; var6 > 0; --var6) { // L: 116
-					int var7 = var0; // L: 117
-					var0 /= var1; // L: 118
-					int var8 = var7 - var0 * var1; // L: 119
-					if (var8 >= 10) { // L: 120
-						var5[var6] = (char)(var8 + 87);
-					} else {
-						var5[var6] = (char)(var8 + 48); // L: 121
-					}
-				}
-
-				return new String(var5); // L: 123
-			} else {
-				return Integer.toString(var0, var1);
-			}
-		} else {
-			throw new IllegalArgumentException("" + var1);
-		}
-	}
-
-	@ObfuscatedName("iq")
-	@ObfuscatedSignature(
-		descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V",
-		garbageValue = "2054699794"
-	)
-	@Export("menuAction")
-	static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) {
-		if (var2 >= 2000) { // L: 7786
-			var2 -= 2000;
-		}
-
-		PacketBufferNode var8;
-		if (var2 == 1) { // L: 7787
-			Client.mouseCrossX = var6; // L: 8140
-			Client.mouseCrossY = var7; // L: 8141
-			Client.mouseCrossColor = 2; // L: 8142
-			Client.mouseCrossState = 0; // L: 8143
-			Client.destinationX = var0; // L: 8144
-			Client.destinationY = var1; // L: 8145
-			var8 = class21.getPacketBufferNode(ClientPacket.field2677, Client.packetWriter.isaacCipher); // L: 8147
-			var8.packetBuffer.method6619(UserComparator5.selectedItemId); // L: 8148
-			var8.packetBuffer.method6602(var3); // L: 8149
-			var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8150
-			var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8151
-			var8.packetBuffer.writeInt(Player.selectedItemWidget); // L: 8152
-			var8.packetBuffer.method6602(var0 + VertexNormal.baseX); // L: 8153
-			var8.packetBuffer.writeShort(ClanChannelMember.selectedItemSlot); // L: 8154
-			Client.packetWriter.addNode(var8); // L: 8155
-		} else if (var2 == 2) {
-			Client.mouseCrossX = var6; // L: 8365
-			Client.mouseCrossY = var7; // L: 8366
-			Client.mouseCrossColor = 2; // L: 8367
-			Client.mouseCrossState = 0; // L: 8368
-			Client.destinationX = var0; // L: 8369
-			Client.destinationY = var1; // L: 8370
-			var8 = class21.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); // L: 8371
-			var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 8372
-			var8.packetBuffer.writeShort(var3); // L: 8373
-			var8.packetBuffer.method6600(Client.field788); // L: 8374
-			var8.packetBuffer.writeShort(SoundSystem.baseY + var1); // L: 8375
-			var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8376
-			var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8377
-			var8.packetBuffer.method6612(Decimator.selectedSpellWidget); // L: 8378
-			Client.packetWriter.addNode(var8); // L: 8379
-		} else if (var2 == 3) {
-			Client.mouseCrossX = var6; // L: 8037
-			Client.mouseCrossY = var7; // L: 8038
-			Client.mouseCrossColor = 2; // L: 8039
-			Client.mouseCrossState = 0; // L: 8040
-			Client.destinationX = var0; // L: 8041
-			Client.destinationY = var1; // L: 8042
-			var8 = class21.getPacketBufferNode(ClientPacket.field2641, Client.packetWriter.isaacCipher); // L: 8044
-			var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8045
-			var8.packetBuffer.method6602(var3); // L: 8046
-			var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8047
-			var8.packetBuffer.method6600(SoundSystem.baseY + var1); // L: 8048
-			Client.packetWriter.addNode(var8); // L: 8049
-		} else if (var2 == 4) {
-			Client.mouseCrossX = var6; // L: 8052
-			Client.mouseCrossY = var7; // L: 8053
-			Client.mouseCrossColor = 2; // L: 8054
-			Client.mouseCrossState = 0; // L: 8055
-			Client.destinationX = var0; // L: 8056
-			Client.destinationY = var1; // L: 8057
-			var8 = class21.getPacketBufferNode(ClientPacket.field2626, Client.packetWriter.isaacCipher); // L: 8059
-			var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8060
-			var8.packetBuffer.method6602(var3); // L: 8061
-			var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8062
-			var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8063
-			Client.packetWriter.addNode(var8); // L: 8064
-		} else if (var2 == 5) {
-			Client.mouseCrossX = var6; // L: 7950
-			Client.mouseCrossY = var7; // L: 7951
-			Client.mouseCrossColor = 2; // L: 7952
-			Client.mouseCrossState = 0; // L: 7953
-			Client.destinationX = var0; // L: 7954
-			Client.destinationY = var1; // L: 7955
-			var8 = class21.getPacketBufferNode(ClientPacket.field2672, Client.packetWriter.isaacCipher); // L: 7957
-			var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 7958
-			var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 7959
-			var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7960
-			var8.packetBuffer.method6619(var3); // L: 7961
-			Client.packetWriter.addNode(var8); // L: 7962
-		} else if (var2 == 6) {
-			Client.mouseCrossX = var6; // L: 8334
-			Client.mouseCrossY = var7; // L: 8335
-			Client.mouseCrossColor = 2; // L: 8336
-			Client.mouseCrossState = 0; // L: 8337
-			Client.destinationX = var0; // L: 8338
-			Client.destinationY = var1; // L: 8339
-			var8 = class21.getPacketBufferNode(ClientPacket.field2572, Client.packetWriter.isaacCipher); // L: 8341
-			var8.packetBuffer.method6619(var3); // L: 8342
-			var8.packetBuffer.method6619(SoundSystem.baseY + var1); // L: 8343
-			var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8344
-			var8.packetBuffer.method6602(var0 + VertexNormal.baseX); // L: 8345
-			Client.packetWriter.addNode(var8); // L: 8346
-		} else {
-			PacketBufferNode var9;
-			NPC var13;
-			if (var2 == 7) {
-				var13 = Client.npcs[var3]; // L: 8284
-				if (var13 != null) { // L: 8285
-					Client.mouseCrossX = var6; // L: 8286
-					Client.mouseCrossY = var7; // L: 8287
-					Client.mouseCrossColor = 2; // L: 8288
-					Client.mouseCrossState = 0; // L: 8289
-					Client.destinationX = var0; // L: 8290
-					Client.destinationY = var1; // L: 8291
-					var9 = class21.getPacketBufferNode(ClientPacket.field2675, Client.packetWriter.isaacCipher); // L: 8293
-					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8294
-					var9.packetBuffer.method6602(UserComparator5.selectedItemId); // L: 8295
-					var9.packetBuffer.method6612(Player.selectedItemWidget); // L: 8296
-					var9.packetBuffer.method6619(var3); // L: 8297
-					var9.packetBuffer.method6600(ClanChannelMember.selectedItemSlot); // L: 8298
-					Client.packetWriter.addNode(var9); // L: 8299
-				}
-			} else if (var2 == 8) {
-				var13 = Client.npcs[var3]; // L: 7897
-				if (var13 != null) { // L: 7898
-					Client.mouseCrossX = var6; // L: 7899
-					Client.mouseCrossY = var7; // L: 7900
-					Client.mouseCrossColor = 2; // L: 7901
-					Client.mouseCrossState = 0; // L: 7902
-					Client.destinationX = var0; // L: 7903
-					Client.destinationY = var1; // L: 7904
-					var9 = class21.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher); // L: 7905
-					var9.packetBuffer.method6612(Decimator.selectedSpellWidget); // L: 7906
-					var9.packetBuffer.method6600(Client.field788); // L: 7907
-					var9.packetBuffer.method6600(var3); // L: 7908
-					var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 7909
-					var9.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7910
-					Client.packetWriter.addNode(var9); // L: 7911
-				}
-			} else if (var2 == 9) {
-				var13 = Client.npcs[var3]; // L: 8268
-				if (var13 != null) { // L: 8269
-					Client.mouseCrossX = var6; // L: 8270
-					Client.mouseCrossY = var7; // L: 8271
-					Client.mouseCrossColor = 2; // L: 8272
-					Client.mouseCrossState = 0; // L: 8273
-					Client.destinationX = var0; // L: 8274
-					Client.destinationY = var1; // L: 8275
-					var9 = class21.getPacketBufferNode(ClientPacket.field2624, Client.packetWriter.isaacCipher); // L: 8277
-					var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8278
-					var9.packetBuffer.method6600(var3); // L: 8279
-					Client.packetWriter.addNode(var9); // L: 8280
-				}
-			} else if (var2 == 10) {
-				var13 = Client.npcs[var3]; // L: 8525
-				if (var13 != null) { // L: 8526
-					Client.mouseCrossX = var6; // L: 8527
-					Client.mouseCrossY = var7; // L: 8528
-					Client.mouseCrossColor = 2; // L: 8529
-					Client.mouseCrossState = 0; // L: 8530
-					Client.destinationX = var0; // L: 8531
-					Client.destinationY = var1; // L: 8532
-					var9 = class21.getPacketBufferNode(ClientPacket.field2670, Client.packetWriter.isaacCipher); // L: 8534
-					var9.packetBuffer.method6619(var3); // L: 8535
-					var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8536
-					Client.packetWriter.addNode(var9); // L: 8537
-				}
-			} else if (var2 == 11) {
-				var13 = Client.npcs[var3]; // L: 8388
-				if (var13 != null) { // L: 8389
-					Client.mouseCrossX = var6; // L: 8390
-					Client.mouseCrossY = var7; // L: 8391
-					Client.mouseCrossColor = 2; // L: 8392
-					Client.mouseCrossState = 0; // L: 8393
-					Client.destinationX = var0; // L: 8394
-					Client.destinationY = var1; // L: 8395
-					var9 = class21.getPacketBufferNode(ClientPacket.field2618, Client.packetWriter.isaacCipher); // L: 8397
-					var9.packetBuffer.method6600(var3); // L: 8398
-					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8399
-					Client.packetWriter.addNode(var9); // L: 8400
-				}
-			} else if (var2 == 12) {
-				var13 = Client.npcs[var3]; // L: 8349
-				if (var13 != null) { // L: 8350
-					Client.mouseCrossX = var6; // L: 8351
-					Client.mouseCrossY = var7; // L: 8352
-					Client.mouseCrossColor = 2; // L: 8353
-					Client.mouseCrossState = 0; // L: 8354
-					Client.destinationX = var0; // L: 8355
-					Client.destinationY = var1; // L: 8356
-					var9 = class21.getPacketBufferNode(ClientPacket.field2601, Client.packetWriter.isaacCipher); // L: 8358
-					var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8359
-					var9.packetBuffer.method6619(var3); // L: 8360
-					Client.packetWriter.addNode(var9); // L: 8361
-				}
-			} else if (var2 == 13) {
-				var13 = Client.npcs[var3]; // L: 7847
-				if (var13 != null) { // L: 7848
-					Client.mouseCrossX = var6; // L: 7849
-					Client.mouseCrossY = var7; // L: 7850
-					Client.mouseCrossColor = 2; // L: 7851
-					Client.mouseCrossState = 0; // L: 7852
-					Client.destinationX = var0; // L: 7853
-					Client.destinationY = var1; // L: 7854
-					var9 = class21.getPacketBufferNode(ClientPacket.field2625, Client.packetWriter.isaacCipher); // L: 7856
-					var9.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7857
-					var9.packetBuffer.method6602(var3); // L: 7858
-					Client.packetWriter.addNode(var9); // L: 7859
-				}
-			} else {
-				Player var15;
-				if (var2 == 14) {
-					var15 = Client.players[var3]; // L: 8067
-					if (var15 != null) { // L: 8068
-						Client.mouseCrossX = var6; // L: 8069
-						Client.mouseCrossY = var7; // L: 8070
-						Client.mouseCrossColor = 2; // L: 8071
-						Client.mouseCrossState = 0; // L: 8072
-						Client.destinationX = var0; // L: 8073
-						Client.destinationY = var1; // L: 8074
-						var9 = class21.getPacketBufferNode(ClientPacket.field2623, Client.packetWriter.isaacCipher); // L: 8076
-						var9.packetBuffer.writeIntME(Player.selectedItemWidget); // L: 8077
-						var9.packetBuffer.method6619(UserComparator5.selectedItemId); // L: 8078
-						var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8079
-						var9.packetBuffer.method6619(ClanChannelMember.selectedItemSlot); // L: 8080
-						var9.packetBuffer.writeShort(var3); // L: 8081
-						Client.packetWriter.addNode(var9); // L: 8082
-					}
-				} else if (var2 == 15) {
-					var15 = Client.players[var3]; // L: 8452
-					if (var15 != null) { // L: 8453
-						Client.mouseCrossX = var6; // L: 8454
-						Client.mouseCrossY = var7; // L: 8455
-						Client.mouseCrossColor = 2; // L: 8456
-						Client.mouseCrossState = 0; // L: 8457
-						Client.destinationX = var0; // L: 8458
-						Client.destinationY = var1; // L: 8459
-						var9 = class21.getPacketBufferNode(ClientPacket.field2615, Client.packetWriter.isaacCipher); // L: 8460
-						var9.packetBuffer.method6619(Client.selectedSpellChildIndex); // L: 8461
-						var9.packetBuffer.method6602(var3); // L: 8462
-						var9.packetBuffer.method6611(Decimator.selectedSpellWidget); // L: 8463
-						var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8464
-						var9.packetBuffer.method6602(Client.field788); // L: 8465
-						Client.packetWriter.addNode(var9); // L: 8466
-					}
-				} else if (var2 == 16) {
-					Client.mouseCrossX = var6; // L: 7799
-					Client.mouseCrossY = var7; // L: 7800
-					Client.mouseCrossColor = 2; // L: 7801
-					Client.mouseCrossState = 0; // L: 7802
-					Client.destinationX = var0; // L: 7803
-					Client.destinationY = var1; // L: 7804
-					var8 = class21.getPacketBufferNode(ClientPacket.field2577, Client.packetWriter.isaacCipher); // L: 7806
-					var8.packetBuffer.method6600(ClanChannelMember.selectedItemSlot); // L: 7807
-					var8.packetBuffer.method6619(var3); // L: 7808
-					var8.packetBuffer.method6600(UserComparator5.selectedItemId); // L: 7809
-					var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 7810
-					var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 7811
-					var8.packetBuffer.method6612(Player.selectedItemWidget); // L: 7812
-					var8.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7813
-					Client.packetWriter.addNode(var8); // L: 7814
-				} else if (var2 == 17) {
-					Client.mouseCrossX = var6; // L: 8086
-					Client.mouseCrossY = var7; // L: 8087
-					Client.mouseCrossColor = 2; // L: 8088
-					Client.mouseCrossState = 0; // L: 8089
-					Client.destinationX = var0; // L: 8090
-					Client.destinationY = var1; // L: 8091
-					var8 = class21.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 8092
-					var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8093
-					var8.packetBuffer.method6611(Decimator.selectedSpellWidget); // L: 8094
-					var8.packetBuffer.method6600(SoundSystem.baseY + var1); // L: 8095
-					var8.packetBuffer.method6602(Client.field788); // L: 8096
-					var8.packetBuffer.method6619(var3); // L: 8097
-					var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8098
-					var8.packetBuffer.method6600(Client.selectedSpellChildIndex); // L: 8099
-					Client.packetWriter.addNode(var8); // L: 8100
-				} else if (var2 == 18) {
-					Client.mouseCrossX = var6; // L: 8011
-					Client.mouseCrossY = var7; // L: 8012
-					Client.mouseCrossColor = 2; // L: 8013
-					Client.mouseCrossState = 0; // L: 8014
-					Client.destinationX = var0; // L: 8015
-					Client.destinationY = var1; // L: 8016
-					var8 = class21.getPacketBufferNode(ClientPacket.field2666, Client.packetWriter.isaacCipher); // L: 8018
-					var8.packetBuffer.writeShort(var3); // L: 8019
-					var8.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8020
-					var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8021
-					var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8022
-					Client.packetWriter.addNode(var8); // L: 8023
-				} else if (var2 == 19) {
-					Client.mouseCrossX = var6; // L: 8565
-					Client.mouseCrossY = var7; // L: 8566
-					Client.mouseCrossColor = 2; // L: 8567
-					Client.mouseCrossState = 0; // L: 8568
-					Client.destinationX = var0; // L: 8569
-					Client.destinationY = var1; // L: 8570
-					var8 = class21.getPacketBufferNode(ClientPacket.field2659, Client.packetWriter.isaacCipher); // L: 8572
-					var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 8573
-					var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8574
-					var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8575
-					var8.packetBuffer.method6600(var3); // L: 8576
-					Client.packetWriter.addNode(var8); // L: 8577
-				} else if (var2 == 20) {
-					Client.mouseCrossX = var6; // L: 8470
-					Client.mouseCrossY = var7; // L: 8471
-					Client.mouseCrossColor = 2; // L: 8472
-					Client.mouseCrossState = 0; // L: 8473
-					Client.destinationX = var0; // L: 8474
-					Client.destinationY = var1; // L: 8475
-					var8 = class21.getPacketBufferNode(ClientPacket.field2676, Client.packetWriter.isaacCipher); // L: 8477
-					var8.packetBuffer.method6619(var3); // L: 8478
-					var8.packetBuffer.method6600(var0 + VertexNormal.baseX); // L: 8479
-					var8.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8480
-					var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8481
-					Client.packetWriter.addNode(var8); // L: 8482
-				} else if (var2 == 21) {
-					Client.mouseCrossX = var6; // L: 7989
-					Client.mouseCrossY = var7; // L: 7990
-					Client.mouseCrossColor = 2; // L: 7991
-					Client.mouseCrossState = 0; // L: 7992
-					Client.destinationX = var0; // L: 7993
-					Client.destinationY = var1; // L: 7994
-					var8 = class21.getPacketBufferNode(ClientPacket.field2575, Client.packetWriter.isaacCipher); // L: 7996
-					var8.packetBuffer.method6602(var3); // L: 7997
-					var8.packetBuffer.writeShort(SoundSystem.baseY + var1); // L: 7998
-					var8.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7999
-					var8.packetBuffer.writeShort(var0 + VertexNormal.baseX); // L: 8000
-					Client.packetWriter.addNode(var8); // L: 8001
-				} else if (var2 == 22) {
-					Client.mouseCrossX = var6; // L: 8415
-					Client.mouseCrossY = var7; // L: 8416
-					Client.mouseCrossColor = 2; // L: 8417
-					Client.mouseCrossState = 0; // L: 8418
-					Client.destinationX = var0; // L: 8419
-					Client.destinationY = var1; // L: 8420
-					var8 = class21.getPacketBufferNode(ClientPacket.field2649, Client.packetWriter.isaacCipher); // L: 8422
-					var8.packetBuffer.method6602(var3); // L: 8423
-					var8.packetBuffer.method6619(var0 + VertexNormal.baseX); // L: 8424
-					var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8425
-					var8.packetBuffer.method6619(SoundSystem.baseY + var1); // L: 8426
-					Client.packetWriter.addNode(var8); // L: 8427
-				} else if (var2 == 23) {
-					if (Client.isMenuOpen) { // L: 8158
-						AbstractSocket.scene.setViewportWalking(); // L: 8159
-					} else {
-						AbstractSocket.scene.menuOpen(class22.Client_plane, var0, var1, true); // L: 8162
-					}
-				} else {
-					PacketBufferNode var11;
-					Widget var16;
-					if (var2 == 24) {
-						var16 = Frames.getWidget(var1); // L: 8404
-						boolean var12 = true; // L: 8405
-						if (var16.contentType > 0) { // L: 8406
-							var12 = SequenceDefinition.method3148(var16);
-						}
-
-						if (var12) { // L: 8407
-							var11 = class21.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 8409
-							var11.packetBuffer.writeInt(var1); // L: 8410
-							Client.packetWriter.addNode(var11); // L: 8411
-						}
-					} else {
-						if (var2 == 25) {
-							var16 = ModeWhere.getWidgetChild(var1, var0); // L: 8501
-							if (var16 != null) { // L: 8502
-								class5.Widget_runOnTargetLeave(); // L: 8503
-								LoginScreenAnimation.selectSpell(var1, var0, AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var16)), var16.itemId); // L: 8504
-								Client.isItemSelected = 0; // L: 8505
-								Client.selectedSpellActionName = BoundaryObject.Widget_getSpellActionName(var16); // L: 8506
-								if (Client.selectedSpellActionName == null) { // L: 8507
-									Client.selectedSpellActionName = "null";
-								}
-
-								if (var16.isIf3) { // L: 8508
-									Client.selectedSpellName = var16.dataText + class44.colorStartTag(16777215);
-								} else {
-									Client.selectedSpellName = class44.colorStartTag(65280) + var16.spellName + class44.colorStartTag(16777215); // L: 8509
-								}
-							}
-
-							return; // L: 8511
-						}
-
-						if (var2 == 26) {
-							class4.method47(); // L: 8382
-						} else {
-							int var10;
-							Widget var14;
-							if (var2 == 28) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 7864
-								var8.packetBuffer.writeInt(var1); // L: 7865
-								Client.packetWriter.addNode(var8); // L: 7866
-								var14 = Frames.getWidget(var1); // L: 7867
-								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 7868
-									var10 = var14.cs1Instructions[0][1]; // L: 7869
-									Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 7870
-									ApproximateRouteStrategy.changeGameOptions(var10); // L: 7871
-								}
-							} else if (var2 == 29) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2619, Client.packetWriter.isaacCipher); // L: 8304
-								var8.packetBuffer.writeInt(var1); // L: 8305
-								Client.packetWriter.addNode(var8); // L: 8306
-								var14 = Frames.getWidget(var1); // L: 8307
-								if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 8308
-									var10 = var14.cs1Instructions[0][1]; // L: 8309
-									if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 8310
-										Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 8311
-										ApproximateRouteStrategy.changeGameOptions(var10); // L: 8312
-									}
-								}
-							} else if (var2 == 30) {
-								if (Client.meslayerContinueWidget == null) { // L: 8004
-									class22.resumePauseWidget(var1, var0); // L: 8005
-									Client.meslayerContinueWidget = ModeWhere.getWidgetChild(var1, var0); // L: 8006
-									WorldMapCacheName.invalidateWidget(Client.meslayerContinueWidget); // L: 8007
-								}
-							} else if (var2 == 31) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2631, Client.packetWriter.isaacCipher); // L: 7937
-								var8.packetBuffer.writeInt(var1); // L: 7938
-								var8.packetBuffer.writeIntME(Player.selectedItemWidget); // L: 7939
-								var8.packetBuffer.method6619(var0); // L: 7940
-								var8.packetBuffer.writeShort(var3); // L: 7941
-								var8.packetBuffer.method6602(ClanChannelMember.selectedItemSlot); // L: 7942
-								var8.packetBuffer.method6602(UserComparator5.selectedItemId); // L: 7943
-								Client.packetWriter.addNode(var8); // L: 7944
-								Client.field747 = 0; // L: 7945
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7946
-								Client.field841 = var0; // L: 7947
-							} else if (var2 == 32) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2609, Client.packetWriter.isaacCipher); // L: 7977
-								var8.packetBuffer.method6612(Decimator.selectedSpellWidget); // L: 7978
-								var8.packetBuffer.method6619(Client.selectedSpellChildIndex); // L: 7979
-								var8.packetBuffer.method6612(var1); // L: 7980
-								var8.packetBuffer.method6600(var3); // L: 7981
-								var8.packetBuffer.method6619(var0); // L: 7982
-								Client.packetWriter.addNode(var8); // L: 7983
-								Client.field747 = 0; // L: 7984
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7985
-								Client.field841 = var0; // L: 7986
-							} else if (var2 == 33) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2585, Client.packetWriter.isaacCipher); // L: 8542
-								var8.packetBuffer.method6612(var1); // L: 8543
-								var8.packetBuffer.method6600(var0); // L: 8544
-								var8.packetBuffer.writeShort(var3); // L: 8545
-								Client.packetWriter.addNode(var8); // L: 8546
-								Client.field747 = 0; // L: 8547
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8548
-								Client.field841 = var0; // L: 8549
-							} else if (var2 == 34) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2576, Client.packetWriter.isaacCipher); // L: 7887
-								var8.packetBuffer.writeIntME(var1); // L: 7888
-								var8.packetBuffer.method6600(var0); // L: 7889
-								var8.packetBuffer.method6600(var3); // L: 7890
-								Client.packetWriter.addNode(var8); // L: 7891
-								Client.field747 = 0; // L: 7892
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7893
-								Client.field841 = var0; // L: 7894
-							} else if (var2 == 35) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2627, Client.packetWriter.isaacCipher); // L: 8442
-								var8.packetBuffer.writeShort(var3); // L: 8443
-								var8.packetBuffer.method6612(var1); // L: 8444
-								var8.packetBuffer.method6602(var0); // L: 8445
-								Client.packetWriter.addNode(var8); // L: 8446
-								Client.field747 = 0; // L: 8447
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8448
-								Client.field841 = var0; // L: 8449
-							} else if (var2 == 36) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2661, Client.packetWriter.isaacCipher); // L: 8027
-								var8.packetBuffer.method6611(var1); // L: 8028
-								var8.packetBuffer.method6600(var3); // L: 8029
-								var8.packetBuffer.method6602(var0); // L: 8030
-								Client.packetWriter.addNode(var8); // L: 8031
-								Client.field747 = 0; // L: 8032
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8033
-								Client.field841 = var0; // L: 8034
-							} else if (var2 == 37) {
-								var8 = class21.getPacketBufferNode(ClientPacket.field2673, Client.packetWriter.isaacCipher); // L: 7789
-								var8.packetBuffer.writeIntME(var1); // L: 7790
-								var8.packetBuffer.method6602(var0); // L: 7791
-								var8.packetBuffer.writeShort(var3); // L: 7792
-								Client.packetWriter.addNode(var8); // L: 7793
-								Client.field747 = 0; // L: 7794
-								GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7795
-								Client.field841 = var0; // L: 7796
-							} else {
-								if (var2 == 38) {
-									class5.Widget_runOnTargetLeave(); // L: 8198
-									var16 = Frames.getWidget(var1); // L: 8199
-									Client.isItemSelected = 1; // L: 8200
-									ClanChannelMember.selectedItemSlot = var0; // L: 8201
-									Player.selectedItemWidget = var1; // L: 8202
-									UserComparator5.selectedItemId = var3; // L: 8203
-									WorldMapCacheName.invalidateWidget(var16); // L: 8204
-									Client.selectedItemName = class44.colorStartTag(16748608) + class260.ItemDefinition_get(var3).name + class44.colorStartTag(16777215); // L: 8205
-									if (Client.selectedItemName == null) { // L: 8206
-										Client.selectedItemName = "null";
-									}
-
-									return; // L: 8207
-								}
-
-								if (var2 == 39) {
-									var8 = class21.getPacketBufferNode(ClientPacket.field2581, Client.packetWriter.isaacCipher); // L: 8431
-									var8.packetBuffer.method6602(var0); // L: 8432
-									var8.packetBuffer.method6600(var3); // L: 8433
-									var8.packetBuffer.method6611(var1); // L: 8434
-									Client.packetWriter.addNode(var8); // L: 8435
-									Client.field747 = 0; // L: 8436
-									GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8437
-									Client.field841 = var0; // L: 8438
-								} else if (var2 == 40) {
-									var8 = class21.getPacketBufferNode(ClientPacket.field2579, Client.packetWriter.isaacCipher); // L: 8515
-									var8.packetBuffer.method6600(var0); // L: 8516
-									var8.packetBuffer.writeIntME(var1); // L: 8517
-									var8.packetBuffer.method6619(var3); // L: 8518
-									Client.packetWriter.addNode(var8); // L: 8519
-									Client.field747 = 0; // L: 8520
-									GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8521
-									Client.field841 = var0; // L: 8522
-								} else if (var2 == 41) {
-									var8 = class21.getPacketBufferNode(ClientPacket.field2639, Client.packetWriter.isaacCipher); // L: 7966
-									var8.packetBuffer.method6600(var3); // L: 7967
-									var8.packetBuffer.method6619(var0); // L: 7968
-									var8.packetBuffer.writeIntME(var1); // L: 7969
-									Client.packetWriter.addNode(var8); // L: 7970
-									Client.field747 = 0; // L: 7971
-									GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7972
-									Client.field841 = var0; // L: 7973
-								} else if (var2 == 42) {
-									var8 = class21.getPacketBufferNode(ClientPacket.field2635, Client.packetWriter.isaacCipher); // L: 7926
-									var8.packetBuffer.method6612(var1); // L: 7927
-									var8.packetBuffer.writeShort(var3); // L: 7928
-									var8.packetBuffer.method6619(var0); // L: 7929
-									Client.packetWriter.addNode(var8); // L: 7930
-									Client.field747 = 0; // L: 7931
-									GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7932
-									Client.field841 = var0; // L: 7933
-								} else if (var2 == 43) {
-									var8 = class21.getPacketBufferNode(ClientPacket.field2633, Client.packetWriter.isaacCipher); // L: 7876
-									var8.packetBuffer.method6619(var3); // L: 7877
-									var8.packetBuffer.method6602(var0); // L: 7878
-									var8.packetBuffer.method6611(var1); // L: 7879
-									Client.packetWriter.addNode(var8); // L: 7880
-									Client.field747 = 0; // L: 7881
-									GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 7882
-									Client.field841 = var0; // L: 7883
-								} else if (var2 == 44) {
-									var15 = Client.players[var3]; // L: 8252
-									if (var15 != null) { // L: 8253
-										Client.mouseCrossX = var6; // L: 8254
-										Client.mouseCrossY = var7; // L: 8255
-										Client.mouseCrossColor = 2; // L: 8256
-										Client.mouseCrossState = 0; // L: 8257
-										Client.destinationX = var0; // L: 8258
-										Client.destinationY = var1; // L: 8259
-										var9 = class21.getPacketBufferNode(ClientPacket.field2597, Client.packetWriter.isaacCipher); // L: 8261
-										var9.packetBuffer.method6619(var3); // L: 8262
-										var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8263
-										Client.packetWriter.addNode(var9); // L: 8264
-									}
-								} else if (var2 == 45) {
-									var15 = Client.players[var3]; // L: 8210
-									if (var15 != null) { // L: 8211
-										Client.mouseCrossX = var6; // L: 8212
-										Client.mouseCrossY = var7; // L: 8213
-										Client.mouseCrossColor = 2; // L: 8214
-										Client.mouseCrossState = 0; // L: 8215
-										Client.destinationX = var0; // L: 8216
-										Client.destinationY = var1; // L: 8217
-										var9 = class21.getPacketBufferNode(ClientPacket.field2654, Client.packetWriter.isaacCipher); // L: 8219
-										var9.packetBuffer.method6600(var3); // L: 8220
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8221
-										Client.packetWriter.addNode(var9); // L: 8222
-									}
-								} else if (var2 == 46) {
-									var15 = Client.players[var3]; // L: 8166
-									if (var15 != null) { // L: 8167
-										Client.mouseCrossX = var6; // L: 8168
-										Client.mouseCrossY = var7; // L: 8169
-										Client.mouseCrossColor = 2; // L: 8170
-										Client.mouseCrossState = 0; // L: 8171
-										Client.destinationX = var0; // L: 8172
-										Client.destinationY = var1; // L: 8173
-										var9 = class21.getPacketBufferNode(ClientPacket.field2637, Client.packetWriter.isaacCipher); // L: 8175
-										var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8176
-										var9.packetBuffer.writeShort(var3); // L: 8177
-										Client.packetWriter.addNode(var9); // L: 8178
-									}
-								} else if (var2 == 47) {
-									var15 = Client.players[var3]; // L: 7817
-									if (var15 != null) { // L: 7818
-										Client.mouseCrossX = var6; // L: 7819
-										Client.mouseCrossY = var7; // L: 7820
-										Client.mouseCrossColor = 2; // L: 7821
-										Client.mouseCrossState = 0; // L: 7822
-										Client.destinationX = var0; // L: 7823
-										Client.destinationY = var1; // L: 7824
-										var9 = class21.getPacketBufferNode(ClientPacket.field2605, Client.packetWriter.isaacCipher); // L: 7826
-										var9.packetBuffer.method6619(var3); // L: 7827
-										var9.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7828
-										Client.packetWriter.addNode(var9); // L: 7829
-									}
-								} else if (var2 == 48) {
-									var15 = Client.players[var3]; // L: 8182
-									if (var15 != null) { // L: 8183
-										Client.mouseCrossX = var6; // L: 8184
-										Client.mouseCrossY = var7; // L: 8185
-										Client.mouseCrossColor = 2; // L: 8186
-										Client.mouseCrossState = 0; // L: 8187
-										Client.destinationX = var0; // L: 8188
-										Client.destinationY = var1; // L: 8189
-										var9 = class21.getPacketBufferNode(ClientPacket.field2602, Client.packetWriter.isaacCipher); // L: 8191
-										var9.packetBuffer.method6602(var3); // L: 8192
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8193
-										Client.packetWriter.addNode(var9); // L: 8194
-									}
-								} else if (var2 == 49) {
-									var15 = Client.players[var3]; // L: 8103
-									if (var15 != null) { // L: 8104
-										Client.mouseCrossX = var6; // L: 8105
-										Client.mouseCrossY = var7; // L: 8106
-										Client.mouseCrossColor = 2; // L: 8107
-										Client.mouseCrossState = 0; // L: 8108
-										Client.destinationX = var0; // L: 8109
-										Client.destinationY = var1; // L: 8110
-										var9 = class21.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 8112
-										var9.packetBuffer.method6581(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8113
-										var9.packetBuffer.method6602(var3); // L: 8114
-										Client.packetWriter.addNode(var9); // L: 8115
-									}
-								} else if (var2 == 50) {
-									var15 = Client.players[var3]; // L: 8226
-									if (var15 != null) { // L: 8227
-										Client.mouseCrossX = var6; // L: 8228
-										Client.mouseCrossY = var7; // L: 8229
-										Client.mouseCrossColor = 2; // L: 8230
-										Client.mouseCrossState = 0; // L: 8231
-										Client.destinationX = var0; // L: 8232
-										Client.destinationY = var1; // L: 8233
-										var9 = class21.getPacketBufferNode(ClientPacket.field2620, Client.packetWriter.isaacCipher); // L: 8235
-										var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8236
-										var9.packetBuffer.method6602(var3); // L: 8237
-										Client.packetWriter.addNode(var9); // L: 8238
-									}
-								} else if (var2 == 51) {
-									var15 = Client.players[var3]; // L: 8485
-									if (var15 != null) { // L: 8486
-										Client.mouseCrossX = var6; // L: 8487
-										Client.mouseCrossY = var7; // L: 8488
-										Client.mouseCrossColor = 2; // L: 8489
-										Client.mouseCrossState = 0; // L: 8490
-										Client.destinationX = var0; // L: 8491
-										Client.destinationY = var1; // L: 8492
-										var9 = class21.getPacketBufferNode(ClientPacket.field2656, Client.packetWriter.isaacCipher); // L: 8494
-										var9.packetBuffer.writeShort(var3); // L: 8495
-										var9.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8496
-										Client.packetWriter.addNode(var9); // L: 8497
-									}
-								} else {
-									label642: {
-										if (var2 != 57) {
-											if (var2 == 58) {
-												var16 = ModeWhere.getWidgetChild(var1, var0); // L: 7833
-												if (var16 != null) { // L: 7834
-													var9 = class21.getPacketBufferNode(ClientPacket.field2598, Client.packetWriter.isaacCipher); // L: 7836
-													var9.packetBuffer.writeIntME(var1); // L: 7837
-													var9.packetBuffer.method6619(var16.itemId); // L: 7838
-													var9.packetBuffer.method6600(Client.field788); // L: 7839
-													var9.packetBuffer.writeInt(Decimator.selectedSpellWidget); // L: 7840
-													var9.packetBuffer.method6619(Client.selectedSpellChildIndex); // L: 7841
-													var9.packetBuffer.method6600(var0); // L: 7842
-													Client.packetWriter.addNode(var9); // L: 7843
-												}
-												break label642;
-											}
-
-											if (var2 == 1001) {
-												Client.mouseCrossX = var6; // L: 8125
-												Client.mouseCrossY = var7; // L: 8126
-												Client.mouseCrossColor = 2; // L: 8127
-												Client.mouseCrossState = 0; // L: 8128
-												Client.destinationX = var0; // L: 8129
-												Client.destinationY = var1; // L: 8130
-												var8 = class21.getPacketBufferNode(ClientPacket.field2640, Client.packetWriter.isaacCipher); // L: 8132
-												var8.packetBuffer.method6602(var0 + VertexNormal.baseX); // L: 8133
-												var8.packetBuffer.method6594(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8134
-												var8.packetBuffer.writeShort(var3); // L: 8135
-												var8.packetBuffer.method6602(SoundSystem.baseY + var1); // L: 8136
-												Client.packetWriter.addNode(var8); // L: 8137
-												break label642;
-											}
-
-											if (var2 == 1002) {
-												Client.mouseCrossX = var6; // L: 7915
-												Client.mouseCrossY = var7; // L: 7916
-												Client.mouseCrossColor = 2; // L: 7917
-												Client.mouseCrossState = 0; // L: 7918
-												var8 = class21.getPacketBufferNode(ClientPacket.field2591, Client.packetWriter.isaacCipher); // L: 7920
-												var8.packetBuffer.method6600(var3); // L: 7921
-												Client.packetWriter.addNode(var8); // L: 7922
-												break label642;
-											}
-
-											if (var2 == 1003) {
-												Client.mouseCrossX = var6; // L: 8317
-												Client.mouseCrossY = var7; // L: 8318
-												Client.mouseCrossColor = 2; // L: 8319
-												Client.mouseCrossState = 0; // L: 8320
-												var13 = Client.npcs[var3]; // L: 8321
-												if (var13 != null) { // L: 8322
-													NPCComposition var17 = var13.definition; // L: 8323
-													if (var17.transforms != null) { // L: 8324
-														var17 = var17.transform();
-													}
-
-													if (var17 != null) { // L: 8325
-														var11 = class21.getPacketBufferNode(ClientPacket.field2578, Client.packetWriter.isaacCipher); // L: 8327
-														var11.packetBuffer.method6600(var17.id); // L: 8328
-														Client.packetWriter.addNode(var11); // L: 8329
-													}
-												}
-												break label642;
-											}
-
-											if (var2 == 1004) {
-												Client.mouseCrossX = var6; // L: 8242
-												Client.mouseCrossY = var7; // L: 8243
-												Client.mouseCrossColor = 2; // L: 8244
-												Client.mouseCrossState = 0; // L: 8245
-												var8 = class21.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); // L: 8247
-												var8.packetBuffer.method6600(var3); // L: 8248
-												Client.packetWriter.addNode(var8); // L: 8249
-												break label642;
-											}
-
-											if (var2 == 1005) {
-												var16 = Frames.getWidget(var1); // L: 8552
-												if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 8553
-													World.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + class260.ItemDefinition_get(var3).name);
-												} else {
-													var9 = class21.getPacketBufferNode(ClientPacket.field2646, Client.packetWriter.isaacCipher); // L: 8556
-													var9.packetBuffer.method6600(var3); // L: 8557
-													Client.packetWriter.addNode(var9); // L: 8558
-												}
-
-												Client.field747 = 0; // L: 8560
-												GrandExchangeEvents.field3626 = Frames.getWidget(var1); // L: 8561
-												Client.field841 = var0; // L: 8562
-												break label642;
-											}
-
-											if (var2 != 1007) {
-												if (var2 == 1009 || var2 == 1008 || var2 == 1010 || var2 == 1011 || var2 == 1012) {
-													class243.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 8385
-												}
-												break label642;
-											}
-										}
-
-										var16 = ModeWhere.getWidgetChild(var1, var0); // L: 8119
-										if (var16 != null) { // L: 8120
-											class376.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 8121
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (Client.isItemSelected != 0) { // L: 8579
-			Client.isItemSelected = 0; // L: 8580
-			WorldMapCacheName.invalidateWidget(Frames.getWidget(Player.selectedItemWidget)); // L: 8581
-		}
-
-		if (Client.isSpellSelected) { // L: 8583
-			class5.Widget_runOnTargetLeave();
-		}
-
-		if (GrandExchangeEvents.field3626 != null && Client.field747 == 0) { // L: 8584
-			WorldMapCacheName.invalidateWidget(GrandExchangeEvents.field3626);
-		}
-
-	} // L: 8585
-
-	@ObfuscatedName("lv")
+	@ObfuscatedName("hb")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2124366444"
+		garbageValue = "2884568"
 	)
-	static void method1999() {
-		if (Client.oculusOrbState == 1) { // L: 11504
-			Client.field724 = true; // L: 11505
+	@Export("addCancelMenuEntry")
+	static void addCancelMenuEntry() {
+		class34.method407(); // L: 7735
+		Client.menuActions[0] = "Cancel"; // L: 7736
+		Client.menuTargets[0] = ""; // L: 7737
+		Client.menuOpcodes[0] = 1006; // L: 7738
+		Client.menuShiftClick[0] = false; // L: 7739
+		Client.menuOptionsCount = 1; // L: 7740
+	} // L: 7741
+
+	@ObfuscatedName("ku")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I)V",
+		garbageValue = "-1229350050"
+	)
+	@Export("invalidateWidget")
+	static void invalidateWidget(Widget var0) {
+		if (var0.cycle == Client.field830) { // L: 11013
+			Client.field831[var0.rootIndex] = true; // L: 11014
 		}
 
-	} // L: 11507
+	} // L: 11016
 }
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index 4b2261d171..eb7d5dab57 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -3,76 +3,69 @@ 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("cz")
+@ObfuscatedName("cs")
 @Implements("ScriptEvent")
 public class ScriptEvent extends Node {
-	@ObfuscatedName("pk")
-	@ObfuscatedSignature(
-		descriptor = "Llm;"
-	)
-	@Export("privateChatMode")
-	static PrivateChatMode privateChatMode;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("args")
 	Object[] args;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("isMouseInputEvent")
 	boolean isMouseInputEvent;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("widget")
 	Widget widget;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1064015207
+		intValue = 666010529
 	)
 	@Export("mouseX")
 	int mouseX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 334920693
+		intValue = 1253492813
 	)
 	@Export("mouseY")
 	int mouseY;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 2026444209
+		intValue = -1848842303
 	)
 	@Export("opIndex")
 	int opIndex;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("dragTarget")
 	Widget dragTarget;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1025309887
+		intValue = 1390259441
 	)
 	@Export("keyTyped")
 	int keyTyped;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -754868141
+		intValue = 156564383
 	)
 	@Export("keyPressed")
 	int keyPressed;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("targetName")
 	String targetName;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 820352111
+		intValue = -1428737731
 	)
-	int field1180;
-	@ObfuscatedName("l")
+	int field1154;
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 487377745
+		intValue = 1474025505
 	)
 	@Export("type")
 	int type;
@@ -81,224 +74,23 @@ public class ScriptEvent extends Node {
 		this.type = 76; // L: 19
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "([Ljava/lang/Object;I)V",
-		garbageValue = "1143010333"
+		garbageValue = "-1554075021"
 	)
 	@Export("setArgs")
 	public void setArgs(Object[] var1) {
 		this.args = var1; // L: 22
 	} // L: 23
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "566555821"
+		garbageValue = "-1915392065"
 	)
 	@Export("setType")
 	public void setType(int var1) {
 		this.type = var1; // L: 26
 	} // L: 27
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1244600055"
-	)
-	static String method2086() {
-		return ObjectComposition.clientPreferences.hideUsername ? class6.method67(Login.Login_username) : Login.Login_username; // L: 188
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "0"
-	)
-	static int method2093(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1190
-		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1191
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var3)); // L: 1192
-			return 1; // L: 1193
-		} else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1195
-			if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1202
-				if (var3.dataText == null) { // L: 1203
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1204
-				}
-
-				return 1; // L: 1205
-			} else {
-				return 2; // L: 1207
-			}
-		} else {
-			int var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1196
-			--var4; // L: 1197
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1198
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1199
-			} else {
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1; // L: 1200
-		}
-	}
-
-	@ObfuscatedName("hs")
-	@ObfuscatedSignature(
-		descriptor = "(Lnb;I)V",
-		garbageValue = "-1497241252"
-	)
-	static final void method2094(PacketBuffer var0) {
-		for (int var1 = 0; var1 < Client.field685; ++var1) { // L: 7453
-			int var2 = Client.field686[var1]; // L: 7454
-			NPC var3 = Client.npcs[var2]; // L: 7455
-			int var4 = var0.readUnsignedByte(); // L: 7456
-			int var5;
-			int var6;
-			int var7;
-			if ((var4 & 32) != 0) { // L: 7457
-				var5 = var0.method6603(); // L: 7458
-				if (var5 == 65535) { // L: 7459
-					var5 = -1;
-				}
-
-				var6 = var0.method6549(); // L: 7460
-				if (var5 == var3.sequence && var5 != -1) { // L: 7461
-					var7 = LoginScreenAnimation.SequenceDefinition_get(var5).field1891; // L: 7462
-					if (var7 == 1) { // L: 7463
-						var3.sequenceFrame = 0; // L: 7464
-						var3.sequenceFrameCycle = 0; // L: 7465
-						var3.sequenceDelay = var6; // L: 7466
-						var3.field1245 = 0; // L: 7467
-					}
-
-					if (var7 == 2) { // L: 7469
-						var3.field1245 = 0; // L: 7470
-					}
-				} else if (var5 == -1 || var3.sequence == -1 || LoginScreenAnimation.SequenceDefinition_get(var5).field1885 >= LoginScreenAnimation.SequenceDefinition_get(var3.sequence).field1885) { // L: 7473
-					var3.sequence = var5; // L: 7474
-					var3.sequenceFrame = 0; // L: 7475
-					var3.sequenceFrameCycle = 0; // L: 7476
-					var3.sequenceDelay = var6; // L: 7477
-					var3.field1245 = 0; // L: 7478
-					var3.field1274 = var3.pathLength; // L: 7479
-				}
-			}
-
-			int var8;
-			if ((var4 & 8) != 0) { // L: 7483
-				var5 = var0.method6605(); // L: 7484
-				var6 = var0.readUnsignedShort(); // L: 7485
-				var7 = var3.x - (var5 - VertexNormal.baseX - VertexNormal.baseX) * 64; // L: 7486
-				var8 = var3.y - (var6 - SoundSystem.baseY - SoundSystem.baseY) * 64; // L: 7487
-				if (var7 != 0 || var8 != 0) { // L: 7488
-					var3.field1264 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
-				}
-			}
-
-			if ((var4 & 2) != 0) { // L: 7490
-				var3.definition = StructComposition.getNpcDefinition(var0.method6603()); // L: 7491
-				var3.field1239 = var3.definition.size; // L: 7492
-				var3.field1289 = var3.definition.rotation; // L: 7493
-				var3.walkSequence = var3.definition.walkSequence; // L: 7494
-				var3.walkBackSequence = var3.definition.walkBackSequence; // L: 7495
-				var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 7496
-				var3.walkRightSequence = var3.definition.walkRightSequence; // L: 7497
-				var3.idleSequence = var3.definition.idleSequence; // L: 7498
-				var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 7499
-				var3.turnRightSequence = var3.definition.turnRightSequence; // L: 7500
-			}
-
-			if ((var4 & 1) != 0) { // L: 7502
-				var3.targetIndex = var0.method6603(); // L: 7503
-				if (var3.targetIndex == 65535) { // L: 7504
-					var3.targetIndex = -1;
-				}
-			}
-
-			if ((var4 & 128) != 0) { // L: 7506
-				var3.field1278 = var0.method6597(); // L: 7507
-				var3.field1280 = var0.method6597(); // L: 7508
-				var3.field1269 = var0.method6559(); // L: 7509
-				var3.field1238 = var0.method6593(); // L: 7510
-				var3.field1265 = var0.method6604() + Client.cycle; // L: 7511
-				var3.field1283 = var0.method6603() + Client.cycle; // L: 7512
-				var3.field1284 = var0.method6604(); // L: 7513
-				var3.pathLength = 1; // L: 7514
-				var3.field1274 = 0; // L: 7515
-				var3.field1278 += var3.pathX[0]; // L: 7516
-				var3.field1280 += var3.pathY[0]; // L: 7517
-				var3.field1269 += var3.pathX[0]; // L: 7518
-				var3.field1238 += var3.pathY[0]; // L: 7519
-			}
-
-			if ((var4 & 64) != 0) { // L: 7521
-				var5 = var0.method6549(); // L: 7522
-				int var9;
-				int var10;
-				int var11;
-				if (var5 > 0) { // L: 7523
-					for (var6 = 0; var6 < var5; ++var6) { // L: 7524
-						var8 = -1; // L: 7526
-						var9 = -1; // L: 7527
-						var10 = -1; // L: 7528
-						var7 = var0.readUShortSmart(); // L: 7529
-						if (var7 == 32767) { // L: 7530
-							var7 = var0.readUShortSmart(); // L: 7531
-							var9 = var0.readUShortSmart(); // L: 7532
-							var8 = var0.readUShortSmart(); // L: 7533
-							var10 = var0.readUShortSmart(); // L: 7534
-						} else if (var7 != 32766) { // L: 7536
-							var9 = var0.readUShortSmart(); // L: 7537
-						} else {
-							var7 = -1; // L: 7539
-						}
-
-						var11 = var0.readUShortSmart(); // L: 7540
-						var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 7541
-					}
-				}
-
-				var6 = var0.method6671(); // L: 7544
-				if (var6 > 0) { // L: 7545
-					for (var7 = 0; var7 < var6; ++var7) { // L: 7546
-						var8 = var0.readUShortSmart(); // L: 7547
-						var9 = var0.readUShortSmart(); // L: 7548
-						if (var9 != 32767) { // L: 7549
-							var10 = var0.readUShortSmart(); // L: 7550
-							var11 = var0.method6671(); // L: 7551
-							int var12 = var9 > 0 ? var0.method6549() : var11; // L: 7552
-							var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 7553
-						} else {
-							var3.removeHealthBar(var8); // L: 7555
-						}
-					}
-				}
-			}
-
-			if ((var4 & 4) != 0) { // L: 7559
-				var3.spotAnimation = var0.method6605(); // L: 7560
-				var5 = var0.method6598(); // L: 7561
-				var3.field1277 = var5 >> 16; // L: 7562
-				var3.field1287 = (var5 & 65535) + Client.cycle; // L: 7563
-				var3.spotAnimationFrame = 0; // L: 7564
-				var3.spotAnimationFrameCycle = 0; // L: 7565
-				if (var3.field1287 > Client.cycle) { // L: 7566
-					var3.spotAnimationFrame = -1;
-				}
-
-				if (var3.spotAnimation == 65535) { // L: 7567
-					var3.spotAnimation = -1;
-				}
-			}
-
-			if ((var4 & 16) != 0) { // L: 7569
-				var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 7570
-				var3.overheadTextCyclesRemaining = 100; // L: 7571
-			}
-		}
-
-	} // L: 7574
 }
diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java
index fcd7bddba7..448c9cab5d 100644
--- a/runescape-client/src/main/java/ScriptFrame.java
+++ b/runescape-client/src/main/java/ScriptFrame.java
@@ -1,27 +1,31 @@
-import java.io.File;
-import java.io.RandomAccessFile;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bw")
+@ObfuscatedName("bu")
 @Implements("ScriptFrame")
 public class ScriptFrame {
-	@ObfuscatedName("v")
+	@ObfuscatedName("gv")
+	@ObfuscatedSignature(
+		descriptor = "[Loa;"
+	)
+	@Export("headIconPkSprites")
+	static SpritePixels[] headIconPkSprites;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "Lcf;"
 	)
 	@Export("script")
 	Script script;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -364828753
+		intValue = -186261179
 	)
 	@Export("pc")
 	int pc;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("intLocals")
 	int[] intLocals;
 	@ObfuscatedName("y")
@@ -32,399 +36,85 @@ public class ScriptFrame {
 		this.pc = -1; // L: 5
 	} // L: 9
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Ljava/io/File;",
-		garbageValue = "-128953674"
+		descriptor = "(II)I",
+		garbageValue = "-309151908"
 	)
-	@Export("getFile")
-	public static File getFile(String var0) {
-		if (!FileSystem.FileSystem_hasPermissions) { // L: 16
-			throw new RuntimeException("");
-		} else {
-			File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 17
-			if (var1 != null) { // L: 18
-				return var1;
-			} else {
-				File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19
-				RandomAccessFile var3 = null; // L: 20
-
-				try {
-					File var4 = new File(var2.getParent()); // L: 22
-					if (!var4.exists()) { // L: 23
-						throw new RuntimeException("");
-					} else {
-						var3 = new RandomAccessFile(var2, "rw"); // L: 24
-						int var5 = var3.read(); // L: 25
-						var3.seek(0L); // L: 26
-						var3.write(var5); // L: 27
-						var3.seek(0L); // L: 28
-						var3.close(); // L: 29
-						FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30
-						return var2; // L: 31
-					}
-				} catch (Exception var8) {
-					try {
-						if (var3 != null) { // L: 35
-							var3.close(); // L: 36
-							var3 = null; // L: 37
-						}
-					} catch (Exception var7) { // L: 40
-					}
-
-					throw new RuntimeException(); // L: 42
-				}
-			}
-		}
+	@Export("getVarbit")
+	public static int getVarbit(int var0) {
+		VarbitComposition var1 = WorldMapSection2.method3329(var0); // L: 24
+		int var2 = var1.baseVar; // L: 25
+		int var3 = var1.startBit; // L: 26
+		int var4 = var1.endBit; // L: 27
+		int var5 = Varps.Varps_masks[var4 - var3]; // L: 28
+		return Varps.Varps_main[var2] >> var3 & var5; // L: 29
 	}
 
-	@ObfuscatedName("gf")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "1213701936"
+		descriptor = "(I)V",
+		garbageValue = "-1244477807"
 	)
-	@Export("drawEntities")
-	static final void drawEntities(int var0, int var1, int var2, int var3) {
-		++Client.viewportDrawCount; // L: 4046
-		if (class93.localPlayer.x >> 7 == Client.destinationX && class93.localPlayer.y >> 7 == Client.destinationY) { // L: 4048
-			Client.destinationX = 0; // L: 4049
+	static void method1231() {
+		if (FaceNormal.loadWorlds()) { // L: 1519
+			Login.worldSelectOpen = true; // L: 1520
+			Login.worldSelectPage = 0; // L: 1521
+			Login.worldSelectPagesCount = 0; // L: 1522
 		}
 
-		Decimator.method1068(); // L: 4052
-		GameObject.method4279(); // L: 4053
-		GrandExchangeOfferOwnWorldComparator.addNpcsToScene(true); // L: 4054
-		class373.method6474(); // L: 4055
-		GrandExchangeOfferOwnWorldComparator.addNpcsToScene(false); // L: 4056
+	} // L: 1524
 
-		int var6;
-		for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { // L: 4058 4059 4076
-			if (var4.plane == class22.Client_plane && Client.cycle <= var4.cycleEnd) { // L: 4060
-				if (Client.cycle >= var4.cycleStart) { // L: 4061
-					if (var4.targetIndex > 0) { // L: 4062
-						NPC var19 = Client.npcs[var4.targetIndex - 1]; // L: 4063
-						if (var19 != null && var19.x >= 0 && var19.x < 13312 && var19.y >= 0 && var19.y < 13312) {
-							var4.setDestination(var19.x, var19.y, class105.getTileHeight(var19.x, var19.y, var4.plane) - var4.endHeight, Client.cycle); // L: 4064
-						}
-					}
+	@ObfuscatedName("ao")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "1365321694"
+	)
+	static int method1233(int var0) {
+		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3563
+	}
 
-					if (var4.targetIndex < 0) { // L: 4066
-						var6 = -var4.targetIndex - 1; // L: 4068
-						Player var22;
-						if (var6 == Client.localPlayerIndex) { // L: 4069
-							var22 = class93.localPlayer;
-						} else {
-							var22 = Client.players[var6]; // L: 4070
-						}
+	@ObfuscatedName("av")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "242905867"
+	)
+	@Export("runWidgetOnLoadListener")
+	static void runWidgetOnLoadListener(int var0) {
+		if (var0 != -1) { // L: 4396
+			if (class20.loadInterface(var0)) { // L: 4397
+				Widget[] var1 = GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0]; // L: 4398
 
-						if (var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) { // L: 4071
-							var4.setDestination(var22.x, var22.y, class105.getTileHeight(var22.x, var22.y, var4.plane) - var4.endHeight, Client.cycle);
-						}
-					}
-
-					var4.advance(Client.field913); // L: 4073
-					AbstractSocket.scene.drawEntity(class22.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); // L: 4074
-				}
-			} else {
-				var4.remove();
-			}
-		}
-
-		for (GraphicsObject var20 = (GraphicsObject)Client.graphicsObjects.last(); var20 != null; var20 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4080 4081 4088
-			if (var20.plane == class22.Client_plane && !var20.isFinished) { // L: 4082
-				if (Client.cycle >= var20.cycleStart) { // L: 4083
-					var20.advance(Client.field913); // L: 4084
-					if (var20.isFinished) { // L: 4085
-						var20.remove();
-					} else {
-						AbstractSocket.scene.drawEntity(var20.plane, var20.x, var20.y, var20.height, 60, var20, 0, -1L, false); // L: 4086
+				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 4399
+					Widget var3 = var1[var2]; // L: 4400
+					if (var3.onLoad != null) { // L: 4401
+						ScriptEvent var4 = new ScriptEvent(); // L: 4402
+						var4.widget = var3; // L: 4403
+						var4.args = var3.onLoad; // L: 4404
+						Varcs.runScript(var4, 5000000, 0); // L: 4405
 					}
 				}
-			} else {
-				var20.remove();
+
+			}
+		}
+	} // L: 4408
+
+	@ObfuscatedName("ll")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "1037794122"
+	)
+	static String method1232(String var0) {
+		PlayerType[] var1 = class106.PlayerType_values(); // L: 11685
+
+		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11686
+			PlayerType var3 = var1[var2]; // L: 11687
+			if (var3.modIcon != -1 && var0.startsWith(MusicPatchPcmStream.method4743(var3.modIcon))) { // L: 11689 11690
+				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11691
+				break;
 			}
 		}
 
-		UrlRequester.setViewportShape(var0, var1, var2, var3, true); // L: 4091
-		var0 = Client.viewportOffsetX; // L: 4092
-		var1 = Client.viewportOffsetY; // L: 4093
-		var2 = Client.viewportWidth; // L: 4094
-		var3 = Client.viewportHeight; // L: 4095
-		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4096
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4097
-		int var5;
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		int var11;
-		int var12;
-		int var13;
-		int var14;
-		int var18;
-		if (!Client.isCameraLocked) { // L: 4098
-			var18 = Client.camAngleX; // L: 4099
-			if (Client.field727 / 256 > var18) { // L: 4100
-				var18 = Client.field727 / 256;
-			}
-
-			if (Client.field693[4] && Client.field891[4] + 128 > var18) { // L: 4101
-				var18 = Client.field891[4] + 128;
-			}
-
-			var5 = Client.camAngleY & 2047; // L: 4102
-			var6 = RouteStrategy.oculusOrbFocalPointX; // L: 4103
-			var7 = class17.field148; // L: 4104
-			var8 = ModelData0.oculusOrbFocalPointY; // L: 4105
-			var9 = SecureRandomFuture.method1980(var18); // L: 4106
-			var9 = WorldMapDecoration.method3627(var9, var3); // L: 4108
-			var10 = 2048 - var18 & 2047; // L: 4109
-			var11 = 2048 - var5 & 2047; // L: 4110
-			var12 = 0; // L: 4111
-			var13 = 0; // L: 4112
-			var14 = var9; // L: 4113
-			int var15;
-			int var16;
-			int var17;
-			if (var10 != 0) { // L: 4114
-				var15 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4115
-				var16 = Rasterizer3D.Rasterizer3D_cosine[var10]; // L: 4116
-				var17 = var13 * var16 - var15 * var9 >> 16; // L: 4117
-				var14 = var15 * var13 + var9 * var16 >> 16; // L: 4118
-				var13 = var17; // L: 4119
-			}
-
-			if (var11 != 0) { // L: 4121
-				var15 = Rasterizer3D.Rasterizer3D_sine[var11]; // L: 4122
-				var16 = Rasterizer3D.Rasterizer3D_cosine[var11]; // L: 4123
-				var17 = var12 * var16 + var14 * var15 >> 16; // L: 4124
-				var14 = var14 * var16 - var12 * var15 >> 16; // L: 4125
-				var12 = var17; // L: 4126
-			}
-
-			MouseHandler.cameraX = var6 - var12; // L: 4128
-			SecureRandomCallable.cameraY = var7 - var13; // L: 4129
-			class105.cameraZ = var8 - var14; // L: 4130
-			SpotAnimationDefinition.cameraPitch = var18; // L: 4131
-			class376.cameraYaw = var5; // L: 4132
-			if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (RouteStrategy.oculusOrbFocalPointX >> 7 != class93.localPlayer.x >> 7 || ModelData0.oculusOrbFocalPointY >> 7 != class93.localPlayer.y >> 7)) { // L: 4133 4134
-				var15 = class93.localPlayer.plane; // L: 4135
-				var16 = (RouteStrategy.oculusOrbFocalPointX >> 7) + VertexNormal.baseX; // L: 4136
-				var17 = (ModelData0.oculusOrbFocalPointY >> 7) + SoundSystem.baseY; // L: 4137
-				class4.method50(var16, var17, var15, true); // L: 4138
-			}
-		}
-
-		if (!Client.isCameraLocked) { // L: 4144
-			if (ObjectComposition.clientPreferences.roofsHidden) { // L: 4147
-				var5 = class22.Client_plane; // L: 4148
-			} else {
-				label407: {
-					var6 = 3; // L: 4151
-					if (SpotAnimationDefinition.cameraPitch < 310) { // L: 4152
-						label405: {
-							if (Client.oculusOrbState == 1) { // L: 4155
-								var7 = RouteStrategy.oculusOrbFocalPointX >> 7; // L: 4156
-								var8 = ModelData0.oculusOrbFocalPointY >> 7; // L: 4157
-							} else {
-								var7 = class93.localPlayer.x >> 7; // L: 4160
-								var8 = class93.localPlayer.y >> 7; // L: 4161
-							}
-
-							var9 = MouseHandler.cameraX >> 7; // L: 4163
-							var10 = class105.cameraZ >> 7; // L: 4164
-							if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4165
-								if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 4169
-									if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4173
-										var6 = class22.Client_plane;
-									}
-
-									if (var7 > var9) { // L: 4175
-										var11 = var7 - var9;
-									} else {
-										var11 = var9 - var7; // L: 4176
-									}
-
-									if (var8 > var10) { // L: 4178
-										var12 = var8 - var10;
-									} else {
-										var12 = var10 - var8; // L: 4179
-									}
-
-									if (var11 > var12) { // L: 4180
-										var13 = var12 * 65536 / var11; // L: 4181
-										var14 = 32768; // L: 4182
-
-										while (true) {
-											if (var7 == var9) { // L: 4183
-												break label405;
-											}
-
-											if (var9 < var7) { // L: 4184
-												++var9;
-											} else if (var9 > var7) { // L: 4185
-												--var9;
-											}
-
-											if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4186
-												var6 = class22.Client_plane;
-											}
-
-											var14 += var13; // L: 4187
-											if (var14 >= 65536) { // L: 4188
-												var14 -= 65536; // L: 4189
-												if (var10 < var8) { // L: 4190
-													++var10;
-												} else if (var10 > var8) { // L: 4191
-													--var10;
-												}
-
-												if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4192
-													var6 = class22.Client_plane;
-												}
-											}
-										}
-									} else {
-										if (var12 > 0) { // L: 4196
-											var13 = var11 * 65536 / var12; // L: 4197
-											var14 = 32768; // L: 4198
-
-											while (var10 != var8) { // L: 4199
-												if (var10 < var8) { // L: 4200
-													++var10;
-												} else if (var10 > var8) { // L: 4201
-													--var10;
-												}
-
-												if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4202
-													var6 = class22.Client_plane;
-												}
-
-												var14 += var13; // L: 4203
-												if (var14 >= 65536) { // L: 4204
-													var14 -= 65536; // L: 4205
-													if (var9 < var7) { // L: 4206
-														++var9;
-													} else if (var9 > var7) { // L: 4207
-														--var9;
-													}
-
-													if ((Tiles.Tiles_renderFlags[class22.Client_plane][var9][var10] & 4) != 0) { // L: 4208
-														var6 = class22.Client_plane;
-													}
-												}
-											}
-										}
-										break label405;
-									}
-								}
-
-								var5 = class22.Client_plane; // L: 4170
-								break label407; // L: 4171
-							}
-
-							var5 = class22.Client_plane; // L: 4166
-							break label407; // L: 4167
-						}
-					}
-
-					if (class93.localPlayer.x >= 0 && class93.localPlayer.y >= 0 && class93.localPlayer.x < 13312 && class93.localPlayer.y < 13312) { // L: 4213
-						if ((Tiles.Tiles_renderFlags[class22.Client_plane][class93.localPlayer.x >> 7][class93.localPlayer.y >> 7] & 4) != 0) { // L: 4217
-							var6 = class22.Client_plane;
-						}
-
-						var5 = var6; // L: 4218
-					} else {
-						var5 = class22.Client_plane; // L: 4214
-					}
-				}
-			}
-
-			var18 = var5; // L: 4220
-		} else {
-			var18 = class32.method305(); // L: 4222
-		}
-
-		var5 = MouseHandler.cameraX; // L: 4223
-		var6 = SecureRandomCallable.cameraY; // L: 4224
-		var7 = class105.cameraZ; // L: 4225
-		var8 = SpotAnimationDefinition.cameraPitch; // L: 4226
-		var9 = class376.cameraYaw; // L: 4227
-
-		for (var10 = 0; var10 < 5; ++var10) { // L: 4228
-			if (Client.field693[var10]) { // L: 4229
-				var11 = (int)(Math.random() * (double)(Client.field890[var10] * 2 + 1) - (double)Client.field890[var10] + Math.sin((double)Client.field893[var10] * ((double)Client.field892[var10] / 100.0D)) * (double)Client.field891[var10]); // L: 4230
-				if (var10 == 0) { // L: 4231
-					MouseHandler.cameraX += var11;
-				}
-
-				if (var10 == 1) { // L: 4232
-					SecureRandomCallable.cameraY += var11;
-				}
-
-				if (var10 == 2) { // L: 4233
-					class105.cameraZ += var11;
-				}
-
-				if (var10 == 3) { // L: 4234
-					class376.cameraYaw = var11 + class376.cameraYaw & 2047;
-				}
-
-				if (var10 == 4) { // L: 4235
-					SpotAnimationDefinition.cameraPitch += var11; // L: 4236
-					if (SpotAnimationDefinition.cameraPitch < 128) { // L: 4237
-						SpotAnimationDefinition.cameraPitch = 128;
-					}
-
-					if (SpotAnimationDefinition.cameraPitch > 383) { // L: 4238
-						SpotAnimationDefinition.cameraPitch = 383;
-					}
-				}
-			}
-		}
-
-		var10 = MouseHandler.MouseHandler_x; // L: 4242
-		var11 = MouseHandler.MouseHandler_y; // L: 4243
-		if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4244
-			var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4245
-			var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4246
-		}
-
-		if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4248
-			class135.method2599(var10 - var0, var11 - var1); // L: 4249
-		} else {
-			class80.method1906(); // L: 4252
-		}
-
-		HealthBarUpdate.playPcmPlayers(); // L: 4254
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4255
-		HealthBarUpdate.playPcmPlayers(); // L: 4256
-		var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4257
-		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4258
-		AbstractSocket.scene.draw(MouseHandler.cameraX, SecureRandomCallable.cameraY, class105.cameraZ, SpotAnimationDefinition.cameraPitch, class376.cameraYaw, var18); // L: 4259
-		Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4260
-		HealthBarUpdate.playPcmPlayers(); // L: 4261
-		AbstractSocket.scene.clearTempGameObjects(); // L: 4262
-		NetCache.method5025(var0, var1, var2, var3); // L: 4263
-		ChatChannel.method2014(var0, var1); // L: 4264
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field913); // L: 4265
-		class27.method283(var0, var1, var2, var3); // L: 4266
-		MouseHandler.cameraX = var5; // L: 4267
-		SecureRandomCallable.cameraY = var6; // L: 4268
-		class105.cameraZ = var7; // L: 4269
-		SpotAnimationDefinition.cameraPitch = var8; // L: 4270
-		class376.cameraYaw = var9; // L: 4271
-		if (Client.isLoading) { // L: 4272
-			byte var21 = 0; // L: 4275
-			var14 = var21 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; // L: 4276
-			if (var14 == 0) { // L: 4280
-				Client.isLoading = false;
-			}
-		}
-
-		if (Client.isLoading) { // L: 4282
-			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4283
-			DirectByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); // L: 4284
-		}
-
-	} // L: 4286
+		return var0; // L: 11698
+	}
 }
diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java
index 17a5debb9e..5aa0340a37 100644
--- a/runescape-client/src/main/java/SecureRandomCallable.java
+++ b/runescape-client/src/main/java/SecureRandomCallable.java
@@ -1,37 +1,73 @@
-import java.security.SecureRandom;
+import java.io.File;
 import java.util.concurrent.Callable;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("co")
+@ObfuscatedName("cd")
 @Implements("SecureRandomCallable")
 public class SecureRandomCallable implements Callable {
-	@ObfuscatedName("hs")
-	@ObfuscatedGetter(
-		intValue = 45831589
-	)
-	@Export("cameraY")
-	static int cameraY;
+	@ObfuscatedName("y")
+	@Export("JagexCache_locationFile")
+	static File JagexCache_locationFile;
 
 	SecureRandomCallable() {
 	} // L: 36
 
 	public Object call() {
-		SecureRandom var2 = new SecureRandom(); // L: 47
-		var2.nextInt(); // L: 48
-		return var2; // L: 51
+		return GrandExchangeOfferOwnWorldComparator.method1271(); // L: 45
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "61"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V",
+		garbageValue = "0"
 	)
-	public static void method2055() {
-		SequenceDefinition.SequenceDefinition_cached.clear(); // L: 218
-		SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 219
-	} // L: 220
+	@Export("addChatMessage")
+	static void addChatMessage(int var0, String var1, String var2, String var3) {
+		ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23
+		if (var4 == null) { // L: 24
+			var4 = new ChatChannel(); // L: 25
+			Messages.Messages_channels.put(var0, var4); // L: 26
+		}
+
+		Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28
+		Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29
+		Messages.Messages_queue.add(var5); // L: 30
+		Client.chatCycle = Client.cycleCntr; // L: 31
+	} // L: 32
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-2065815479"
+	)
+	@Export("isKeyDown")
+	public static final boolean isKeyDown() {
+		synchronized(KeyHandler.KeyHandler_instance) { // L: 167
+			if (KeyHandler.field276 == KeyHandler.field277) { // L: 168
+				return false;
+			} else {
+				SoundCache.field446 = KeyHandler.field270[KeyHandler.field276]; // L: 169
+				Timer.field3780 = KeyHandler.field269[KeyHandler.field276]; // L: 170
+				KeyHandler.field276 = KeyHandler.field276 + 1 & 127; // L: 171
+				return true; // L: 172
+			}
+		}
+	}
+
+	@ObfuscatedName("lt")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;S)Ljava/lang/String;",
+		garbageValue = "32547"
+	)
+	@Export("Widget_getSpellActionName")
+	static String Widget_getSpellActionName(Widget var0) {
+		if (ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var0)) == 0) { // L: 11566
+			return null;
+		} else {
+			return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 11567 11568 11570
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java
index 793fbfdd48..2feb17111d 100644
--- a/runescape-client/src/main/java/SecureRandomFuture.java
+++ b/runescape-client/src/main/java/SecureRandomFuture.java
@@ -7,13 +7,19 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cr")
+@ObfuscatedName("cv")
 @Implements("SecureRandomFuture")
 public class SecureRandomFuture {
-	@ObfuscatedName("v")
+	@ObfuscatedName("dl")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive2")
+	static Archive archive2;
+	@ObfuscatedName("f")
 	@Export("executor")
 	ExecutorService executor;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("future")
 	Future future;
 
@@ -22,92 +28,58 @@ public class SecureRandomFuture {
 		this.future = this.executor.submit(new SecureRandomCallable()); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "32"
+		garbageValue = "96"
 	)
 	@Export("shutdown")
 	void shutdown() {
-		this.executor.shutdown();
-		this.executor = null;
-	}
+		this.executor.shutdown(); // L: 18
+		this.executor = null; // L: 19
+	} // L: 20
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1067207786"
+		garbageValue = "1235169435"
 	)
 	@Export("isDone")
 	boolean isDone() {
-		return this.future.isDone();
+		return this.future.isDone(); // L: 23
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/security/SecureRandom;",
-		garbageValue = "97"
+		descriptor = "(I)Ljava/security/SecureRandom;",
+		garbageValue = "-455615969"
 	)
 	@Export("get")
 	SecureRandom get() {
 		try {
-			return (SecureRandom)this.future.get();
+			return (SecureRandom)this.future.get(); // L: 28
 		} catch (Exception var2) { // L: 30
-			return PlayerComposition.method4711();
+			return GrandExchangeOfferOwnWorldComparator.method1271(); // L: 31
 		}
 	}
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "([I[II)V",
-		garbageValue = "-2018126556"
-	)
-	public static void method1981(int[] var0, int[] var1) {
-		if (var0 != null && var1 != null) { // L: 19
-			ByteArrayPool.ByteArrayPool_alternativeSizes = var0; // L: 25
-			ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26
-			class20.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27
-
-			for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28
-				class20.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29
-			}
-
-		} else {
-			ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 20
-			ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; // L: 21
-			class20.ByteArrayPool_arrays = null; // L: 22
-		}
-	} // L: 23 31
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-1561643653"
+		garbageValue = "-687753348"
 	)
-	static String method1982(int var0) {
-		return "<img=" + var0 + ">"; // L: 18
+	@Export("colorStartTag")
+	static String colorStartTag(int var0) {
+		return "<col=" + Integer.toHexString(var0) + ">"; // L: 22
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("ki")
 	@ObfuscatedSignature(
-		descriptor = "(Lmr;III)I",
-		garbageValue = "-1327945264"
+		descriptor = "(I)V",
+		garbageValue = "-758448635"
 	)
-	static int method1977(IterableNodeHashTable var0, int var1, int var2) {
-		if (var0 == null) { // L: 33
-			return var2;
-		} else {
-			IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34
-			return var3 == null ? var2 : var3.integer; // L: 35 36
-		}
-	}
-
-	@ObfuscatedName("fa")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "353118952"
-	)
-	static int method1980(int var0) {
-		return var0 * 3 + 600; // L: 1507
-	}
+	static final void method2085() {
+		Client.field819 = Client.cycleCntr; // L: 11466
+		class170.field2016 = true; // L: 11467
+	} // L: 11468
 }
diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java
index 5d6a047b17..032f036065 100644
--- a/runescape-client/src/main/java/SequenceDefinition.java
+++ b/runescape-client/src/main/java/SequenceDefinition.java
@@ -4,98 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fl")
+@ObfuscatedName("fm")
 @Implements("SequenceDefinition")
 public class SequenceDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("SequenceDefinition_archive")
 	public static AbstractArchive SequenceDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("SequenceDefinition_animationsArchive")
 	public static AbstractArchive SequenceDefinition_animationsArchive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("SequenceDefinition_skeletonsArchive")
 	public static AbstractArchive SequenceDefinition_skeletonsArchive;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("SequenceDefinition_cached")
-	static EvictingDualNodeHashTable SequenceDefinition_cached;
-	@ObfuscatedName("p")
+	public static EvictingDualNodeHashTable SequenceDefinition_cached;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("SequenceDefinition_cachedFrames")
-	static EvictingDualNodeHashTable SequenceDefinition_cachedFrames;
-	@ObfuscatedName("j")
+	public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames;
+	@ObfuscatedName("o")
 	@Export("frameIds")
 	public int[] frameIds;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("chatFrameIds")
 	int[] chatFrameIds;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("frameLengths")
 	public int[] frameLengths;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("soundEffects")
 	public int[] soundEffects;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 729318423
+		intValue = 403704851
 	)
 	@Export("frameCount")
 	public int frameCount;
-	@ObfuscatedName("u")
-	int[] field1884;
-	@ObfuscatedName("l")
-	public boolean field1882;
-	@ObfuscatedName("o")
+	@ObfuscatedName("z")
+	int[] field1886;
+	@ObfuscatedName("b")
+	public boolean field1888;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 213844623
+		intValue = -1860367517
 	)
-	public int field1885;
-	@ObfuscatedName("c")
+	public int field1892;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1368426299
+		intValue = -1677443273
 	)
 	@Export("shield")
 	public int shield;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -234609209
+		intValue = -757910463
 	)
 	@Export("weapon")
 	public int weapon;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 692165837
+		intValue = -374777757
 	)
-	public int field1888;
-	@ObfuscatedName("a")
+	public int field1896;
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1960140293
+		intValue = -302620765
 	)
-	public int field1883;
-	@ObfuscatedName("k")
+	public int field1895;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -263393733
+		intValue = 317689877
 	)
-	public int field1890;
-	@ObfuscatedName("m")
+	public int field1893;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1161864623
+		intValue = -2048501497
 	)
-	public int field1891;
+	public int field1894;
 
 	static {
 		SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15
@@ -104,25 +104,25 @@ public class SequenceDefinition extends DualNode {
 
 	SequenceDefinition() {
 		this.frameCount = -1; // L: 21
-		this.field1882 = false; // L: 23
-		this.field1885 = 5; // L: 24
+		this.field1888 = false; // L: 23
+		this.field1892 = 5; // L: 24
 		this.shield = -1; // L: 25
 		this.weapon = -1; // L: 26
-		this.field1888 = 99; // L: 27
-		this.field1883 = -1; // L: 28
-		this.field1890 = -1; // L: 29
-		this.field1891 = 2; // L: 30
+		this.field1896 = 99; // L: 27
+		this.field1895 = -1; // L: 28
+		this.field1893 = -1; // L: 29
+		this.field1894 = 2; // L: 30
 	} // L: 32
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;B)V",
-		garbageValue = "11"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1823528439"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte();
+			int var2 = var1.readUnsignedByte(); // L: 47
 			if (var2 == 0) { // L: 48
 				return; // L: 51
 			}
@@ -131,10 +131,10 @@ public class SequenceDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1165284602"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "48"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -157,34 +157,34 @@ public class SequenceDefinition extends DualNode {
 			for (var4 = 0; var4 < var3; ++var4) { // L: 60
 				this.frameIds[var4] += var1.readUnsignedShort() << 16;
 			}
-		} else if (var2 == 2) { // L: 62
+		} else if (var2 == 2) {
 			this.frameCount = var1.readUnsignedShort();
-		} else if (var2 == 3) { // L: 63
+		} else if (var2 == 3) {
 			var3 = var1.readUnsignedByte(); // L: 64
-			this.field1884 = new int[var3 + 1]; // L: 65
+			this.field1886 = new int[var3 + 1];
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 66
-				this.field1884[var4] = var1.readUnsignedByte();
+			for (var4 = 0; var4 < var3; ++var4) {
+				this.field1886[var4] = var1.readUnsignedByte();
 			}
 
-			this.field1884[var3] = 9999999; // L: 67
-		} else if (var2 == 4) { // L: 69
-			this.field1882 = true;
-		} else if (var2 == 5) { // L: 70
-			this.field1885 = var1.readUnsignedByte();
-		} else if (var2 == 6) { // L: 71
+			this.field1886[var3] = 9999999;
+		} else if (var2 == 4) {
+			this.field1888 = true;
+		} else if (var2 == 5) {
+			this.field1892 = var1.readUnsignedByte();
+		} else if (var2 == 6) {
 			this.shield = var1.readUnsignedShort();
 		} else if (var2 == 7) { // L: 72
 			this.weapon = var1.readUnsignedShort();
-		} else if (var2 == 8) { // L: 73
-			this.field1888 = var1.readUnsignedByte();
-		} else if (var2 == 9) { // L: 74
-			this.field1883 = var1.readUnsignedByte();
-		} else if (var2 == 10) { // L: 75
-			this.field1890 = var1.readUnsignedByte();
-		} else if (var2 == 11) { // L: 76
-			this.field1891 = var1.readUnsignedByte();
-		} else if (var2 == 12) { // L: 77
+		} else if (var2 == 8) {
+			this.field1896 = var1.readUnsignedByte();
+		} else if (var2 == 9) {
+			this.field1895 = var1.readUnsignedByte();
+		} else if (var2 == 10) {
+			this.field1893 = var1.readUnsignedByte();
+		} else if (var2 == 11) {
+			this.field1894 = var1.readUnsignedByte();
+		} else if (var2 == 12) {
 			var3 = var1.readUnsignedByte(); // L: 78
 			this.chatFrameIds = new int[var3]; // L: 79
 
@@ -192,7 +192,7 @@ public class SequenceDefinition extends DualNode {
 				this.chatFrameIds[var4] = var1.readUnsignedShort();
 			}
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 81
+			for (var4 = 0; var4 < var3; ++var4) {
 				this.chatFrameIds[var4] += var1.readUnsignedShort() << 16;
 			}
 		} else if (var2 == 13) { // L: 83
@@ -209,32 +209,32 @@ public class SequenceDefinition extends DualNode {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1519522081"
+		garbageValue = "-1961662829"
 	)
 	@Export("postDecode")
 	void postDecode() {
-		if (this.field1883 == -1) { // L: 92
-			if (this.field1884 != null) { // L: 93
-				this.field1883 = 2;
+		if (this.field1895 == -1) { // L: 92
+			if (this.field1886 != null) { // L: 93
+				this.field1895 = 2;
 			} else {
-				this.field1883 = 0; // L: 94
+				this.field1895 = 0; // L: 94
 			}
 		}
 
-		if (this.field1890 == -1) { // L: 96
-			if (this.field1884 != null) { // L: 97
-				this.field1890 = 2;
+		if (this.field1893 == -1) { // L: 96
+			if (this.field1886 != null) { // L: 97
+				this.field1893 = 2;
 			} else {
-				this.field1890 = 0; // L: 98
+				this.field1893 = 0; // L: 98
 			}
 		}
 
 	} // L: 100
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lgr;II)Lgr;",
-		garbageValue = "-2056462779"
+		descriptor = "(Lgd;II)Lgd;",
+		garbageValue = "-237449426"
 	)
 	@Export("transformActorModel")
 	public Model transformActorModel(Model var1, int var2) {
@@ -250,10 +250,10 @@ public class SequenceDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lgr;IIB)Lgr;",
-		garbageValue = "-63"
+		descriptor = "(Lgd;III)Lgd;",
+		garbageValue = "-188678867"
 	)
 	@Export("transformObjectModel")
 	Model transformObjectModel(Model var1, int var2, int var3) {
@@ -265,8 +265,8 @@ public class SequenceDefinition extends DualNode {
 		} else {
 			Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); // L: 117
 			var3 &= 3; // L: 118
-			if (var3 == 1) {
-				var5.rotateY270Ccw(); // L: 119
+			if (var3 == 1) { // L: 119
+				var5.rotateY270Ccw();
 			} else if (var3 == 2) { // L: 120
 				var5.rotateY180();
 			} else if (var3 == 3) { // L: 121
@@ -286,10 +286,10 @@ public class SequenceDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lgr;II)Lgr;",
-		garbageValue = "1547720783"
+		descriptor = "(Lgd;IB)Lgd;",
+		garbageValue = "-1"
 	)
 	@Export("transformSpotAnimationModel")
 	Model transformSpotAnimationModel(Model var1, int var2) {
@@ -305,10 +305,10 @@ public class SequenceDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lgr;ILfl;II)Lgr;",
-		garbageValue = "-924612466"
+		descriptor = "(Lgd;ILfm;II)Lgd;",
+		garbageValue = "-1179378305"
 	)
 	@Export("applyTransformations")
 	public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) {
@@ -328,16 +328,16 @@ public class SequenceDefinition extends DualNode {
 				return var7; // L: 150
 			} else {
 				var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152
-				var7.animate2(var5, var2, var6, var4, this.field1884); // L: 153
+				var7.animate2(var5, var2, var6, var4, this.field1886); // L: 153
 				return var7; // L: 154
 			}
 		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lgr;II)Lgr;",
-		garbageValue = "1569515982"
+		descriptor = "(Lgd;II)Lgd;",
+		garbageValue = "-23683496"
 	)
 	@Export("transformWidgetModel")
 	public Model transformWidgetModel(Model var1, int var2) {
@@ -369,61 +369,29 @@ public class SequenceDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "2003025544"
+		descriptor = "([BB)V",
+		garbageValue = "-88"
 	)
-	public static int method3149(int var0) {
-		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 42
-		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 43
-		var0 = var0 + (var0 >>> 4) & 252645135; // L: 44
-		var0 += var0 >>> 8; // L: 45
-		var0 += var0 >>> 16; // L: 46
-		return var0 & 255; // L: 47
-	}
-
-	@ObfuscatedName("kq")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I)Z",
-		garbageValue = "376048815"
-	)
-	static final boolean method3148(Widget var0) {
-		int var1 = var0.contentType; // L: 11093
-		if (var1 == 205) { // L: 11094
-			Client.logoutTimer = 250; // L: 11095
-			return true; // L: 11096
+	@Export("ByteArrayPool_release")
+	public static synchronized void ByteArrayPool_release(byte[] var0) {
+		if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 61
+			ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 62
+		} else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 65
+			ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 66
+		} else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 69
+			ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 70
 		} else {
-			int var2;
-			int var3;
-			if (var1 >= 300 && var1 <= 313) { // L: 11098
-				var2 = (var1 - 300) / 2; // L: 11099
-				var3 = var1 & 1; // L: 11100
-				Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11101
+			if (Tiles.ByteArrayPool_arrays != null) { // L: 73
+				for (int var1 = 0; var1 < class372.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 74
+					if (var0.length == class372.ByteArrayPool_alternativeSizes[var1] && WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var1] < Tiles.ByteArrayPool_arrays[var1].length) { // L: 75
+						Tiles.ByteArrayPool_arrays[var1][WorldMapScaleHandler.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 76
+						return; // L: 77
+					}
+				}
 			}
 
-			if (var1 >= 314 && var1 <= 323) { // L: 11103
-				var2 = (var1 - 314) / 2; // L: 11104
-				var3 = var1 & 1; // L: 11105
-				Client.playerAppearance.method4703(var2, var3 == 1); // L: 11106
-			}
-
-			if (var1 == 324) { // L: 11108
-				Client.playerAppearance.changeSex(false);
-			}
-
-			if (var1 == 325) { // L: 11109
-				Client.playerAppearance.changeSex(true);
-			}
-
-			if (var1 == 326) { // L: 11110
-				PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2674, Client.packetWriter.isaacCipher); // L: 11112
-				Client.playerAppearance.write(var4.packetBuffer); // L: 11113
-				Client.packetWriter.addNode(var4); // L: 11114
-				return true; // L: 11115
-			} else {
-				return false; // L: 11117
-			}
 		}
-	}
+	} // L: 63 67 71 81
 }
diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java
index f686921f2b..8ab0dd7f88 100644
--- a/runescape-client/src/main/java/ServerPacket.java
+++ b/runescape-client/src/main/java/ServerPacket.java
@@ -4,674 +4,597 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hl")
+@ObfuscatedName("hs")
 @Implements("ServerPacket")
 public class ServerPacket {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2780;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2751;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2702;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2703;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2704;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2705;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2706;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2798;
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2708;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2785;
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2729;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2711;
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2748;
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2713;
+	public static final ServerPacket field2752;
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2714;
-	@ObfuscatedName("g")
+	public static final ServerPacket field2704;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2760;
-	@ObfuscatedName("a")
+	public static final ServerPacket field2705;
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2716;
-	@ObfuscatedName("k")
+	public static final ServerPacket field2706;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2717;
+	public static final ServerPacket field2707;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2708;
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2746;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2719;
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
 	public static final ServerPacket field2709;
-	@ObfuscatedName("w")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2746;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2711;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2728;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2713;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2714;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2715;
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2716;
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
 	)
 	public static final ServerPacket field2721;
 	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2715;
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2723;
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2724;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2725;
-	@ObfuscatedName("ae")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2726;
-	@ObfuscatedName("ap")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2775;
-	@ObfuscatedName("ab")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2756;
-	@ObfuscatedName("al")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2722;
-	@ObfuscatedName("ad")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2764;
-	@ObfuscatedName("ai")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2731;
-	@ObfuscatedName("ar")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2712;
-	@ObfuscatedName("ag")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2795;
-	@ObfuscatedName("ax")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2734;
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2735;
-	@ObfuscatedName("aj")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2700;
-	@ObfuscatedName("am")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2737;
-	@ObfuscatedName("az")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2749;
-	@ObfuscatedName("av")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2739;
-	@ObfuscatedName("ac")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2740;
-	@ObfuscatedName("at")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2741;
-	@ObfuscatedName("ah")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2742;
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2743;
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2744;
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2745;
-	@ObfuscatedName("af")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2774;
-	@ObfuscatedName("ak")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2732;
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2773;
-	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2738;
-	@ObfuscatedName("au")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2750;
-	@ObfuscatedName("an")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2747;
-	@ObfuscatedName("bd")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2752;
-	@ObfuscatedName("bt")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2753;
-	@ObfuscatedName("bq")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2754;
-	@ObfuscatedName("bu")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2755;
-	@ObfuscatedName("bl")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2757;
-	@ObfuscatedName("bv")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2789;
-	@ObfuscatedName("bm")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2710;
-	@ObfuscatedName("bz")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2759;
-	@ObfuscatedName("bh")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2793;
-	@ObfuscatedName("bs")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2761;
-	@ObfuscatedName("br")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2762;
-	@ObfuscatedName("bf")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2763;
-	@ObfuscatedName("ba")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2787;
-	@ObfuscatedName("be")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2765;
-	@ObfuscatedName("bj")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2784;
-	@ObfuscatedName("bx")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2767;
-	@ObfuscatedName("bp")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2730;
-	@ObfuscatedName("bn")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2769;
-	@ObfuscatedName("bo")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2770;
-	@ObfuscatedName("bw")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2771;
-	@ObfuscatedName("bi")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2772;
-	@ObfuscatedName("bb")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2768;
-	@ObfuscatedName("bk")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2701;
-	@ObfuscatedName("bg")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
 	public static final ServerPacket field2718;
-	@ObfuscatedName("by")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2776;
-	@ObfuscatedName("bc")
+	public static final ServerPacket field2719;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2777;
-	@ObfuscatedName("cd")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
 	public static final ServerPacket field2778;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2779;
-	@ObfuscatedName("cv")
+	public static final ServerPacket field2765;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
-	public static final ServerPacket field2794;
-	@ObfuscatedName("cp")
+	public static final ServerPacket field2722;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2781;
-	@ObfuscatedName("ci")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2782;
-	@ObfuscatedName("ct")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2783;
-	@ObfuscatedName("cq")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2727;
-	@ObfuscatedName("cr")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2728;
-	@ObfuscatedName("cf")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2786;
-	@ObfuscatedName("cn")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2707;
-	@ObfuscatedName("cs")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2788;
-	@ObfuscatedName("cg")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2766;
-	@ObfuscatedName("co")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2790;
-	@ObfuscatedName("ck")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2791;
-	@ObfuscatedName("cj")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
-	)
-	public static final ServerPacket field2792;
-	@ObfuscatedName("cc")
-	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
 	)
 	public static final ServerPacket field2720;
-	@ObfuscatedName("cu")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lhl;"
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2724;
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2725;
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2726;
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2712;
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2753;
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2732;
+	@ObfuscatedName("ak")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2773;
+	@ObfuscatedName("ad")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2731;
+	@ObfuscatedName("at")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2798;
+	@ObfuscatedName("ah")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2733;
+	@ObfuscatedName("az")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2734;
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2735;
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2717;
+	@ObfuscatedName("ab")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2737;
+	@ObfuscatedName("aq")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2738;
+	@ObfuscatedName("ae")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2739;
+	@ObfuscatedName("ao")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2740;
+	@ObfuscatedName("an")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2741;
+	@ObfuscatedName("al")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2742;
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2743;
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2744;
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2710;
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2793;
+	@ObfuscatedName("ay")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2747;
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2723;
+	@ObfuscatedName("aa")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2749;
+	@ObfuscatedName("ai")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2748;
+	@ObfuscatedName("av")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2751;
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2727;
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
 	)
 	public static final ServerPacket field2736;
-	@ObfuscatedName("fm")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "Ldo;"
+		descriptor = "Lhs;"
 	)
-	@Export("urlRequester")
-	static UrlRequester urlRequester;
+	public static final ServerPacket field2754;
+	@ObfuscatedName("bq")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2755;
+	@ObfuscatedName("bx")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2703;
+	@ObfuscatedName("bi")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2757;
+	@ObfuscatedName("bz")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2758;
+	@ObfuscatedName("bb")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2799;
+	@ObfuscatedName("bv")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2760;
+	@ObfuscatedName("bc")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2761;
+	@ObfuscatedName("be")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2762;
+	@ObfuscatedName("ba")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2763;
+	@ObfuscatedName("bs")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2764;
+	@ObfuscatedName("br")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2794;
+	@ObfuscatedName("bw")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2766;
+	@ObfuscatedName("by")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2767;
+	@ObfuscatedName("bt")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2768;
+	@ObfuscatedName("bg")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2769;
+	@ObfuscatedName("bm")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2770;
+	@ObfuscatedName("bj")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2771;
+	@ObfuscatedName("bo")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2772;
+	@ObfuscatedName("bn")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2759;
+	@ObfuscatedName("bu")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2774;
+	@ObfuscatedName("bl")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2775;
+	@ObfuscatedName("bd")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2776;
+	@ObfuscatedName("bp")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2777;
+	@ObfuscatedName("bk")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2780;
+	@ObfuscatedName("bh")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2779;
+	@ObfuscatedName("bf")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2730;
+	@ObfuscatedName("cm")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2781;
+	@ObfuscatedName("cx")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2750;
+	@ObfuscatedName("cq")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2782;
 	@ObfuscatedName("cz")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2784;
+	@ObfuscatedName("cc")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2785;
+	@ObfuscatedName("cu")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2786;
+	@ObfuscatedName("cp")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2729;
+	@ObfuscatedName("cv")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2792;
+	@ObfuscatedName("cf")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2789;
+	@ObfuscatedName("cb")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2790;
+	@ObfuscatedName("cg")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2783;
+	@ObfuscatedName("ca")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2791;
+	@ObfuscatedName("cd")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2745;
+	@ObfuscatedName("ce")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2756;
+	@ObfuscatedName("cy")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2795;
+	@ObfuscatedName("ct")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2796;
+	@ObfuscatedName("ci")
+	@ObfuscatedSignature(
+		descriptor = "Lhs;"
+	)
+	public static final ServerPacket field2797;
+	@ObfuscatedName("cs")
 	@ObfuscatedGetter(
-		intValue = -1581409905
+		intValue = -1501005443
 	)
 	@Export("id")
 	public final int id;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("co")
 	@ObfuscatedGetter(
-		intValue = -17713621
+		intValue = -2132505615
 	)
 	@Export("length")
 	public final int length;
 
 	static {
-		field2780 = new ServerPacket(0, -2); // L: 5
-		field2751 = new ServerPacket(1, 0); // L: 6
-		field2702 = new ServerPacket(2, 3); // L: 7
-		field2703 = new ServerPacket(3, 8); // L: 8
-		field2704 = new ServerPacket(4, 5); // L: 9
-		field2705 = new ServerPacket(5, 5); // L: 10
-		field2706 = new ServerPacket(6, 4); // L: 11
-		field2798 = new ServerPacket(7, -2);
-		field2708 = new ServerPacket(8, 2);
-		field2785 = new ServerPacket(9, -1);
-		field2729 = new ServerPacket(10, -1);
-		field2711 = new ServerPacket(11, 5);
-		field2748 = new ServerPacket(12, 4);
-		field2713 = new ServerPacket(13, -2);
-		field2714 = new ServerPacket(14, 1);
-		field2760 = new ServerPacket(15, 1);
-		field2716 = new ServerPacket(16, -2);
-		field2717 = new ServerPacket(17, 6);
-		field2746 = new ServerPacket(18, 14);
-		field2719 = new ServerPacket(19, -1);
-		field2709 = new ServerPacket(20, 15);
-		field2721 = new ServerPacket(21, 6);
-		field2715 = new ServerPacket(22, 4);
-		field2723 = new ServerPacket(23, 0);
-		field2724 = new ServerPacket(24, 6);
-		field2725 = new ServerPacket(25, 5);
-		field2726 = new ServerPacket(26, -2);
-		field2775 = new ServerPacket(27, -2);
-		field2756 = new ServerPacket(28, 2);
-		field2722 = new ServerPacket(29, 0);
-		field2764 = new ServerPacket(30, 8);
-		field2731 = new ServerPacket(31, 6);
-		field2712 = new ServerPacket(32, 2);
-		field2795 = new ServerPacket(33, 4);
-		field2734 = new ServerPacket(34, 1);
-		field2735 = new ServerPacket(35, -2);
-		field2700 = new ServerPacket(36, 2);
-		field2737 = new ServerPacket(37, -1); // L: 42
-		field2749 = new ServerPacket(38, -2); // L: 43
-		field2739 = new ServerPacket(39, -2); // L: 44
-		field2740 = new ServerPacket(40, 2); // L: 45
-		field2741 = new ServerPacket(41, 1); // L: 46
-		field2742 = new ServerPacket(42, -1); // L: 47
-		field2743 = new ServerPacket(43, 8); // L: 48
-		field2744 = new ServerPacket(44, 4); // L: 49
-		field2745 = new ServerPacket(45, -2); // L: 50
-		field2774 = new ServerPacket(46, 6); // L: 51
-		field2732 = new ServerPacket(47, 6); // L: 52
-		field2773 = new ServerPacket(48, 7); // L: 53
-		field2738 = new ServerPacket(49, -1); // L: 54
-		field2750 = new ServerPacket(50, 5); // L: 55
-		field2747 = new ServerPacket(51, 8); // L: 56
-		field2752 = new ServerPacket(52, 20); // L: 57
-		field2753 = new ServerPacket(53, 10); // L: 58
-		field2754 = new ServerPacket(54, -1); // L: 59
-		field2755 = new ServerPacket(55, 0); // L: 60
-		field2757 = new ServerPacket(56, -2); // L: 61
-		field2789 = new ServerPacket(57, 0); // L: 62
-		field2710 = new ServerPacket(58, -2); // L: 63
-		field2759 = new ServerPacket(59, 6); // L: 64
-		field2793 = new ServerPacket(60, 2); // L: 65
-		field2761 = new ServerPacket(61, 4); // L: 66
-		field2762 = new ServerPacket(62, 10); // L: 67
-		field2763 = new ServerPacket(63, -1); // L: 68
-		field2787 = new ServerPacket(64, 6); // L: 69
-		field2765 = new ServerPacket(65, -2); // L: 70
-		field2784 = new ServerPacket(66, 28); // L: 71
-		field2767 = new ServerPacket(67, -2); // L: 72
-		field2730 = new ServerPacket(68, 0); // L: 73
-		field2769 = new ServerPacket(69, 7); // L: 74
-		field2770 = new ServerPacket(70, 3); // L: 75
-		field2771 = new ServerPacket(71, -2); // L: 76
-		field2772 = new ServerPacket(72, 2); // L: 77
-		field2768 = new ServerPacket(73, -2); // L: 78
-		field2701 = new ServerPacket(74, 6); // L: 79
-		field2718 = new ServerPacket(75, 12); // L: 80
-		field2776 = new ServerPacket(76, 6); // L: 81
-		field2777 = new ServerPacket(77, 1); // L: 82
-		field2778 = new ServerPacket(78, 0); // L: 83
-		field2779 = new ServerPacket(79, -2); // L: 84
-		field2794 = new ServerPacket(80, 1); // L: 85
-		field2781 = new ServerPacket(81, -2); // L: 86
-		field2782 = new ServerPacket(82, 0); // L: 87
-		field2783 = new ServerPacket(83, 2); // L: 88
-		field2727 = new ServerPacket(84, -2); // L: 89
-		field2728 = new ServerPacket(85, 2); // L: 90
-		field2786 = new ServerPacket(86, -2); // L: 91
-		field2707 = new ServerPacket(87, -2); // L: 92
-		field2788 = new ServerPacket(88, 6); // L: 93
-		field2766 = new ServerPacket(89, -2); // L: 94
-		field2790 = new ServerPacket(90, 0); // L: 95
-		field2791 = new ServerPacket(91, 2); // L: 96
-		field2792 = new ServerPacket(92, -2); // L: 97
-		field2720 = new ServerPacket(93, -1); // L: 98
-		field2736 = new ServerPacket(94, 4); // L: 99
+		field2752 = new ServerPacket(0, -2); // L: 5
+		field2704 = new ServerPacket(1, 0); // L: 6
+		field2705 = new ServerPacket(2, 0); // L: 7
+		field2706 = new ServerPacket(3, 7); // L: 8
+		field2707 = new ServerPacket(4, -2); // L: 9
+		field2708 = new ServerPacket(5, 4); // L: 10
+		field2709 = new ServerPacket(6, 2); // L: 11
+		field2746 = new ServerPacket(7, 15); // L: 12
+		field2711 = new ServerPacket(8, -2); // L: 13
+		field2728 = new ServerPacket(9, 2); // L: 14
+		field2713 = new ServerPacket(10, -2); // L: 15
+		field2714 = new ServerPacket(11, 2); // L: 16
+		field2715 = new ServerPacket(12, 5); // L: 17
+		field2716 = new ServerPacket(13, 0); // L: 18
+		field2721 = new ServerPacket(14, -2); // L: 19
+		field2718 = new ServerPacket(15, 4); // L: 20
+		field2719 = new ServerPacket(16, 6); // L: 21
+		field2778 = new ServerPacket(17, 0); // L: 22
+		field2765 = new ServerPacket(18, -2); // L: 23
+		field2722 = new ServerPacket(19, -2); // L: 24
+		field2720 = new ServerPacket(20, 0); // L: 25
+		field2724 = new ServerPacket(21, 8); // L: 26
+		field2725 = new ServerPacket(22, 6); // L: 27
+		field2726 = new ServerPacket(23, -2); // L: 28
+		field2712 = new ServerPacket(24, 1); // L: 29
+		field2753 = new ServerPacket(25, 20); // L: 30
+		field2732 = new ServerPacket(26, -2); // L: 31
+		field2773 = new ServerPacket(27, 1); // L: 32
+		field2731 = new ServerPacket(28, -1); // L: 33
+		field2798 = new ServerPacket(29, 6); // L: 34
+		field2733 = new ServerPacket(30, -2); // L: 35
+		field2734 = new ServerPacket(31, -2); // L: 36
+		field2735 = new ServerPacket(32, -1); // L: 37
+		field2717 = new ServerPacket(33, 8); // L: 38
+		field2737 = new ServerPacket(34, -1); // L: 39
+		field2738 = new ServerPacket(35, 6); // L: 40
+		field2739 = new ServerPacket(36, -1); // L: 41
+		field2740 = new ServerPacket(37, -1); // L: 42
+		field2741 = new ServerPacket(38, 2); // L: 43
+		field2742 = new ServerPacket(39, 5); // L: 44
+		field2743 = new ServerPacket(40, 6); // L: 45
+		field2744 = new ServerPacket(41, -2); // L: 46
+		field2710 = new ServerPacket(42, -1); // L: 47
+		field2793 = new ServerPacket(43, -1); // L: 48
+		field2747 = new ServerPacket(44, 3); // L: 49
+		field2723 = new ServerPacket(45, 6); // L: 50
+		field2749 = new ServerPacket(46, -2); // L: 51
+		field2748 = new ServerPacket(47, 5); // L: 52
+		field2751 = new ServerPacket(48, 7); // L: 53
+		field2727 = new ServerPacket(49, -1); // L: 54
+		field2736 = new ServerPacket(50, 12); // L: 55
+		field2754 = new ServerPacket(51, 2); // L: 56
+		field2755 = new ServerPacket(52, 10); // L: 57
+		field2703 = new ServerPacket(53, 3); // L: 58
+		field2757 = new ServerPacket(54, -2); // L: 59
+		field2758 = new ServerPacket(55, 0); // L: 60
+		field2799 = new ServerPacket(56, 10); // L: 61
+		field2760 = new ServerPacket(57, 0); // L: 62
+		field2761 = new ServerPacket(58, 1); // L: 63
+		field2762 = new ServerPacket(59, 5); // L: 64
+		field2763 = new ServerPacket(60, 2); // L: 65
+		field2764 = new ServerPacket(61, -2); // L: 66
+		field2794 = new ServerPacket(62, 14); // L: 67
+		field2766 = new ServerPacket(63, 28); // L: 68
+		field2767 = new ServerPacket(64, -2); // L: 69
+		field2768 = new ServerPacket(65, 1); // L: 70
+		field2769 = new ServerPacket(66, 5); // L: 71
+		field2770 = new ServerPacket(67, -2); // L: 72
+		field2771 = new ServerPacket(68, 4); // L: 73
+		field2772 = new ServerPacket(69, 4); // L: 74
+		field2759 = new ServerPacket(70, 6); // L: 75
+		field2774 = new ServerPacket(71, 6); // L: 76
+		field2775 = new ServerPacket(72, 6); // L: 77
+		field2776 = new ServerPacket(73, -2); // L: 78
+		field2777 = new ServerPacket(74, 2); // L: 79
+		field2780 = new ServerPacket(75, 2); // L: 80
+		field2779 = new ServerPacket(76, -2); // L: 81
+		field2730 = new ServerPacket(77, -2); // L: 82
+		field2781 = new ServerPacket(78, 6); // L: 83
+		field2750 = new ServerPacket(79, -2); // L: 84
+		field2782 = new ServerPacket(80, 0); // L: 85
+		field2784 = new ServerPacket(81, 4); // L: 86
+		field2785 = new ServerPacket(82, 4); // L: 87
+		field2786 = new ServerPacket(83, 0); // L: 88
+		field2729 = new ServerPacket(84, -2); // L: 89
+		field2792 = new ServerPacket(85, 8); // L: 90
+		field2789 = new ServerPacket(86, 1); // L: 91
+		field2790 = new ServerPacket(87, -1); // L: 92
+		field2783 = new ServerPacket(88, 2); // L: 93
+		field2791 = new ServerPacket(89, 4); // L: 94
+		field2745 = new ServerPacket(90, 6); // L: 95
+		field2756 = new ServerPacket(91, 2); // L: 96
+		field2795 = new ServerPacket(92, -2); // L: 97
+		field2796 = new ServerPacket(93, 8); // L: 98
+		field2797 = new ServerPacket(94, 1); // L: 99
 	}
 
 	ServerPacket(int var1, int var2) {
 		this.id = var1; // L: 108
 		this.length = var2; // L: 109
 	} // L: 110
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(CB)B",
-		garbageValue = "53"
-	)
-	@Export("charToByteCp1252")
-	public static byte charToByteCp1252(char var0) {
-		byte var1;
-		if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12
-			var1 = (byte)var0;
-		} else if (var0 == 8364) { // L: 13
-			var1 = -128;
-		} else if (var0 == 8218) { // L: 14
-			var1 = -126;
-		} else if (var0 == 402) { // L: 15
-			var1 = -125;
-		} else if (var0 == 8222) { // L: 16
-			var1 = -124;
-		} else if (var0 == 8230) { // L: 17
-			var1 = -123;
-		} else if (var0 == 8224) { // L: 18
-			var1 = -122;
-		} else if (var0 == 8225) { // L: 19
-			var1 = -121;
-		} else if (var0 == 710) { // L: 20
-			var1 = -120;
-		} else if (var0 == 8240) { // L: 21
-			var1 = -119;
-		} else if (var0 == 352) { // L: 22
-			var1 = -118;
-		} else if (var0 == 8249) { // L: 23
-			var1 = -117;
-		} else if (var0 == 338) { // L: 24
-			var1 = -116;
-		} else if (var0 == 381) { // L: 25
-			var1 = -114;
-		} else if (var0 == 8216) { // L: 26
-			var1 = -111;
-		} else if (var0 == 8217) { // L: 27
-			var1 = -110;
-		} else if (var0 == 8220) { // L: 28
-			var1 = -109;
-		} else if (var0 == 8221) { // L: 29
-			var1 = -108;
-		} else if (var0 == 8226) { // L: 30
-			var1 = -107;
-		} else if (var0 == 8211) { // L: 31
-			var1 = -106;
-		} else if (var0 == 8212) { // L: 32
-			var1 = -105;
-		} else if (var0 == 732) { // L: 33
-			var1 = -104;
-		} else if (var0 == 8482) { // L: 34
-			var1 = -103;
-		} else if (var0 == 353) { // L: 35
-			var1 = -102;
-		} else if (var0 == 8250) { // L: 36
-			var1 = -101;
-		} else if (var0 == 339) { // L: 37
-			var1 = -100;
-		} else if (var0 == 382) { // L: 38
-			var1 = -98;
-		} else if (var0 == 376) { // L: 39
-			var1 = -97;
-		} else {
-			var1 = 63; // L: 40
-		}
-
-		return var1; // L: 41
-	}
 }
diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java
index 8c6161f2c7..720a3a2b8c 100644
--- a/runescape-client/src/main/java/Skeleton.java
+++ b/runescape-client/src/main/java/Skeleton.java
@@ -4,27 +4,22 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ge")
+@ObfuscatedName("gb")
 @Implements("Skeleton")
 public class Skeleton extends Node {
-	@ObfuscatedName("ak")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1049112805
-	)
-	static int field2287;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -2039033351
+		intValue = 1170142713
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1780750535
+		intValue = 213807601
 	)
 	@Export("count")
 	int count;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("transformTypes")
 	int[] transformTypes;
 	@ObfuscatedName("y")
@@ -55,63 +50,44 @@ public class Skeleton extends Node {
 
 	} // L: 23
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-651931102"
-	)
-	@Export("getVarbit")
-	public static int getVarbit(int var0) {
-		VarbitComposition var1 = FontName.method6299(var0); // L: 24
-		int var2 = var1.baseVar; // L: 25
-		int var3 = var1.startBit; // L: 26
-		int var4 = var1.endBit; // L: 27
-		int var5 = Varps.Varps_masks[var4 - var3]; // L: 28
-		return Varps.Varps_main[var2] >> var3 & var5; // L: 29
-	}
-
-	@ObfuscatedName("r")
+	@ObfuscatedName("ia")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-2037150007"
+		garbageValue = "-913891462"
 	)
-	static void method3921() {
-		ItemContainer.itemContainers = new NodeHashTable(32); // L: 78
-	} // L: 79
+	static final void method4034() {
+		boolean var0 = false; // L: 8917
 
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "-698896598"
-	)
-	static final int method3920(int var0, int var1, int var2) {
-		int var3 = var0 / var2; // L: 804
-		int var4 = var0 & var2 - 1; // L: 805
-		int var5 = var1 / var2; // L: 806
-		int var6 = var1 & var2 - 1; // L: 807
-		int var7 = Occluder.method4109(var3, var5); // L: 808
-		int var8 = Occluder.method4109(var3 + 1, var5); // L: 809
-		int var9 = Occluder.method4109(var3, var5 + 1); // L: 810
-		int var10 = Occluder.method4109(var3 + 1, var5 + 1); // L: 811
-		int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; // L: 814
-		int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); // L: 815
-		int var13 = SoundSystem.method806(var9, var10, var4, var2); // L: 818
-		int var15 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 821
-		int var14 = ((65536 - var15) * var11 >> 16) + (var13 * var15 >> 16); // L: 822
-		return var14; // L: 824
-	}
+		while (!var0) { // L: 8918
+			var0 = true; // L: 8919
 
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		descriptor = "(ILii;ZI)V",
-		garbageValue = "1737731022"
-	)
-	static void method3922(int var0, Coord var1, boolean var2) {
-		WorldMapArea var3 = HealthBarUpdate.getWorldMap().getMapArea(var0); // L: 4336
-		int var4 = class93.localPlayer.plane; // L: 4337
-		int var5 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 4338
-		int var6 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 4339
-		Coord var7 = new Coord(var4, var5, var6); // L: 4340
-		HealthBarUpdate.getWorldMap().method6291(var3, var7, var1, var2); // L: 4341
-	} // L: 4342
+			for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8920
+				if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 8921
+					String var2 = Client.menuTargets[var1]; // L: 8922
+					Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8923
+					Client.menuTargets[var1 + 1] = var2; // L: 8924
+					String var3 = Client.menuActions[var1]; // L: 8925
+					Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8926
+					Client.menuActions[var1 + 1] = var3; // L: 8927
+					int var4 = Client.menuOpcodes[var1]; // L: 8928
+					Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8929
+					Client.menuOpcodes[var1 + 1] = var4; // L: 8930
+					var4 = Client.menuArguments1[var1]; // L: 8931
+					Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8932
+					Client.menuArguments1[var1 + 1] = var4; // L: 8933
+					var4 = Client.menuArguments2[var1]; // L: 8934
+					Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8935
+					Client.menuArguments2[var1 + 1] = var4; // L: 8936
+					var4 = Client.menuIdentifiers[var1]; // L: 8937
+					Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8938
+					Client.menuIdentifiers[var1 + 1] = var4; // L: 8939
+					boolean var5 = Client.menuShiftClick[var1]; // L: 8940
+					Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8941
+					Client.menuShiftClick[var1 + 1] = var5; // L: 8942
+					var0 = false; // L: 8943
+				}
+			}
+		}
+
+	} // L: 8947
 }
diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java
index 7006181b56..a500864d7f 100644
--- a/runescape-client/src/main/java/Skills.java
+++ b/runescape-client/src/main/java/Skills.java
@@ -3,21 +3,23 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iw")
+@ObfuscatedName("ij")
 @Implements("Skills")
 public class Skills {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("Skills_enabled")
 	public static final boolean[] Skills_enabled;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("Skills_experienceTable")
 	public static int[] Skills_experienceTable;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("b")
+	public static short[][] field3175;
+	@ObfuscatedName("he")
 	@ObfuscatedSignature(
-		descriptor = "Lcb;"
+		descriptor = "[Loa;"
 	)
-	@Export("mouseRecorder")
-	static MouseRecorder mouseRecorder;
+	@Export("headIconHintSprites")
+	static SpritePixels[] headIconHintSprites;
 
 	static {
 		Skills_enabled = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false}; // L: 5
diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java
index 139d9e3eda..03b249b1ab 100644
--- a/runescape-client/src/main/java/SoftWrapper.java
+++ b/runescape-client/src/main/java/SoftWrapper.java
@@ -3,10 +3,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("hc")
+@ObfuscatedName("hn")
 @Implements("SoftWrapper")
 public class SoftWrapper extends Wrapper {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("ref")
 	SoftReference ref;
 
@@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper {
 		this.ref = new SoftReference(var1); // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("get")
 	Object get() {
 		return this.ref.get(); // L: 15
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("isSoft")
 	boolean isSoft() {
 		return true; // L: 19
diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java
index 0fdf4ba7bd..88f889cc64 100644
--- a/runescape-client/src/main/java/SoundCache.java
+++ b/runescape-client/src/main/java/SoundCache.java
@@ -1,59 +1,66 @@
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
+import java.awt.Component;
+import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bu")
+@ObfuscatedName("bz")
 @Implements("SoundCache")
 public class SoundCache {
-	@ObfuscatedName("rw")
-	@ObfuscatedGetter(
-		intValue = -1515591247
+	@ObfuscatedName("rj")
+	@ObfuscatedSignature(
+		descriptor = "Lbq;"
 	)
-	static int field468;
-	@ObfuscatedName("j")
+	@Export("pcmPlayer0")
+	static PcmPlayer pcmPlayer0;
+	@ObfuscatedName("rz")
 	@ObfuscatedGetter(
-		intValue = 264174683
+		intValue = 1079033783
 	)
-	@Export("idxCount")
-	public static int idxCount;
-	@ObfuscatedName("de")
+	static int field448;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "Ljp;"
 	)
-	@Export("archive10")
-	static Archive archive10;
-	@ObfuscatedName("v")
+	@Export("ItemDefinition_modelArchive")
+	public static AbstractArchive ItemDefinition_modelArchive;
+	@ObfuscatedName("ce")
+	@ObfuscatedGetter(
+		intValue = -1271809059
+	)
+	public static int field446;
+	@ObfuscatedName("ez")
+	static int[] field438;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("soundEffectIndex")
 	AbstractArchive soundEffectIndex;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("musicSampleIndex")
 	AbstractArchive musicSampleIndex;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("musicSamples")
 	NodeHashTable musicSamples;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lmd;"
+		descriptor = "Lmn;"
 	)
 	@Export("rawSounds")
 	NodeHashTable rawSounds;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;)V"
+		descriptor = "(Ljp;Ljp;)V"
 	)
 	public SoundCache(AbstractArchive var1, AbstractArchive var2) {
 		this.musicSamples = new NodeHashTable(256); // L: 9
@@ -62,10 +69,10 @@ public class SoundCache {
 		this.musicSampleIndex = var2; // L: 14
 	} // L: 15
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II[IB)Lau;",
-		garbageValue = "22"
+		descriptor = "(II[IB)Lar;",
+		garbageValue = "58"
 	)
 	@Export("getSoundEffect0")
 	RawSound getSoundEffect0(int var1, int var2, int[] var3) {
@@ -78,8 +85,8 @@ public class SoundCache {
 		} else if (var3 != null && var3[0] <= 0) { // L: 23
 			return null;
 		} else {
-			SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2);
-			if (var8 == null) {
+			SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24
+			if (var8 == null) { // L: 25
 				return null;
 			} else {
 				var7 = var8.toRawSound(); // L: 26
@@ -93,10 +100,10 @@ public class SoundCache {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II[IB)Lau;",
-		garbageValue = "83"
+		descriptor = "(II[II)Lar;",
+		garbageValue = "822692099"
 	)
 	@Export("getMusicSample0")
 	RawSound getMusicSample0(int var1, int var2, int[] var3) {
@@ -130,10 +137,10 @@ public class SoundCache {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I[IB)Lau;",
-		garbageValue = "36"
+		descriptor = "(I[II)Lar;",
+		garbageValue = "-2090630447"
 	)
 	@Export("getSoundEffect")
 	public RawSound getSoundEffect(int var1, int[] var2) {
@@ -148,8 +155,8 @@ public class SoundCache {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I[II)Lau;",
-		garbageValue = "2094009970"
+		descriptor = "(I[II)Lar;",
+		garbageValue = "-1103543677"
 	)
 	@Export("getMusicSample")
 	public RawSound getMusicSample(int var1, int[] var2) {
@@ -162,162 +169,369 @@ public class SoundCache {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/awt/Component;B)V",
+		garbageValue = "-55"
+	)
+	static void method932(Component var0) {
+		var0.setFocusTraversalKeysEnabled(false); // L: 155
+		var0.addKeyListener(KeyHandler.KeyHandler_instance); // L: 156
+		var0.addFocusListener(KeyHandler.KeyHandler_instance); // L: 157
+	} // L: 158
+
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1930699867"
+		garbageValue = "1363768741"
 	)
-	public static void method811() {
-		class69.reflectionChecks = new IterableNodeDeque(); // L: 24
-	} // L: 25
+	static void method928() {
+		Players.Players_count = 0; // L: 618
 
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "([Lbg;II[I[II)V",
-		garbageValue = "-408447852"
-	)
-	@Export("sortWorlds")
-	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
-		if (var1 < var2) { // L: 81
-			int var5 = var1 - 1; // L: 82
-			int var6 = var2 + 1; // L: 83
-			int var7 = (var2 + var1) / 2; // L: 84
-			World var8 = var0[var7]; // L: 85
-			var0[var7] = var0[var1]; // L: 86
-			var0[var1] = var8; // L: 87
-
-			while (var5 < var6) { // L: 88
-				boolean var9 = true; // L: 89
-
-				int var10;
-				int var11;
-				int var12;
-				do {
-					--var6; // L: 91
-
-					for (var10 = 0; var10 < 4; ++var10) { // L: 92
-						if (var3[var10] == 2) { // L: 95
-							var11 = var0[var6].index; // L: 96
-							var12 = var8.index; // L: 97
-						} else if (var3[var10] == 1) { // L: 99
-							var11 = var0[var6].population; // L: 100
-							var12 = var8.population; // L: 101
-							if (var11 == -1 && var4[var10] == 1) { // L: 102
-								var11 = 2001;
-							}
-
-							if (var12 == -1 && var4[var10] == 1) { // L: 103
-								var12 = 2001;
-							}
-						} else if (var3[var10] == 3) { // L: 105
-							var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106
-							var12 = var8.isMembersOnly() ? 1 : 0; // L: 107
-						} else {
-							var11 = var0[var6].id; // L: 110
-							var12 = var8.id; // L: 111
-						}
-
-						if (var11 != var12) { // L: 113
-							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117
-								var9 = false; // L: 119
-							}
-							break;
-						}
-
-						if (var10 == 3) { // L: 114
-							var9 = false;
-						}
-					}
-				} while(var9);
-
-				var9 = true; // L: 124
-
-				do {
-					++var5; // L: 126
-
-					for (var10 = 0; var10 < 4; ++var10) { // L: 127
-						if (var3[var10] == 2) { // L: 130
-							var11 = var0[var5].index; // L: 131
-							var12 = var8.index; // L: 132
-						} else if (var3[var10] == 1) { // L: 134
-							var11 = var0[var5].population; // L: 135
-							var12 = var8.population; // L: 136
-							if (var11 == -1 && var4[var10] == 1) { // L: 137
-								var11 = 2001;
-							}
-
-							if (var12 == -1 && var4[var10] == 1) { // L: 138
-								var12 = 2001;
-							}
-						} else if (var3[var10] == 3) { // L: 140
-							var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141
-							var12 = var8.isMembersOnly() ? 1 : 0; // L: 142
-						} else {
-							var11 = var0[var5].id; // L: 145
-							var12 = var8.id; // L: 146
-						}
-
-						if (var11 != var12) { // L: 148
-							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152
-								var9 = false; // L: 154
-							}
-							break;
-						}
-
-						if (var10 == 3) { // L: 149
-							var9 = false;
-						}
-					}
-				} while(var9);
-
-				if (var5 < var6) { // L: 159
-					World var13 = var0[var5]; // L: 160
-					var0[var5] = var0[var6]; // L: 161
-					var0[var6] = var13; // L: 162
-				}
-			}
-
-			sortWorlds(var0, var1, var6, var3, var4); // L: 165
-			sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166
+		for (int var0 = 0; var0 < 2048; ++var0) { // L: 619
+			Players.field1362[var0] = null; // L: 620
+			Players.field1361[var0] = 1; // L: 621
 		}
 
-	} // L: 168
+	} // L: 623
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1514973539"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-943679526"
 	)
-	public static void method830() {
-		try {
-			File var0 = new File(class22.userHomeDirectory, "random.dat"); // L: 195
-			int var2;
-			if (var0.exists()) { // L: 196
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 197
+	static int method929(int var0, Script var1, boolean var2) {
+		String var3;
+		int var9;
+		if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2992
+			var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 2993
+			var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2994
+			Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2995
+			return 1; // L: 2996
+		} else {
+			String var4;
+			if (var0 == ScriptOpcodes.APPEND) { // L: 2998
+				UserComparator9.Interpreter_stringStackSize -= 2; // L: 2999
+				var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3000
+				var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3001
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + var4; // L: 3002
+				return 1; // L: 3003
+			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 3005
+				var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3006
+				var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3007
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + HealthBarDefinition.intToString(var9, true); // L: 3008
+				return 1; // L: 3009
+			} else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 3011
+				var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3012
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 3013
+				return 1; // L: 3014
 			} else {
-				label38:
-				for (int var1 = 0; var1 < PlayerType.cacheSubPaths.length; ++var1) { // L: 200
-					for (var2 = 0; var2 < InterfaceParent.cacheParentPaths.length; ++var2) { // L: 201
-						File var3 = new File(InterfaceParent.cacheParentPaths[var2] + PlayerType.cacheSubPaths[var1] + File.separatorChar + "random.dat"); // L: 202
-						if (var3.exists()) { // L: 203
-							JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 204
-							break label38; // L: 205
+				int var6;
+				int var10;
+				if (var0 == ScriptOpcodes.FROMDATE) { // L: 3016
+					var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3017
+					long var13 = ((long)var10 + 11745L) * 86400000L; // L: 3018
+					Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 3019
+					var6 = Interpreter.Interpreter_calendar.get(5); // L: 3020
+					int var17 = Interpreter.Interpreter_calendar.get(2); // L: 3021
+					int var8 = Interpreter.Interpreter_calendar.get(1); // L: 3022
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 3023
+					return 1; // L: 3024
+				} else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 3026
+					if (var0 == ScriptOpcodes.TOSTRING) { // L: 3034
+						var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3035
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3036
+						return 1; // L: 3037
+					} else if (var0 == ScriptOpcodes.COMPARE) { // L: 3039
+						UserComparator9.Interpreter_stringStackSize -= 2; // L: 3040
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class269.method5000(class226.compareStrings(Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1], AbstractArchive.clientLanguage)); // L: 3041
+						return 1; // L: 3042
+					} else {
+						int var5;
+						byte[] var11;
+						Font var12;
+						if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3044
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3045
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3046
+							var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3047
+							var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3048
+							var11 = GrandExchangeOfferOwnWorldComparator.archive13.takeFile(var5, 0); // L: 3049
+							var12 = new Font(var11); // L: 3050
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3051
+							return 1; // L: 3052
+						} else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3054
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3055
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3056
+							var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3057
+							var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3058
+							var11 = GrandExchangeOfferOwnWorldComparator.archive13.takeFile(var5, 0); // L: 3059
+							var12 = new Font(var11); // L: 3060
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3061
+							return 1; // L: 3062
+						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3064
+							UserComparator9.Interpreter_stringStackSize -= 2; // L: 3065
+							var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3066
+							var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3067
+							if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 3068
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3;
+							} else {
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4; // L: 3069
+							}
+
+							return 1; // L: 3070
+						} else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3072
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3073
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3074
+							return 1; // L: 3075
+						} else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3077
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3078
+							var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3079
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3080
+							return 1; // L: 3081
+						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3083
+							var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3084
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = GameBuild.isCharPrintable((char)var10) ? 1 : 0; // L: 3085
+							return 1; // L: 3086
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3088
+							var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3089
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DynamicObject.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3090
+							return 1; // L: 3091
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3093
+							var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3094
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = HitSplatDefinition.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3095
+							return 1; // L: 3096
+						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3098
+							var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3099
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class105.isDigit((char)var10) ? 1 : 0; // L: 3100
+							return 1; // L: 3101
+						} else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3103
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3104
+							if (var3 != null) { // L: 3105
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.length();
+							} else {
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3106
+							}
+
+							return 1; // L: 3107
+						} else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3109
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3110
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3111
+							var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3112
+							var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3113
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3114
+							return 1; // L: 3115
+						} else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3117
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3118
+							StringBuilder var15 = new StringBuilder(var3.length()); // L: 3119
+							boolean var16 = false; // L: 3120
+
+							for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3121
+								char var7 = var3.charAt(var6); // L: 3122
+								if (var7 == '<') { // L: 3123
+									var16 = true;
+								} else if (var7 == '>') { // L: 3124
+									var16 = false;
+								} else if (!var16) { // L: 3125
+									var15.append(var7);
+								}
+							}
+
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3127
+							return 1; // L: 3128
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3130
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3131
+							var9 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3132
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3133
+							return 1; // L: 3134
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3136
+							UserComparator9.Interpreter_stringStackSize -= 2; // L: 3137
+							var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3138
+							var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3139
+							var5 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3140
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3141
+							return 1; // L: 3142
+						} else if (var0 == 4122) { // L: 3144
+							var3 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3145
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3146
+							return 1; // L: 3147
+						} else {
+							return 2; // L: 3149
 						}
 					}
+				} else {
+					UserComparator9.Interpreter_stringStackSize -= 2; // L: 3027
+					var3 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3028
+					var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3029
+					if (class262.localPlayer.appearance != null && class262.localPlayer.appearance.isFemale) { // L: 3030
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4;
+					} else {
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3; // L: 3031
+					}
+
+					return 1; // L: 3032
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("gu")
+	@ObfuscatedSignature(
+		descriptor = "(Lcl;B)V",
+		garbageValue = "-11"
+	)
+	static final void method930(Actor var0) {
+		var0.movementSequence = var0.idleSequence; // L: 4198
+		if (var0.pathLength == 0) { // L: 4199
+			var0.field1242 = 0; // L: 4200
+		} else {
+			if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4203
+				SequenceDefinition var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.sequence); // L: 4204
+				if (var0.field1281 > 0 && var1.field1895 == 0) { // L: 4205
+					++var0.field1242; // L: 4206
+					return; // L: 4207
+				}
+
+				if (var0.field1281 <= 0 && var1.field1893 == 0) { // L: 4209
+					++var0.field1242; // L: 4210
+					return; // L: 4211
 				}
 			}
 
-			if (JagexCache.JagexCache_randomDat == null) { // L: 210
-				RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 211
-				var2 = var4.read(); // L: 212
-				var4.seek(0L); // L: 213
-				var4.write(var2); // L: 214
-				var4.seek(0L); // L: 215
-				var4.close(); // L: 216
-				JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 217
+			int var10 = var0.x; // L: 4214
+			int var2 = var0.y; // L: 4215
+			int var3 = var0.field1225 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 4216
+			int var4 = var0.field1225 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 4217
+			if (var10 < var3) { // L: 4218
+				if (var2 < var4) { // L: 4219
+					var0.orientation = 1280;
+				} else if (var2 > var4) { // L: 4220
+					var0.orientation = 1792;
+				} else {
+					var0.orientation = 1536; // L: 4221
+				}
+			} else if (var10 > var3) { // L: 4223
+				if (var2 < var4) { // L: 4224
+					var0.orientation = 768;
+				} else if (var2 > var4) { // L: 4225
+					var0.orientation = 256;
+				} else {
+					var0.orientation = 512; // L: 4226
+				}
+			} else if (var2 < var4) { // L: 4228
+				var0.orientation = 1024;
+			} else if (var2 > var4) { // L: 4229
+				var0.orientation = 0;
 			}
-		} catch (IOException var5) { // L: 220
-		}
 
-	} // L: 221
+			byte var5 = var0.pathTraversed[var0.pathLength - 1]; // L: 4230
+			if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { // L: 4231
+				int var6 = var0.orientation - var0.rotation & 2047; // L: 4238
+				if (var6 > 1024) { // L: 4239
+					var6 -= 2048;
+				}
+
+				int var7 = var0.walkBackSequence; // L: 4240
+				if (var6 >= -256 && var6 <= 256) { // L: 4241
+					var7 = var0.walkSequence;
+				} else if (var6 >= 256 && var6 < 768) { // L: 4242
+					var7 = var0.walkRightSequence;
+				} else if (var6 >= -768 && var6 <= -256) { // L: 4243
+					var7 = var0.walkLeftSequence;
+				}
+
+				if (var7 == -1) {
+					var7 = var0.walkSequence; // L: 4244
+				}
+
+				var0.movementSequence = var7; // L: 4245
+				int var8 = 4; // L: 4246
+				boolean var9 = true; // L: 4247
+				if (var0 instanceof NPC) { // L: 4248
+					var9 = ((NPC)var0).definition.isClickable;
+				}
+
+				if (var9) { // L: 4249
+					if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field1275 != 0) { // L: 4250
+						var8 = 2;
+					}
+
+					if (var0.pathLength > 2) { // L: 4251
+						var8 = 6;
+					}
+
+					if (var0.pathLength > 3) { // L: 4252
+						var8 = 8;
+					}
+
+					if (var0.field1242 > 0 && var0.pathLength > 1) { // L: 4253
+						var8 = 8; // L: 4254
+						--var0.field1242; // L: 4255
+					}
+				} else {
+					if (var0.pathLength > 1) { // L: 4259
+						var8 = 6;
+					}
+
+					if (var0.pathLength > 2) { // L: 4260
+						var8 = 8;
+					}
+
+					if (var0.field1242 > 0 && var0.pathLength > 1) { // L: 4261
+						var8 = 8; // L: 4262
+						--var0.field1242; // L: 4263
+					}
+				}
+
+				if (var5 == 2) { // L: 4266
+					var8 <<= 1;
+				}
+
+				if (var8 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 4267
+					var0.movementSequence = var0.runSequence;
+				}
+
+				if (var10 != var3 || var2 != var4) { // L: 4268
+					if (var10 < var3) { // L: 4269
+						var0.x += var8; // L: 4270
+						if (var0.x > var3) { // L: 4271
+							var0.x = var3;
+						}
+					} else if (var10 > var3) { // L: 4273
+						var0.x -= var8; // L: 4274
+						if (var0.x < var3) { // L: 4275
+							var0.x = var3;
+						}
+					}
+
+					if (var2 < var4) { // L: 4277
+						var0.y += var8; // L: 4278
+						if (var0.y > var4) { // L: 4279
+							var0.y = var4;
+						}
+					} else if (var2 > var4) { // L: 4281
+						var0.y -= var8; // L: 4282
+						if (var0.y < var4) { // L: 4283
+							var0.y = var4;
+						}
+					}
+				}
+
+				if (var3 == var0.x && var4 == var0.y) { // L: 4286
+					--var0.pathLength; // L: 4287
+					if (var0.field1281 > 0) { // L: 4288
+						--var0.field1281;
+					}
+				}
+
+			} else {
+				var0.x = var3; // L: 4232
+				var0.y = var4; // L: 4233
+				--var0.pathLength; // L: 4234
+				if (var0.field1281 > 0) {
+					--var0.field1281; // L: 4235
+				}
+
+			}
+		}
+	} // L: 4201 4236 4290
 }
diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java
index 81b93afc7c..f002ca8051 100644
--- a/runescape-client/src/main/java/SoundEffect.java
+++ b/runescape-client/src/main/java/SoundEffect.java
@@ -3,16 +3,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aa")
+@ObfuscatedName("ax")
 @Implements("SoundEffect")
 public class SoundEffect {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "[Lbx;"
+		descriptor = "[Lbm;"
 	)
 	@Export("instruments")
 	Instrument[] instruments;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("start")
 	int start;
 	@ObfuscatedName("y")
@@ -20,7 +20,7 @@ public class SoundEffect {
 	int end;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	SoundEffect(Buffer var1) {
 		this.instruments = new Instrument[10]; // L: 10
@@ -38,9 +38,9 @@ public class SoundEffect {
 		this.end = var1.readUnsignedShort(); // L: 29
 	} // L: 30
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "()Lau;"
+		descriptor = "()Lar;"
 	)
 	@Export("toRawSound")
 	public RawSound toRawSound() {
@@ -48,7 +48,7 @@ public class SoundEffect {
 		return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("calculateDelay")
 	public final int calculateDelay() {
 		int var1 = 9999999; // L: 38
@@ -122,9 +122,9 @@ public class SoundEffect {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;II)Laa;"
+		descriptor = "(Ljp;II)Lax;"
 	)
 	@Export("readSoundEffect")
 	public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) {
diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java
index e95b2d3f17..8eba0372a0 100644
--- a/runescape-client/src/main/java/SoundEnvelope.java
+++ b/runescape-client/src/main/java/SoundEnvelope.java
@@ -3,40 +3,40 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bt")
+@ObfuscatedName("bx")
 @Implements("SoundEnvelope")
 public class SoundEnvelope {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("segments")
 	int segments;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("durations")
 	int[] durations;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("phases")
 	int[] phases;
 	@ObfuscatedName("y")
 	@Export("max")
 	int max;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("start")
 	int start;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("end")
 	int end;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("form")
 	int form;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("ticks")
 	int ticks;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("phaseIndex")
 	int phaseIndex;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("step")
 	int step;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("amplitude")
 	int amplitude;
 
@@ -50,9 +50,9 @@ public class SoundEnvelope {
 		this.phases[1] = 65535; // L: 27
 	} // L: 28
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -62,9 +62,9 @@ public class SoundEnvelope {
 		this.decodeSegments(var1); // L: 34
 	} // L: 35
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	@Export("decodeSegments")
 	final void decodeSegments(Buffer var1) {
@@ -79,7 +79,7 @@ public class SoundEnvelope {
 
 	} // L: 45
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("reset")
 	final void reset() {
 		this.ticks = 0; // L: 48
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index fc5b1e60fe..1cc2b347a0 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -1,34 +1,27 @@
-import java.awt.Component;
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bq")
+@ObfuscatedName("bi")
 @Implements("SoundSystem")
 public class SoundSystem implements Runnable {
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "Lnd;"
-	)
-	@Export("NetCache_responseArchiveBuffer")
-	public static Buffer NetCache_responseArchiveBuffer;
-	@ObfuscatedName("bl")
-	@ObfuscatedSignature(
-		descriptor = "Ljd;"
-	)
-	static StudioGame field461;
-	@ObfuscatedName("gq")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -27903763
+		intValue = -95994325
 	)
-	@Export("baseY")
-	static int baseY;
-	@ObfuscatedName("v")
+	@Export("VarpDefinition_fileCount")
+	public static int VarpDefinition_fileCount;
+	@ObfuscatedName("km")
+	@ObfuscatedGetter(
+		intValue = 1676071199
+	)
+	@Export("Client_plane")
+	static int Client_plane;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "[Lbd;"
+		descriptor = "[Lbq;"
 	)
 	@Export("players")
 	volatile PcmPlayer[] players;
@@ -46,799 +39,70 @@ public class SoundSystem implements Runnable {
 				}
 			}
 		} catch (Exception var4) { // L: 17
-			class266.RunException_sendStackTrace((String)null, var4); // L: 18
+			FriendsChat.RunException_sendStackTrace((String)null, var4); // L: 18
 		}
 
-	}
+	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(II)Leo;",
-		garbageValue = "-1234409963"
+		descriptor = "(B)V",
+		garbageValue = "-27"
 	)
-	public static FloorOverlayDefinition method807(int var0) {
-		FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0);
-		if (var1 != null) { // L: 27
-			return var1;
+	public static void method916() {
+		StructComposition.StructDefinition_cached.clear(); // L: 67
+	} // L: 68
+
+	@ObfuscatedName("ig")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIIIB)V",
+		garbageValue = "1"
+	)
+	@Export("drawWidgets")
+	static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		if (class20.loadInterface(var0)) { // L: 9373
+			WorldMapCacheName.field2135 = null; // L: 9380
+			PcmPlayer.drawInterface(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9381
+			if (WorldMapCacheName.field2135 != null) { // L: 9382
+				PcmPlayer.drawInterface(WorldMapCacheName.field2135, -1412584499, var1, var2, var3, var4, Clock.field1538, Canvas.field296, var7); // L: 9383
+				WorldMapCacheName.field2135 = null; // L: 9384
+			}
+
 		} else {
-			byte[] var2 = class142.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28
-			var1 = new FloorOverlayDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2), var0);
-			}
-
-			var1.postDecode();
-			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(IIILfc;Lfz;Z[I[II)I",
-		garbageValue = "1972841264"
-	)
-	public static int method808(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) {
-		int var9;
-		for (int var8 = 0; var8 < 128; ++var8) { // L: 19
-			for (var9 = 0; var9 < 128; ++var9) { // L: 20
-				class159.directions[var8][var9] = 0; // L: 21
-				class159.distances[var8][var9] = 99999999; // L: 22
-			}
-		}
-
-		int var10;
-		int var11;
-		byte var12;
-		byte var13;
-		int var14;
-		int var15;
-		byte var16;
-		int var17;
-		int[][] var18;
-		int var19;
-		int var20;
-		int var21;
-		int var22;
-		boolean var28;
-		boolean var29;
-		int var30;
-		int var31;
-		int var33;
-		if (var2 == 1) { // L: 26
-			var10 = var0; // L: 29
-			var11 = var1; // L: 30
-			var12 = 64;
-			var13 = 64; // L: 32
-			var14 = var0 - var12;
-			var15 = var1 - var13;
-			class159.directions[var12][var13] = 99;
-			class159.distances[var12][var13] = 0;
-			var16 = 0;
-			var17 = 0;
-			class159.bufferX[var16] = var0;
-			var33 = var16 + 1;
-			class159.bufferY[var16] = var1;
-			var18 = var4.flags;
-
-			while (true) {
-				if (var33 == var17) {
-					UserComparator10.field1457 = var10; // L: 116
-					FaceNormal.field2363 = var11; // L: 117
-					var29 = false; // L: 118
-					break;
-				}
-
-				var10 = class159.bufferX[var17];
-				var11 = class159.bufferY[var17];
-				var17 = var17 + 1 & 4095;
-				var30 = var10 - var14; // L: 48
-				var31 = var11 - var15;
-				var19 = var10 - var4.xInset;
-				var20 = var11 - var4.yInset;
-				if (var3.hasArrived(1, var10, var11, var4)) { // L: 52
-					UserComparator10.field1457 = var10; // L: 53
-					FaceNormal.field2363 = var11; // L: 54
-					var29 = true;
-					break;
-				}
-
-				var21 = class159.distances[var30][var31] + 1; // L: 58
-				if (var30 > 0 && class159.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) {
-					class159.bufferX[var33] = var10 - 1; // L: 60
-					class159.bufferY[var33] = var11; // L: 61
-					var33 = var33 + 1 & 4095; // L: 62
-					class159.directions[var30 - 1][var31] = 2; // L: 63
-					class159.distances[var30 - 1][var31] = var21; // L: 64
-				}
-
-				if (var30 < 127 && class159.directions[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { // L: 66
-					class159.bufferX[var33] = var10 + 1; // L: 67
-					class159.bufferY[var33] = var11; // L: 68
-					var33 = var33 + 1 & 4095; // L: 69
-					class159.directions[var30 + 1][var31] = 8; // L: 70
-					class159.distances[var30 + 1][var31] = var21; // L: 71
-				}
-
-				if (var31 > 0 && class159.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 73
-					class159.bufferX[var33] = var10; // L: 74
-					class159.bufferY[var33] = var11 - 1; // L: 75
-					var33 = var33 + 1 & 4095; // L: 76
-					class159.directions[var30][var31 - 1] = 1; // L: 77
-					class159.distances[var30][var31 - 1] = var21; // L: 78
-				}
-
-				if (var31 < 127 && class159.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 80
-					class159.bufferX[var33] = var10; // L: 81
-					class159.bufferY[var33] = var11 + 1; // L: 82
-					var33 = var33 + 1 & 4095; // L: 83
-					class159.directions[var30][var31 + 1] = 4; // L: 84
-					class159.distances[var30][var31 + 1] = var21; // L: 85
-				}
-
-				if (var30 > 0 && var31 > 0 && class159.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 87
-					class159.bufferX[var33] = var10 - 1; // L: 88
-					class159.bufferY[var33] = var11 - 1; // L: 89
-					var33 = var33 + 1 & 4095; // L: 90
-					class159.directions[var30 - 1][var31 - 1] = 3; // L: 91
-					class159.distances[var30 - 1][var31 - 1] = var21; // L: 92
-				}
-
-				if (var30 < 127 && var31 > 0 && class159.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { // L: 94
-					class159.bufferX[var33] = var10 + 1; // L: 95
-					class159.bufferY[var33] = var11 - 1; // L: 96
-					var33 = var33 + 1 & 4095; // L: 97
-					class159.directions[var30 + 1][var31 - 1] = 9; // L: 98
-					class159.distances[var30 + 1][var31 - 1] = var21; // L: 99
-				}
-
-				if (var30 > 0 && var31 < 127 && class159.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 101
-					class159.bufferX[var33] = var10 - 1; // L: 102
-					class159.bufferY[var33] = var11 + 1; // L: 103
-					var33 = var33 + 1 & 4095; // L: 104
-					class159.directions[var30 - 1][var31 + 1] = 6; // L: 105
-					class159.distances[var30 - 1][var31 + 1] = var21; // L: 106
-				}
-
-				if (var30 < 127 && var31 < 127 && class159.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { // L: 108
-					class159.bufferX[var33] = var10 + 1; // L: 109
-					class159.bufferY[var33] = var11 + 1; // L: 110
-					var33 = var33 + 1 & 4095; // L: 111
-					class159.directions[var30 + 1][var31 + 1] = 12; // L: 112
-					class159.distances[var30 + 1][var31 + 1] = var21; // L: 113
-				}
-			}
-
-			var28 = var29; // L: 120
-		} else if (var2 == 2) { // L: 122
-			var10 = var0; // L: 125
-			var11 = var1; // L: 126
-			var12 = 64; // L: 127
-			var13 = 64; // L: 128
-			var14 = var0 - var12; // L: 129
-			var15 = var1 - var13; // L: 130
-			class159.directions[var12][var13] = 99; // L: 131
-			class159.distances[var12][var13] = 0; // L: 132
-			var16 = 0; // L: 133
-			var17 = 0; // L: 134
-			class159.bufferX[var16] = var0; // L: 135
-			var33 = var16 + 1;
-			class159.bufferY[var16] = var1; // L: 136
-			var18 = var4.flags; // L: 137
-
-			while (true) {
-				if (var33 == var17) { // L: 138
-					UserComparator10.field1457 = var10; // L: 238
-					FaceNormal.field2363 = var11; // L: 239
-					var29 = false; // L: 240
-					break;
-				}
-
-				var10 = class159.bufferX[var17]; // L: 139
-				var11 = class159.bufferY[var17]; // L: 140
-				var17 = var17 + 1 & 4095; // L: 141
-				var30 = var10 - var14; // L: 142
-				var31 = var11 - var15; // L: 143
-				var19 = var10 - var4.xInset; // L: 144
-				var20 = var11 - var4.yInset; // L: 145
-				if (var3.hasArrived(2, var10, var11, var4)) { // L: 146
-					UserComparator10.field1457 = var10; // L: 147
-					FaceNormal.field2363 = var11; // L: 148
-					var29 = true; // L: 149
-					break;
-				}
-
-				var21 = class159.distances[var30][var31] + 1; // L: 152
-				if (var30 > 0 && class159.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0) { // L: 153 154 155
-					class159.bufferX[var33] = var10 - 1;
-					class159.bufferY[var33] = var11;
-					var33 = var33 + 1 & 4095;
-					class159.directions[var30 - 1][var31] = 2; // L: 160
-					class159.distances[var30 - 1][var31] = var21; // L: 161
-				}
-
-				if (var30 < 126 && class159.directions[var30 + 1][var31] == 0 && (var18[var19 + 2][var20] & 19136899) == 0 && (var18[var19 + 2][var20 + 1] & 19136992) == 0) { // L: 163 164 165 166
-					class159.bufferX[var33] = var10 + 1; // L: 167
-					class159.bufferY[var33] = var11; // L: 168
-					var33 = var33 + 1 & 4095; // L: 169
-					class159.directions[var30 + 1][var31] = 8; // L: 170
-					class159.distances[var30 + 1][var31] = var21; // L: 171
-				}
-
-				if (var31 > 0 && class159.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0) { // L: 173 174 175 176
-					class159.bufferX[var33] = var10; // L: 177
-					class159.bufferY[var33] = var11 - 1; // L: 178
-					var33 = var33 + 1 & 4095; // L: 179
-					class159.directions[var30][var31 - 1] = 1; // L: 180
-					class159.distances[var30][var31 - 1] = var21; // L: 181
-				}
-
-				if (var31 < 126 && class159.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 2] & 19136824) == 0 && (var18[var19 + 1][var20 + 2] & 19136992) == 0) { // L: 183 184 185 186
-					class159.bufferX[var33] = var10; // L: 187
-					class159.bufferY[var33] = var11 + 1; // L: 188
-					var33 = var33 + 1 & 4095; // L: 189
-					class159.directions[var30][var31 + 1] = 4; // L: 190
-					class159.distances[var30][var31 + 1] = var21; // L: 191
-				}
-
-				if (var30 > 0 && var31 > 0 && class159.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20] & 19136830) == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19][var20 - 1] & 19136911) == 0) { // L: 193 194 195 196 197
-					class159.bufferX[var33] = var10 - 1; // L: 198
-					class159.bufferY[var33] = var11 - 1; // L: 199
-					var33 = var33 + 1 & 4095; // L: 200
-					class159.directions[var30 - 1][var31 - 1] = 3; // L: 201
-					class159.distances[var30 - 1][var31 - 1] = var21; // L: 202
-				}
-
-				if (var30 < 126 && var31 > 0 && class159.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136911) == 0 && (var18[var19 + 2][var20 - 1] & 19136899) == 0 && (var18[var19 + 2][var20] & 19136995) == 0) { // L: 204 205 206 207 208
-					class159.bufferX[var33] = var10 + 1; // L: 209
-					class159.bufferY[var33] = var11 - 1; // L: 210
-					var33 = var33 + 1 & 4095; // L: 211
-					class159.directions[var30 + 1][var31 - 1] = 9; // L: 212
-					class159.distances[var30 + 1][var31 - 1] = var21; // L: 213
-				}
-
-				if (var30 > 0 && var31 < 126 && class159.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136830) == 0 && (var18[var19 - 1][var20 + 2] & 19136824) == 0 && (var18[var19][var20 + 2] & 19137016) == 0) { // L: 215 216 217 218 219
-					class159.bufferX[var33] = var10 - 1; // L: 220
-					class159.bufferY[var33] = var11 + 1; // L: 221
-					var33 = var33 + 1 & 4095; // L: 222
-					class159.directions[var30 - 1][var31 + 1] = 6; // L: 223
-					class159.distances[var30 - 1][var31 + 1] = var21; // L: 224
-				}
-
-				if (var30 < 126 && var31 < 126 && class159.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 2] & 19137016) == 0 && (var18[var19 + 2][var20 + 2] & 19136992) == 0 && (var18[var19 + 2][var20 + 1] & 19136995) == 0) { // L: 226 227 228 229 230
-					class159.bufferX[var33] = var10 + 1; // L: 231
-					class159.bufferY[var33] = var11 + 1; // L: 232
-					var33 = var33 + 1 & 4095; // L: 233
-					class159.directions[var30 + 1][var31 + 1] = 12; // L: 234
-					class159.distances[var30 + 1][var31 + 1] = var21; // L: 235
-				}
-			}
-
-			var28 = var29; // L: 242
-		} else {
-			var10 = var0; // L: 247
-			var11 = var1; // L: 248
-			var12 = 64; // L: 249
-			var13 = 64; // L: 250
-			var14 = var0 - var12; // L: 251
-			var15 = var1 - var13; // L: 252
-			class159.directions[var12][var13] = 99; // L: 253
-			class159.distances[var12][var13] = 0; // L: 254
-			var16 = 0; // L: 255
-			var17 = 0; // L: 256
-			class159.bufferX[var16] = var0; // L: 257
-			var33 = var16 + 1;
-			class159.bufferY[var16] = var1; // L: 258
-			var18 = var4.flags; // L: 259
-
-			label768:
-			while (true) {
-				label766:
-				while (true) {
-					do {
-						do {
-							do {
-								label743:
-								do {
-									if (var17 == var33) { // L: 260
-										UserComparator10.field1457 = var10; // L: 380
-										FaceNormal.field2363 = var11; // L: 381
-										var29 = false; // L: 382
-										break label768;
-									}
-
-									var10 = class159.bufferX[var17]; // L: 261
-									var11 = class159.bufferY[var17]; // L: 262
-									var17 = var17 + 1 & 4095; // L: 263
-									var30 = var10 - var14; // L: 264
-									var31 = var11 - var15; // L: 265
-									var19 = var10 - var4.xInset; // L: 266
-									var20 = var11 - var4.yInset; // L: 267
-									if (var3.hasArrived(var2, var10, var11, var4)) { // L: 268
-										UserComparator10.field1457 = var10; // L: 269
-										FaceNormal.field2363 = var11; // L: 270
-										var29 = true; // L: 271
-										break label768;
-									}
-
-									var21 = class159.distances[var30][var31] + 1; // L: 274
-									if (var30 > 0 && class159.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136782) == 0 && (var18[var19 - 1][var20 + var2 - 1] & 19136824) == 0) { // L: 275 276 277 278
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class159.bufferX[var33] = var10 - 1; // L: 282
-												class159.bufferY[var33] = var11; // L: 283
-												var33 = var33 + 1 & 4095; // L: 284
-												class159.directions[var30 - 1][var31] = 2; // L: 285
-												class159.distances[var30 - 1][var31] = var21; // L: 286
-												break;
-											}
-
-											if ((var18[var19 - 1][var22 + var20] & 19136830) != 0) { // L: 280
-												break;
-											}
-
-											++var22; // L: 279
-										}
-									}
-
-									if (var30 < 128 - var2 && class159.directions[var30 + 1][var31] == 0 && (var18[var19 + var2][var20] & 19136899) == 0 && (var18[var19 + var2][var20 + var2 - 1] & 19136992) == 0) { // L: 288 289 290 291
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class159.bufferX[var33] = var10 + 1; // L: 295
-												class159.bufferY[var33] = var11; // L: 296
-												var33 = var33 + 1 & 4095; // L: 297
-												class159.directions[var30 + 1][var31] = 8; // L: 298
-												class159.distances[var30 + 1][var31] = var21; // L: 299
-												break;
-											}
-
-											if ((var18[var19 + var2][var22 + var20] & 19136995) != 0) { // L: 293
-												break;
-											}
-
-											++var22; // L: 292
-										}
-									}
-
-									if (var31 > 0 && class159.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136782) == 0 && (var18[var19 + var2 - 1][var20 - 1] & 19136899) == 0) { // L: 301 302 303 304
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class159.bufferX[var33] = var10; // L: 308
-												class159.bufferY[var33] = var11 - 1; // L: 309
-												var33 = var33 + 1 & 4095; // L: 310
-												class159.directions[var30][var31 - 1] = 1; // L: 311
-												class159.distances[var30][var31 - 1] = var21; // L: 312
-												break;
-											}
-
-											if ((var18[var19 + var22][var20 - 1] & 19136911) != 0) { // L: 306
-												break;
-											}
-
-											++var22; // L: 305
-										}
-									}
-
-									if (var31 < 128 - var2 && class159.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + var2] & 19136824) == 0 && (var18[var19 + var2 - 1][var20 + var2] & 19136992) == 0) { // L: 314 315 316 317
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2 - 1) {
-												class159.bufferX[var33] = var10; // L: 321
-												class159.bufferY[var33] = var11 + 1; // L: 322
-												var33 = var33 + 1 & 4095; // L: 323
-												class159.directions[var30][var31 + 1] = 4; // L: 324
-												class159.distances[var30][var31 + 1] = var21; // L: 325
-												break;
-											}
-
-											if ((var18[var22 + var19][var20 + var2] & 19137016) != 0) { // L: 319
-												break;
-											}
-
-											++var22; // L: 318
-										}
-									}
-
-									if (var30 > 0 && var31 > 0 && class159.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0) { // L: 327 328 329
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2) {
-												class159.bufferX[var33] = var10 - 1; // L: 334
-												class159.bufferY[var33] = var11 - 1; // L: 335
-												var33 = var33 + 1 & 4095; // L: 336
-												class159.directions[var30 - 1][var31 - 1] = 3; // L: 337
-												class159.distances[var30 - 1][var31 - 1] = var21; // L: 338
-												break;
-											}
-
-											if ((var18[var19 - 1][var22 + (var20 - 1)] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 - 1] & 19136911) != 0) { // L: 331 332
-												break;
-											}
-
-											++var22; // L: 330
-										}
-									}
-
-									if (var30 < 128 - var2 && var31 > 0 && class159.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + var2][var20 - 1] & 19136899) == 0) { // L: 340 341 342
-										var22 = 1;
-
-										while (true) {
-											if (var22 >= var2) {
-												class159.bufferX[var33] = var10 + 1; // L: 347
-												class159.bufferY[var33] = var11 - 1; // L: 348
-												var33 = var33 + 1 & 4095; // L: 349
-												class159.directions[var30 + 1][var31 - 1] = 9; // L: 350
-												class159.distances[var30 + 1][var31 - 1] = var21; // L: 351
-												break;
-											}
-
-											if ((var18[var19 + var2][var22 + (var20 - 1)] & 19136995) != 0 || (var18[var19 + var22][var20 - 1] & 19136911) != 0) { // L: 344 345
-												break;
-											}
-
-											++var22; // L: 343
-										}
-									}
-
-									if (var30 > 0 && var31 < 128 - var2 && class159.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + var2] & 19136824) == 0) { // L: 353 354 355
-										for (var22 = 1; var22 < var2; ++var22) { // L: 356
-											if ((var18[var19 - 1][var20 + var22] & 19136830) != 0 || (var18[var22 + (var19 - 1)][var20 + var2] & 19137016) != 0) { // L: 357 358
-												continue label743;
-											}
-										}
-
-										class159.bufferX[var33] = var10 - 1; // L: 360
-										class159.bufferY[var33] = var11 + 1; // L: 361
-										var33 = var33 + 1 & 4095; // L: 362
-										class159.directions[var30 - 1][var31 + 1] = 6; // L: 363
-										class159.distances[var30 - 1][var31 + 1] = var21; // L: 364
-									}
-								} while(var30 >= 128 - var2); // L: 366
-							} while(var31 >= 128 - var2);
-						} while(class159.directions[var30 + 1][var31 + 1] != 0); // L: 367
-					} while((var18[var19 + var2][var20 + var2] & 19136992) != 0); // L: 368
-
-					for (var22 = 1; var22 < var2; ++var22) { // L: 369
-						if ((var18[var22 + var19][var20 + var2] & 19137016) != 0 || (var18[var19 + var2][var22 + var20] & 19136995) != 0) { // L: 370 371
-							continue label766;
-						}
-					}
-
-					class159.bufferX[var33] = var10 + 1; // L: 373
-					class159.bufferY[var33] = var11 + 1; // L: 374
-					var33 = var33 + 1 & 4095; // L: 375
-					class159.directions[var30 + 1][var31 + 1] = 12; // L: 376
-					class159.distances[var30 + 1][var31 + 1] = var21; // L: 377
-				}
-			}
-
-			var28 = var29; // L: 384
-		}
-
-		var9 = var0 - 64; // L: 386
-		var10 = var1 - 64; // L: 387
-		var11 = UserComparator10.field1457; // L: 388
-		var30 = FaceNormal.field2363; // L: 389
-		if (!var28) { // L: 390
-			var31 = Integer.MAX_VALUE; // L: 392
-			var14 = Integer.MAX_VALUE; // L: 393
-			byte var32 = 10; // L: 394
-			var33 = var3.approxDestinationX; // L: 395
-			var17 = var3.approxDestinationY; // L: 396
-			int var27 = var3.approxDestinationSizeX; // L: 397
-			var19 = var3.approxDestinationSizeY; // L: 398
-
-			for (var20 = var33 - var32; var20 <= var33 + var32; ++var20) { // L: 399
-				for (var21 = var17 - var32; var21 <= var32 + var17; ++var21) { // L: 400
-					var22 = var20 - var9; // L: 401
-					int var23 = var21 - var10; // L: 402
-					if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class159.distances[var22][var23] < 100) { // L: 403 404
-						int var24 = 0; // L: 405
-						if (var20 < var33) { // L: 406
-							var24 = var33 - var20;
-						} else if (var20 > var33 + var27 - 1) { // L: 407
-							var24 = var20 - (var33 + var27 - 1);
-						}
-
-						int var25 = 0; // L: 408
-						if (var21 < var17) { // L: 409
-							var25 = var17 - var21;
-						} else if (var21 > var17 + var19 - 1) { // L: 410
-							var25 = var21 - (var19 + var17 - 1);
-						}
-
-						int var26 = var25 * var25 + var24 * var24; // L: 411
-						if (var26 < var31 || var31 == var26 && class159.distances[var22][var23] < var14) { // L: 412
-							var31 = var26; // L: 413
-							var14 = class159.distances[var22][var23]; // L: 414
-							var11 = var20; // L: 415
-							var30 = var21; // L: 416
-						}
-					}
-				}
-			}
-
-			if (var31 == Integer.MAX_VALUE) { // L: 422
-				return -1;
-			}
-		}
-
-		if (var0 == var11 && var30 == var1) { // L: 426
-			return 0;
-		} else {
-			var13 = 0; // L: 427
-			class159.bufferX[var13] = var11; // L: 430
-			var31 = var13 + 1;
-			class159.bufferY[var13] = var30; // L: 431
-
-			for (var14 = var15 = class159.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class159.directions[var11 - var9][var30 - var10]) { // L: 432 433 443
-				if (var14 != var15) { // L: 434
-					var15 = var14; // L: 435
-					class159.bufferX[var31] = var11; // L: 436
-					class159.bufferY[var31++] = var30; // L: 437
-				}
-
-				if ((var14 & 2) != 0) { // L: 439
-					++var11;
-				} else if ((var14 & 8) != 0) { // L: 440
-					--var11;
-				}
-
-				if ((var14 & 1) != 0) { // L: 441
-					++var30;
-				} else if ((var14 & 4) != 0) { // L: 442
-					--var30;
-				}
-			}
-
-			var33 = 0; // L: 445
-
-			while (var31-- > 0) { // L: 446
-				var6[var33] = class159.bufferX[var31]; // L: 447
-				var7[var33++] = class159.bufferY[var31]; // L: 448
-				if (var33 >= var6.length) { // L: 449
-					break;
-				}
-			}
-
-			return var33; // L: 451
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "2145982637"
-	)
-	@Export("loadWorlds")
-	static boolean loadWorlds() {
-		try {
-			if (MilliClock.World_request == null) { // L: 31
-				MilliClock.World_request = ServerPacket.urlRequester.request(new URL(class6.field58));
-			} else if (MilliClock.World_request.isDone()) { // L: 33
-				byte[] var0 = MilliClock.World_request.getResponse(); // L: 34
-				Buffer var1 = new Buffer(var0); // L: 35
-				var1.readInt(); // L: 36
-				World.World_count = var1.readUnsignedShort(); // L: 37
-				Tiles.World_worlds = new World[World.World_count]; // L: 38
-
-				World var3;
-				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47
-					var3 = Tiles.World_worlds[var2] = new World(); // L: 40
-					var3.id = var1.readUnsignedShort(); // L: 41
-					var3.properties = var1.readInt(); // L: 42
-					var3.host = var1.readStringCp1252NullTerminated(); // L: 43
-					var3.activity = var1.readStringCp1252NullTerminated(); // L: 44
-					var3.location = var1.readUnsignedByte(); // L: 45
-					var3.population = var1.readShort(); // L: 46
-				}
-
-				SoundCache.sortWorlds(Tiles.World_worlds, 0, Tiles.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
-				MilliClock.World_request = null; // L: 50
-				return true; // L: 51
-			}
-		} catch (Exception var4) { // L: 55
-			var4.printStackTrace(); // L: 56
-			MilliClock.World_request = null; // L: 57
-		}
-
-		return false; // L: 59
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/awt/Component;B)V",
-		garbageValue = "-28"
-	)
-	static void method803(Component var0) {
-		var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 156
-		var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 157
-		KeyHandler.field288 = -1; // L: 158
-	} // L: 159
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIB)I",
-		garbageValue = "-61"
-	)
-	static final int method806(int var0, int var1, int var2, int var3) {
-		int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 828
-		return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 829
-	}
-
-	@ObfuscatedName("hr")
-	@ObfuscatedSignature(
-		descriptor = "(ZLnb;I)V",
-		garbageValue = "-964489928"
-	)
-	@Export("updateNpcs")
-	static final void updateNpcs(boolean var0, PacketBuffer var1) {
-		Client.field762 = 0; // L: 7327
-		Client.field685 = 0; // L: 7328
-		PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 7330
-		var2.importIndex(); // L: 7331
-		int var3 = var2.readBits(8); // L: 7332
-		int var4;
-		if (var3 < Client.npcCount) { // L: 7333
-			for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 7334
-				Client.field771[++Client.field762 - 1] = Client.npcIndices[var4];
-			}
-		}
-
-		if (var3 > Client.npcCount) { // L: 7336
-			throw new RuntimeException("");
-		} else {
-			Client.npcCount = 0; // L: 7337
-
-			int var5;
-			int var7;
-			int var8;
-			int var9;
-			for (var4 = 0; var4 < var3; ++var4) { // L: 7338
-				var5 = Client.npcIndices[var4]; // L: 7339
-				NPC var14 = Client.npcs[var5]; // L: 7340
-				var7 = var2.readBits(1); // L: 7341
-				if (var7 == 0) { // L: 7342
-					Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7343
-					var14.npcCycle = Client.cycle; // L: 7344
-				} else {
-					var8 = var2.readBits(2); // L: 7347
-					if (var8 == 0) { // L: 7348
-						Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7349
-						var14.npcCycle = Client.cycle; // L: 7350
-						Client.field686[++Client.field685 - 1] = var5; // L: 7351
-					} else {
-						int var10;
-						if (var8 == 1) { // L: 7354
-							Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7355
-							var14.npcCycle = Client.cycle; // L: 7356
-							var9 = var2.readBits(3); // L: 7357
-							var14.method2259(var9, (byte)1); // L: 7358
-							var10 = var2.readBits(1); // L: 7359
-							if (var10 == 1) { // L: 7360
-								Client.field686[++Client.field685 - 1] = var5;
-							}
-						} else if (var8 == 2) { // L: 7363
-							Client.npcIndices[++Client.npcCount - 1] = var5; // L: 7364
-							var14.npcCycle = Client.cycle; // L: 7365
-							var9 = var2.readBits(3); // L: 7366
-							var14.method2259(var9, (byte)2); // L: 7367
-							var10 = var2.readBits(3); // L: 7368
-							var14.method2259(var10, (byte)2); // L: 7369
-							int var11 = var2.readBits(1); // L: 7370
-							if (var11 == 1) { // L: 7371
-								Client.field686[++Client.field685 - 1] = var5;
-							}
-						} else if (var8 == 3) { // L: 7374
-							Client.field771[++Client.field762 - 1] = var5; // L: 7375
-						}
-					}
-				}
-			}
-
-			int var12;
-			while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7382
-				var12 = var1.readBits(15); // L: 7383
-				if (var12 == 32767) { // L: 7384
-					break;
-				}
-
-				boolean var15 = false; // L: 7385
-				if (Client.npcs[var12] == null) { // L: 7386
-					Client.npcs[var12] = new NPC(); // L: 7387
-					var15 = true; // L: 7388
-				}
-
-				NPC var13 = Client.npcs[var12]; // L: 7390
-				Client.npcIndices[++Client.npcCount - 1] = var12; // L: 7391
-				var13.npcCycle = Client.cycle; // L: 7392
-				var13.definition = StructComposition.getNpcDefinition(var1.readBits(14)); // L: 7396
-				if (var0) { // L: 7397
-					var7 = var1.readBits(8); // L: 7398
-					if (var7 > 127) { // L: 7399
-						var7 -= 256;
-					}
-				} else {
-					var7 = var1.readBits(5); // L: 7402
-					if (var7 > 15) { // L: 7403
-						var7 -= 32;
-					}
-				}
-
-				int var6;
-				if (var0) { // L: 7405
-					var6 = var1.readBits(8); // L: 7406
-					if (var6 > 127) { // L: 7407
-						var6 -= 256;
-					}
-				} else {
-					var6 = var1.readBits(5); // L: 7410
-					if (var6 > 15) { // L: 7411
-						var6 -= 32;
-					}
-				}
-
-				var8 = Client.defaultRotations[var1.readBits(3)]; // L: 7413
-				if (var15) { // L: 7414
-					var13.orientation = var13.rotation = var8;
-				}
-
-				var9 = var1.readBits(1); // L: 7415
-				if (var9 == 1) { // L: 7416
-					Client.field686[++Client.field685 - 1] = var12;
-				}
-
-				boolean var16 = var1.readBits(1) == 1; // L: 7417
-				if (var16) { // L: 7418
-					var1.readBits(32); // L: 7419
-				}
-
-				var5 = var1.readBits(1); // L: 7421
-				var13.field1239 = var13.definition.size; // L: 7422
-				var13.field1289 = var13.definition.rotation; // L: 7423
-				if (var13.field1289 == 0) { // L: 7424
-					var13.rotation = 0;
-				}
-
-				var13.walkSequence = var13.definition.walkSequence; // L: 7425
-				var13.walkBackSequence = var13.definition.walkBackSequence; // L: 7426
-				var13.walkLeftSequence = var13.definition.walkLeftSequence; // L: 7427
-				var13.walkRightSequence = var13.definition.walkRightSequence; // L: 7428
-				var13.idleSequence = var13.definition.idleSequence; // L: 7429
-				var13.turnLeftSequence = var13.definition.turnLeftSequence; // L: 7430
-				var13.turnRightSequence = var13.definition.turnRightSequence; // L: 7431
-				var13.method2260(class93.localPlayer.pathX[0] + var6, class93.localPlayer.pathY[0] + var7, var5 == 1); // L: 7432
-			}
-
-			var1.exportIndex(); // L: 7434
-			ScriptEvent.method2094(var1); // L: 7436
-
-			for (var12 = 0; var12 < Client.field762; ++var12) { // L: 7437
-				var3 = Client.field771[var12]; // L: 7438
-				if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 7439
-					Client.npcs[var3].definition = null; // L: 7440
-					Client.npcs[var3] = null; // L: 7441
-				}
-			}
-
-			if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7444
-				throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+			if (var7 != -1) { // L: 9374
+				Client.field831[var7] = true;
 			} else {
-				for (var12 = 0; var12 < Client.npcCount; ++var12) { // L: 7445
-					if (Client.npcs[Client.npcIndices[var12]] == null) { // L: 7446
-						throw new RuntimeException(var12 + "," + Client.npcCount); // L: 7447
-					}
+				for (int var8 = 0; var8 < 100; ++var8) { // L: 9376
+					Client.field831[var8] = true;
 				}
-
 			}
+
 		}
-	} // L: 7450
+	} // L: 9378 9386
+
+	@ObfuscatedName("kw")
+	@ObfuscatedSignature(
+		descriptor = "(IIIILoa;Liq;B)V",
+		garbageValue = "-118"
+	)
+	@Export("worldToMinimap")
+	static final void worldToMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
+		int var6 = var3 * var3 + var2 * var2; // L: 11405
+		if (var6 > 4225 && var6 < 90000) { // L: 11406
+			int var7 = Client.camAngleY & 2047; // L: 11407
+			int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 11408
+			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 11409
+			int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11410
+			int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11411
+			double var12 = Math.atan2((double)var10, (double)var11); // L: 11412
+			int var14 = var5.width / 2 - 25; // L: 11413
+			int var15 = (int)(Math.sin(var12) * (double)var14); // L: 11414
+			int var16 = (int)(Math.cos(var12) * (double)var14); // L: 11415
+			byte var17 = 20; // L: 11416
+			class22.redHintArrowSprite.method7043(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 11417
+		} else {
+			class32.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 11419
+		}
+
+	} // L: 11420
 }
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index 55c8046ff0..3470bc8266 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -4,96 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("es")
+@ObfuscatedName("eu")
 @Implements("SpotAnimationDefinition")
 public class SpotAnimationDefinition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("SpotAnimationDefinition_archive")
 	static AbstractArchive SpotAnimationDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("SpotAnimationDefinition_modelArchive")
 	static AbstractArchive SpotAnimationDefinition_modelArchive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("SpotAnimationDefinition_cached")
-	public static EvictingDualNodeHashTable SpotAnimationDefinition_cached;
+	static EvictingDualNodeHashTable SpotAnimationDefinition_cached;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("SpotAnimationDefinition_cachedModels")
-	public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels;
-	@ObfuscatedName("hq")
+	static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1584922015
-	)
-	@Export("cameraPitch")
-	static int cameraPitch;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1517431137
+		intValue = 1638565333
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -439820555
+		intValue = -2042923893
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -814046371
+		intValue = 1562787325
 	)
 	@Export("sequence")
 	public int sequence;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("recolorFrom")
 	short[] recolorFrom;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("recolorTo")
 	short[] recolorTo;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("retextureFrom")
 	short[] retextureFrom;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("retextureTo")
 	short[] retextureTo;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1653169243
+		intValue = -131798201
 	)
 	@Export("widthScale")
 	int widthScale;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1577696091
+		intValue = -1053916553
 	)
 	@Export("heightScale")
 	int heightScale;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1414282043
+		intValue = -715862297
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1878430379
+		intValue = -1937159093
 	)
 	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -191851365
+		intValue = 2094133553
 	)
 	@Export("contrast")
 	int contrast;
@@ -112,10 +106,10 @@ public class SpotAnimationDefinition extends DualNode {
 		this.contrast = 0; // L: 27
 	} // L: 29
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-929011134"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "-47"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -131,8 +125,8 @@ public class SpotAnimationDefinition extends DualNode {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "-81"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "95"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -176,10 +170,10 @@ public class SpotAnimationDefinition extends DualNode {
 
 	} // L: 82
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lgr;",
-		garbageValue = "42"
+		descriptor = "(IB)Lgd;",
+		garbageValue = "-1"
 	)
 	@Export("getModel")
 	public final Model getModel(int var1) {
@@ -209,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode {
 
 		Model var5;
 		if (this.sequence != -1 && var1 != -1) { // L: 103
-			var5 = LoginScreenAnimation.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
+			var5 = WorldMapScaleHandler.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
 		} else {
 			var5 = var2.toSharedSpotAnimationModel(true); // L: 104
 		}
@@ -238,24 +232,145 @@ public class SpotAnimationDefinition extends DualNode {
 		return var5; // L: 118
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lbg;",
-		garbageValue = "395857864"
+		descriptor = "(CLkn;I)I",
+		garbageValue = "-1325304015"
 	)
-	@Export("worldListStart")
-	static World worldListStart() {
-		World.World_listCount = 0; // L: 247
-		return GraphicsObject.getNextWorldListWorld(); // L: 248
+	@Export("lowercaseChar")
+	static int lowercaseChar(char var0, Language var1) {
+		int var2 = var0 << 4; // L: 143
+		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 144
+			var0 = Character.toLowerCase(var0); // L: 145
+			var2 = (var0 << 4) + 1; // L: 146
+		}
+
+		if (var0 == 241 && var1 == Language.Language_ES) { // L: 148
+			var2 = 1762;
+		}
+
+		return var2; // L: 149
 	}
 
-	@ObfuscatedName("gb")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "702215999"
+		descriptor = "(IIIIIZI)Loa;",
+		garbageValue = "1093852955"
 	)
-	@Export("getWindowedMode")
-	static int getWindowedMode() {
-		return Client.isResizable ? 2 : 1; // L: 3909
+	@Export("getItemSprite")
+	public static final SpritePixels getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
+		if (var1 == -1) { // L: 357
+			var4 = 0;
+		} else if (var4 == 2 && var1 != 1) { // L: 358
+			var4 = 1;
+		}
+
+		long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 359
+		SpritePixels var8;
+		if (!var5) { // L: 361
+			var8 = (SpritePixels)ItemComposition.ItemDefinition_cachedSprites.get(var6); // L: 362
+			if (var8 != null) { // L: 363
+				return var8;
+			}
+		}
+
+		ItemComposition var9 = class250.ItemDefinition_get(var0); // L: 365
+		if (var1 > 1 && var9.countobj != null) { // L: 366
+			int var10 = -1; // L: 367
+
+			for (int var11 = 0; var11 < 10; ++var11) { // L: 368
+				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 369
+					var10 = var9.countobj[var11];
+				}
+			}
+
+			if (var10 != -1) { // L: 371
+				var9 = class250.ItemDefinition_get(var10);
+			}
+		}
+
+		Model var19 = var9.getModel(1); // L: 373
+		if (var19 == null) { // L: 374
+			return null;
+		} else {
+			SpritePixels var20 = null; // L: 375
+			if (var9.noteTemplate != -1) { // L: 376
+				var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 377
+				if (var20 == null) { // L: 378
+					return null;
+				}
+			} else if (var9.notedId != -1) { // L: 380
+				var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 381
+				if (var20 == null) { // L: 382
+					return null;
+				}
+			} else if (var9.placeholderTemplate != -1) { // L: 384
+				var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 385
+				if (var20 == null) { // L: 386
+					return null;
+				}
+			}
+
+			int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 388
+			int var13 = Rasterizer2D.Rasterizer2D_width; // L: 389
+			int var14 = Rasterizer2D.Rasterizer2D_height; // L: 390
+			int[] var15 = new int[4]; // L: 391
+			Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 392
+			var8 = new SpritePixels(36, 32); // L: 393
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 394
+			Rasterizer2D.Rasterizer2D_clear(); // L: 395
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 396
+			Rasterizer3D.method3950(16, 16); // L: 397
+			Rasterizer3D.field2281 = false; // L: 398
+			if (var9.placeholderTemplate != -1) { // L: 399
+				var20.drawTransBgAt(0, 0);
+			}
+
+			int var16 = var9.zoom2d; // L: 400
+			if (var5) { // L: 401
+				var16 = (int)((double)var16 * 1.5D);
+			} else if (var2 == 2) { // L: 402
+				var16 = (int)((double)var16 * 1.04D);
+			}
+
+			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 403
+			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 404
+			var19.calculateBoundsCylinder(); // L: 405
+			var19.method4347(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 406
+			if (var9.notedId != -1) { // L: 407
+				var20.drawTransBgAt(0, 0);
+			}
+
+			if (var2 >= 1) { // L: 408
+				var8.outline(1);
+			}
+
+			if (var2 >= 2) { // L: 409
+				var8.outline(16777215);
+			}
+
+			if (var3 != 0) { // L: 410
+				var8.shadow(var3);
+			}
+
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 411
+			if (var9.noteTemplate != -1) { // L: 412
+				var20.drawTransBgAt(0, 0);
+			}
+
+			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 413
+				ItemComposition.ItemDefinition_fontPlain11.draw(MenuAction.method2026(var1), 0, 9, 16776960, 1); // L: 414
+			}
+
+			if (!var5) { // L: 416
+				ItemComposition.ItemDefinition_cachedSprites.put(var8, var6);
+			}
+
+			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 417
+			Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 418
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 419
+			Rasterizer3D.field2281 = true; // L: 420
+			return var8; // L: 421
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java
index 754f639ce9..89d3c583ce 100644
--- a/runescape-client/src/main/java/SpriteMask.java
+++ b/runescape-client/src/main/java/SpriteMask.java
@@ -4,28 +4,22 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("it")
+@ObfuscatedName("iq")
 @Implements("SpriteMask")
 public class SpriteMask extends DualNode {
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("Widget_modelsArchive")
-	public static AbstractArchive Widget_modelsArchive;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1279799405
+		intValue = 833712115
 	)
 	@Export("width")
 	public final int width;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1973837741
+		intValue = 1197266213
 	)
 	@Export("height")
 	public final int height;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("xWidths")
 	public final int[] xWidths;
 	@ObfuscatedName("y")
@@ -33,26 +27,35 @@ public class SpriteMask extends DualNode {
 	public final int[] xStarts;
 
 	SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) {
-		this.width = var1; // L: 691
-		this.height = var2; // L: 692
-		this.xWidths = var3; // L: 693
-		this.xStarts = var4; // L: 694
-	} // L: 695
+		this.width = var1; // L: 718
+		this.height = var2; // L: 719
+		this.xWidths = var3; // L: 720
+		this.xStarts = var4; // L: 721
+	} // L: 722
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-1353633749"
+		garbageValue = "-1133848125"
 	)
 	@Export("contains")
 	public boolean contains(int var1, int var2) {
-		if (var2 >= 0 && var2 < this.xStarts.length) { // L: 698
-			int var3 = this.xStarts[var2]; // L: 699
-			if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 700
+		if (var2 >= 0 && var2 < this.xStarts.length) { // L: 725
+			int var3 = this.xStarts[var2]; // L: 726
+			if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 727
 				return true;
 			}
 		}
 
-		return false; // L: 702
+		return false; // L: 729
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(CB)Z",
+		garbageValue = "-99"
+	)
+	public static final boolean method4777(char var0) {
+		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; // L: 48
 	}
 }
diff --git a/runescape-client/src/main/java/SpritePixels.java b/runescape-client/src/main/java/SpritePixels.java
index 61bc5d1eb2..51506fe038 100644
--- a/runescape-client/src/main/java/SpritePixels.java
+++ b/runescape-client/src/main/java/SpritePixels.java
@@ -3,28 +3,28 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oh")
+@ObfuscatedName("oa")
 @Implements("SpritePixels")
 public final class SpritePixels extends Rasterizer2D {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("subHeight")
 	public int subHeight;
 	@ObfuscatedName("y")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("p")
-	@Export("yOffset")
-	int yOffset;
 	@ObfuscatedName("j")
+	@Export("yOffset")
+	public int yOffset;
+	@ObfuscatedName("o")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("height")
 	public int height;
 
@@ -40,12 +40,12 @@ public final class SpritePixels extends Rasterizer2D {
 		this(new int[var2 * var1], var1, var2); // L: 22
 	} // L: 23
 
-	SpritePixels() {
+	public SpritePixels() {
 	} // L: 19
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "()Loh;"
+		descriptor = "()Loa;"
 	)
 	@Export("mirrorHorizontally")
 	public SpritePixels mirrorHorizontally() {
@@ -64,9 +64,9 @@ public final class SpritePixels extends Rasterizer2D {
 		return var1; // L: 44
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "()Loh;"
+		descriptor = "()Loa;"
 	)
 	@Export("copyNormalized")
 	public SpritePixels copyNormalized() {
@@ -81,7 +81,7 @@ public final class SpritePixels extends Rasterizer2D {
 		return var1; // L: 54
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("setRaster")
 	public void setRaster() {
 		Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58
@@ -107,7 +107,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 74
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("pad")
 	public void pad(int var1) {
 		if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77
@@ -149,7 +149,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 99
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("flipHorizontally")
 	public void flipHorizontally() {
 		int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102
@@ -165,7 +165,7 @@ public final class SpritePixels extends Rasterizer2D {
 		this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108
 	} // L: 109
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("flipVertically")
 	public void flipVertically() {
 		int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112
@@ -181,7 +181,7 @@ public final class SpritePixels extends Rasterizer2D {
 		this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118
 	} // L: 119
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("outline")
 	public void outline(int var1) {
 		int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122
@@ -195,8 +195,8 @@ public final class SpritePixels extends Rasterizer2D {
 						var6 = var1;
 					} else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129
 						var6 = var1;
-					} else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { // L: 130
-						var6 = var1;
+					} else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
+						var6 = var1; // L: 130
 					} else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131
 						var6 = var1;
 					}
@@ -209,7 +209,7 @@ public final class SpritePixels extends Rasterizer2D {
 		this.pixels = var2; // L: 136
 	} // L: 137
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("shadow")
 	public void shadow(int var1) {
 		for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140
@@ -224,7 +224,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 146
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 149
@@ -270,7 +270,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 182
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("drawTransBgAt")
 	public void drawTransBgAt(int var1, int var2) {
 		var1 += this.xOffset; // L: 203
@@ -316,7 +316,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 236
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("drawScaledAt")
 	public void drawScaledAt(int var1, int var2, int var3, int var4) {
 		if (var3 > 0 && var4 > 0) { // L: 267
@@ -381,7 +381,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 310
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("drawTransOverlayAt")
 	public void drawTransOverlayAt(int var1, int var2, int var3, int var4) {
 		if (var3 == 256) { // L: 329
@@ -431,7 +431,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 331 366
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("drawTransAt")
 	public void drawTransAt(int var1, int var2, int var3) {
 		var1 += this.xOffset; // L: 389
@@ -477,7 +477,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 422
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@Export("drawTransScaledAt")
 	public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) {
 		if (var3 > 0 && var4 > 0) { // L: 441
@@ -542,8 +542,8 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 484
 
-	@ObfuscatedName("w")
-	public void method7002(int var1, int var2, int var3) {
+	@ObfuscatedName("c")
+	public void method7035(int var1, int var2, int var3) {
 		var1 += this.xOffset; // L: 507
 		var2 += this.yOffset; // L: 508
 		int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 509
@@ -584,16 +584,16 @@ public final class SpritePixels extends Rasterizer2D {
 
 		if (var7 > 0 && var6 > 0) { // L: 538
 			if (var3 == 256) {
-				method6984(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539
+				method7036(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539
 			} else {
-				method6985(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540
+				method7065(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540
 			}
 
 		}
 	} // L: 541
 
-	@ObfuscatedName("q")
-	public void method6986(int var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("w")
+	public void method7038(int var1, int var2, int var3, int var4, int var5) {
 		if (var3 > 0 && var4 > 0) { // L: 582
 			int var6 = this.subWidth; // L: 583
 			int var7 = this.subHeight; // L: 584
@@ -653,16 +653,16 @@ public final class SpritePixels extends Rasterizer2D {
 			}
 
 			if (var5 == 256) { // L: 624
-				method7024(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
+				method7039(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
 			} else {
-				method6988(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625
+				method7064(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625
 			}
 
 		}
 	} // L: 626
 
-	@ObfuscatedName("ap")
-	public void method6989(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
+	@ObfuscatedName("ak")
+	public void method7041(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
 		int var9 = var2 < 0 ? -var2 : 0; // L: 675
 		int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 676
 		int var11 = var1 < 0 ? -var1 : 0; // L: 677
@@ -709,7 +709,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 700
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@Export("drawRotatedMaskedCenteredAround")
 	public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
 		try {
@@ -744,8 +744,8 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 729
 
-	@ObfuscatedName("al")
-	public void method6990(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
+	@ObfuscatedName("at")
+	public void method7043(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
 		try {
 			int var10 = -var3 / 2; // L: 733
 			int var11 = -var4 / 2; // L: 734
@@ -783,13 +783,13 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 759
 
-	@ObfuscatedName("ad")
-	public void method6991(int var1, int var2, int var3, int var4) {
-		this.method6992(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762
+	@ObfuscatedName("ah")
+	public void method7097(int var1, int var2, int var3, int var4) {
+		this.method7045(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762
 	} // L: 763
 
-	@ObfuscatedName("ai")
-	void method6992(int var1, int var2, int var3, int var4, int var5, int var6) {
+	@ObfuscatedName("az")
+	void method7045(int var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var6 != 0) { // L: 766
 			var1 -= this.xOffset << 4; // L: 767
 			var2 -= this.yOffset << 4; // L: 768
@@ -1257,7 +1257,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 1076
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@Export("drawScaledWorldmap")
 	public void drawScaledWorldmap(int var1, int var2, int var3, int var4) {
 		if (var3 <= this.width && var4 <= this.height) { // L: 1079
@@ -1380,7 +1380,7 @@ public final class SpritePixels extends Rasterizer2D {
 		}
 	} // L: 1094 1151
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("Sprite_draw")
 	static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		for (int var8 = -var5; var8 < 0; ++var8) { // L: 185
@@ -1400,7 +1400,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 200
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("Sprite_drawTransBg")
 	static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2); // L: 239
@@ -1453,7 +1453,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 264
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("Sprite_drawScaled")
 	static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
 		int var12 = var3; // L: 313
@@ -1479,7 +1479,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 326
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("Sprite_drawTransOverlay")
 	static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		int var11 = 256 - var9; // L: 369
@@ -1505,7 +1505,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 386
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@Export("Sprite_drawTransparent")
 	static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
 		int var10 = 256 - var9; // L: 425
@@ -1527,7 +1527,7 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 438
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("Sprite_drawTransScaled")
 	static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
 		int var13 = 256 - var12; // L: 487
@@ -1555,8 +1555,8 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 504
 
-	@ObfuscatedName("t")
-	static void method6984(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
+	@ObfuscatedName("n")
+	static void method7036(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) {
 		for (var8 = -var10; var8 < 0; ++var8) { // L: 544
 			for (var6 = -var9; var6 < 0; ++var6) { // L: 545
 				var0 = var4[var5++]; // L: 546
@@ -1577,8 +1577,8 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 559
 
-	@ObfuscatedName("h")
-	static void method6985(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) {
+	@ObfuscatedName("l")
+	static void method7065(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) {
 		for (var8 = -var10; var8 < 0; ++var8) { // L: 562
 			for (var6 = -var9; var6 < 0; ++var6) { // L: 563
 				var0 = var4[var5++]; // L: 564
@@ -1601,8 +1601,8 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 579
 
-	@ObfuscatedName("i")
-	static void method7024(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) {
+	@ObfuscatedName("a")
+	static void method7039(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) {
 		for (int var16 = var3; var8 < 0; ++var8) { // L: 629 630
 			var7 = var15 * (var9 >> 16); // L: 631
 
@@ -1628,8 +1628,8 @@ public final class SpritePixels extends Rasterizer2D {
 
 	} // L: 648
 
-	@ObfuscatedName("ae")
-	static void method6988(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) {
+	@ObfuscatedName("aw")
+	static void method7064(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) {
 		for (int var17 = var3; var8 < 0; ++var8) { // L: 651 652
 			var7 = var15 * (var9 >> 16); // L: 653
 
diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java
index 20acbfa1c7..c39f5993e8 100644
--- a/runescape-client/src/main/java/Strings.java
+++ b/runescape-client/src/main/java/Strings.java
@@ -1,107 +1,25 @@
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jo")
+@ObfuscatedName("jh")
 @Implements("Strings")
 public class Strings {
-	@ObfuscatedName("bu")
-	public static String field3306;
-	@ObfuscatedName("cu")
-	public static String field3327;
-	@ObfuscatedName("jy")
-	public static String field3503;
-	@ObfuscatedName("jg")
-	public static String field3504;
-	@ObfuscatedName("jp")
-	public static String field3505;
+	@ObfuscatedName("bz")
+	public static String field3284;
+	@ObfuscatedName("ci")
+	public static String field3529;
+	@ObfuscatedName("ja")
+	public static String field3499;
+	@ObfuscatedName("jw")
+	public static String field3500;
+	@ObfuscatedName("jn")
+	public static String field3286;
 
 	static {
-		field3306 = "Please visit the support page for assistance."; // L: 60
-		field3327 = "Please visit the support page for assistance."; // L: 99
-		field3503 = ""; // L: 275
-		field3504 = "Page has opened in a new window."; // L: 276
-		field3505 = "(Please check your popup blocker.)"; // L: 277
+		field3284 = "Please visit the support page for assistance."; // L: 60
+		field3529 = "Please visit the support page for assistance."; // L: 99
+		field3499 = ""; // L: 275
+		field3500 = "Page has opened in a new window."; // L: 276
+		field3286 = "(Please check your popup blocker.)"; // L: 277
 	} // L: 307
-
-	@ObfuscatedName("gw")
-	@ObfuscatedSignature(
-		descriptor = "(Lcy;I)V",
-		garbageValue = "-1661416870"
-	)
-	static final void method4850(Actor var0) {
-		if (var0.field1289 != 0) { // L: 3758
-			if (var0.targetIndex != -1) { // L: 3759
-				Object var1 = null; // L: 3760
-				if (var0.targetIndex < 32768) { // L: 3761
-					var1 = Client.npcs[var0.targetIndex];
-				} else if (var0.targetIndex >= 32768) { // L: 3762
-					var1 = Client.players[var0.targetIndex - 32768];
-				}
-
-				if (var1 != null) { // L: 3763
-					int var2 = var0.x - ((Actor)var1).x; // L: 3764
-					int var3 = var0.y - ((Actor)var1).y; // L: 3765
-					if (var2 != 0 || var3 != 0) { // L: 3766
-						var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
-					}
-				} else if (var0.false0) { // L: 3768
-					var0.targetIndex = -1; // L: 3769
-					var0.false0 = false; // L: 3770
-				}
-			}
-
-			if (var0.field1264 != -1 && (var0.pathLength == 0 || var0.field1294 > 0)) { // L: 3773
-				var0.orientation = var0.field1264; // L: 3774
-				var0.field1264 = -1; // L: 3775
-			}
-
-			int var4 = var0.orientation - var0.rotation & 2047; // L: 3777
-			if (var4 == 0 && var0.false0) { // L: 3778
-				var0.targetIndex = -1; // L: 3779
-				var0.false0 = false; // L: 3780
-			}
-
-			if (var4 != 0) { // L: 3782
-				++var0.field1282; // L: 3783
-				boolean var6;
-				if (var4 > 1024) { // L: 3784
-					var0.rotation -= var0.field1289; // L: 3785
-					var6 = true; // L: 3786
-					if (var4 < var0.field1289 || var4 > 2048 - var0.field1289) { // L: 3787
-						var0.rotation = var0.orientation; // L: 3788
-						var6 = false; // L: 3789
-					}
-
-					if (var0.idleSequence == var0.movementSequence && (var0.field1282 > 25 || var6)) { // L: 3791
-						if (var0.turnLeftSequence != -1) { // L: 3792
-							var0.movementSequence = var0.turnLeftSequence;
-						} else {
-							var0.movementSequence = var0.walkSequence; // L: 3793
-						}
-					}
-				} else {
-					var0.rotation += var0.field1289; // L: 3797
-					var6 = true; // L: 3798
-					if (var4 < var0.field1289 || var4 > 2048 - var0.field1289) { // L: 3799
-						var0.rotation = var0.orientation; // L: 3800
-						var6 = false; // L: 3801
-					}
-
-					if (var0.movementSequence == var0.idleSequence && (var0.field1282 > 25 || var6)) { // L: 3803
-						if (var0.turnRightSequence != -1) { // L: 3804
-							var0.movementSequence = var0.turnRightSequence;
-						} else {
-							var0.movementSequence = var0.walkSequence; // L: 3805
-						}
-					}
-				}
-
-				var0.rotation &= 2047; // L: 3809
-			} else {
-				var0.field1282 = 0; // L: 3811
-			}
-
-		}
-	} // L: 3812
 }
diff --git a/runescape-client/src/main/java/StructComposition.java b/runescape-client/src/main/java/StructComposition.java
index a886169e4a..c82902e61f 100644
--- a/runescape-client/src/main/java/StructComposition.java
+++ b/runescape-client/src/main/java/StructComposition.java
@@ -1,26 +1,34 @@
 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("ei")
+@ObfuscatedName("eh")
 @Implements("StructComposition")
 public class StructComposition extends DualNode {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("StructDefinition_archive")
-	static AbstractArchive StructDefinition_archive;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lhz;"
-	)
-	@Export("StructDefinition_cached")
-	public static EvictingDualNodeHashTable StructDefinition_cached;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmr;"
+		descriptor = "Ljp;"
+	)
+	@Export("StructDefinition_archive")
+	public static AbstractArchive StructDefinition_archive;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lht;"
+	)
+	@Export("StructDefinition_cached")
+	static EvictingDualNodeHashTable StructDefinition_cached;
+	@ObfuscatedName("li")
+	@ObfuscatedGetter(
+		intValue = 456557527
+	)
+	@Export("menuX")
+	static int menuX;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lmo;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
@@ -32,116 +40,186 @@ public class StructComposition extends DualNode {
 	StructComposition() {
 	} // L: 16
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1000000"
+		garbageValue = "2004161330"
 	)
 	@Export("postDecode")
 	void postDecode() {
-	}
+	} // L: 29
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-32029901"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "-59"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 37
-			if (var2 == 0) { // L: 38
-				return; // L: 41
+			int var2 = var1.readUnsignedByte(); // L: 33
+			if (var2 == 0) { // L: 34
+				return; // L: 37
 			}
 
-			this.decodeNext(var1, var2); // L: 39
+			this.decodeNext(var1, var2); // L: 35
+		}
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-606284417"
+	)
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2) {
+		if (var2 == 249) {
+			this.params = class19.readStringIntParameters(var1, this.params); // L: 40
+		}
+
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-1271027205"
+	)
+	@Export("getIntParam")
+	public int getIntParam(int var1, int var2) {
+		IterableNodeHashTable var4 = this.params;
+		int var3;
+		if (var4 == null) {
+			var3 = var2;
+		} else {
+			IntegerNode var5 = (IntegerNode)var4.get((long)var1);
+			if (var5 == null) {
+				var3 = var2;
+			} else {
+				var3 = var5.integer; // L: 57
+			}
+		}
+
+		return var3;
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;B)Ljava/lang/String;",
+		garbageValue = "1"
+	)
+	@Export("getStringParam")
+	public String getStringParam(int var1, String var2) {
+		return WorldMapElement.method2742(this.params, var1, var2); // L: 63
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)Lcf;",
+		garbageValue = "15"
+	)
+	@Export("getWorldMapScript")
+	static Script getWorldMapScript(int var0, int var1, int var2) {
+		int var3 = MusicPatchNode.method4776(var1, var0); // L: 38
+		Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 41
+		Script var4;
+		if (var5 != null) { // L: 42
+			var4 = var5; // L: 43
+		} else {
+			String var6 = String.valueOf(var3); // L: 46
+			int var7 = Varcs.archive12.getGroupId(var6); // L: 47
+			if (var7 == -1) { // L: 48
+				var4 = null; // L: 49
+			} else {
+				label58: {
+					byte[] var8 = Varcs.archive12.takeFileFlat(var7); // L: 52
+					if (var8 != null) { // L: 53
+						if (var8.length <= 1) { // L: 54
+							var4 = null; // L: 55
+							break label58; // L: 56
+						}
+
+						var5 = NetSocket.newScript(var8); // L: 58
+						if (var5 != null) { // L: 59
+							Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 60
+							var4 = var5; // L: 61
+							break label58; // L: 62
+						}
+					}
+
+					var4 = null; // L: 65
+				}
+			}
+		}
+
+		if (var4 != null) { // L: 68
+			return var4; // L: 69
+		} else {
+			var3 = VarbitComposition.method2935(var2, var0); // L: 71
+			Script var11 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 74
+			Script var12;
+			if (var11 != null) { // L: 75
+				var12 = var11; // L: 76
+			} else {
+				String var13 = String.valueOf(var3); // L: 79
+				int var9 = Varcs.archive12.getGroupId(var13); // L: 80
+				if (var9 == -1) { // L: 81
+					var12 = null; // L: 82
+				} else {
+					byte[] var10 = Varcs.archive12.takeFileFlat(var9); // L: 85
+					if (var10 != null) { // L: 86
+						if (var10.length <= 1) { // L: 87
+							var12 = null; // L: 88
+							return var12 != null ? var12 : null; // L: 101 104
+						}
+
+						var11 = NetSocket.newScript(var10); // L: 91
+						if (var11 != null) { // L: 92
+							Script.Script_cached.put(var11, (long)(var3 << 16)); // L: 93
+							var12 = var11; // L: 94
+							return var12 != null ? var12 : null;
+						}
+					}
+
+					var12 = null; // L: 98
+				}
+			}
+
+			return var12 != null ? var12 : null;
 		}
 	}
 
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1568797940"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-560000506"
 	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 249) {
-			this.params = ModeWhere.readStringIntParameters(var1, this.params); // L: 44
-		}
-
-	} // L: 46
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "1766165302"
-	)
-	@Export("getIntParam")
-	public int getIntParam(int var1, int var2) {
-		return SecureRandomFuture.method1977(this.params, var1, var2); // L: 49
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "1932867603"
-	)
-	@Export("getStringParam")
-	public String getStringParam(int var1, String var2) {
-		return FriendsList.method5650(this.params, var1, var2); // L: 53
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lef;",
-		garbageValue = "1856212739"
-	)
-	@Export("getNpcDefinition")
-	public static NPCComposition getNpcDefinition(int var0) {
-		NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57
-		if (var1 != null) { // L: 58
-			return var1;
-		} else {
-			byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59
-			var1 = new NPCComposition(); // L: 60
-			var1.id = var0; // L: 61
-			if (var2 != null) { // L: 62
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode(); // L: 63
-			NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64
-			return var1; // L: 65
-		}
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "-1621598776"
-	)
-	public static boolean method2908(int var0) {
-		return (var0 >> 31 & 1) != 0; // L: 33
-	}
-
-	@ObfuscatedName("lr")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I)Lio;",
-		garbageValue = "1650638386"
-	)
-	static Widget method2892(Widget var0) {
-		int var1 = class18.method213(class21.getWidgetFlags(var0)); // L: 11363
-		if (var1 == 0) { // L: 11364
-			return null;
-		} else {
-			for (int var2 = 0; var2 < var1; ++var2) { // L: 11365
-				var0 = Frames.getWidget(var0.parentId); // L: 11366
-				if (var0 == null) { // L: 11367
-					return null;
+	static int method2972(int var0, Script var1, boolean var2) {
+		Widget var3 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1390
+		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1391
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var3)); // L: 1392
+			return 1; // L: 1393
+		} else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1395
+			if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1402
+				if (var3.dataText == null) { // L: 1403
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = "";
+				} else {
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1404
 				}
+
+				return 1; // L: 1405
+			} else {
+				return 2; // L: 1407
+			}
+		} else {
+			int var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1396
+			--var4; // L: 1397
+			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1398
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1399
+			} else {
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = "";
 			}
 
-			return var0; // L: 11369
+			return 1; // L: 1400
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java
index 9ba36361bd..a4695347a0 100644
--- a/runescape-client/src/main/java/StudioGame.java
+++ b/runescape-client/src/main/java/StudioGame.java
@@ -1,56 +1,57 @@
-import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jd")
+@ObfuscatedName("jl")
 @Implements("StudioGame")
-public enum StudioGame implements Enumerated {
-	@ObfuscatedName("v")
+public enum StudioGame implements Enumerated
+{
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Ljl;"
 	)
 	@Export("runescape")
 	runescape("runescape", "RuneScape", 0),
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Ljl;"
 	)
 	@Export("stellardawn")
 	stellardawn("stellardawn", "Stellar Dawn", 1),
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Ljl;"
 	)
 	@Export("game3")
 	game3("game3", "Game 3", 2),
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Ljl;"
 	)
 	@Export("game4")
 	game4("game4", "Game 4", 3),
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Ljl;"
 	)
 	@Export("game5")
 	game5("game5", "Game 5", 4),
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Ljd;"
+		descriptor = "Ljl;"
 	)
 	@Export("oldscape")
 	oldscape("oldscape", "RuneScape 2007", 5);
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("name")
 	public final String name;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1213598965
+		intValue = 698335859
 	)
 	@Export("id")
 	final int id;
@@ -60,10 +61,10 @@ public enum StudioGame implements Enumerated {
 		this.id = var5; // L: 18
 	} // L: 19
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
@@ -72,26 +73,56 @@ public enum StudioGame implements Enumerated {
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "31"
+		descriptor = "(Ljava/lang/String;IS)Z",
+		garbageValue = "14714"
 	)
-	public static void method4847(boolean var0) {
-		if (NetCache.NetCache_socket != null) { // L: 42
-			try {
-				Buffer var1 = new Buffer(4); // L: 44
-				var1.writeByte(var0 ? 2 : 3); // L: 45
-				var1.writeMedium(0); // L: 46
-				NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47
-			} catch (IOException var4) {
-				try {
-					NetCache.NetCache_socket.close(); // L: 51
-				} catch (Exception var3) { // L: 53
-				}
+	static boolean method4982(String var0, int var1) {
+		return HealthBarUpdate.method2284(var0, var1, "openjs"); // L: 55
+	}
 
-				++NetCache.NetCache_ioExceptions; // L: 54
-				NetCache.NetCache_socket = null; // L: 55
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "1"
+	)
+	static int method4983(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1824
+			ChatChannel.Interpreter_intStackSize -= 3; // L: 1825
+			ClanSettings.queueSoundEffect(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]); // L: 1826
+			return 1; // L: 1827
+		} else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1829
+			class6.playSong(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1830
+			return 1; // L: 1831
+		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1833
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 1834
+			ReflectionCheck.method1230(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 1835
+			return 1; // L: 1836
+		} else {
+			int var3;
+			if (var0 == 3203) { // L: 1838
+				var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1839
+				class0.method0(Math.round(2.55F * (float)var3)); // L: 1840
+				return 1; // L: 1841
+			} else if (var0 == 3204) { // L: 1843
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Math.round((float)class4.clientPreferences.musicVolume / 2.55F); // L: 1844
+				return 1; // L: 1845
+			} else if (var0 == 3205) { // L: 1847
+				var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1848
+				class226.updateSoundEffectVolume(Math.round((float)var3 * 1.27F)); // L: 1849
+				return 1; // L: 1850
+			} else if (var0 == 3206) { // L: 1852
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Math.round((float)class4.clientPreferences.soundEffectsVolume / 1.27F); // L: 1853
+				return 1; // L: 1854
+			} else if (var0 == 3207) { // L: 1856
+				var3 = Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1857
+				NPCComposition.method2882(Math.round(1.27F * (float)var3)); // L: 1858
+				return 1; // L: 1859
+			} else if (var0 == 3208) { // L: 1861
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Math.round((float)class4.clientPreferences.areaSoundEffectsVolume / 1.27F); // L: 1862
+				return 1; // L: 1863
+			} else {
+				return 2; // L: 1865
 			}
-
 		}
-	} // L: 57
+	}
 }
diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java
index f227097853..e16d2d6244 100644
--- a/runescape-client/src/main/java/Task.java
+++ b/runescape-client/src/main/java/Task.java
@@ -4,31 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eu")
+@ObfuscatedName("el")
 @Implements("Task")
 public class Task {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Leu;"
+		descriptor = "Lel;"
 	)
 	@Export("next")
 	Task next;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("status")
 	public volatile int status;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -308758867
+		intValue = 522618097
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("intArgument")
 	public int intArgument;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("objectArgument")
 	Object objectArgument;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("result")
 	public volatile Object result;
 
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index eebff01a43..fd96693c22 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -2,42 +2,38 @@ import java.io.DataInputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.URL;
+import java.util.Date;
 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("dp")
+@ObfuscatedName("da")
 @Implements("TaskHandler")
 public class TaskHandler implements Runnable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("javaVendor")
 	public static String javaVendor;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("javaVersion")
 	public static String javaVersion;
-	@ObfuscatedName("ex")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Llz;"
-	)
-	@Export("spriteIds")
-	static GraphicsDefaults spriteIds;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Leu;"
+		descriptor = "Lel;"
 	)
 	@Export("current")
 	Task current;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Leu;"
+		descriptor = "Lel;"
 	)
 	@Export("task")
 	Task task;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("isClosed")
 	boolean isClosed;
 
@@ -61,10 +57,10 @@ public class TaskHandler implements Runnable {
 		this.thread.start(); // L: 31
 	} // L: 32
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "57"
+		descriptor = "(I)V",
+		garbageValue = "-1744867211"
 	)
 	@Export("close")
 	public final void close() {
@@ -78,12 +74,12 @@ public class TaskHandler implements Runnable {
 		} catch (InterruptedException var3) { // L: 42
 		}
 
-	}
+	} // L: 43
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IIILjava/lang/Object;I)Leu;",
-		garbageValue = "-46619903"
+		descriptor = "(IIILjava/lang/Object;B)Lel;",
+		garbageValue = "127"
 	)
 	@Export("newTask")
 	final Task newTask(int var1, int var2, int var3, Object var4) {
@@ -104,10 +100,10 @@ public class TaskHandler implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;IB)Leu;",
-		garbageValue = "90"
+		descriptor = "(Ljava/lang/String;II)Lel;",
+		garbageValue = "1638941584"
 	)
 	@Export("newSocketTask")
 	public final Task newSocketTask(String var1, int var2) {
@@ -116,8 +112,8 @@ public class TaskHandler implements Runnable {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Runnable;IB)Leu;",
-		garbageValue = "20"
+		descriptor = "(Ljava/lang/Runnable;II)Lel;",
+		garbageValue = "2125831447"
 	)
 	@Export("newThreadTask")
 	public final Task newThreadTask(Runnable var1, int var2) {
@@ -127,35 +123,35 @@ public class TaskHandler implements Runnable {
 	public final void run() {
 		while (true) {
 			Task var1;
-			synchronized(this) {
+			synchronized(this) { // L: 48
 				while (true) {
-					if (this.isClosed) {
+					if (this.isClosed) { // L: 50
 						return;
 					}
 
-					if (this.current != null) {
-						var1 = this.current;
-						this.current = this.current.next;
-						if (this.current == null) {
+					if (this.current != null) { // L: 51
+						var1 = this.current; // L: 52
+						this.current = this.current.next; // L: 53
+						if (this.current == null) { // L: 54
 							this.task = null;
 						}
 						break;
 					}
 
 					try {
-						this.wait();
+						this.wait(); // L: 58
 					} catch (InterruptedException var8) { // L: 60
 					}
 				}
 			}
 
 			try {
-				int var5 = var1.type;
-				if (var5 == 1) {
-					var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument);
-				} else if (var5 == 2) {
+				int var5 = var1.type; // L: 64
+				if (var5 == 1) { // L: 65
+					var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); // L: 66
+				} else if (var5 == 2) { // L: 68
 					Thread var3 = new Thread((Runnable)var1.objectArgument); // L: 69
-					var3.setDaemon(true);
+					var3.setDaemon(true); // L: 70
 					var3.start(); // L: 71
 					var3.setPriority(var1.intArgument); // L: 72
 					var1.result = var3; // L: 73
@@ -172,40 +168,77 @@ public class TaskHandler implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "([Ljava/lang/String;[IIIB)V",
-		garbageValue = "121"
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "89"
 	)
-	static void method2518(String[] var0, int[] var1, int var2, int var3) {
-		if (var2 < var3) { // L: 43
-			int var4 = (var3 + var2) / 2; // L: 44
-			int var5 = var2; // L: 45
-			String var6 = var0[var4]; // L: 46
-			var0[var4] = var0[var3]; // L: 47
-			var0[var3] = var6; // L: 48
-			int var7 = var1[var4]; // L: 49
-			var1[var4] = var1[var3]; // L: 50
-			var1[var3] = var7; // L: 51
+	static int method2626(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1086
+		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1087
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.x; // L: 1088
+			return 1; // L: 1089
+		} else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1091
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.y; // L: 1092
+			return 1; // L: 1093
+		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1095
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.width; // L: 1096
+			return 1; // L: 1097
+		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1099
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.height; // L: 1100
+			return 1; // L: 1101
+		} else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1103
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1104
+			return 1; // L: 1105
+		} else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1107
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3.parentId; // L: 1108
+			return 1; // L: 1109
+		} else {
+			return 2; // L: 1111
+		}
+	}
 
-			for (int var8 = var2; var8 < var3; ++var8) { // L: 52
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 53
-					String var9 = var0[var8]; // L: 54
-					var0[var8] = var0[var5]; // L: 55
-					var0[var5] = var9; // L: 56
-					int var10 = var1[var8]; // L: 57
-					var1[var8] = var1[var5]; // L: 58
-					var1[var5++] = var10; // L: 59
-				}
+	@ObfuscatedName("iq")
+	@ObfuscatedSignature(
+		descriptor = "(Lcz;IIB)V",
+		garbageValue = "-68"
+	)
+	static final void method2625(MenuAction var0, int var1, int var2) {
+		GameObject.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 7930
+	} // L: 7931
+
+	@ObfuscatedName("lr")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-846504237"
+	)
+	static void method2615(String var0) {
+		Messages.field1397 = var0; // L: 11587
+
+		try {
+			String var1 = class1.client.getParameter(Integer.toString(18)); // L: 11589
+			String var2 = class1.client.getParameter(Integer.toString(13)); // L: 11590
+			String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 11591
+			if (var0.length() == 0) { // L: 11592
+				var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
+			} else {
+				String var4 = var3 + "; Expires="; // L: 11594
+				long var6 = ClientPacket.currentTimeMillis() + 94608000000L; // L: 11596
+				Calendar.Calendar_calendar.setTime(new Date(var6)); // L: 11598
+				int var8 = Calendar.Calendar_calendar.get(7); // L: 11599
+				int var9 = Calendar.Calendar_calendar.get(5); // L: 11600
+				int var10 = Calendar.Calendar_calendar.get(2); // L: 11601
+				int var11 = Calendar.Calendar_calendar.get(1); // L: 11602
+				int var12 = Calendar.Calendar_calendar.get(11); // L: 11603
+				int var13 = Calendar.Calendar_calendar.get(12); // L: 11604
+				int var14 = Calendar.Calendar_calendar.get(13); // L: 11605
+				String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; // L: 11606
+				var3 = var4 + var5 + "; Max-Age=" + 94608000L; // L: 11608
 			}
 
-			var0[var3] = var0[var5]; // L: 63
-			var0[var5] = var6; // L: 64
-			var1[var3] = var1[var5]; // L: 65
-			var1[var5] = var7; // L: 66
-			method2518(var0, var1, var2, var5 - 1); // L: 67
-			method2518(var0, var1, var5 + 1, var3); // L: 68
+			class42.method525(class1.client, "document.cookie=\"" + var3 + "\""); // L: 11610
+		} catch (Throwable var15) { // L: 11612
 		}
 
-	} // L: 70
+	} // L: 11613
 }
diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java
index abaecd341f..be55ce508b 100644
--- a/runescape-client/src/main/java/Texture.java
+++ b/runescape-client/src/main/java/Texture.java
@@ -3,46 +3,46 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gf")
+@ObfuscatedName("gm")
 @Implements("Texture")
 public class Texture extends Node {
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("Texture_animatedPixels")
 	static int[] Texture_animatedPixels;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("averageRGB")
 	int averageRGB;
-	@ObfuscatedName("j")
-	boolean field2220;
-	@ObfuscatedName("r")
+	@ObfuscatedName("o")
+	boolean field2214;
+	@ObfuscatedName("m")
 	@Export("fileIds")
 	int[] fileIds;
-	@ObfuscatedName("b")
-	int[] field2216;
-	@ObfuscatedName("d")
+	@ObfuscatedName("r")
 	int[] field2217;
-	@ObfuscatedName("s")
-	int[] field2223;
-	@ObfuscatedName("u")
+	@ObfuscatedName("h")
+	int[] field2221;
+	@ObfuscatedName("d")
+	int[] field2218;
+	@ObfuscatedName("z")
 	@Export("animationDirection")
 	int animationDirection;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("animationSpeed")
 	int animationSpeed;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("pixels")
 	int[] pixels;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("isLoaded")
 	boolean isLoaded;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	Texture(Buffer var1) {
 		this.isLoaded = false; // L: 25
 		this.averageRGB = var1.readUnsignedShort(); // L: 29
-		this.field2220 = var1.readUnsignedByte() == 1; // L: 30
+		this.field2214 = var1.readUnsignedByte() == 1; // L: 30
 		int var2 = var1.readUnsignedByte(); // L: 31
 		if (var2 >= 1 && var2 <= 4) { // L: 32
 			this.fileIds = new int[var2]; // L: 35
@@ -53,25 +53,25 @@ public class Texture extends Node {
 			}
 
 			if (var2 > 1) { // L: 37
-				this.field2216 = new int[var2 - 1]; // L: 38
+				this.field2217 = new int[var2 - 1]; // L: 38
 
 				for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39
-					this.field2216[var3] = var1.readUnsignedByte();
-				}
-			}
-
-			if (var2 > 1) { // L: 41
-				this.field2217 = new int[var2 - 1]; // L: 42
-
-				for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43
 					this.field2217[var3] = var1.readUnsignedByte();
 				}
 			}
 
-			this.field2223 = new int[var2]; // L: 45
+			if (var2 > 1) { // L: 41
+				this.field2221 = new int[var2 - 1]; // L: 42
+
+				for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43
+					this.field2221[var3] = var1.readUnsignedByte();
+				}
+			}
+
+			this.field2218 = new int[var2]; // L: 45
 
 			for (var3 = 0; var3 < var2; ++var3) { // L: 46
-				this.field2223[var3] = var1.readInt();
+				this.field2218[var3] = var1.readInt();
 			}
 
 			this.animationDirection = var1.readUnsignedByte(); // L: 47
@@ -82,9 +82,9 @@ public class Texture extends Node {
 		}
 	} // L: 50
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(DILjv;)Z"
+		descriptor = "(DILjp;)Z"
 	)
 	@Export("load")
 	boolean load(double var1, int var3, AbstractArchive var4) {
@@ -99,11 +99,11 @@ public class Texture extends Node {
 		this.pixels = new int[var5]; // L: 57
 
 		for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58
-			IndexedSprite var7 = MouseHandler.method647(var4, this.fileIds[var6]); // L: 59
+			IndexedSprite var7 = ClientPacket.method4492(var4, this.fileIds[var6]); // L: 59
 			var7.normalize(); // L: 60
 			byte[] var8 = var7.pixels; // L: 61
 			int[] var9 = var7.palette; // L: 62
-			int var10 = this.field2223[var6]; // L: 63
+			int var10 = this.field2218[var6]; // L: 63
 			if ((var10 & -16777216) == 16777216) { // L: 64
 			}
 
@@ -134,7 +134,7 @@ public class Texture extends Node {
 			if (var6 == 0) { // L: 79
 				var11 = 0;
 			} else {
-				var11 = this.field2216[var6 - 1]; // L: 80
+				var11 = this.field2217[var6 - 1]; // L: 80
 			}
 
 			if (var11 == 0) { // L: 81
@@ -178,13 +178,13 @@ public class Texture extends Node {
 		return true; // L: 105
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("reset")
 	void reset() {
 		this.pixels = null; // L: 109
 	} // L: 110
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("animate")
 	void animate(int var1) {
 		if (this.pixels != null) { // L: 113
diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java
index 4332e3208a..5f7b450aa4 100644
--- a/runescape-client/src/main/java/TextureLoader.java
+++ b/runescape-client/src/main/java/TextureLoader.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hb")
+@ObfuscatedName("hy")
 @Implements("TextureLoader")
 public interface TextureLoader {
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)[I",
-		garbageValue = "-455909856"
+		descriptor = "(IB)[I",
+		garbageValue = "20"
 	)
 	@Export("getTexturePixels")
 	int[] getTexturePixels(int var1);
@@ -17,22 +17,22 @@ public interface TextureLoader {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-33912050"
+		garbageValue = "1186181127"
 	)
 	@Export("getAverageTextureRGB")
 	int getAverageTextureRGB(int var1);
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "28"
-	)
-	boolean vmethod4276(int var1);
-
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "1780944645"
+		garbageValue = "-189956627"
+	)
+	boolean vmethod4428(int var1);
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "2053899531"
 	)
 	@Export("isLowDetail")
 	boolean isLowDetail(int var1);
diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java
index 73513a1ff7..4e9088f19e 100644
--- a/runescape-client/src/main/java/TextureProvider.java
+++ b/runescape-client/src/main/java/TextureProvider.java
@@ -1,64 +1,57 @@
-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("gh")
+@ObfuscatedName("gj")
 @Implements("TextureProvider")
 public class TextureProvider implements TextureLoader {
-	@ObfuscatedName("hy")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "[Loh;"
-	)
-	@Export("headIconPrayerSprites")
-	static SpritePixels[] headIconPrayerSprites;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "[Lgf;"
+		descriptor = "[Lgm;"
 	)
 	@Export("textures")
 	Texture[] textures;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkx;"
+		descriptor = "Lkq;"
 	)
 	@Export("deque")
 	NodeDeque deque;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 117958777
+		intValue = -518380787
 	)
 	@Export("capacity")
 	int capacity;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 530672939
+		intValue = -879981925
 	)
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("brightness")
 	double brightness;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 861354963
+		intValue = -858300133
 	)
 	@Export("textureSize")
 	int textureSize;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("archive")
 	AbstractArchive archive;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;IDI)V"
+		descriptor = "(Ljp;Ljp;IDI)V"
 	)
 	public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) {
-		this.deque = new NodeDeque();
+		this.deque = new NodeDeque(); // L: 9
 		this.remaining = 0; // L: 11
 		this.brightness = 1.0D; // L: 12
 		this.textureSize = 128; // L: 13
@@ -76,18 +69,18 @@ public class TextureProvider implements TextureLoader {
 			this.textures[var7[var9]] = new Texture(var10); // L: 27
 		}
 
-	} // L: 29
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1596585605"
+		garbageValue = "-1251728227"
 	)
 	@Export("getLoadedPercentage")
 	public int getLoadedPercentage() {
-		int var1 = 0; // L: 32
-		int var2 = 0; // L: 33
-		Texture[] var3 = this.textures; // L: 35
+		int var1 = 0;
+		int var2 = 0;
+		Texture[] var3 = this.textures;
 
 		for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36
 			Texture var5 = var3[var4]; // L: 37
@@ -97,7 +90,7 @@ public class TextureProvider implements TextureLoader {
 
 				for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43
 					int var8 = var6[var7]; // L: 44
-					if (this.archive.method4963(var8)) { // L: 46
+					if (this.archive.method5071(var8)) { // L: 46
 						++var2; // L: 47
 					}
 				}
@@ -107,21 +100,21 @@ public class TextureProvider implements TextureLoader {
 		if (var1 == 0) { // L: 55
 			return 0;
 		} else {
-			return var2 * 100 / var1; // L: 56
+			return var2 * 100 / var1;
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("setBrightness")
 	public void setBrightness(double var1) {
 		this.brightness = var1; // L: 60
 		this.clear(); // L: 61
 	} // L: 62
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)[I",
-		garbageValue = "-455909856"
+		descriptor = "(IB)[I",
+		garbageValue = "20"
 	)
 	@Export("getTexturePixels")
 	public int[] getTexturePixels(int var1) {
@@ -136,14 +129,14 @@ public class TextureProvider implements TextureLoader {
 			boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); // L: 72
 			if (var3) { // L: 73
 				if (this.remaining == 0) { // L: 74
-					Texture var4 = (Texture)this.deque.removeFirst(); // L: 75
-					var4.reset(); // L: 76
+					Texture var4 = (Texture)this.deque.removeFirst();
+					var4.reset();
 				} else {
 					--this.remaining; // L: 78
 				}
 
-				this.deque.addLast(var2); // L: 79
-				var2.isLoaded = true; // L: 80
+				this.deque.addLast(var2);
+				var2.isLoaded = true;
 				return var2.pixels; // L: 81
 			}
 		}
@@ -154,36 +147,36 @@ public class TextureProvider implements TextureLoader {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-33912050"
+		garbageValue = "1186181127"
 	)
 	@Export("getAverageTextureRGB")
 	public int getAverageTextureRGB(int var1) {
 		return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89
 	}
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "28"
-	)
-	public boolean vmethod4276(int var1) {
-		return this.textures[var1].field2220; // L: 93
-	}
-
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(II)Z",
-		garbageValue = "1780944645"
+		garbageValue = "-189956627"
+	)
+	public boolean vmethod4428(int var1) {
+		return this.textures[var1].field2214; // L: 93
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "2053899531"
 	)
 	@Export("isLowDetail")
 	public boolean isLowDetail(int var1) {
 		return this.textureSize == 64; // L: 97
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(S)V",
-		garbageValue = "128"
+		garbageValue = "-19913"
 	)
 	@Export("clear")
 	public void clear() {
@@ -197,10 +190,10 @@ public class TextureProvider implements TextureLoader {
 		this.remaining = this.capacity; // L: 105
 	} // L: 106
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(II)V",
-		garbageValue = "-451757246"
+		garbageValue = "942464912"
 	)
 	@Export("animate")
 	public void animate(int var1) {
@@ -214,36 +207,82 @@ public class TextureProvider implements TextureLoader {
 
 	} // L: 116
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(III)Z",
-		garbageValue = "-2085550538"
+		descriptor = "(IB)Lep;",
+		garbageValue = "-96"
 	)
-	public static boolean method4141(int var0, int var1) {
-		return (var0 >> var1 + 1 & 1) != 0; // L: 9
+	@Export("getEnum")
+	public static EnumComposition getEnum(int var0) {
+		EnumComposition var1 = (EnumComposition)EnumComposition.EnumDefinition_cached.get((long)var0); // L: 29
+		if (var1 != null) { // L: 30
+			return var1;
+		} else {
+			byte[] var2 = EnumComposition.EnumDefinition_archive.takeFile(8, var0); // L: 31
+			var1 = new EnumComposition(); // L: 32
+			if (var2 != null) { // L: 33
+				var1.decode(new Buffer(var2));
+			}
+
+			EnumComposition.EnumDefinition_cached.put(var1, (long)var0); // L: 34
+			return var1; // L: 35
+		}
 	}
 
-	@ObfuscatedName("hg")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-148617531"
-	)
-	static final void method4142(boolean var0) {
-		HealthBarUpdate.playPcmPlayers(); // L: 5224
-		++Client.packetWriter.pendingWrites; // L: 5225
-		if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5226
-			Client.packetWriter.pendingWrites = 0; // L: 5227
-			if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) { // L: 5228
-				PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2590, Client.packetWriter.isaacCipher); // L: 5230
-				Client.packetWriter.addNode(var1); // L: 5231
+	@ObfuscatedName("v")
+	public static int method4272(long var0) {
+		return (int)(var0 >>> 7 & 127L); // L: 56
+	}
 
-				try {
-					Client.packetWriter.flush(); // L: 5233
-				} catch (IOException var3) { // L: 5235
-					Client.hadNetworkError = true; // L: 5236
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;I)Lof;",
+		garbageValue = "-1314791632"
+	)
+	@Export("SpriteBuffer_getIndexedSpriteByName")
+	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1); // L: 75
+		int var4 = var0.getFileId(var3, var2); // L: 76
+		IndexedSprite var5;
+		if (!Message.method1263(var0, var3, var4)) { // L: 79
+			var5 = null; // L: 80
+		} else {
+			var5 = class302.method5571(); // L: 83
+		}
+
+		return var5; // L: 85
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-635307263"
+	)
+	static final void method4291(String var0) {
+		PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2643, Client.packetWriter.isaacCipher); // L: 198
+		var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 199
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 200
+		Client.packetWriter.addNode(var1); // L: 201
+	} // L: 202
+
+	@ObfuscatedName("km")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "462577738"
+	)
+	@Export("Widget_resetModelFrames")
+	static final void Widget_resetModelFrames(int var0) {
+		if (class20.loadInterface(var0)) { // L: 11040
+			Widget[] var1 = GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0]; // L: 11041
+
+			for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11042
+				Widget var3 = var1[var2]; // L: 11043
+				if (var3 != null) { // L: 11044
+					var3.modelFrame = 0; // L: 11045
+					var3.modelFrameCycle = 0; // L: 11046
 				}
 			}
 
 		}
-	} // L: 5239
+	} // L: 11048
 }
diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java
index 2ed78ed819..671a55638d 100644
--- a/runescape-client/src/main/java/Tile.java
+++ b/runescape-client/src/main/java/Tile.java
@@ -4,129 +4,129 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gx")
+@ObfuscatedName("gf")
 @Implements("Tile")
 public final class Tile extends Node {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 952681323
+		intValue = -608522313
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -509167035
+		intValue = -616715047
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 950473561
+		intValue = -1378240875
 	)
 	@Export("y")
 	int y;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1257822241
+		intValue = 219645789
 	)
 	@Export("originalPlane")
 	int originalPlane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lga;"
+		descriptor = "Lhp;"
 	)
 	@Export("paint")
 	SceneTilePaint paint;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lgp;"
-	)
-	@Export("model")
-	SceneTileModel model;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lhw;"
-	)
-	@Export("boundaryObject")
-	BoundaryObject boundaryObject;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lho;"
-	)
-	@Export("wallDecoration")
-	WallDecoration wallDecoration;
-	@ObfuscatedName("d")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "Lgo;"
 	)
+	@Export("model")
+	SceneTileModel model;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lhr;"
+	)
+	@Export("boundaryObject")
+	BoundaryObject boundaryObject;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lhd;"
+	)
+	@Export("wallDecoration")
+	WallDecoration wallDecoration;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lgq;"
+	)
 	@Export("floorDecoration")
 	FloorDecoration floorDecoration;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lgv;"
+		descriptor = "Lgw;"
 	)
 	@Export("itemLayer")
 	ItemLayer itemLayer;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1720897143
+		intValue = 660578381
 	)
 	@Export("gameObjectsCount")
 	int gameObjectsCount;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "[Lhj;"
+		descriptor = "[Lhf;"
 	)
 	@Export("gameObjects")
 	GameObject[] gameObjects;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("gameObjectEdgeMasks")
 	int[] gameObjectEdgeMasks;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1099123981
+		intValue = 1421591103
 	)
 	@Export("gameObjectsEdgeMask")
 	int gameObjectsEdgeMask;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 961427167
+		intValue = -551165813
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("drawPrimary")
 	boolean drawPrimary;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("drawSecondary")
 	boolean drawSecondary;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("drawGameObjects")
 	boolean drawGameObjects;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1695083523
+		intValue = -153088239
 	)
 	@Export("drawGameObjectEdges")
 	int drawGameObjectEdges;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1060231869
+		intValue = 2075522037
 	)
-	int field2254;
-	@ObfuscatedName("z")
+	int field2247;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -726038297
+		intValue = -403680437
 	)
-	int field2244;
-	@ObfuscatedName("w")
+	int field2255;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1501732115
+		intValue = 1737009435
 	)
-	int field2235;
-	@ObfuscatedName("t")
+	int field2256;
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lgx;"
+		descriptor = "Lgf;"
 	)
 	@Export("linkedBelowTile")
 	Tile linkedBelowTile;
@@ -140,318 +140,13 @@ public final class Tile extends Node {
 		this.y = var3; // L: 33
 	} // L: 34
 
-	@ObfuscatedName("hn")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lha;I)V",
-		garbageValue = "236848204"
+		descriptor = "(Ljp;IIB)Loa;",
+		garbageValue = "-63"
 	)
-	static final void method3843(class225 var0) {
-		PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6933
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var9;
-		int var10;
-		if (class225.field2683 == var0) { // L: 6934
-			var2 = var1.method6595(); // L: 6935
-			var3 = (var2 >> 4 & 7) + Occluder.field2387; // L: 6936
-			var4 = (var2 & 7) + class69.field596; // L: 6937
-			var5 = var1.method6595(); // L: 6938
-			var6 = var1.readUnsignedByte(); // L: 6939
-			var7 = var6 >> 4 & 15; // L: 6940
-			var8 = var6 & 7; // L: 6941
-			var9 = var1.method6603(); // L: 6942
-			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6943
-				var10 = var7 + 1; // L: 6944
-				if (class93.localPlayer.pathX[0] >= var3 - var10 && class93.localPlayer.pathX[0] <= var3 + var10 && class93.localPlayer.pathY[0] >= var4 - var10 && class93.localPlayer.pathY[0] <= var10 + var4 && ObjectComposition.clientPreferences.areaSoundEffectsVolume != 0 && var8 > 0 && Client.soundEffectCount < 50) { // L: 6945 6946
-					Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 6947
-					Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; // L: 6948
-					Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; // L: 6949
-					Client.soundEffects[Client.soundEffectCount] = null; // L: 6950
-					Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); // L: 6951
-					++Client.soundEffectCount; // L: 6952
-				}
-			}
-		}
-
-		if (class225.field2688 == var0) { // L: 6957
-			var2 = var1.method6603(); // L: 6958
-			var3 = var1.method6549(); // L: 6959
-			var4 = var3 >> 2; // L: 6960
-			var5 = var3 & 3; // L: 6961
-			var6 = Client.field702[var4]; // L: 6962
-			var7 = var1.method6595(); // L: 6963
-			var8 = (var7 >> 4 & 7) + Occluder.field2387; // L: 6964
-			var9 = (var7 & 7) + class69.field596; // L: 6965
-			if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) { // L: 6966
-				DevicePcmPlayerProvider.updatePendingSpawn(class22.Client_plane, var8, var9, var6, var2, var4, var5, 0, -1); // L: 6967
-			}
-
-		} else if (class225.field2680 == var0) { // L: 6971
-			var2 = var1.method6603(); // L: 6972
-			var3 = var1.method6604(); // L: 6973
-			var4 = var1.method6603(); // L: 6974
-			var5 = var1.readUnsignedByte(); // L: 6975
-			var6 = (var5 >> 4 & 7) + Occluder.field2387; // L: 6976
-			var7 = (var5 & 7) + class69.field596; // L: 6977
-			if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 6978
-				NodeDeque var42 = Client.groundItems[class22.Client_plane][var6][var7]; // L: 6979
-				if (var42 != null) { // L: 6980
-					for (TileItem var36 = (TileItem)var42.last(); var36 != null; var36 = (TileItem)var42.previous()) { // L: 6981 6982 6987
-						if ((var4 & 32767) == var36.id && var3 == var36.quantity) { // L: 6983
-							var36.quantity = var2; // L: 6984
-							break;
-						}
-					}
-
-					ClanSettings.updateItemPile(var6, var7); // L: 6989
-				}
-			}
-
-		} else {
-			int var11;
-			if (class225.field2684 == var0) { // L: 6994
-				var2 = var1.method6671(); // L: 6995
-				var3 = (var2 >> 4 & 7) + Occluder.field2387; // L: 6996
-				var4 = (var2 & 7) + class69.field596; // L: 6997
-				var5 = var1.method6605(); // L: 6998
-				var6 = var1.method6549(); // L: 6999
-				var7 = var6 >> 2; // L: 7000
-				var8 = var6 & 3; // L: 7001
-				var9 = Client.field702[var7]; // L: 7002
-				if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 7003
-					if (var9 == 0) { // L: 7004
-						BoundaryObject var35 = AbstractSocket.scene.method4089(class22.Client_plane, var3, var4); // L: 7005
-						if (var35 != null) { // L: 7006
-							var11 = class93.Entity_unpackID(var35.tag); // L: 7007
-							if (var7 == 2) { // L: 7008
-								var35.renderable1 = new DynamicObject(var11, 2, var8 + 4, class22.Client_plane, var3, var4, var5, false, var35.renderable1); // L: 7009
-								var35.renderable2 = new DynamicObject(var11, 2, var8 + 1 & 3, class22.Client_plane, var3, var4, var5, false, var35.renderable2); // L: 7010
-							} else {
-								var35.renderable1 = new DynamicObject(var11, var7, var8, class22.Client_plane, var3, var4, var5, false, var35.renderable1); // L: 7012
-							}
-						}
-					}
-
-					if (var9 == 1) { // L: 7015
-						WallDecoration var43 = AbstractSocket.scene.method3948(class22.Client_plane, var3, var4); // L: 7016
-						if (var43 != null) { // L: 7017
-							var11 = class93.Entity_unpackID(var43.tag); // L: 7018
-							if (var7 != 4 && var7 != 5) { // L: 7019
-								if (var7 == 6) { // L: 7020
-									var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable1);
-								} else if (var7 == 7) { // L: 7021
-									var43.renderable1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable1);
-								} else if (var7 == 8) { // L: 7022
-									var43.renderable1 = new DynamicObject(var11, 4, var8 + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable1); // L: 7023
-									var43.renderable2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, class22.Client_plane, var3, var4, var5, false, var43.renderable2); // L: 7024
-								}
-							} else {
-								var43.renderable1 = new DynamicObject(var11, 4, var8, class22.Client_plane, var3, var4, var5, false, var43.renderable1);
-							}
-						}
-					}
-
-					if (var9 == 2) { // L: 7028
-						GameObject var44 = AbstractSocket.scene.method3926(class22.Client_plane, var3, var4); // L: 7029
-						if (var7 == 11) { // L: 7030
-							var7 = 10;
-						}
-
-						if (var44 != null) { // L: 7031
-							var44.renderable = new DynamicObject(class93.Entity_unpackID(var44.tag), var7, var8, class22.Client_plane, var3, var4, var5, false, var44.renderable);
-						}
-					}
-
-					if (var9 == 3) { // L: 7033
-						FloorDecoration var45 = AbstractSocket.scene.getFloorDecoration(class22.Client_plane, var3, var4); // L: 7034
-						if (var45 != null) { // L: 7035
-							var45.renderable = new DynamicObject(class93.Entity_unpackID(var45.tag), 22, var8, class22.Client_plane, var3, var4, var5, false, var45.renderable);
-						}
-					}
-				}
-
-			} else if (class225.field2682 == var0) { // L: 7040
-				var2 = var1.method6595(); // L: 7041
-				var3 = var2 >> 2; // L: 7042
-				var4 = var2 & 3; // L: 7043
-				var5 = Client.field702[var3]; // L: 7044
-				var6 = var1.method6595(); // L: 7045
-				var7 = (var6 >> 4 & 7) + Occluder.field2387; // L: 7046
-				var8 = (var6 & 7) + class69.field596; // L: 7047
-				if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 7048
-					DevicePcmPlayerProvider.updatePendingSpawn(class22.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 7049
-				}
-
-			} else {
-				TileItem var32;
-				if (class225.field2685 == var0) { // L: 7053
-					var2 = var1.readUnsignedShort(); // L: 7054
-					var3 = var1.method6595(); // L: 7055
-					var4 = (var3 >> 4 & 7) + Occluder.field2387; // L: 7056
-					var5 = (var3 & 7) + class69.field596; // L: 7057
-					if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7058
-						NodeDeque var34 = Client.groundItems[class22.Client_plane][var4][var5]; // L: 7059
-						if (var34 != null) { // L: 7060
-							for (var32 = (TileItem)var34.last(); var32 != null; var32 = (TileItem)var34.previous()) { // L: 7061 7062 7067
-								if ((var2 & 32767) == var32.id) { // L: 7063
-									var32.remove(); // L: 7064
-									break;
-								}
-							}
-
-							if (var34.last() == null) { // L: 7069
-								Client.groundItems[class22.Client_plane][var4][var5] = null;
-							}
-
-							ClanSettings.updateItemPile(var4, var5); // L: 7070
-						}
-					}
-
-				} else {
-					int var12;
-					int var13;
-					int var14;
-					if (class225.field2686 == var0) { // L: 7075
-						var2 = var1.method6726(); // L: 7076
-						var3 = var1.method6595() * 4; // L: 7077
-						byte var38 = var1.method6559(); // L: 7078
-						var5 = var1.method6671() * 4; // L: 7079
-						var6 = var1.method6549(); // L: 7080
-						var7 = (var6 >> 4 & 7) + Occluder.field2387; // L: 7081
-						var8 = (var6 & 7) + class69.field596; // L: 7082
-						var9 = var1.method6549(); // L: 7083
-						var10 = var1.method6604(); // L: 7084
-						byte var41 = var1.method6559(); // L: 7085
-						var12 = var1.method6605(); // L: 7086
-						var13 = var1.readUnsignedShort(); // L: 7087
-						var14 = var1.method6595(); // L: 7088
-						var11 = var41 + var7; // L: 7089
-						var4 = var38 + var8; // L: 7090
-						if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104 && var11 >= 0 && var4 >= 0 && var11 < 104 && var4 < 104 && var13 != 65535) { // L: 7091
-							var7 = var7 * 128 + 64; // L: 7092
-							var8 = var8 * 128 + 64; // L: 7093
-							var11 = var11 * 128 + 64; // L: 7094
-							var4 = var4 * 128 + 64; // L: 7095
-							Projectile var33 = new Projectile(var13, class22.Client_plane, var7, var8, class105.getTileHeight(var7, var8, class22.Client_plane) - var3, var12 + Client.cycle, var10 + Client.cycle, var9, var14, var2, var5); // L: 7096
-							var33.setDestination(var11, var4, class105.getTileHeight(var11, var4, class22.Client_plane) - var5, var12 + Client.cycle); // L: 7097
-							Client.projectiles.addFirst(var33); // L: 7098
-						}
-
-					} else {
-						if (class225.field2681 == var0) { // L: 7102
-							byte var37 = var1.readByte(); // L: 7103
-							var3 = var1.method6604(); // L: 7104
-							var4 = var1.method6603(); // L: 7105
-							byte var39 = var1.method6597(); // L: 7106
-							var6 = var1.readUnsignedShort(); // L: 7107
-							var7 = var1.method6603(); // L: 7108
-							byte var40 = var1.method6593(); // L: 7109
-							var9 = var1.method6549(); // L: 7110
-							var10 = (var9 >> 4 & 7) + Occluder.field2387; // L: 7111
-							var11 = (var9 & 7) + class69.field596; // L: 7112
-							var12 = var1.method6595(); // L: 7113
-							var13 = var12 >> 2; // L: 7114
-							var14 = var12 & 3; // L: 7115
-							int var15 = Client.field702[var13]; // L: 7116
-							byte var16 = var1.readByte(); // L: 7117
-							Player var17;
-							if (var6 == Client.localPlayerIndex) { // L: 7119
-								var17 = class93.localPlayer;
-							} else {
-								var17 = Client.players[var6]; // L: 7120
-							}
-
-							if (var17 != null) { // L: 7121
-								ObjectComposition var18 = class23.getObjectDefinition(var3); // L: 7122
-								int var19;
-								int var20;
-								if (var14 != 1 && var14 != 3) { // L: 7125
-									var19 = var18.sizeX; // L: 7130
-									var20 = var18.sizeY; // L: 7131
-								} else {
-									var19 = var18.sizeY; // L: 7126
-									var20 = var18.sizeX; // L: 7127
-								}
-
-								int var21 = var10 + (var19 >> 1); // L: 7133
-								int var22 = var10 + (var19 + 1 >> 1); // L: 7134
-								int var23 = var11 + (var20 >> 1); // L: 7135
-								int var24 = var11 + (var20 + 1 >> 1); // L: 7136
-								int[][] var25 = Tiles.Tiles_heights[class22.Client_plane]; // L: 7137
-								int var26 = var25[var21][var23] + var25[var22][var23] + var25[var21][var24] + var25[var22][var24] >> 2; // L: 7138
-								int var27 = (var10 << 7) + (var19 << 6); // L: 7139
-								int var28 = (var11 << 7) + (var20 << 6); // L: 7140
-								Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 7141
-								if (var29 != null) { // L: 7142
-									DevicePcmPlayerProvider.updatePendingSpawn(class22.Client_plane, var10, var11, var15, -1, 0, 0, var4 + 1, var7 + 1); // L: 7143
-									var17.animationCycleStart = var4 + Client.cycle; // L: 7144
-									var17.animationCycleEnd = var7 + Client.cycle; // L: 7145
-									var17.model0 = var29; // L: 7146
-									var17.field1202 = var19 * 64 + var10 * 128; // L: 7147
-									var17.field1220 = var20 * 64 + var11 * 128; // L: 7148
-									var17.tileHeight2 = var26; // L: 7149
-									byte var30;
-									if (var16 > var39) { // L: 7150
-										var30 = var16; // L: 7151
-										var16 = var39; // L: 7152
-										var39 = var30; // L: 7153
-									}
-
-									if (var37 > var40) { // L: 7155
-										var30 = var37; // L: 7156
-										var37 = var40; // L: 7157
-										var40 = var30; // L: 7158
-									}
-
-									var17.minX = var16 + var10; // L: 7160
-									var17.maxX = var10 + var39; // L: 7161
-									var17.minY = var11 + var37; // L: 7162
-									var17.maxY = var11 + var40; // L: 7163
-								}
-							}
-						}
-
-						if (class225.field2687 == var0) { // L: 7167
-							var2 = var1.method6605(); // L: 7168
-							var3 = var1.readUnsignedShort(); // L: 7169
-							var4 = var1.readUnsignedByte(); // L: 7170
-							var5 = (var4 >> 4 & 7) + Occluder.field2387; // L: 7171
-							var6 = (var4 & 7) + class69.field596; // L: 7172
-							if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7173
-								var32 = new TileItem(); // L: 7174
-								var32.id = var3; // L: 7175
-								var32.quantity = var2; // L: 7176
-								if (Client.groundItems[class22.Client_plane][var5][var6] == null) { // L: 7177
-									Client.groundItems[class22.Client_plane][var5][var6] = new NodeDeque();
-								}
-
-								Client.groundItems[class22.Client_plane][var5][var6].addFirst(var32); // L: 7178
-								ClanSettings.updateItemPile(var5, var6); // L: 7179
-							}
-
-						} else if (class225.field2689 == var0) { // L: 7183
-							var2 = var1.readUnsignedShort(); // L: 7184
-							var3 = var1.method6595(); // L: 7185
-							var4 = var1.method6595(); // L: 7186
-							var5 = (var4 >> 4 & 7) + Occluder.field2387; // L: 7187
-							var6 = (var4 & 7) + class69.field596; // L: 7188
-							var7 = var1.method6605(); // L: 7189
-							if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { // L: 7190
-								var5 = var5 * 128 + 64; // L: 7191
-								var6 = var6 * 128 + 64; // L: 7192
-								GraphicsObject var31 = new GraphicsObject(var2, class22.Client_plane, var5, var6, class105.getTileHeight(var5, var6, class22.Client_plane) - var3, var7, Client.cycle); // L: 7193
-								Client.graphicsObjects.addFirst(var31); // L: 7194
-							}
-
-						}
-					}
-				}
-			}
-		}
-	} // L: 6969 6992 7038 7051 7073 7100 7181 7196 7198
+	@Export("SpriteBuffer_getSprite")
+	public static SpritePixels SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+		return !Message.method1263(var0, var1, var2) ? null : AbstractSocket.method5940(); // L: 23 24
+	}
 }
diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java
index b81fa8bc20..d56cf0d40f 100644
--- a/runescape-client/src/main/java/TileItem.java
+++ b/runescape-client/src/main/java/TileItem.java
@@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dr")
+@ObfuscatedName("di")
 @Implements("TileItem")
 public final class TileItem extends Renderable {
-	@ObfuscatedName("ro")
-	@ObfuscatedSignature(
-		descriptor = "Lbe;"
-	)
-	@Export("decimator")
-	static Decimator decimator;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -467972035
+		intValue = -1193847607
+	)
+	@Export("KitDefinition_fileCount")
+	public static int KitDefinition_fileCount;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 1014786241
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 223075527
+		intValue = -1411898513
 	)
 	@Export("quantity")
 	int quantity;
@@ -29,38 +29,13 @@ public final class TileItem extends Renderable {
 	TileItem() {
 	} // L: 11
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgr;",
-		garbageValue = "-76"
+		descriptor = "(I)Lgd;",
+		garbageValue = "326918784"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		return class260.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14
+		return class250.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14
 	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1655147086"
-	)
-	@Export("savePreferences")
-	static void savePreferences() {
-		AccessFile var0 = null; // L: 95
-
-		try {
-			var0 = class82.getPreferencesFile("", SoundSystem.field461.name, true); // L: 97
-			Buffer var1 = ObjectComposition.clientPreferences.toBuffer(); // L: 98
-			var0.write(var1.array, 0, var1.offset); // L: 99
-		} catch (Exception var3) { // L: 101
-		}
-
-		try {
-			if (var0 != null) { // L: 103
-				var0.closeSync(true); // L: 104
-			}
-		} catch (Exception var2) { // L: 107
-		}
-
-	} // L: 108
 }
diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java
index 59a2f752e7..1113302bb1 100644
--- a/runescape-client/src/main/java/Tiles.java
+++ b/runescape-client/src/main/java/Tiles.java
@@ -4,87 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cg")
+@ObfuscatedName("ca")
 @Implements("Tiles")
 public final class Tiles {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("Tiles_heights")
 	static int[][][] Tiles_heights;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("Tiles_renderFlags")
 	static byte[][][] Tiles_renderFlags;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1752941579
+		intValue = -879678159
 	)
 	@Export("Tiles_minPlane")
 	static int Tiles_minPlane;
-	@ObfuscatedName("y")
-	static byte[][][] field1120;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "[Lbg;"
-	)
-	@Export("World_worlds")
-	static World[] World_worlds;
-	@ObfuscatedName("l")
-	@Export("Tiles_lightness")
-	static int[] Tiles_lightness;
-	@ObfuscatedName("m")
-	static final int[] field1117;
-	@ObfuscatedName("x")
-	static final int[] field1125;
-	@ObfuscatedName("z")
-	static final int[] field1126;
-	@ObfuscatedName("w")
-	static final int[] field1123;
-	@ObfuscatedName("t")
-	static final int[] field1128;
+	@ObfuscatedName("j")
+	static byte[][][] field1111;
 	@ObfuscatedName("h")
-	static final int[] field1129;
+	@Export("ByteArrayPool_arrays")
+	public static byte[][][] ByteArrayPool_arrays;
+	@ObfuscatedName("z")
+	@Export("Tiles_saturation")
+	static int[] Tiles_saturation;
+	@ObfuscatedName("k")
+	static int[] field1095;
+	@ObfuscatedName("g")
+	static int[][][] field1101;
 	@ObfuscatedName("q")
+	static final int[] field1102;
+	@ObfuscatedName("s")
+	static final int[] field1107;
+	@ObfuscatedName("p")
+	static final int[] field1100;
+	@ObfuscatedName("c")
+	static final int[] field1105;
+	@ObfuscatedName("n")
+	static final int[] field1106;
+	@ObfuscatedName("l")
+	static final int[] field1097;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -760931637
+		intValue = 892658251
 	)
-	static int field1130;
-	@ObfuscatedName("i")
+	static int field1108;
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 696638661
+		intValue = 1828170801
 	)
-	static int field1131;
+	static int field1109;
 
 	static {
 		Tiles_heights = new int[4][105][105]; // L: 16
 		Tiles_renderFlags = new byte[4][104][104]; // L: 17
 		Tiles_minPlane = 99; // L: 18
-		field1117 = new int[]{1, 2, 4, 8}; // L: 34
-		field1125 = new int[]{16, 32, 64, 128}; // L: 35
-		field1126 = new int[]{1, 0, -1, 0}; // L: 36
-		field1123 = new int[]{0, -1, 0, 1}; // L: 37
-		field1128 = new int[]{1, -1, -1, 1}; // L: 38
-		field1129 = new int[]{-1, -1, 1, 1}; // L: 39
-		field1130 = (int)(Math.random() * 17.0D) - 8; // L: 40
-		field1131 = (int)(Math.random() * 33.0D) - 16; // L: 41
+		field1102 = new int[]{1, 2, 4, 8}; // L: 34
+		field1107 = new int[]{16, 32, 64, 128}; // L: 35
+		field1100 = new int[]{1, 0, -1, 0}; // L: 36
+		field1105 = new int[]{0, -1, 0, 1};
+		field1106 = new int[]{1, -1, -1, 1};
+		field1097 = new int[]{-1, -1, 1, 1};
+		field1108 = (int)(Math.random() * 17.0D) - 8;
+		field1109 = (int)(Math.random() * 33.0D) - 16;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "928975395"
+		descriptor = "(II)Leu;",
+		garbageValue = "-1940168302"
 	)
-	static final void method2053() {
-		Object var10000 = null; // L: 114
-		String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members";
-		World.addGameMessage(30, "", var0); // L: 116
-	} // L: 118
+	@Export("SpotAnimationDefinition_get")
+	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
+		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37
+		if (var1 != null) { // L: 38
+			return var1;
+		} else {
+			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39
+			var1 = new SpotAnimationDefinition(); // L: 40
+			var1.id = var0; // L: 41
+			if (var2 != null) { // L: 42
+				var1.decode(new Buffer(var2));
+			}
 
-	@ObfuscatedName("ac")
+			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43
+			return var1; // L: 44
+		}
+	}
+
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)I",
-		garbageValue = "-175787881"
+		descriptor = "(IB)Lez;",
+		garbageValue = "107"
 	)
-	@Export("stringCp1252NullTerminatedByteSize")
-	public static int stringCp1252NullTerminatedByteSize(String var0) {
-		return var0.length() + 1; // L: 115
+	@Export("getObjectDefinition")
+	public static ObjectComposition getObjectDefinition(int var0) {
+		ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 79
+		if (var1 != null) { // L: 80
+			return var1;
+		} else {
+			byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 81
+			var1 = new ObjectComposition(); // L: 82
+			var1.id = var0; // L: 83
+			if (var2 != null) { // L: 84
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 85
+			if (var1.isSolid) { // L: 86
+				var1.interactType = 0; // L: 87
+				var1.boolean1 = false; // L: 88
+			}
+
+			ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 90
+			return var1; // L: 91
+		}
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)[I",
+		garbageValue = "1675810560"
+	)
+	public static int[] method2154() {
+		int[] var0 = new int[KeyHandler.field274]; // L: 257
+
+		for (int var1 = 0; var1 < KeyHandler.field274; ++var1) { // L: 258
+			var0[var1] = KeyHandler.field273[var1]; // L: 259
+		}
+
+		return var0; // L: 261
 	}
 }
diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java
index 03b9d5b2ad..0f7a53bdd7 100644
--- a/runescape-client/src/main/java/Timer.java
+++ b/runescape-client/src/main/java/Timer.java
@@ -3,273 +3,175 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("kv")
+@ObfuscatedName("ki")
 @Implements("Timer")
 public class Timer {
-	@ObfuscatedName("v")
+	@ObfuscatedName("cd")
+	public static char field3780;
+	@ObfuscatedName("mt")
 	@ObfuscatedGetter(
-		longValue = 8797083750332969957L
+		intValue = -581156997
 	)
-	long field3768;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		longValue = 807741776312371019L
-	)
-	long field3766;
+	@Export("selectedItemSlot")
+	static int selectedItemSlot;
 	@ObfuscatedName("f")
-	public boolean field3769;
-	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = -8039422533561910721L
+		longValue = -8319452105604280943L
 	)
 	long field3770;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = -1942511866147941553L
-	)
-	long field3767;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		longValue = -6788679505704133641L
+		longValue = -4202680176653939475L
 	)
 	long field3771;
-	@ObfuscatedName("r")
+	@ObfuscatedName("v")
+	public boolean field3772;
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 2093027907
+		longValue = -6108273028306314795L
 	)
-	int field3772;
-	@ObfuscatedName("b")
+	long field3777;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2015708795
+		longValue = -3021156974356860875L
+	)
+	long field3774;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		longValue = -4665176274502754377L
+	)
+	long field3775;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -460386751
 	)
 	int field3773;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1685103385
+	)
+	int field3778;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -1772065697
+	)
+	int field3776;
 	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -211935081
+		intValue = 1176466241
 	)
-	int field3774;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1004054843
-	)
-	int field3775;
+	int field3779;
 
 	public Timer() {
-		this.field3768 = -1L; // L: 7
-		this.field3766 = -1L; // L: 8
-		this.field3769 = false; // L: 9
-		this.field3770 = 0L; // L: 10
-		this.field3767 = 0L; // L: 11
-		this.field3771 = 0L; // L: 12
-		this.field3772 = 0; // L: 13
-		this.field3773 = 0; // L: 14
-		this.field3774 = 0; // L: 15
-		this.field3775 = 0; // L: 16
+		this.field3770 = -1L; // L: 7
+		this.field3771 = -1L; // L: 8
+		this.field3772 = false; // L: 9
+		this.field3777 = 0L; // L: 10
+		this.field3774 = 0L; // L: 11
+		this.field3775 = 0L; // L: 12
+		this.field3773 = 0; // L: 13
+		this.field3778 = 0; // L: 14
+		this.field3776 = 0; // L: 15
+		this.field3779 = 0; // L: 16
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1898013614"
+		garbageValue = "1876708169"
 	)
-	public void method5602() {
-		this.field3768 = ObjectComposition.currentTimeMillis(); // L: 19
+	public void method5690() {
+		this.field3770 = ClientPacket.currentTimeMillis(); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-1"
+		descriptor = "(I)V",
+		garbageValue = "-962261688"
 	)
-	public void method5590() {
-		if (this.field3768 != -1L) { // L: 23
-			this.field3767 = ObjectComposition.currentTimeMillis() - this.field3768; // L: 24
-			this.field3768 = -1L; // L: 25
+	public void method5672() {
+		if (-1L != this.field3770) { // L: 23
+			this.field3774 = ClientPacket.currentTimeMillis() - this.field3770; // L: 24
+			this.field3770 = -1L; // L: 25
 		}
 
 	} // L: 27
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "1638200135"
+		descriptor = "(IB)V",
+		garbageValue = "-28"
 	)
-	public void method5591(int var1) {
-		this.field3766 = ObjectComposition.currentTimeMillis(); // L: 30
-		this.field3772 = var1; // L: 31
+	public void method5675(int var1) {
+		this.field3771 = ClientPacket.currentTimeMillis(); // L: 30
+		this.field3773 = var1; // L: 31
 	} // L: 32
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-99"
+		descriptor = "(I)V",
+		garbageValue = "-95839674"
 	)
-	public void method5592() {
-		if (-1L != this.field3766) { // L: 35
-			this.field3770 = ObjectComposition.currentTimeMillis() - this.field3766; // L: 36
-			this.field3766 = -1L; // L: 37
+	public void method5676() {
+		if (this.field3771 != -1L) { // L: 35
+			this.field3777 = ClientPacket.currentTimeMillis() - this.field3771; // L: 36
+			this.field3771 = -1L; // L: 37
 		}
 
-		++this.field3774; // L: 39
-		this.field3769 = true; // L: 40
+		++this.field3776; // L: 39
+		this.field3772 = true; // L: 40
 	} // L: 41
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-722241109"
-	)
-	public void method5593() {
-		this.field3769 = false; // L: 44
-		this.field3773 = 0;
-	}
-
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2107700042"
+		descriptor = "(B)V",
+		garbageValue = "1"
 	)
-	public void method5594() {
-		this.method5592();
-	}
+	public void method5677() {
+		this.field3772 = false; // L: 44
+		this.field3778 = 0; // L: 45
+	} // L: 46
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-442398587"
+		descriptor = "(I)V",
+		garbageValue = "1992092142"
+	)
+	public void method5678() {
+		this.method5676(); // L: 49
+	} // L: 50
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "646714111"
 	)
 	@Export("write")
 	public void write(Buffer var1) {
-		long var2 = this.field3767; // L: 53
-		var2 /= 10L; // L: 55
-		if (var2 < 0L) { // L: 56
-			var2 = 0L;
-		} else if (var2 > 65535L) {
-			var2 = 65535L;
-		}
+		ClanChannel.method56(var1, this.field3774); // L: 53
+		ClanChannel.method56(var1, this.field3777); // L: 54
+		ClanChannel.method56(var1, this.field3775); // L: 55
+		var1.writeShort(this.field3773); // L: 56
+		var1.writeShort(this.field3778);
+		var1.writeShort(this.field3776);
+		var1.writeShort(this.field3779);
+	} // L: 60
 
-		var1.writeShort((int)var2); // L: 58
-		long var4 = this.field3770; // L: 60
-		var4 /= 10L; // L: 62
-		if (var4 < 0L) { // L: 63
-			var4 = 0L;
-		} else if (var4 > 65535L) { // L: 64
-			var4 = 65535L;
-		}
-
-		var1.writeShort((int)var4); // L: 65
-		long var6 = this.field3771;
-		var6 /= 10L;
-		if (var6 < 0L) { // L: 70
-			var6 = 0L;
-		} else if (var6 > 65535L) { // L: 71
-			var6 = 65535L;
-		}
-
-		var1.writeShort((int)var6); // L: 72
-		var1.writeShort(this.field3772); // L: 74
-		var1.writeShort(this.field3773); // L: 75
-		var1.writeShort(this.field3774); // L: 76
-		var1.writeShort(this.field3775); // L: 77
-	} // L: 78
-
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "1457822410"
+		descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loc;"
 	)
-	public static boolean method5614(char var0) {
-		if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45
-			if (var0 != 0) { // L: 46
-				char[] var1 = class301.cp1252AsciiExtension; // L: 48
-
-				for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49
-					char var3 = var1[var2]; // L: 50
-					if (var0 == var3) { // L: 52
-						return true;
-					}
-				}
-			}
-
-			return false; // L: 57
+	@Export("newRunException")
+	public static RunException newRunException(Throwable var0, String var1) {
+		RunException var2;
+		if (var0 instanceof RunException) { // L: 57
+			var2 = (RunException)var0; // L: 58
+			var2.message = var2.message + ' ' + var1; // L: 59
 		} else {
-			return true;
+			var2 = new RunException(var0, var1); // L: 61
 		}
-	}
 
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-2049201204"
-	)
-	static int method5595(int var0) {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 66
-		if (var1 == null) { // L: 67
-			return -1;
-		} else {
-			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 68 69
-		}
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-1991704132"
-	)
-	static int method5600(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1103
-		if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1104
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1105
-			return 1; // L: 1106
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1108
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1109
-			return 1; // L: 1110
-		} else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1112
-			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text; // L: 1113
-			return 1; // L: 1114
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1116
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1117
-			return 1; // L: 1118
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1120
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1121
-			return 1; // L: 1122
-		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1124
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1125
-			return 1; // L: 1126
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1128
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1129
-			return 1; // L: 1130
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1132
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1133
-			return 1; // L: 1134
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1136
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1137
-			return 1; // L: 1138
-		} else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1140
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1141
-			return 1; // L: 1142
-		} else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1144
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1145
-			return 1; // L: 1146
-		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1148
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color; // L: 1149
-			return 1; // L: 1150
-		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1152
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.color2; // L: 1153
-			return 1; // L: 1154
-		} else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1156
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1157
-			return 1; // L: 1158
-		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1160
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1161
-			return 1; // L: 1162
-		} else if (var0 != 1615 && var0 != 1616) { // L: 1164
-			return 2; // L: 1168
-		} else {
-			++class44.Interpreter_intStackSize; // L: 1165
-			return 1; // L: 1166
-		}
+		return var2; // L: 62
 	}
 }
diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java
index b61ccf34a6..7d65e0d443 100644
--- a/runescape-client/src/main/java/TriBool.java
+++ b/runescape-client/src/main/java/TriBool.java
@@ -6,19 +6,19 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("lu")
 @Implements("TriBool")
 public class TriBool {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("TriBool_unknown")
 	public static final TriBool TriBool_unknown;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
 	@Export("TriBool_true")
 	public static final TriBool TriBool_true;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "Llu;"
 	)
diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java
index df07db40e2..8a0130c2ce 100644
--- a/runescape-client/src/main/java/UrlRequest.java
+++ b/runescape-client/src/main/java/UrlRequest.java
@@ -4,46 +4,492 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("df")
+@ObfuscatedName("dc")
 @Implements("UrlRequest")
 public class UrlRequest {
-	@ObfuscatedName("dn")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive6")
-	static Archive archive6;
-	@ObfuscatedName("v")
+	@ObfuscatedName("gf")
+	@Export("regionLandArchives")
+	static byte[][] regionLandArchives;
+	@ObfuscatedName("f")
 	@Export("url")
 	final URL url;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("isDone0")
 	volatile boolean isDone0;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("response0")
 	volatile byte[] response0;
 
 	UrlRequest(URL var1) {
 		this.url = var1; // L: 96
-	} // L: 97
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-754673345"
+		descriptor = "(B)Z",
+		garbageValue = "0"
 	)
 	@Export("isDone")
 	public boolean isDone() {
 		return this.isDone0; // L: 100
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)[B",
-		garbageValue = "83"
+		descriptor = "(I)[B",
+		garbageValue = "669779460"
 	)
 	@Export("getResponse")
 	public byte[] getResponse() {
-		return this.response0; // L: 104
+		return this.response0;
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "841550711"
+	)
+	static final void method2520(int var0, int var1, int var2, int var3) {
+		for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 48
+			for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 49
+				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 50
+					class43.field307[0][var5][var4] = 127; // L: 51
+					if (var0 == var5 && var5 > 0) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
+					}
+
+					if (var5 == var0 + var2 && var5 < 103) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; // L: 53
+					}
+
+					if (var4 == var1 && var4 > 0) { // L: 54
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
+					}
+
+					if (var4 == var3 + var1 && var4 < 103) { // L: 55
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
+					}
+				}
+			}
+		}
+
+	} // L: 59
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(II)J",
+		garbageValue = "1235169435"
+	)
+	public static long method2516(int var0) {
+		return ViewportMouse.ViewportMouse_entityTags[var0]; // L: 52
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIB)V",
+		garbageValue = "-79"
+	)
+	static void method2519(int var0, int var1, int var2, int var3) {
+		for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 85
+			if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 86
+				int var5 = 0; // L: 87
+				if (var1 > var4.field937) { // L: 88
+					var5 += var1 - var4.field937;
+				} else if (var1 < var4.x) { // L: 89
+					var5 += var4.x - var1;
+				}
+
+				if (var2 > var4.field944) { // L: 90
+					var5 += var2 - var4.field944;
+				} else if (var2 < var4.y) { // L: 91
+					var5 += var4.y - var2;
+				}
+
+				if (var5 - 64 <= var4.field939 && class4.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 92
+					var5 -= 64; // L: 103
+					if (var5 < 0) { // L: 104
+						var5 = 0;
+					}
+
+					int var6 = (var4.field939 - var5) * class4.clientPreferences.areaSoundEffectsVolume / var4.field939; // L: 105
+					if (var4.stream1 == null) { // L: 106
+						if (var4.soundEffectId >= 0) { // L: 107
+							SoundEffect var7 = SoundEffect.readSoundEffect(class26.archive4, var4.soundEffectId, 0); // L: 108
+							if (var7 != null) { // L: 109
+								RawSound var8 = var7.toRawSound().resample(WorldMapAreaData.decimator); // L: 110
+								RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 111
+								var9.setNumLoops(-1); // L: 112
+								UserComparator7.pcmStreamMixer.addSubStream(var9); // L: 113
+								var4.stream1 = var9; // L: 114
+							}
+						}
+					} else {
+						var4.stream1.method936(var6); // L: 118
+					}
+
+					if (var4.stream2 == null) { // L: 119
+						if (var4.soundEffectIds != null && (var4.field945 -= var3) <= 0) { // L: 120
+							int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 121
+							SoundEffect var12 = SoundEffect.readSoundEffect(class26.archive4, var4.soundEffectIds[var11], 0); // L: 122
+							if (var12 != null) { // L: 123
+								RawSound var13 = var12.toRawSound().resample(WorldMapAreaData.decimator); // L: 124
+								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 125
+								var10.setNumLoops(0); // L: 126
+								UserComparator7.pcmStreamMixer.addSubStream(var10); // L: 127
+								var4.stream2 = var10; // L: 128
+								var4.field945 = var4.field941 + (int)(Math.random() * (double)(var4.field943 - var4.field941)); // L: 129
+							}
+						}
+					} else {
+						var4.stream2.method936(var6); // L: 134
+						if (!var4.stream2.hasNext()) { // L: 135
+							var4.stream2 = null; // L: 136
+						}
+					}
+				} else {
+					if (var4.stream1 != null) { // L: 93
+						UserComparator7.pcmStreamMixer.removeSubStream(var4.stream1); // L: 94
+						var4.stream1 = null; // L: 95
+					}
+
+					if (var4.stream2 != null) { // L: 97
+						UserComparator7.pcmStreamMixer.removeSubStream(var4.stream2); // L: 98
+						var4.stream2 = null; // L: 99
+					}
+				}
+			}
+		}
+
+	} // L: 140
+
+	@ObfuscatedName("fs")
+	@ObfuscatedSignature(
+		descriptor = "(IZZZS)Ljf;",
+		garbageValue = "-28511"
+	)
+	@Export("newArchive")
+	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
+		ArchiveDisk var4 = null; // L: 2419
+		if (JagexCache.JagexCache_dat2File != null) { // L: 2420
+			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, class369.JagexCache_idxFiles[var0], 1000000);
+		}
+
+		return new Archive(var4, WorldMapID.masterDisk, var0, var1, var2, var3); // L: 2421
+	}
+
+	@ObfuscatedName("ht")
+	@ObfuscatedSignature(
+		descriptor = "(Lhj;I)V",
+		garbageValue = "1535496544"
+	)
+	static final void method2511(class226 var0) {
+		PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 7025
+		int var2;
+		int var3;
+		int var4;
+		int var5;
+		int var6;
+		TileItem var35;
+		if (class226.field2687 == var0) { // L: 7026
+			var2 = var1.method6643(); // L: 7027
+			var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7028
+			var4 = (var2 & 7) + class15.field128; // L: 7029
+			var5 = var1.method6653(); // L: 7030
+			var6 = var1.method6652(); // L: 7031
+			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7032
+				var35 = new TileItem(); // L: 7033
+				var35.id = var5; // L: 7034
+				var35.quantity = var6; // L: 7035
+				if (Client.groundItems[SoundSystem.Client_plane][var3][var4] == null) { // L: 7036
+					Client.groundItems[SoundSystem.Client_plane][var3][var4] = new NodeDeque();
+				}
+
+				Client.groundItems[SoundSystem.Client_plane][var3][var4].addFirst(var35); // L: 7037
+				class26.updateItemPile(var3, var4); // L: 7038
+			}
+
+		} else {
+			int var7;
+			if (class226.field2693 == var0) { // L: 7042
+				var2 = var1.readUnsignedShort(); // L: 7043
+				var3 = var1.method6652(); // L: 7044
+				var4 = var1.method6653(); // L: 7045
+				var5 = var1.method6643(); // L: 7046
+				var6 = (var5 >> 4 & 7) + WorldMapSection0.field2047; // L: 7047
+				var7 = (var5 & 7) + class15.field128; // L: 7048
+				if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { // L: 7049
+					NodeDeque var42 = Client.groundItems[SoundSystem.Client_plane][var6][var7]; // L: 7050
+					if (var42 != null) { // L: 7051
+						for (TileItem var36 = (TileItem)var42.last(); var36 != null; var36 = (TileItem)var42.previous()) { // L: 7052 7053 7058
+							if ((var4 & 32767) == var36.id && var2 == var36.quantity) { // L: 7054
+								var36.quantity = var3; // L: 7055
+								break;
+							}
+						}
+
+						class26.updateItemPile(var6, var7); // L: 7060
+					}
+				}
+
+			} else {
+				int var8;
+				int var9;
+				if (class226.field2683 == var0) { // L: 7065
+					var2 = var1.method6642(); // L: 7066
+					var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7067
+					var4 = (var2 & 7) + class15.field128; // L: 7068
+					var5 = var1.method6651(); // L: 7069
+					var6 = var1.method6643(); // L: 7070
+					var7 = var6 >> 2; // L: 7071
+					var8 = var6 & 3; // L: 7072
+					var9 = Client.field682[var7]; // L: 7073
+					if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7074
+						class375.updatePendingSpawn(SoundSystem.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1); // L: 7075
+					}
+
+				} else if (class226.field2684 == var0) { // L: 7079
+					var2 = var1.method6642(); // L: 7080
+					var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7081
+					var4 = (var2 & 7) + class15.field128; // L: 7082
+					var5 = var1.method6653(); // L: 7083
+					if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7084
+						NodeDeque var34 = Client.groundItems[SoundSystem.Client_plane][var3][var4]; // L: 7085
+						if (var34 != null) { // L: 7086
+							for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { // L: 7087 7088 7093
+								if ((var5 & 32767) == var35.id) { // L: 7089
+									var35.remove(); // L: 7090
+									break;
+								}
+							}
+
+							if (var34.last() == null) { // L: 7095
+								Client.groundItems[SoundSystem.Client_plane][var3][var4] = null;
+							}
+
+							class26.updateItemPile(var3, var4); // L: 7096
+						}
+					}
+
+				} else {
+					int var11;
+					if (class226.field2686 == var0) { // L: 7101
+						var2 = var1.method6643(); // L: 7102
+						var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7103
+						var4 = (var2 & 7) + class15.field128; // L: 7104
+						var5 = var1.readUnsignedByte(); // L: 7105
+						var6 = var5 >> 2; // L: 7106
+						var7 = var5 & 3; // L: 7107
+						var8 = Client.field682[var6]; // L: 7108
+						var9 = var1.method6652(); // L: 7109
+						if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 7110
+							if (var8 == 0) { // L: 7111
+								BoundaryObject var33 = DevicePcmPlayerProvider.scene.method4058(SoundSystem.Client_plane, var3, var4); // L: 7112
+								if (var33 != null) { // L: 7113
+									var11 = Message.Entity_unpackID(var33.tag); // L: 7114
+									if (var6 == 2) { // L: 7115
+										var33.renderable1 = new DynamicObject(var11, 2, var7 + 4, SoundSystem.Client_plane, var3, var4, var9, false, var33.renderable1); // L: 7116
+										var33.renderable2 = new DynamicObject(var11, 2, var7 + 1 & 3, SoundSystem.Client_plane, var3, var4, var9, false, var33.renderable2); // L: 7117
+									} else {
+										var33.renderable1 = new DynamicObject(var11, var6, var7, SoundSystem.Client_plane, var3, var4, var9, false, var33.renderable1); // L: 7119
+									}
+								}
+							}
+
+							if (var8 == 1) { // L: 7122
+								WallDecoration var43 = DevicePcmPlayerProvider.scene.method4059(SoundSystem.Client_plane, var3, var4); // L: 7123
+								if (var43 != null) { // L: 7124
+									var11 = Message.Entity_unpackID(var43.tag); // L: 7125
+									if (var6 != 4 && var6 != 5) { // L: 7126
+										if (var6 == 6) { // L: 7127
+											var43.renderable1 = new DynamicObject(var11, 4, var7 + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1);
+										} else if (var6 == 7) { // L: 7128
+											var43.renderable1 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1);
+										} else if (var6 == 8) { // L: 7129
+											var43.renderable1 = new DynamicObject(var11, 4, var7 + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1); // L: 7130
+											var43.renderable2 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable2); // L: 7131
+										}
+									} else {
+										var43.renderable1 = new DynamicObject(var11, 4, var7, SoundSystem.Client_plane, var3, var4, var9, false, var43.renderable1);
+									}
+								}
+							}
+
+							if (var8 == 2) { // L: 7135
+								GameObject var44 = DevicePcmPlayerProvider.scene.method4094(SoundSystem.Client_plane, var3, var4); // L: 7136
+								if (var6 == 11) { // L: 7137
+									var6 = 10;
+								}
+
+								if (var44 != null) { // L: 7138
+									var44.renderable = new DynamicObject(Message.Entity_unpackID(var44.tag), var6, var7, SoundSystem.Client_plane, var3, var4, var9, false, var44.renderable);
+								}
+							}
+
+							if (var8 == 3) { // L: 7140
+								FloorDecoration var45 = DevicePcmPlayerProvider.scene.getFloorDecoration(SoundSystem.Client_plane, var3, var4); // L: 7141
+								if (var45 != null) {
+									var45.renderable = new DynamicObject(Message.Entity_unpackID(var45.tag), 22, var7, SoundSystem.Client_plane, var3, var4, var9, false, var45.renderable); // L: 7142
+								}
+							}
+						}
+
+					} else {
+						int var10;
+						if (class226.field2688 == var0) { // L: 7147
+							var2 = var1.method6642(); // L: 7148
+							var3 = var1.readUnsignedByte(); // L: 7149
+							var4 = (var3 >> 4 & 7) + WorldMapSection0.field2047; // L: 7150
+							var5 = (var3 & 7) + class15.field128; // L: 7151
+							var6 = var1.readUnsignedShort(); // L: 7152
+							var7 = var1.method6643(); // L: 7153
+							var8 = var7 >> 4 & 15; // L: 7154
+							var9 = var7 & 7; // L: 7155
+							if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7156
+								var10 = var8 + 1; // L: 7157
+								if (class262.localPlayer.pathX[0] >= var4 - var10 && class262.localPlayer.pathX[0] <= var4 + var10 && class262.localPlayer.pathY[0] >= var5 - var10 && class262.localPlayer.pathY[0] <= var10 + var5 && class4.clientPreferences.areaSoundEffectsVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { // L: 7158 7159
+									Client.soundEffectIds[Client.soundEffectCount] = var6; // L: 7160
+									Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; // L: 7161
+									Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 7162
+									Client.soundEffects[Client.soundEffectCount] = null; // L: 7163
+									Client.soundLocations[Client.soundEffectCount] = var8 + (var5 << 8) + (var4 << 16); // L: 7164
+									++Client.soundEffectCount; // L: 7165
+								}
+							}
+						}
+
+						if (class226.field2690 == var0) { // L: 7170
+							var2 = var1.method6643(); // L: 7171
+							var3 = (var2 >> 4 & 7) + WorldMapSection0.field2047; // L: 7172
+							var4 = (var2 & 7) + class15.field128; // L: 7173
+							var5 = var1.readUnsignedByte(); // L: 7174
+							var6 = var5 >> 2; // L: 7175
+							var7 = var5 & 3; // L: 7176
+							var8 = Client.field682[var6]; // L: 7177
+							if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 7178
+								class375.updatePendingSpawn(SoundSystem.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1); // L: 7179
+							}
+
+						} else {
+							int var12;
+							int var14;
+							if (class226.field2691 == var0) { // L: 7183
+								var2 = var1.readUnsignedShort(); // L: 7184
+								var3 = var1.readUnsignedShort(); // L: 7185
+								var4 = var1.method6642(); // L: 7186
+								var5 = (var4 >> 4 & 7) + WorldMapSection0.field2047; // L: 7187
+								var6 = (var4 & 7) + class15.field128; // L: 7188
+								byte var38 = var1.method6750(); // L: 7189
+								byte var39 = var1.method6750(); // L: 7190
+								var9 = var1.method6642(); // L: 7191
+								var10 = var9 >> 2; // L: 7192
+								var11 = var9 & 3; // L: 7193
+								var12 = Client.field682[var10]; // L: 7194
+								byte var13 = var1.readByte(); // L: 7195
+								var14 = var1.method6653(); // L: 7196
+								byte var15 = var1.readByte(); // L: 7197
+								int var16 = var1.method6651(); // L: 7198
+								Player var17;
+								if (var3 == Client.localPlayerIndex) { // L: 7200
+									var17 = class262.localPlayer;
+								} else {
+									var17 = Client.players[var3]; // L: 7201
+								}
+
+								if (var17 != null) { // L: 7202
+									ObjectComposition var18 = Tiles.getObjectDefinition(var2); // L: 7203
+									int var19;
+									int var20;
+									if (var11 != 1 && var11 != 3) { // L: 7206
+										var19 = var18.sizeX; // L: 7211
+										var20 = var18.sizeY; // L: 7212
+									} else {
+										var19 = var18.sizeY; // L: 7207
+										var20 = var18.sizeX; // L: 7208
+									}
+
+									int var21 = var5 + (var19 >> 1); // L: 7214
+									int var22 = var5 + (var19 + 1 >> 1); // L: 7215
+									int var23 = var6 + (var20 >> 1); // L: 7216
+									int var24 = var6 + (var20 + 1 >> 1); // L: 7217
+									int[][] var25 = Tiles.Tiles_heights[SoundSystem.Client_plane]; // L: 7218
+									int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; // L: 7219
+									int var27 = (var5 << 7) + (var19 << 6); // L: 7220
+									int var28 = (var6 << 7) + (var20 << 6); // L: 7221
+									Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28); // L: 7222
+									if (var29 != null) { // L: 7223
+										class375.updatePendingSpawn(SoundSystem.Client_plane, var5, var6, var12, -1, 0, 0, var14 + 1, var16 + 1); // L: 7224
+										var17.animationCycleStart = var14 + Client.cycle; // L: 7225
+										var17.animationCycleEnd = var16 + Client.cycle; // L: 7226
+										var17.model0 = var29; // L: 7227
+										var17.field1185 = var19 * 64 + var5 * 128; // L: 7228
+										var17.field1197 = var20 * 64 + var6 * 128; // L: 7229
+										var17.tileHeight2 = var26; // L: 7230
+										byte var30;
+										if (var13 > var15) { // L: 7231
+											var30 = var13; // L: 7232
+											var13 = var15; // L: 7233
+											var15 = var30; // L: 7234
+										}
+
+										if (var39 > var38) { // L: 7236
+											var30 = var39; // L: 7237
+											var39 = var38; // L: 7238
+											var38 = var30; // L: 7239
+										}
+
+										var17.minX = var13 + var5; // L: 7241
+										var17.maxX = var15 + var5; // L: 7242
+										var17.minY = var6 + var39; // L: 7243
+										var17.maxY = var6 + var38; // L: 7244
+									}
+								}
+							}
+
+							if (class226.field2689 == var0) { // L: 7248
+								var2 = var1.method6757(); // L: 7249
+								byte var37 = var1.method6619(); // L: 7250
+								var4 = var1.method6651(); // L: 7251
+								var5 = var1.method6653(); // L: 7252
+								var6 = var1.method6644(); // L: 7253
+								var7 = var1.method6652(); // L: 7254
+								var8 = var1.readUnsignedByte(); // L: 7255
+								var9 = (var8 >> 4 & 7) + WorldMapSection0.field2047; // L: 7256
+								var10 = (var8 & 7) + class15.field128; // L: 7257
+								var11 = var1.method6643(); // L: 7258
+								byte var40 = var1.readByte(); // L: 7259
+								int var41 = var1.method6644() * 4; // L: 7260
+								var14 = var1.method6643() * 4; // L: 7261
+								var3 = var37 + var9; // L: 7262
+								var12 = var40 + var10; // L: 7263
+								if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104 && var3 >= 0 && var12 >= 0 && var3 < 104 && var12 < 104 && var7 != 65535) { // L: 7264
+									var9 = var9 * 128 + 64; // L: 7265
+									var10 = var10 * 128 + 64; // L: 7266
+									var3 = var3 * 128 + 64; // L: 7267
+									var12 = var12 * 128 + 64; // L: 7268
+									Projectile var32 = new Projectile(var7, SoundSystem.Client_plane, var9, var10, ItemContainer.getTileHeight(var9, var10, SoundSystem.Client_plane) - var14, var4 + Client.cycle, var5 + Client.cycle, var6, var11, var2, var41); // L: 7269
+									var32.setDestination(var3, var12, ItemContainer.getTileHeight(var3, var12, SoundSystem.Client_plane) - var41, var4 + Client.cycle); // L: 7270
+									Client.projectiles.addFirst(var32); // L: 7271
+								}
+
+							} else if (class226.field2692 == var0) { // L: 7275
+								var2 = var1.method6651(); // L: 7276
+								var3 = var1.method6642(); // L: 7277
+								var4 = (var3 >> 4 & 7) + WorldMapSection0.field2047; // L: 7278
+								var5 = (var3 & 7) + class15.field128; // L: 7279
+								var6 = var1.method6643(); // L: 7280
+								var7 = var1.method6652(); // L: 7281
+								if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 7282
+									var4 = var4 * 128 + 64; // L: 7283
+									var5 = var5 * 128 + 64; // L: 7284
+									GraphicsObject var31 = new GraphicsObject(var7, SoundSystem.Client_plane, var4, var5, ItemContainer.getTileHeight(var4, var5, SoundSystem.Client_plane) - var6, var2, Client.cycle); // L: 7285
+									Client.graphicsObjects.addFirst(var31); // L: 7286
+								}
+
+							}
+						}
+					}
+				}
+			}
+		}
+	} // L: 7040 7063 7077 7099 7145 7181 7273 7288 7290
 }
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index 3eb4ad095c..246c3a6366 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -9,20 +9,35 @@ 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("do")
+@ObfuscatedName("dz")
 @Implements("UrlRequester")
 public class UrlRequester implements Runnable {
-	@ObfuscatedName("e")
-	static int[][][] field1419;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ri")
+	@ObfuscatedSignature(
+		descriptor = "Lbq;"
+	)
+	@Export("pcmPlayer1")
+	static PcmPlayer pcmPlayer1;
+	@ObfuscatedName("m")
+	@Export("Interpreter_stringLocals")
+	static String[] Interpreter_stringLocals;
+	@ObfuscatedName("ce")
+	@ObfuscatedSignature(
+		descriptor = "Lco;"
+	)
+	@Export("mouseRecorder")
+	static MouseRecorder mouseRecorder;
+	@ObfuscatedName("gq")
+	@Export("regionMapArchiveIds")
+	static int[] regionMapArchiveIds;
+	@ObfuscatedName("f")
 	@Export("thread")
 	final Thread thread;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("isClosed")
 	volatile boolean isClosed;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("requests")
 	Queue requests;
 
@@ -33,10 +48,10 @@ public class UrlRequester implements Runnable {
 		this.thread.start(); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/net/URL;I)Ldf;",
-		garbageValue = "-1811269491"
+		descriptor = "(Ljava/net/URL;I)Ldc;",
+		garbageValue = "-1779738307"
 	)
 	@Export("request")
 	public UrlRequest request(URL var1) {
@@ -48,10 +63,10 @@ public class UrlRequester implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "279229859"
+		descriptor = "(S)V",
+		garbageValue = "256"
 	)
 	@Export("close")
 	public void close() {
@@ -113,179 +128,37 @@ public class UrlRequester implements Runnable {
 					}
 
 				}
-			} catch (Exception var17) { // L: 64
-				class266.RunException_sendStackTrace((String)null, var17); // L: 65
+			} catch (Exception var17) {
+				FriendsChat.RunException_sendStackTrace((String)null, var17);
 			}
 		}
 
-	} // L: 68
-
-	@ObfuscatedName("az")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1175355119"
-	)
-	static int method2420(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3519
-			class44.Interpreter_intStackSize -= 2; // L: 3520
-			Client.field894 = (short)class43.method436(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]); // L: 3521
-			if (Client.field894 <= 0) { // L: 3522
-				Client.field894 = 256;
-			}
-
-			Client.field895 = (short)class43.method436(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3523
-			if (Client.field895 <= 0) { // L: 3524
-				Client.field895 = 256;
-			}
-
-			return 1; // L: 3525
-		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3527
-			class44.Interpreter_intStackSize -= 2; // L: 3528
-			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3529
-			if (Client.zoomHeight <= 0) { // L: 3530
-				Client.zoomHeight = 256;
-			}
-
-			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3531
-			if (Client.zoomWidth <= 0) { // L: 3532
-				Client.zoomWidth = 320;
-			}
-
-			return 1; // L: 3533
-		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3535
-			class44.Interpreter_intStackSize -= 4; // L: 3536
-			Client.field909 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3537
-			if (Client.field909 <= 0) { // L: 3538
-				Client.field909 = 1;
-			}
-
-			Client.field828 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3539
-			if (Client.field828 <= 0) { // L: 3540
-				Client.field828 = 32767;
-			} else if (Client.field828 < Client.field909) { // L: 3541
-				Client.field828 = Client.field909;
-			}
-
-			Client.field900 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 3542
-			if (Client.field900 <= 0) { // L: 3543
-				Client.field900 = 1;
-			}
-
-			Client.field901 = (short)Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 3544
-			if (Client.field901 <= 0) { // L: 3545
-				Client.field901 = 32767;
-			} else if (Client.field901 < Client.field900) { // L: 3546
-				Client.field901 = Client.field900;
-			}
-
-			return 1; // L: 3547
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3549
-			if (Client.viewportWidget != null) { // L: 3550
-				setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3551
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3552
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3553
-			} else {
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3556
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3557
-			}
-
-			return 1; // L: 3559
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3561
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3562
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3563
-			return 1; // L: 3564
-		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3566
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator9.method2467(Client.field894); // L: 3567
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator9.method2467(Client.field895); // L: 3568
-			return 1; // L: 3569
-		} else if (var0 == 6220) { // L: 3571
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3572
-			return 1; // L: 3573
-		} else if (var0 == 6221) { // L: 3575
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3576
-			return 1; // L: 3577
-		} else if (var0 == 6222) { // L: 3579
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class32.canvasWidth; // L: 3580
-			return 1; // L: 3581
-		} else if (var0 == 6223) { // L: 3583
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ReflectionCheck.canvasHeight; // L: 3584
-			return 1; // L: 3585
-		} else {
-			return 2; // L: 3587
-		}
 	}
 
-	@ObfuscatedName("gu")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIZI)V",
-		garbageValue = "1159694527"
+		descriptor = "(IB)I",
+		garbageValue = "117"
 	)
-	@Export("setViewportShape")
-	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
-		if (var2 < 1) { // L: 4289
-			var2 = 1;
-		}
+	public static int method2504(int var0) {
+		--var0; // L: 64
+		var0 |= var0 >>> 1; // L: 65
+		var0 |= var0 >>> 2; // L: 66
+		var0 |= var0 >>> 4; // L: 67
+		var0 |= var0 >>> 8; // L: 68
+		var0 |= var0 >>> 16; // L: 69
+		return var0 + 1; // L: 70
+	}
 
-		if (var3 < 1) { // L: 4290
-			var3 = 1;
-		}
-
-		int var5 = var3 - 334; // L: 4291
-		int var6;
-		if (var5 < 0) { // L: 4293
-			var6 = Client.field894;
-		} else if (var5 >= 100) { // L: 4294
-			var6 = Client.field895;
-		} else {
-			var6 = (Client.field895 - Client.field894) * var5 / 100 + Client.field894; // L: 4295
-		}
-
-		int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4296
-		int var8;
-		int var9;
-		short var10;
-		if (var7 < Client.field900) { // L: 4297
-			var10 = Client.field900; // L: 4298
-			var6 = var10 * var2 * 334 / (var3 * 512); // L: 4299
-			if (var6 > Client.field828) { // L: 4300
-				var6 = Client.field828; // L: 4301
-				var8 = var3 * var6 * 512 / (var10 * 334); // L: 4302
-				var9 = (var2 - var8) / 2; // L: 4303
-				if (var4) { // L: 4304
-					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4305
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4306
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4307
-				}
-
-				var0 += var9; // L: 4309
-				var2 -= var9 * 2; // L: 4310
-			}
-		} else if (var7 > Client.field901) { // L: 4313
-			var10 = Client.field901; // L: 4314
-			var6 = var10 * var2 * 334 / (var3 * 512); // L: 4315
-			if (var6 < Client.field909) { // L: 4316
-				var6 = Client.field909; // L: 4317
-				var8 = var10 * var2 * 334 / (var6 * 512); // L: 4318
-				var9 = (var3 - var8) / 2; // L: 4319
-				if (var4) { // L: 4320
-					Rasterizer2D.Rasterizer2D_resetClip(); // L: 4321
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4322
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4323
-				}
-
-				var1 += var9; // L: 4325
-				var3 -= var9 * 2; // L: 4326
-			}
-		}
-
-		Client.viewportZoom = var3 * var6 / 334; // L: 4329
-		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4330
-			class17.method209(var2, var3); // L: 4331
-		}
-
-		Client.viewportOffsetX = var0; // L: 4333
-		Client.viewportOffsetY = var1; // L: 4334
-		Client.viewportWidth = var2; // L: 4335
-		Client.viewportHeight = var3; // L: 4336
-	} // L: 4337
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "216480272"
+	)
+	static final int method2509(int var0, int var1) {
+		int var2 = AttackOption.method2378(var0 - 1, var1 - 1) + AttackOption.method2378(var0 + 1, var1 - 1) + AttackOption.method2378(var0 - 1, var1 + 1) + AttackOption.method2378(1 + var0, 1 + var1); // L: 830
+		int var3 = AttackOption.method2378(var0 - 1, var1) + AttackOption.method2378(1 + var0, var1) + AttackOption.method2378(var0, var1 - 1) + AttackOption.method2378(var0, var1 + 1); // L: 831
+		int var4 = AttackOption.method2378(var0, var1); // L: 832
+		return var2 / 16 + var3 / 8 + var4 / 4; // L: 833
+	}
 }
diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java
index f9ba970b48..56f9f14ba5 100644
--- a/runescape-client/src/main/java/User.java
+++ b/runescape-client/src/main/java/User.java
@@ -3,18 +3,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lx")
+@ObfuscatedName("lf")
 @Implements("User")
 public class User implements Comparable {
-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lly;"
+		descriptor = "Liv;"
+	)
+	@Export("scriptActiveWidget")
+	static Widget scriptActiveWidget;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Llc;"
 	)
 	@Export("username")
 	Username username;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lly;"
+		descriptor = "Llc;"
 	)
 	@Export("previousUsername")
 	Username previousUsername;
@@ -22,50 +28,50 @@ public class User implements Comparable {
 	User() {
 	} // L: 7
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)I",
-		garbageValue = "539732409"
+		descriptor = "(Llf;I)I",
+		garbageValue = "-1545273649"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
 		return this.username.compareToTyped(var1.username); // L: 30
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lly;",
-		garbageValue = "1600385893"
+		descriptor = "(I)Llc;",
+		garbageValue = "1609286013"
 	)
 	@Export("getUsername")
 	public Username getUsername() {
 		return this.username; // L: 10
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "1"
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "-507308651"
 	)
 	@Export("getName")
 	public String getName() {
 		return this.username == null ? "" : this.username.getName(); // L: 14 15
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "192558419"
+		garbageValue = "-1933928316"
 	)
 	@Export("getPreviousName")
 	public String getPreviousName() {
 		return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;Lly;I)V",
-		garbageValue = "2108784704"
+		descriptor = "(Llc;Llc;I)V",
+		garbageValue = "-2071487865"
 	)
 	@Export("set")
 	void set(Username var1, Username var2) {
diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java
index 9d18e04dfd..81eafd7154 100644
--- a/runescape-client/src/main/java/UserComparator1.java
+++ b/runescape-client/src/main/java/UserComparator1.java
@@ -1,13 +1,19 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ns")
+@ObfuscatedName("ng")
 @Implements("UserComparator1")
 public class UserComparator1 implements Comparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -82634641
+	)
+	public static int field4220;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -15,10 +21,10 @@ public class UserComparator1 implements Comparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;Llx;I)I",
-		garbageValue = "-4111631"
+		descriptor = "(Llf;Llf;I)I",
+		garbageValue = "652408691"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(User var1, User var2) {
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index deeede3900..5657304eba 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -1,24 +1,18 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("du")
+@ObfuscatedName("dd")
 @Implements("UserComparator10")
 public class UserComparator10 extends AbstractUserComparator {
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -2005962759
+	@ObfuscatedName("fh")
+	@ObfuscatedSignature(
+		descriptor = "Lkj;"
 	)
-	static int field1457;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -1166420103
-	)
-	@Export("cacheGamebuild")
-	public static int cacheGamebuild;
-	@ObfuscatedName("v")
+	@Export("fontPlain11")
+	static Font fontPlain11;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -26,10 +20,10 @@ public class UserComparator10 extends AbstractUserComparator {
 		this.reversed = var1; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "254646745"
+		descriptor = "(Lly;Lly;I)I",
+		garbageValue = "-569162831"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -41,38 +35,71 @@ public class UserComparator10 extends AbstractUserComparator {
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22
+		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;I)V",
-		garbageValue = "2118947714"
+		descriptor = "(ILjava/lang/String;Ljava/lang/String;B)V",
+		garbageValue = "89"
 	)
-	public static void method2471(AbstractArchive var0) {
-		VarbitComposition.VarbitDefinition_archive = var0; // L: 26
-	} // L: 27
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(CB)Z",
-		garbageValue = "-13"
-	)
-	@Export("isDigit")
-	public static boolean isDigit(char var0) {
-		return var0 >= '0' && var0 <= '9'; // L: 138
+	@Export("addGameMessage")
+	static void addGameMessage(int var0, String var1, String var2) {
+		SecureRandomCallable.addChatMessage(var0, var1, var2, (String)null);
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-1839553264"
+		descriptor = "(II)Led;",
+		garbageValue = "1800688185"
 	)
-	public static int method2474(int var0) {
-		if (var0 > 0) { // L: 183
-			return 1;
+	@Export("getParamDefinition")
+	public static ParamComposition getParamDefinition(int var0) {
+		ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
 		} else {
-			return var0 < 0 ? -1 : 0; // L: 184 185
+			byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0);
+			var1 = new ParamComposition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27
+			return var1; // L: 28
 		}
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Leh;",
+		garbageValue = "844202869"
+	)
+	@Export("StructDefinition_getStructDefinition")
+	public static StructComposition StructDefinition_getStructDefinition(int var0) {
+		StructComposition var1 = (StructComposition)StructComposition.StructDefinition_cached.get((long)var0); // L: 19
+		if (var1 != null) { // L: 20
+			return var1;
+		} else {
+			byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 21
+			var1 = new StructComposition(); // L: 22
+			if (var2 != null) { // L: 23
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 24
+			StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 25
+			return var1; // L: 26
+		}
+	}
+
+	@ObfuscatedName("kg")
+	static final void method2568(double var0) {
+		Rasterizer3D.Rasterizer3D_setBrightness(var0); // L: 11102
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(var0); // L: 11103
+		ItemComposition.ItemDefinition_cachedSprites.clear(); // L: 11105
+		class4.clientPreferences.field1312 = var0; // L: 11107
+		Actor.savePreferences(); // L: 11108
+	} // L: 11109
 }
diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java
index cd7bb11f4e..790772cb7a 100644
--- a/runescape-client/src/main/java/UserComparator2.java
+++ b/runescape-client/src/main/java/UserComparator2.java
@@ -5,16 +5,22 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nj")
+@ObfuscatedName("nd")
 @Implements("UserComparator2")
 public class UserComparator2 implements Comparator {
-	@ObfuscatedName("f")
+	@ObfuscatedName("ev")
 	@ObfuscatedGetter(
-		intValue = -821679425
+		intValue = 1703708567
 	)
-	@Export("SpriteBuffer_spriteHeight")
-	static int SpriteBuffer_spriteHeight;
-	@ObfuscatedName("v")
+	@Export("currentPort")
+	static int currentPort;
+	@ObfuscatedName("jb")
+	@ObfuscatedSignature(
+		descriptor = "Liv;"
+	)
+	@Export("hoveredItemContainer")
+	static Widget hoveredItemContainer;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -22,21 +28,30 @@ public class UserComparator2 implements Comparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;Llx;B)I",
-		garbageValue = "-9"
+		descriptor = "(Llf;Llf;I)I",
+		garbageValue = "-85390661"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(User var1, User var2) {
 		return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14
 	}
 
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 22
+	}
+
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((User)var1, (User)var2); // L: 18
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 22
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "173515967"
+	)
+	public static int method6890(int var0) {
+		return class231.field2817[var0]; // L: 38
 	}
 }
diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java
index 42e7f28059..553e7cfba8 100644
--- a/runescape-client/src/main/java/UserComparator3.java
+++ b/runescape-client/src/main/java/UserComparator3.java
@@ -1,33 +1,22 @@
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InvalidClassException;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("dx")
+@ObfuscatedName("de")
 @Implements("UserComparator3")
 public class UserComparator3 extends AbstractUserComparator {
-	@ObfuscatedName("tb")
-	@ObfuscatedSignature(
-		descriptor = "Lje;"
+	@ObfuscatedName("dm")
+	@Export("mouseCam")
+	static boolean mouseCam;
+	@ObfuscatedName("lo")
+	@ObfuscatedGetter(
+		intValue = -350817607
 	)
-	public static class285 field1444;
-	@ObfuscatedName("fd")
-	@ObfuscatedSignature(
-		descriptor = "Lkt;"
-	)
-	@Export("fontPlain12")
-	static Font fontPlain12;
-	@ObfuscatedName("v")
+	@Export("menuWidth")
+	static int menuWidth;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -35,10 +24,10 @@ public class UserComparator3 extends AbstractUserComparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "2053904932"
+		descriptor = "(Lly;Lly;I)I",
+		garbageValue = "-462849378"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -53,123 +42,18 @@ public class UserComparator3 extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnb;I)V",
-		garbageValue = "1636861714"
+		descriptor = "(IIIZIB)J",
+		garbageValue = "-13"
 	)
-	@Export("performReflectionCheck")
-	public static void performReflectionCheck(PacketBuffer var0) {
-		ReflectionCheck var1 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 35
-		if (var1 != null) { // L: 36
-			int var2 = var0.offset; // L: 37
-			var0.writeInt(var1.id); // L: 38
-
-			for (int var3 = 0; var3 < var1.size; ++var3) { // L: 39
-				if (var1.creationErrors[var3] != 0) { // L: 40
-					var0.writeByte(var1.creationErrors[var3]); // L: 41
-				} else {
-					try {
-						int var4 = var1.operations[var3]; // L: 45
-						Field var5;
-						int var6;
-						if (var4 == 0) { // L: 46
-							var5 = var1.fields[var3]; // L: 47
-							var6 = Reflection.getInt(var5, (Object)null); // L: 48
-							var0.writeByte(0); // L: 49
-							var0.writeInt(var6); // L: 50
-						} else if (var4 == 1) { // L: 52
-							var5 = var1.fields[var3]; // L: 53
-							Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 54
-							var0.writeByte(0); // L: 55
-						} else if (var4 == 2) { // L: 57
-							var5 = var1.fields[var3]; // L: 58
-							var6 = var5.getModifiers(); // L: 59
-							var0.writeByte(0); // L: 60
-							var0.writeInt(var6); // L: 61
-						}
-
-						Method var25;
-						if (var4 != 3) { // L: 63
-							if (var4 == 4) { // L: 83
-								var25 = var1.methods[var3]; // L: 84
-								var6 = var25.getModifiers(); // L: 85
-								var0.writeByte(0); // L: 86
-								var0.writeInt(var6); // L: 87
-							}
-						} else {
-							var25 = var1.methods[var3]; // L: 64
-							byte[][] var10 = var1.arguments[var3]; // L: 65
-							Object[] var7 = new Object[var10.length]; // L: 66
-
-							for (int var8 = 0; var8 < var10.length; ++var8) { // L: 67
-								ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 68
-								var7[var8] = var9.readObject(); // L: 69
-							}
-
-							Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 71
-							if (var11 == null) { // L: 72
-								var0.writeByte(0);
-							} else if (var11 instanceof Number) { // L: 73
-								var0.writeByte(1); // L: 74
-								var0.writeLong(((Number)var11).longValue()); // L: 75
-							} else if (var11 instanceof String) { // L: 77
-								var0.writeByte(2); // L: 78
-								var0.writeStringCp1252NullTerminated((String)var11); // L: 79
-							} else {
-								var0.writeByte(4); // L: 81
-							}
-						}
-					} catch (ClassNotFoundException var13) { // L: 90
-						var0.writeByte(-10); // L: 91
-					} catch (InvalidClassException var14) { // L: 93
-						var0.writeByte(-11); // L: 94
-					} catch (StreamCorruptedException var15) { // L: 96
-						var0.writeByte(-12); // L: 97
-					} catch (OptionalDataException var16) { // L: 99
-						var0.writeByte(-13); // L: 100
-					} catch (IllegalAccessException var17) { // L: 102
-						var0.writeByte(-14); // L: 103
-					} catch (IllegalArgumentException var18) { // L: 105
-						var0.writeByte(-15); // L: 106
-					} catch (InvocationTargetException var19) { // L: 108
-						var0.writeByte(-16); // L: 109
-					} catch (SecurityException var20) { // L: 111
-						var0.writeByte(-17); // L: 112
-					} catch (IOException var21) { // L: 114
-						var0.writeByte(-18); // L: 115
-					} catch (NullPointerException var22) { // L: 117
-						var0.writeByte(-19); // L: 118
-					} catch (Exception var23) { // L: 120
-						var0.writeByte(-20); // L: 121
-					} catch (Throwable var24) { // L: 123
-						var0.writeByte(-21); // L: 124
-					}
-				}
-			}
-
-			var0.writeCrc(var2); // L: 127
-			var1.remove(); // L: 128
-		}
-	} // L: 129
-
-	@ObfuscatedName("iv")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-1768191443"
-	)
-	@Export("formatItemStacks")
-	static final String formatItemStacks(int var0) {
-		String var1 = Integer.toString(var0); // L: 9726
-
-		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9727
-			var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9728
+	@Export("calculateTag")
+	public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
+		long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 68
+		if (var3) { // L: 69
+			var5 |= 65536L;
 		}
 
-		if (var1.length() > 9) { // L: 9730
-			return " " + class44.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
-		} else {
-			return var1.length() > 6 ? " " + class44.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + class44.colorStartTag(16776960) + var1 + "</col>"; // L: 9731 9732
-		}
+		return var5; // L: 70
 	}
 }
diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java
index 7d689cd7b9..7c0f161a58 100644
--- a/runescape-client/src/main/java/UserComparator4.java
+++ b/runescape-client/src/main/java/UserComparator4.java
@@ -1,25 +1,16 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dv")
+@ObfuscatedName("dt")
 @Implements("UserComparator4")
 public class UserComparator4 implements Comparator {
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 2097206533
-	)
-	@Export("loginBoxCenter")
-	static int loginBoxCenter;
-	@ObfuscatedName("gi")
-	@ObfuscatedGetter(
-		intValue = -845013717
-	)
-	static int field1427;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ga")
+	@Export("regions")
+	static int[] regions;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -27,31 +18,645 @@ public class UserComparator4 implements Comparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "-903246659"
+		descriptor = "(Lly;Lly;I)I",
+		garbageValue = "1741486756"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(Buddy var1, Buddy var2) {
 		return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 22
 	}
 
-	@ObfuscatedName("jg")
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18
+	}
+
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "0"
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "61"
 	)
-	@Export("setTapToDrop")
-	static void setTapToDrop(boolean var0) {
-		Client.tapToDrop = var0; // L: 10172
-	} // L: 10173
+	static int method2529(int var0, Script var1, boolean var2) {
+		if (var0 == 6900) { // L: 4261
+			Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4262
+			return 1; // L: 4263
+		} else if (var0 == 6950) { // L: 4265
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4266
+			return 1; // L: 4267
+		} else {
+			return 2; // L: 4269
+		}
+	}
+
+	@ObfuscatedName("hr")
+	@ObfuscatedSignature(
+		descriptor = "(Lcl;IIIIII)V",
+		garbageValue = "-1284495098"
+	)
+	@Export("drawActor2d")
+	static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
+		if (var0 != null && var0.isVisible()) { // L: 4886
+			if (var0 instanceof NPC) { // L: 4887
+				NPCComposition var6 = ((NPC)var0).definition; // L: 4888
+				if (var6.transforms != null) { // L: 4889
+					var6 = var6.transform();
+				}
+
+				if (var6 == null) { // L: 4890
+					return;
+				}
+			}
+
+			int var76 = Players.Players_count; // L: 4892
+			int[] var7 = Players.Players_indices; // L: 4893
+			byte var8 = 0; // L: 4894
+			int var10;
+			if (var1 < var76 && var0.playerCycle == Client.cycle && Canvas.method492((Player)var0)) { // L: 4895
+				Player var9 = (Player)var0; // L: 4896
+				if (var1 < var76) { // L: 4897
+					var10 = var0.defaultHeight + 15; // L: 4898
+					ClanChannel.worldToScreen(var0.x, var0.y, var10); // L: 4900
+					AbstractFont var11 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4902
+					byte var12 = 9; // L: 4903
+					var11.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var12, 16777215, 0); // L: 4904
+					var8 = 18; // L: 4905
+				}
+			}
+
+			int var77 = -2; // L: 4908
+			int var17;
+			int var23;
+			int var24;
+			if (!var0.healthBars.method5364()) { // L: 4909
+				var10 = var0.defaultHeight + 15; // L: 4910
+				ClanChannel.worldToScreen(var0.x, var0.y, var10); // L: 4912
+
+				for (HealthBar var89 = (HealthBar)var0.healthBars.last(); var89 != null; var89 = (HealthBar)var0.healthBars.previous()) { // L: 4914
+					HealthBarUpdate var81 = var89.get(Client.cycle); // L: 4915
+					if (var81 == null) { // L: 4916
+						if (var89.isEmpty()) { // L: 4974
+							var89.remove();
+						}
+					} else {
+						HealthBarDefinition var13 = var89.definition; // L: 4917
+						SpritePixels var82 = var13.getBackSprite(); // L: 4918
+						SpritePixels var83 = var13.getFrontSprite(); // L: 4919
+						var17 = 0; // L: 4921
+						int var84;
+						if (var82 != null && var83 != null) { // L: 4922
+							if (var13.widthPadding * 2 < var83.subWidth) { // L: 4923
+								var17 = var13.widthPadding;
+							}
+
+							var84 = var83.subWidth - var17 * 2; // L: 4924
+						} else {
+							var84 = var13.width; // L: 4926
+						}
+
+						int var18 = 255; // L: 4927
+						boolean var85 = true; // L: 4928
+						int var86 = Client.cycle - var81.cycle; // L: 4929
+						int var87 = var84 * var81.health2 / var13.width; // L: 4930
+						int var88;
+						int var94;
+						if (var81.cycleOffset > var86) { // L: 4931
+							var88 = var13.field1607 == 0 ? 0 : var13.field1607 * (var86 / var13.field1607); // L: 4932
+							var23 = var84 * var81.health / var13.width; // L: 4933
+							var94 = var88 * (var87 - var23) / var81.cycleOffset + var23; // L: 4934
+						} else {
+							var94 = var87; // L: 4937
+							var88 = var81.cycleOffset + var13.int5 - var86; // L: 4938
+							if (var13.int3 >= 0) { // L: 4939
+								var18 = (var88 << 8) / (var13.int5 - var13.int3);
+							}
+						}
+
+						if (var81.health2 > 0 && var94 < 1) { // L: 4941
+							var94 = 1;
+						}
+
+						if (var82 != null && var83 != null) { // L: 4942
+							if (var84 == var94) { // L: 4943
+								var94 += var17 * 2;
+							} else {
+								var94 += var17; // L: 4944
+							}
+
+							var88 = var82.subHeight; // L: 4945
+							var77 += var88; // L: 4946
+							var23 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4947
+							var24 = var3 + Client.viewportTempY - var77; // L: 4948
+							var23 -= var17; // L: 4949
+							if (var18 >= 0 && var18 < 255) { // L: 4950
+								var82.drawTransAt(var23, var24, var18); // L: 4951
+								Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var94 + var23, var88 + var24); // L: 4952
+								var83.drawTransAt(var23, var24, var18); // L: 4953
+							} else {
+								var82.drawTransBgAt(var23, var24); // L: 4956
+								Rasterizer2D.Rasterizer2D_expandClip(var23, var24, var23 + var94, var24 + var88); // L: 4957
+								var83.drawTransBgAt(var23, var24); // L: 4958
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4960
+							var77 += 2; // L: 4961
+						} else {
+							var77 += 5; // L: 4964
+							if (Client.viewportTempX > -1) { // L: 4965
+								var88 = var2 + Client.viewportTempX - (var84 >> 1); // L: 4966
+								var23 = var3 + Client.viewportTempY - var77; // L: 4967
+								Rasterizer2D.Rasterizer2D_fillRectangle(var88, var23, var94, 5, 65280); // L: 4968
+								Rasterizer2D.Rasterizer2D_fillRectangle(var94 + var88, var23, var84 - var94, 5, 16711680); // L: 4969
+							}
+
+							var77 += 2; // L: 4971
+						}
+					}
+				}
+			}
+
+			if (var77 == -2) { // L: 4977
+				var77 += 7;
+			}
+
+			var77 += var8; // L: 4978
+			int var79;
+			if (var1 < var76) { // L: 4979
+				Player var78 = (Player)var0; // L: 4980
+				if (var78.isHidden) { // L: 4981
+					return;
+				}
+
+				if (var78.headIconPk != -1 || var78.headIconPrayer != -1) { // L: 4982
+					var79 = var0.defaultHeight + 15; // L: 4983
+					ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 4985
+					if (Client.viewportTempX > -1) { // L: 4987
+						if (var78.headIconPk != -1) { // L: 4988
+							var77 += 25; // L: 4989
+							ScriptFrame.headIconPkSprites[var78.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4990
+						}
+
+						if (var78.headIconPrayer != -1) { // L: 4992
+							var77 += 25; // L: 4993
+							class20.headIconPrayerSprites[var78.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 4994
+						}
+					}
+				}
+
+				if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4998
+					var79 = var0.defaultHeight + 15; // L: 4999
+					ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 5001
+					if (Client.viewportTempX > -1) { // L: 5003
+						var77 += Skills.headIconHintSprites[1].subHeight; // L: 5004
+						Skills.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var77); // L: 5005
+					}
+				}
+			} else {
+				NPCComposition var93 = ((NPC)var0).definition; // L: 5010
+				if (var93.transforms != null) { // L: 5011
+					var93 = var93.transform();
+				}
+
+				if (var93.headIconPrayer >= 0 && var93.headIconPrayer < class20.headIconPrayerSprites.length) { // L: 5012
+					var79 = var0.defaultHeight + 15; // L: 5013
+					ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 5015
+					if (Client.viewportTempX > -1) { // L: 5017
+						class20.headIconPrayerSprites[var93.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 5018
+					}
+				}
+
+				if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var76] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 5021
+					var79 = var0.defaultHeight + 15; // L: 5022
+					ClanChannel.worldToScreen(var0.x, var0.y, var79); // L: 5024
+					if (Client.viewportTempX > -1) { // L: 5026
+						Skills.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
+					}
+				}
+			}
+
+			if (var0.overheadText != null && (var1 >= var76 || !var0.field1253 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 5029 5030
+				var10 = var0.defaultHeight; // L: 5031
+				ClanChannel.worldToScreen(var0.x, var0.y, var10); // L: 5033
+				if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 5035
+					Client.overheadTextXOffsets[Client.overheadTextCount] = class309.fontBold12.stringWidth(var0.overheadText) / 2; // L: 5036
+					Client.overheadTextAscents[Client.overheadTextCount] = class309.fontBold12.ascent; // L: 5037
+					Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 5038
+					Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 5039
+					Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 5040
+					Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 5041
+					Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 5042
+					Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 5043
+					++Client.overheadTextCount; // L: 5044
+				}
+			}
+
+			for (var10 = 0; var10 < 4; ++var10) { // L: 5048
+				var79 = var0.hitSplatCycles[var10]; // L: 5049
+				int var90 = var0.hitSplatTypes[var10]; // L: 5050
+				HitSplatDefinition var91 = null; // L: 5051
+				int var14 = 0; // L: 5052
+				if (var90 >= 0) { // L: 5053
+					if (var79 <= Client.cycle) { // L: 5054
+						continue;
+					}
+
+					var91 = Decimator.method1171(var0.hitSplatTypes[var10]); // L: 5055
+					var14 = var91.field1738; // L: 5056
+					if (var91 != null && var91.transforms != null) { // L: 5057
+						var91 = var91.transform(); // L: 5058
+						if (var91 == null) { // L: 5059
+							var0.hitSplatCycles[var10] = -1; // L: 5060
+							continue; // L: 5061
+						}
+					}
+				} else if (var79 < 0) { // L: 5065
+					continue;
+				}
+
+				int var15 = var0.hitSplatTypes2[var10]; // L: 5066
+				HitSplatDefinition var16 = null; // L: 5067
+				if (var15 >= 0) { // L: 5068
+					var16 = Decimator.method1171(var15); // L: 5069
+					if (var16 != null && var16.transforms != null) { // L: 5070
+						var16 = var16.transform();
+					}
+				}
+
+				if (var79 - var14 <= Client.cycle) { // L: 5072
+					if (var91 == null) { // L: 5073
+						var0.hitSplatCycles[var10] = -1; // L: 5074
+					} else {
+						var17 = var0.defaultHeight / 2; // L: 5077
+						ClanChannel.worldToScreen(var0.x, var0.y, var17); // L: 5079
+						if (Client.viewportTempX > -1) { // L: 5081
+							if (var10 == 1) { // L: 5083
+								Client.viewportTempY -= 20; // L: 5084
+							}
+
+							if (var10 == 2) { // L: 5086
+								Client.viewportTempX -= 15; // L: 5087
+								Client.viewportTempY -= 10; // L: 5088
+							}
+
+							if (var10 == 3) { // L: 5090
+								Client.viewportTempX += 15; // L: 5091
+								Client.viewportTempY -= 10; // L: 5092
+							}
+
+							SpritePixels var19 = null; // L: 5094
+							SpritePixels var20 = null; // L: 5095
+							SpritePixels var21 = null; // L: 5096
+							SpritePixels var22 = null; // L: 5097
+							var23 = 0; // L: 5098
+							var24 = 0; // L: 5099
+							int var25 = 0; // L: 5100
+							int var26 = 0; // L: 5101
+							int var27 = 0; // L: 5102
+							int var28 = 0; // L: 5103
+							int var29 = 0; // L: 5104
+							int var30 = 0; // L: 5105
+							SpritePixels var31 = null; // L: 5106
+							SpritePixels var32 = null; // L: 5107
+							SpritePixels var33 = null; // L: 5108
+							SpritePixels var34 = null; // L: 5109
+							int var35 = 0; // L: 5110
+							int var36 = 0; // L: 5111
+							int var37 = 0; // L: 5112
+							int var38 = 0; // L: 5113
+							int var39 = 0; // L: 5114
+							int var40 = 0; // L: 5115
+							int var41 = 0; // L: 5116
+							int var42 = 0; // L: 5117
+							int var43 = 0; // L: 5118
+							var19 = var91.method2978(); // L: 5119
+							int var44;
+							if (var19 != null) { // L: 5120
+								var23 = var19.subWidth; // L: 5121
+								var44 = var19.subHeight; // L: 5122
+								if (var44 > var43) { // L: 5123
+									var43 = var44;
+								}
+
+								var27 = var19.xOffset; // L: 5124
+							}
+
+							var20 = var91.method3005(); // L: 5126
+							if (var20 != null) { // L: 5127
+								var24 = var20.subWidth; // L: 5128
+								var44 = var20.subHeight; // L: 5129
+								if (var44 > var43) { // L: 5130
+									var43 = var44;
+								}
+
+								var28 = var20.xOffset; // L: 5131
+							}
+
+							var21 = var91.method2980(); // L: 5133
+							if (var21 != null) { // L: 5134
+								var25 = var21.subWidth; // L: 5135
+								var44 = var21.subHeight; // L: 5136
+								if (var44 > var43) { // L: 5137
+									var43 = var44;
+								}
+
+								var29 = var21.xOffset; // L: 5138
+							}
+
+							var22 = var91.method2981(); // L: 5140
+							if (var22 != null) { // L: 5141
+								var26 = var22.subWidth; // L: 5142
+								var44 = var22.subHeight; // L: 5143
+								if (var44 > var43) { // L: 5144
+									var43 = var44;
+								}
+
+								var30 = var22.xOffset; // L: 5145
+							}
+
+							if (var16 != null) { // L: 5147
+								var31 = var16.method2978(); // L: 5148
+								if (var31 != null) { // L: 5149
+									var35 = var31.subWidth; // L: 5150
+									var44 = var31.subHeight; // L: 5151
+									if (var44 > var43) { // L: 5152
+										var43 = var44;
+									}
+
+									var39 = var31.xOffset; // L: 5153
+								}
+
+								var32 = var16.method3005(); // L: 5155
+								if (var32 != null) { // L: 5156
+									var36 = var32.subWidth; // L: 5157
+									var44 = var32.subHeight; // L: 5158
+									if (var44 > var43) { // L: 5159
+										var43 = var44;
+									}
+
+									var40 = var32.xOffset; // L: 5160
+								}
+
+								var33 = var16.method2980(); // L: 5162
+								if (var33 != null) { // L: 5163
+									var37 = var33.subWidth; // L: 5164
+									var44 = var33.subHeight; // L: 5165
+									if (var44 > var43) { // L: 5166
+										var43 = var44;
+									}
+
+									var41 = var33.xOffset; // L: 5167
+								}
+
+								var34 = var16.method2981(); // L: 5169
+								if (var34 != null) { // L: 5170
+									var38 = var34.subWidth; // L: 5171
+									var44 = var34.subHeight; // L: 5172
+									if (var44 > var43) { // L: 5173
+										var43 = var44;
+									}
+
+									var42 = var34.xOffset; // L: 5174
+								}
+							}
+
+							Font var80 = var91.getFont(); // L: 5179
+							if (var80 == null) { // L: 5180
+								var80 = UserComparator10.fontPlain11;
+							}
+
+							Font var45;
+							if (var16 != null) { // L: 5181
+								var45 = var16.getFont(); // L: 5182
+								if (var45 == null) { // L: 5183
+									var45 = UserComparator10.fontPlain11;
+								}
+							} else {
+								var45 = UserComparator10.fontPlain11; // L: 5185
+							}
+
+							String var46 = null; // L: 5186
+							String var47 = null; // L: 5187
+							boolean var48 = false; // L: 5188
+							int var49 = 0; // L: 5189
+							var46 = var91.getString(var0.hitSplatValues[var10]); // L: 5190
+							int var92 = var80.stringWidth(var46); // L: 5191
+							if (var16 != null) { // L: 5192
+								var47 = var16.getString(var0.hitSplatValues2[var10]); // L: 5193
+								var49 = var45.stringWidth(var47); // L: 5194
+							}
+
+							int var50 = 0; // L: 5196
+							int var51 = 0; // L: 5197
+							if (var24 > 0) { // L: 5198
+								if (var21 == null && var22 == null) { // L: 5199
+									var50 = 1; // L: 5200
+								} else {
+									var50 = var92 / var24 + 1;
+								}
+							}
+
+							if (var16 != null && var36 > 0) { // L: 5202 5203
+								if (var33 == null && var34 == null) { // L: 5204
+									var51 = 1; // L: 5205
+								} else {
+									var51 = var49 / var36 + 1;
+								}
+							}
+
+							int var52 = 0; // L: 5208
+							int var53 = var52; // L: 5209
+							if (var23 > 0) { // L: 5210
+								var52 += var23;
+							}
+
+							var52 += 2; // L: 5211
+							int var54 = var52; // L: 5212
+							if (var25 > 0) { // L: 5213
+								var52 += var25;
+							}
+
+							int var55 = var52; // L: 5214
+							int var56 = var52; // L: 5215
+							int var57;
+							if (var24 > 0) { // L: 5216
+								var57 = var24 * var50; // L: 5217
+								var52 += var57; // L: 5218
+								var56 += (var57 - var92) / 2; // L: 5219
+							} else {
+								var52 += var92; // L: 5222
+							}
+
+							var57 = var52; // L: 5224
+							if (var26 > 0) { // L: 5225
+								var52 += var26;
+							}
+
+							int var58 = 0; // L: 5226
+							int var59 = 0; // L: 5227
+							int var60 = 0; // L: 5228
+							int var61 = 0; // L: 5229
+							int var62 = 0; // L: 5230
+							int var63;
+							if (var16 != null) { // L: 5231
+								var52 += 2; // L: 5232
+								var58 = var52; // L: 5233
+								if (var35 > 0) { // L: 5234
+									var52 += var35;
+								}
+
+								var52 += 2; // L: 5235
+								var59 = var52; // L: 5236
+								if (var37 > 0) { // L: 5237
+									var52 += var37;
+								}
+
+								var60 = var52; // L: 5238
+								var62 = var52; // L: 5239
+								if (var36 > 0) { // L: 5240
+									var63 = var51 * var36; // L: 5241
+									var52 += var63; // L: 5242
+									var62 += (var63 - var49) / 2; // L: 5243
+								} else {
+									var52 += var49; // L: 5246
+								}
+
+								var61 = var52; // L: 5248
+								if (var38 > 0) { // L: 5249
+									var52 += var38;
+								}
+							}
+
+							var63 = var0.hitSplatCycles[var10] - Client.cycle; // L: 5251
+							int var64 = var91.field1733 - var63 * var91.field1733 / var91.field1738; // L: 5252
+							int var65 = var63 * var91.field1744 / var91.field1738 + -var91.field1744; // L: 5253
+							int var66 = var64 + (var2 + Client.viewportTempX - (var52 >> 1)); // L: 5254
+							int var67 = var65 + (var3 + Client.viewportTempY - 12); // L: 5255
+							int var68 = var67; // L: 5256
+							int var69 = var67 + var43; // L: 5257
+							int var70 = var67 + var91.field1748 + 15; // L: 5258
+							int var71 = var70 - var80.maxAscent; // L: 5259
+							int var72 = var70 + var80.maxDescent; // L: 5260
+							if (var71 < var67) { // L: 5261
+								var68 = var71;
+							}
+
+							if (var72 > var69) { // L: 5262
+								var69 = var72;
+							}
+
+							int var73 = 0; // L: 5263
+							int var74;
+							int var75;
+							if (var16 != null) { // L: 5264
+								var73 = var67 + var16.field1748 + 15; // L: 5265
+								var74 = var73 - var45.maxAscent; // L: 5266
+								var75 = var73 + var45.maxDescent; // L: 5267
+								if (var74 < var68) { // L: 5268
+									;
+								}
+
+								if (var75 > var69) { // L: 5269
+									;
+								}
+							}
+
+							var74 = 255; // L: 5271
+							if (var91.field1745 >= 0) { // L: 5272
+								var74 = (var63 << 8) / (var91.field1738 - var91.field1745);
+							}
+
+							if (var74 >= 0 && var74 < 255) { // L: 5273
+								if (var19 != null) { // L: 5274
+									var19.drawTransAt(var66 + var53 - var27, var67, var74);
+								}
+
+								if (var21 != null) { // L: 5275
+									var21.drawTransAt(var54 + var66 - var29, var67, var74);
+								}
+
+								if (var20 != null) { // L: 5276
+									for (var75 = 0; var75 < var50; ++var75) { // L: 5277
+										var20.drawTransAt(var75 * var24 + (var55 + var66 - var28), var67, var74); // L: 5278
+									}
+								}
+
+								if (var22 != null) { // L: 5281
+									var22.drawTransAt(var57 + var66 - var30, var67, var74);
+								}
+
+								var80.drawAlpha(var46, var56 + var66, var70, var91.textColor, 0, var74); // L: 5282
+								if (var16 != null) { // L: 5283
+									if (var31 != null) { // L: 5284
+										var31.drawTransAt(var58 + var66 - var39, var67, var74);
+									}
+
+									if (var33 != null) { // L: 5285
+										var33.drawTransAt(var66 + var59 - var41, var67, var74);
+									}
+
+									if (var32 != null) { // L: 5286
+										for (var75 = 0; var75 < var51; ++var75) { // L: 5287
+											var32.drawTransAt(var75 * var36 + (var66 + var60 - var40), var67, var74); // L: 5288
+										}
+									}
+
+									if (var34 != null) { // L: 5291
+										var34.drawTransAt(var61 + var66 - var42, var67, var74);
+									}
+
+									var45.drawAlpha(var47, var66 + var62, var73, var16.textColor, 0, var74); // L: 5292
+								}
+							} else {
+								if (var19 != null) { // L: 5296
+									var19.drawTransBgAt(var53 + var66 - var27, var67);
+								}
+
+								if (var21 != null) { // L: 5297
+									var21.drawTransBgAt(var66 + var54 - var29, var67);
+								}
+
+								if (var20 != null) { // L: 5298
+									for (var75 = 0; var75 < var50; ++var75) { // L: 5299
+										var20.drawTransBgAt(var75 * var24 + (var66 + var55 - var28), var67); // L: 5300
+									}
+								}
+
+								if (var22 != null) { // L: 5303
+									var22.drawTransBgAt(var66 + var57 - var30, var67);
+								}
+
+								var80.draw(var46, var66 + var56, var70, var91.textColor | -16777216, 0); // L: 5304
+								if (var16 != null) { // L: 5305
+									if (var31 != null) { // L: 5306
+										var31.drawTransBgAt(var66 + var58 - var39, var67);
+									}
+
+									if (var33 != null) { // L: 5307
+										var33.drawTransBgAt(var66 + var59 - var41, var67);
+									}
+
+									if (var32 != null) { // L: 5308
+										for (var75 = 0; var75 < var51; ++var75) { // L: 5309
+											var32.drawTransBgAt(var75 * var36 + (var66 + var60 - var40), var67); // L: 5310
+										}
+									}
+
+									if (var34 != null) { // L: 5313
+										var34.drawTransBgAt(var66 + var61 - var42, var67);
+									}
+
+									var45.draw(var47, var66 + var62, var73, var16.textColor | -16777216, 0); // L: 5314
+								}
+							}
+						}
+					}
+				}
+			}
+
+		}
+	} // L: 5319
 }
diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java
index 5df27a7a19..8768971ed0 100644
--- a/runescape-client/src/main/java/UserComparator5.java
+++ b/runescape-client/src/main/java/UserComparator5.java
@@ -1,30 +1,25 @@
+import java.applet.Applet;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("da")
+@ObfuscatedName("dl")
 @Implements("UserComparator5")
 public class UserComparator5 extends AbstractUserComparator {
-	@ObfuscatedName("u")
-	public static short[] field1442;
-	@ObfuscatedName("z")
-	@Export("formattedOperatingSystemName")
-	public static String formattedOperatingSystemName;
-	@ObfuscatedName("dm")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive12")
-	static Archive archive12;
-	@ObfuscatedName("iz")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1854633345
+		intValue = -580519893
 	)
-	@Export("selectedItemId")
-	static int selectedItemId;
-	@ObfuscatedName("v")
+	static int field1442;
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "Liv;"
+	)
+	@Export("scriptDotWidget")
+	static Widget scriptDotWidget;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -32,10 +27,10 @@ public class UserComparator5 extends AbstractUserComparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "1211998991"
+		descriptor = "(Lly;Lly;B)I",
+		garbageValue = "16"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -51,70 +46,19 @@ public class UserComparator5 extends AbstractUserComparator {
 	}
 
 	public int compare(Object var1, Object var2) {
-		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24
+		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;I)Z",
-		garbageValue = "-1243272557"
+		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V",
+		garbageValue = "1563764098"
 	)
-	public static boolean method2449(AbstractArchive var0, AbstractArchive var1) {
-		WorldMapElement.WorldMapElement_archive = var1; // L: 44
-		if (!var0.isFullyLoaded()) { // L: 45
-			return false; // L: 46
-		} else {
-			class311.WorldMapElement_count = var0.getGroupFileCount(35); // L: 48
-			WorldMapElement.WorldMapElement_cached = new WorldMapElement[class311.WorldMapElement_count]; // L: 49
-
-			for (int var2 = 0; var2 < class311.WorldMapElement_count; ++var2) { // L: 50
-				byte[] var3 = var0.takeFile(35, var2); // L: 51
-				WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2); // L: 52
-				if (var3 != null) { // L: 53
-					WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3)); // L: 54
-					WorldMapElement.WorldMapElement_cached[var2].method2634(); // L: 55
-				}
-			}
-
-			return true; // L: 58
-		}
-	}
-
-	@ObfuscatedName("hz")
-	@ObfuscatedSignature(
-		descriptor = "(Lch;I)V",
-		garbageValue = "14093457"
-	)
-	static final void method2448(PendingSpawn var0) {
-		long var1 = 0L; // L: 7227
-		int var3 = -1; // L: 7228
-		int var4 = 0; // L: 7229
-		int var5 = 0; // L: 7230
-		if (var0.type == 0) { // L: 7231
-			var1 = AbstractSocket.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
+	public static void method2543(Applet var0, String var1) {
+		class44.applet = var0; // L: 22
+		if (var1 != null) { // L: 23
+			class44.field309 = var1;
 		}
 
-		if (var0.type == 1) { // L: 7232
-			var1 = AbstractSocket.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 2) { // L: 7233
-			var1 = AbstractSocket.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
-		}
-
-		if (var0.type == 3) {
-			var1 = AbstractSocket.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); // L: 7234
-		}
-
-		if (0L != var1) { // L: 7235
-			int var6 = AbstractSocket.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 7236
-			var3 = class93.Entity_unpackID(var1); // L: 7237
-			var4 = var6 & 31; // L: 7238
-			var5 = var6 >> 6 & 3; // L: 7239
-		}
-
-		var0.objectId = var3; // L: 7241
-		var0.field1229 = var4; // L: 7242
-		var0.field1225 = var5; // L: 7243
-	} // L: 7244
+	} // L: 24
 }
diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java
index 725a5a2614..6b7178099c 100644
--- a/runescape-client/src/main/java/UserComparator6.java
+++ b/runescape-client/src/main/java/UserComparator6.java
@@ -2,12 +2,18 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("dn")
+@ObfuscatedName("dj")
 @Implements("UserComparator6")
 public class UserComparator6 extends AbstractUserComparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lnt;"
+	)
+	@Export("NetCache_reference")
+	public static Buffer NetCache_reference;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -15,10 +21,10 @@ public class UserComparator6 extends AbstractUserComparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "-26460885"
+		descriptor = "(Lly;Lly;I)I",
+		garbageValue = "2014862906"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -33,96 +39,57 @@ public class UserComparator6 extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)Let;",
-		garbageValue = "1390407086"
+		descriptor = "([BIIIIIII[Lfl;B)V",
+		garbageValue = "6"
 	)
-	public static HealthBarDefinition method2492(int var0) {
-		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32
-		if (var1 != null) { // L: 33
-			return var1;
-		} else {
-			byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34
-			var1 = new HealthBarDefinition(); // L: 35
-			if (var2 != null) { // L: 36
-				var1.decode(new Buffer(var2));
-			}
-
-			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 37
-			return var1; // L: 38
-		}
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;",
-		garbageValue = "-2129011135"
-	)
-	@Export("loadClassFromDescriptor")
-	static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
-		if (var0.equals("B")) { // L: 222
-			return Byte.TYPE;
-		} else if (var0.equals("I")) { // L: 223
-			return Integer.TYPE;
-		} else if (var0.equals("S")) { // L: 224
-			return Short.TYPE;
-		} else if (var0.equals("J")) { // L: 225
-			return Long.TYPE;
-		} else if (var0.equals("Z")) { // L: 226
-			return Boolean.TYPE;
-		} else if (var0.equals("F")) { // L: 227
-			return Float.TYPE;
-		} else if (var0.equals("D")) { // L: 228
-			return Double.TYPE;
-		} else if (var0.equals("C")) { // L: 229
-			return Character.TYPE;
-		} else {
-			return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); // L: 230 231
-		}
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1210061532"
-	)
-	public static void method2485() {
-		HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 203
-		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 204
-		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 205
-	} // L: 206
-
-	@ObfuscatedName("bn")
-	@ObfuscatedSignature(
-		descriptor = "([BI)[B",
-		garbageValue = "1275679316"
-	)
-	@Export("decompressBytes")
-	static final byte[] decompressBytes(byte[] var0) {
-		Buffer var1 = new Buffer(var0); // L: 381
-		int var2 = var1.readUnsignedByte(); // L: 382
-		int var3 = var1.readInt(); // L: 383
-		if (var3 < 0 || AbstractArchive.field3589 != 0 && var3 > AbstractArchive.field3589) { // L: 384
-			throw new RuntimeException(); // L: 385
-		} else if (var2 == 0) { // L: 387
-			byte[] var6 = new byte[var3]; // L: 388
-			var1.readBytes(var6, 0, var3); // L: 389
-			return var6; // L: 390
-		} else {
-			int var4 = var1.readInt(); // L: 393
-			if (var4 >= 0 && (AbstractArchive.field3589 == 0 || var4 <= AbstractArchive.field3589)) { // L: 394
-				byte[] var5 = new byte[var4]; // L: 397
-				if (var2 == 1) { // L: 398
-					BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
-				} else {
-					AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 399
+	static final void method2580(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
+		int var10;
+		for (int var9 = 0; var9 < 8; ++var9) { // L: 62
+			for (var10 = 0; var10 < 8; ++var10) { // L: 63
+				if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) {
+					int[] var10000 = var8[var1].flags[var9 + var2]; // L: 64
+					var10000[var10 + var3] &= -16777217;
 				}
-
-				return var5; // L: 400
-			} else {
-				throw new RuntimeException(); // L: 395
 			}
 		}
+
+		Buffer var13 = new Buffer(var0); // L: 67
+
+		for (var10 = 0; var10 < 4; ++var10) { // L: 68
+			for (int var11 = 0; var11 < 64; ++var11) { // L: 69
+				for (int var12 = 0; var12 < 64; ++var12) { // L: 70
+					if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { // L: 71
+						Huffman.loadTerrain(var13, var1, var2 + class143.method2815(var11 & 7, var12 & 7, var7), var3 + class171.method3614(var11 & 7, var12 & 7, var7), 0, 0, var7); // L: 72
+					} else {
+						Huffman.loadTerrain(var13, 0, -1, -1, 0, 0, 0); // L: 74
+					}
+				}
+			}
+		}
+
+	} // L: 78
+
+	@ObfuscatedName("ae")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-675377144"
+	)
+	static int method2585(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.LOGOUT) { // L: 3547
+			Client.logoutTimer = 250; // L: 3548
+			return 1; // L: 3549
+		} else if (var0 != 5631 && var0 != 5633) { // L: 3551
+			if (var0 == 5632) { // L: 3555
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 26; // L: 3556
+				return 1; // L: 3557
+			} else {
+				return 2; // L: 3559
+			}
+		} else {
+			UserComparator9.Interpreter_stringStackSize -= 2; // L: 3552
+			return 1; // L: 3553
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index 22d9de9924..62f9c8ba55 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -1,12 +1,31 @@
 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("dd")
+@ObfuscatedName("do")
 @Implements("UserComparator7")
 public class UserComparator7 extends AbstractUserComparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("qj")
+	@ObfuscatedSignature(
+		descriptor = "Lav;"
+	)
+	@Export("pcmStreamMixer")
+	static PcmStreamMixer pcmStreamMixer;
+	@ObfuscatedName("ep")
+	@ObfuscatedGetter(
+		intValue = 2052906641
+	)
+	@Export("worldPort")
+	static int worldPort;
+	@ObfuscatedName("nh")
+	@ObfuscatedGetter(
+		intValue = -455733963
+	)
+	@Export("widgetDragDuration")
+	static int widgetDragDuration;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -14,10 +33,10 @@ public class UserComparator7 extends AbstractUserComparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "-1880914380"
+		descriptor = "(Lly;Lly;B)I",
+		garbageValue = "8"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -31,4 +50,13 @@ public class UserComparator7 extends AbstractUserComparator {
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21
 	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1200768882"
+	)
+	public static void method2539() {
+		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 69
+	} // L: 70
 }
diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java
index 695f8a282c..555524f254 100644
--- a/runescape-client/src/main/java/UserComparator8.java
+++ b/runescape-client/src/main/java/UserComparator8.java
@@ -3,10 +3,10 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dy")
+@ObfuscatedName("dp")
 @Implements("UserComparator8")
 public class UserComparator8 extends AbstractUserComparator {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -14,10 +14,10 @@ public class UserComparator8 extends AbstractUserComparator {
 		this.reversed = var1; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;I)I",
-		garbageValue = "-1643284848"
+		descriptor = "(Lly;Lly;B)I",
+		garbageValue = "1"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -36,9 +36,47 @@ public class UserComparator8 extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25
 	}
 
-	@ObfuscatedName("n")
-	static boolean method2437(long var0) {
-		int var2 = (int)(var0 >>> 14 & 3L); // L: 50
-		return var2 == 2; // L: 52
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Ljs;",
+		garbageValue = "2010413146"
+	)
+	static GameBuild[] method2538() {
+		return new GameBuild[]{GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.RC, GameBuild.LIVE}; // L: 13
 	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I[B[BI)V",
+		garbageValue = "700891995"
+	)
+	@Export("Widget_setKey")
+	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		if (var0.field3035 == null) { // L: 974
+			if (var2 == null) { // L: 975
+				return; // L: 981
+			}
+
+			var0.field3035 = new byte[11][]; // L: 976
+			var0.field3036 = new byte[11][]; // L: 977
+			var0.field3037 = new int[11]; // L: 978
+			var0.field3038 = new int[11]; // L: 979
+		}
+
+		var0.field3035[var1] = var2; // L: 983
+		if (var2 != null) {
+			var0.field3034 = true; // L: 984
+		} else {
+			var0.field3034 = false; // L: 986
+
+			for (int var4 = 0; var4 < var0.field3035.length; ++var4) { // L: 987
+				if (var0.field3035[var4] != null) { // L: 988
+					var0.field3034 = true; // L: 989
+					break;
+				}
+			}
+		}
+
+		var0.field3036[var1] = var3; // L: 994
+	} // L: 995
 }
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index d714181ea2..0cbcab4d96 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -1,19 +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;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("dg")
+@ObfuscatedName("dr")
 @Implements("UserComparator9")
 public class UserComparator9 extends AbstractUserComparator {
-	@ObfuscatedName("ff")
-	@ObfuscatedSignature(
-		descriptor = "Leu;"
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = -1946098059
 	)
-	@Export("socketTask")
-	static Task socketTask;
-	@ObfuscatedName("v")
+	@Export("Interpreter_stringStackSize")
+	static int Interpreter_stringStackSize;
+	@ObfuscatedName("f")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -21,10 +21,10 @@ public class UserComparator9 extends AbstractUserComparator {
 		this.reversed = var1; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Llv;Llv;B)I",
-		garbageValue = "-69"
+		descriptor = "(Lly;Lly;B)I",
+		garbageValue = "6"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -39,386 +39,537 @@ public class UserComparator9 extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "910297623"
+		descriptor = "(Lns;II)V",
+		garbageValue = "798107312"
 	)
-	static int method2466(int var0, Script var1, boolean var2) {
-		String var7;
-		if (var0 == ScriptOpcodes.MES) { // L: 1397
-			var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1398
-			World.addGameMessage(0, "", var7); // L: 1399
-			return 1; // L: 1400
-		} else if (var0 == ScriptOpcodes.ANIM) {
-			class44.Interpreter_intStackSize -= 2; // L: 1403
-			class32.performPlayerAnimation(class93.localPlayer, Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 1404
-			return 1; // L: 1405
-		} else if (var0 == ScriptOpcodes.IF_CLOSE) {
-			if (!Interpreter.field986) { // L: 1408
-				Interpreter.field973 = true; // L: 1409
+	@Export("updatePlayers")
+	static final void updatePlayers(PacketBuffer var0, int var1) {
+		int var2 = var0.offset; // L: 71
+		Players.Players_pendingUpdateCount = 0; // L: 72
+		AbstractArchive.method5160(var0); // L: 73
+
+		for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { // L: 75
+			int var4 = Players.Players_pendingUpdateIndices[var3]; // L: 76
+			Player var5 = Client.players[var4]; // L: 77
+			int var6 = var0.readUnsignedByte(); // L: 78
+			if ((var6 & 128) != 0) { // L: 79
+				var6 += var0.readUnsignedByte() << 8;
 			}
 
-			return 1; // L: 1411
-		} else {
-			int var16;
-			if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
-				var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1414
-				var16 = 0; // L: 1415
-				if (class20.isNumber(var7)) { // L: 1416
-					var16 = class82.method1908(var7);
-				}
+			method2561(var0, var4, var5, var6); // L: 80
+		}
 
-				PacketBufferNode var14 = class21.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); // L: 1418
-				var14.packetBuffer.writeInt(var16); // L: 1419
-				Client.packetWriter.addNode(var14); // L: 1420
-				return 1; // L: 1421
-			} else {
-				PacketBufferNode var12;
-				if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
-					var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1424
-					var12 = class21.getPacketBufferNode(ClientPacket.field2595, Client.packetWriter.isaacCipher); // L: 1426
-					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1427
-					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1428
-					Client.packetWriter.addNode(var12); // L: 1429
-					return 1; // L: 1430
-				} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
-					var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1433
-					var12 = class21.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); // L: 1435
-					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1436
-					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1437
-					Client.packetWriter.addNode(var12); // L: 1438
-					return 1; // L: 1439
-				} else {
-					String var4;
-					int var10;
-					if (var0 == ScriptOpcodes.OPPLAYER) {
-						var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1442
-						var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1443
-						Actor.method2192(var10, var4); // L: 1444
-						return 1; // L: 1445
-					} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
-						class44.Interpreter_intStackSize -= 3; // L: 1448
-						var10 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1449
-						var16 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1450
-						int var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 1451
-						Widget var15 = Frames.getWidget(var9); // L: 1452
-						VarcInt.clickWidget(var15, var10, var16); // L: 1453
-						return 1; // L: 1454
-					} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
-						class44.Interpreter_intStackSize -= 2; // L: 1457
-						var10 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1458
-						var16 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1459
-						Widget var13 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1460
-						VarcInt.clickWidget(var13, var10, var16); // L: 1461
-						return 1; // L: 1462
-					} else if (var0 == ScriptOpcodes.MOUSECAM) {
-						Client.mouseCam = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1465
-						return 1; // L: 1466
-					} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.roofsHidden ? 1 : 0; // L: 1469
-						return 1; // L: 1470
-					} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
-						ObjectComposition.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1473
-						TileItem.savePreferences(); // L: 1474
-						return 1; // L: 1475
-					} else if (var0 == ScriptOpcodes.OPENURL) {
-						var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1478
-						boolean var8 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1479
-						Players.openURL(var7, var8, false); // L: 1480
-						return 1; // L: 1481
-					} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
-						var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1484
-						var12 = class21.getPacketBufferNode(ClientPacket.field2647, Client.packetWriter.isaacCipher); // L: 1486
-						var12.packetBuffer.writeShort(var10); // L: 1487
-						Client.packetWriter.addNode(var12); // L: 1488
-						return 1; // L: 1489
-					} else if (var0 == ScriptOpcodes.BUG_REPORT) {
-						var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1492
-						Interpreter.Interpreter_stringStackSize -= 2; // L: 1493
-						var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 1494
-						String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 1495
-						if (var4.length() > 500) { // L: 1496
-							return 1;
-						} else if (var5.length() > 500) { // L: 1497
-							return 1;
-						} else {
-							PacketBufferNode var6 = class21.getPacketBufferNode(ClientPacket.field2588, Client.packetWriter.isaacCipher); // L: 1498
-							var6.packetBuffer.writeShort(1 + Tiles.stringCp1252NullTerminatedByteSize(var4) + Tiles.stringCp1252NullTerminatedByteSize(var5)); // L: 1499
-							var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1500
-							var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1501
-							var6.packetBuffer.writeByte(var10); // L: 1502
-							Client.packetWriter.addNode(var6); // L: 1503
-							return 1; // L: 1504
-						}
-					} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
-						Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1507
-						return 1; // L: 1508
-					} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
-						Client.showMouseOverText = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1511
-						return 1; // L: 1512
-					} else if (var0 == ScriptOpcodes.RENDERSELF) {
-						Client.renderSelf = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1515
-						return 1; // L: 1516
-					} else if (var0 == 3120) {
-						if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1519
-							Client.drawPlayerNames |= 1;
-						} else {
-							Client.drawPlayerNames &= -2; // L: 1520
-						}
+		if (var0.offset - var2 != var1) { // L: 83
+			throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 84
+		}
+	} // L: 86
 
-						return 1; // L: 1521
-					} else if (var0 == 3121) {
-						if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1524
-							Client.drawPlayerNames |= 2;
-						} else {
-							Client.drawPlayerNames &= -3; // L: 1525
-						}
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lns;ILcj;II)V",
+		garbageValue = "1472974577"
+	)
+	static final void method2561(PacketBuffer var0, int var1, Player var2, int var3) {
+		byte var4 = -1; // L: 453
+		int var5;
+		if ((var3 & 4) != 0) { // L: 454
+			var5 = var0.readUnsignedByte(); // L: 455
+			byte[] var6 = new byte[var5]; // L: 456
+			Buffer var7 = new Buffer(var6); // L: 457
+			var0.method6821(var6, 0, var5); // L: 458
+			Players.field1362[var1] = var7; // L: 459
+			var2.read(var7); // L: 460
+		}
 
-						return 1; // L: 1526
-					} else if (var0 == 3122) {
-						if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1529
-							Client.drawPlayerNames |= 4;
-						} else {
-							Client.drawPlayerNames &= -5; // L: 1530
-						}
-
-						return 1; // L: 1531
-					} else if (var0 == 3123) {
-						if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 1534
-							Client.drawPlayerNames |= 8;
-						} else {
-							Client.drawPlayerNames &= -9; // L: 1535
-						}
-
-						return 1; // L: 1536
-					} else if (var0 == 3124) {
-						Client.drawPlayerNames = 0; // L: 1539
-						return 1; // L: 1540
-					} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
-						Client.showMouseCross = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1543
-						return 1; // L: 1544
-					} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
-						Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1547
-						return 1; // L: 1548
-					} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
-						UserComparator4.setTapToDrop(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1); // L: 1551
-						return 1; // L: 1552
-					} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class8.getTapToDrop() ? 1 : 0; // L: 1555
-						return 1; // L: 1556
-					} else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) {
-						class44.Interpreter_intStackSize -= 2; // L: 1559
-						Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1560
-						Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1561
-						return 1; // L: 1562
-					} else if (var0 == 3130) {
-						class44.Interpreter_intStackSize -= 2; // L: 1565
-						return 1; // L: 1566
-					} else if (var0 == 3131) {
-						--class44.Interpreter_intStackSize; // L: 1569
-						return 1; // L: 1570
-					} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class32.canvasWidth; // L: 1573
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ReflectionCheck.canvasHeight; // L: 1574
-						return 1; // L: 1575
-					} else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
-						--class44.Interpreter_intStackSize; // L: 1578
-						return 1; // L: 1579
-					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
-						return 1; // L: 1582
-					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
-						class44.Interpreter_intStackSize -= 2; // L: 1585
-						return 1; // L: 1586
-					} else if (var0 == 3136) {
-						Client.field803 = 3; // L: 1589
-						Client.field805 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1590
-						return 1; // L: 1591
-					} else if (var0 == 3137) {
-						Client.field803 = 2; // L: 1594
-						Client.field805 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1595
-						return 1; // L: 1596
-					} else if (var0 == 3138) {
-						Client.field803 = 0; // L: 1599
-						return 1; // L: 1600
-					} else if (var0 == 3139) {
-						Client.field803 = 1; // L: 1603
-						return 1; // L: 1604
-					} else if (var0 == 3140) {
-						Client.field803 = 3; // L: 1607
-						Client.field805 = var2 ? class13.scriptDotWidget.id * 1969535585 * -1722455647 : Interpreter.scriptActiveWidget.id * 1969535585 * -1722455647; // L: 1608
-						return 1; // L: 1609
+		int var8;
+		int var9;
+		int var12;
+		int var13;
+		if ((var3 & 2) != 0) { // L: 462
+			var5 = var0.readUnsignedByte(); // L: 463
+			int var10;
+			int var14;
+			int var15;
+			if (var5 > 0) { // L: 464
+				for (var13 = 0; var13 < var5; ++var13) { // L: 465
+					var8 = -1; // L: 467
+					var9 = -1; // L: 468
+					var10 = -1; // L: 469
+					var14 = var0.readUShortSmart(); // L: 470
+					if (var14 == 32767) { // L: 471
+						var14 = var0.readUShortSmart(); // L: 472
+						var9 = var0.readUShortSmart(); // L: 473
+						var8 = var0.readUShortSmart(); // L: 474
+						var10 = var0.readUShortSmart(); // L: 475
+					} else if (var14 != 32766) { // L: 477
+						var9 = var0.readUShortSmart(); // L: 478
 					} else {
-						boolean var11;
-						if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
-							var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1612
-							ObjectComposition.clientPreferences.hideUsername = var11; // L: 1613
-							TileItem.savePreferences(); // L: 1614
-							return 1; // L: 1615
-						} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.hideUsername ? 1 : 0; // L: 1618
-							return 1; // L: 1619
-						} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
-							var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1622
-							Client.Login_isUsernameRemembered = var11; // L: 1623
-							if (!var11) { // L: 1624
-								ObjectComposition.clientPreferences.rememberedUsername = ""; // L: 1625
-								TileItem.savePreferences(); // L: 1626
-							}
+						var14 = -1; // L: 480
+					}
 
-							return 1; // L: 1628
-						} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1631
-							return 1; // L: 1632
-						} else if (var0 == 3145) {
-							return 1; // L: 1635
-						} else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) {
-							var11 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 1638
-							if (var11 == ObjectComposition.clientPreferences.titleMusicDisabled) { // L: 1639
-								ObjectComposition.clientPreferences.titleMusicDisabled = !var11; // L: 1640
-								TileItem.savePreferences(); // L: 1641
-							}
+					var15 = var0.readUShortSmart(); // L: 481
+					var2.addHitSplat(var14, var9, var8, var10, Client.cycle, var15); // L: 482
+				}
+			}
 
-							return 1; // L: 1643
-						} else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1646
-							return 1; // L: 1647
-						} else if (var0 == 3148) {
-							return 1; // L: 1650
-						} else if (var0 == 3149) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1653
-							return 1; // L: 1654
-						} else if (var0 == 3150) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1657
-							return 1; // L: 1658
-						} else if (var0 == 3151) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1661
-							return 1; // L: 1662
-						} else if (var0 == 3152) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1665
-							return 1; // L: 1666
-						} else if (var0 == 3153) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1669
-							return 1; // L: 1670
-						} else if (var0 == 3154) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class43.method440(); // L: 1673
-							return 1; // L: 1674
-						} else if (var0 == 3155) {
-							--Interpreter.Interpreter_stringStackSize; // L: 1677
-							return 1; // L: 1678
-						} else if (var0 == 3156) {
-							return 1; // L: 1681
-						} else if (var0 == 3157) {
-							class44.Interpreter_intStackSize -= 2; // L: 1684
-							return 1; // L: 1685
-						} else if (var0 == 3158) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1688
-							return 1; // L: 1689
-						} else if (var0 == 3159) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1692
-							return 1; // L: 1693
-						} else if (var0 == 3160) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1696
-							return 1; // L: 1697
-						} else if (var0 == 3161) {
-							--class44.Interpreter_intStackSize; // L: 1700
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1701
-							return 1; // L: 1702
-						} else if (var0 == 3162) {
-							--class44.Interpreter_intStackSize; // L: 1705
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1706
-							return 1; // L: 1707
-						} else if (var0 == 3163) {
-							--Interpreter.Interpreter_stringStackSize; // L: 1710
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1711
-							return 1; // L: 1712
-						} else if (var0 == 3164) {
-							--class44.Interpreter_intStackSize; // L: 1715
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1716
-							return 1; // L: 1717
-						} else if (var0 == 3165) {
-							--class44.Interpreter_intStackSize; // L: 1720
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1721
-							return 1; // L: 1722
-						} else if (var0 == 3166) {
-							class44.Interpreter_intStackSize -= 2; // L: 1725
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1726
-							return 1; // L: 1727
-						} else if (var0 == 3167) {
-							class44.Interpreter_intStackSize -= 2; // L: 1730
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1731
-							return 1; // L: 1732
-						} else if (var0 == 3168) {
-							class44.Interpreter_intStackSize -= 2; // L: 1735
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1736
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1737
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1738
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1739
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1740
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1741
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1742
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1743
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 1744
-							return 1; // L: 1745
-						} else if (var0 == 3169) {
-							return 1; // L: 1748
-						} else if (var0 == 3170) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1751
-							return 1; // L: 1752
-						} else if (var0 == 3171) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1755
-							return 1; // L: 1756
-						} else if (var0 == 3172) {
-							--class44.Interpreter_intStackSize; // L: 1759
-							return 1; // L: 1760
-						} else if (var0 == 3173) {
-							--class44.Interpreter_intStackSize; // L: 1763
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1764
-							return 1; // L: 1765
-						} else if (var0 == 3174) {
-							--class44.Interpreter_intStackSize; // L: 1768
-							return 1; // L: 1769
-						} else if (var0 == 3175) {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1772
-							return 1; // L: 1773
-						} else if (var0 == 3176) {
-							return 1; // L: 1776
-						} else if (var0 == 3177) {
-							return 1; // L: 1779
-						} else if (var0 == 3178) {
-							--Interpreter.Interpreter_stringStackSize; // L: 1782
-							return 1; // L: 1783
-						} else if (var0 == 3179) {
-							return 1; // L: 1786
-						} else if (var0 == 3180) {
-							--Interpreter.Interpreter_stringStackSize; // L: 1789
-							return 1; // L: 1790
-						} else if (var0 == 3181) {
-							var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize], 0), 100); // L: 1793
-							InterfaceParent.method2082((double)(0.5F + (float)var10 / 200.0F)); // L: 1794
-							return 1; // L: 1795
-						} else if (var0 == 3182) {
-							float var3 = 200.0F * ((float)ObjectComposition.clientPreferences.field1337 - 0.5F); // L: 1798
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1799
-							return 1; // L: 1800
-						} else if (var0 != 3183 && var0 != 3184) {
-							return 2; // L: 1806
-						} else {
-							--class44.Interpreter_intStackSize; // L: 1803
-							return 1; // L: 1804
-						}
+			var13 = var0.method6643(); // L: 485
+			if (var13 > 0) { // L: 486
+				for (var14 = 0; var14 < var13; ++var14) { // L: 487
+					var8 = var0.readUShortSmart(); // L: 488
+					var9 = var0.readUShortSmart(); // L: 489
+					if (var9 != 32767) { // L: 490
+						var10 = var0.readUShortSmart(); // L: 491
+						var15 = var0.method6643(); // L: 492
+						var12 = var9 > 0 ? var0.readUnsignedByte() : var15; // L: 493
+						var2.addHealthBar(var8, Client.cycle, var9, var10, var15, var12); // L: 494
+					} else {
+						var2.removeHealthBar(var8); // L: 496
 					}
 				}
 			}
 		}
-	}
 
-	@ObfuscatedName("am")
+		if ((var3 & 2048) != 0) { // L: 500
+			for (var5 = 0; var5 < 3; ++var5) { // L: 501
+				var2.actions[var5] = var0.readStringCp1252NullTerminated();
+			}
+		}
+
+		if ((var3 & 512) != 0) { // L: 503
+			var2.spotAnimation = var0.readUnsignedShort(); // L: 504
+			var5 = var0.method6675(); // L: 505
+			var2.field1263 = var5 >> 16; // L: 506
+			var2.field1262 = (var5 & 65535) + Client.cycle; // L: 507
+			var2.spotAnimationFrame = 0; // L: 508
+			var2.spotAnimationFrameCycle = 0; // L: 509
+			if (var2.field1262 > Client.cycle) { // L: 510
+				var2.spotAnimationFrame = -1;
+			}
+
+			if (var2.spotAnimation == 65535) { // L: 511
+				var2.spotAnimation = -1;
+			}
+		}
+
+		if ((var3 & 8) != 0) { // L: 513
+			var2.overheadText = var0.readStringCp1252NullTerminated(); // L: 514
+			if (var2.overheadText.charAt(0) == '~') { // L: 515
+				var2.overheadText = var2.overheadText.substring(1); // L: 516
+				UserComparator10.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 517
+			} else if (var2 == class262.localPlayer) { // L: 519
+				UserComparator10.addGameMessage(2, var2.username.getName(), var2.overheadText); // L: 520
+			}
+
+			var2.isAutoChatting = false; // L: 522
+			var2.overheadTextColor = 0; // L: 523
+			var2.overheadTextEffect = 0; // L: 524
+			var2.overheadTextCyclesRemaining = 150; // L: 525
+		}
+
+		if ((var3 & 64) != 0) { // L: 527
+			var5 = var0.method6653(); // L: 528
+			PlayerType var16 = (PlayerType)Clock.findEnumerated(class106.PlayerType_values(), var0.method6644()); // L: 529
+			boolean var19 = var0.method6644() == 1; // L: 530
+			var8 = var0.method6644(); // L: 531
+			var9 = var0.offset; // L: 532
+			if (var2.username != null && var2.appearance != null) { // L: 533
+				boolean var18 = false; // L: 534
+				if (var16.isUser && DevicePcmPlayerProvider.friendSystem.isIgnored(var2.username)) { // L: 535 536
+					var18 = true;
+				}
+
+				if (!var18 && Client.field629 == 0 && !var2.isHidden) { // L: 538
+					Players.field1373.offset = 0; // L: 539
+					var0.method6821(Players.field1373.array, 0, var8); // L: 540
+					Players.field1373.offset = 0; // L: 541
+					String var11 = AbstractFont.escapeBrackets(GrandExchangeEvents.method5182(WorldMapIcon_1.method3304(Players.field1373))); // L: 542
+					var2.overheadText = var11.trim(); // L: 543
+					var2.overheadTextColor = var5 >> 8; // L: 544
+					var2.overheadTextEffect = var5 & 255; // L: 545
+					var2.overheadTextCyclesRemaining = 150; // L: 546
+					var2.isAutoChatting = var19; // L: 547
+					var2.field1253 = var2 != class262.localPlayer && var16.isUser && "" != Client.field642 && var11.toLowerCase().indexOf(Client.field642) == -1; // L: 548
+					if (var16.isPrivileged) { // L: 550
+						var12 = var19 ? 91 : 1;
+					} else {
+						var12 = var19 ? 90 : 2; // L: 551
+					}
+
+					if (var16.modIcon != -1) { // L: 552
+						UserComparator10.addGameMessage(var12, MusicPatchPcmStream.method4743(var16.modIcon) + var2.username.getName(), var11);
+					} else {
+						UserComparator10.addGameMessage(var12, var2.username.getName(), var11); // L: 553
+					}
+				}
+			}
+
+			var0.offset = var8 + var9; // L: 556
+		}
+
+		if ((var3 & 16) != 0) { // L: 558
+			var2.targetIndex = var0.method6652(); // L: 559
+			if (var2.targetIndex == 65535) { // L: 560
+				var2.targetIndex = -1;
+			}
+		}
+
+		if ((var3 & 4096) != 0) { // L: 562
+			Players.field1361[var1] = var0.method6619(); // L: 563
+		}
+
+		if ((var3 & 32) != 0) { // L: 565
+			var5 = var0.method6651(); // L: 566
+			if (var5 == 65535) { // L: 567
+				var5 = -1;
+			}
+
+			var13 = var0.readUnsignedByte(); // L: 568
+			World.performPlayerAnimation(var2, var5, var13); // L: 569
+		}
+
+		if ((var3 & 8192) != 0) { // L: 571
+			var2.field1264 = var0.readByte(); // L: 572
+			var2.field1268 = var0.method6682(); // L: 573
+			var2.field1265 = var0.readByte(); // L: 574
+			var2.field1267 = var0.method6682(); // L: 575
+			var2.field1276 = var0.method6653() + Client.cycle; // L: 576
+			var2.field1269 = var0.method6652() + Client.cycle; // L: 577
+			var2.field1270 = var0.method6653(); // L: 578
+			if (var2.field1201) { // L: 579
+				var2.field1264 += var2.tileX; // L: 580
+				var2.field1268 += var2.tileY; // L: 581
+				var2.field1265 += var2.tileX; // L: 582
+				var2.field1267 += var2.tileY; // L: 583
+				var2.pathLength = 0; // L: 584
+			} else {
+				var2.field1264 += var2.pathX[0]; // L: 587
+				var2.field1268 += var2.pathY[0]; // L: 588
+				var2.field1265 += var2.pathX[0]; // L: 589
+				var2.field1267 += var2.pathY[0]; // L: 590
+				var2.pathLength = 1; // L: 591
+			}
+
+			var2.field1281 = 0; // L: 593
+		}
+
+		if ((var3 & 256) != 0) { // L: 595
+			var4 = var0.method6619(); // L: 596
+		}
+
+		if ((var3 & 1) != 0) { // L: 598
+			var2.field1280 = var0.method6652(); // L: 599
+			if (var2.pathLength == 0) { // L: 600
+				var2.orientation = var2.field1280; // L: 601
+				var2.field1280 = -1; // L: 602
+			}
+		}
+
+		if (var2.field1201) { // L: 605
+			if (var4 == 127) { // L: 606
+				var2.resetPath(var2.tileX, var2.tileY);
+			} else {
+				byte var17;
+				if (var4 != -1) { // L: 609
+					var17 = var4;
+				} else {
+					var17 = Players.field1361[var1]; // L: 610
+				}
+
+				var2.method2217(var2.tileX, var2.tileY, var17); // L: 611
+			}
+		}
+
+	} // L: 615
+
+	@ObfuscatedName("gr")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "70996791"
+		descriptor = "(IIIII)V",
+		garbageValue = "-1473289711"
 	)
-	static int method2467(int var0) {
-		return (int)((Math.log((double)var0) / Interpreter.field989 - 7.0D) * 256.0D); // L: 3515
-	}
+	@Export("drawEntities")
+	static final void drawEntities(int var0, int var1, int var2, int var3) {
+		++Client.viewportDrawCount; // L: 4524
+		if (class262.localPlayer.x >> 7 == Client.destinationX && class262.localPlayer.y >> 7 == Client.destinationY) { // L: 4526
+			Client.destinationX = 0; // L: 4527
+		}
+
+		class15.method238(); // L: 4530
+		MouseHandler.method741(); // L: 4531
+		DevicePcmPlayerProvider.addNpcsToScene(true); // L: 4532
+		int var4 = Players.Players_count; // L: 4534
+		int[] var5 = Players.Players_indices; // L: 4535
+
+		int var6;
+		for (var6 = 0; var6 < var4; ++var6) { // L: 4536
+			if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4537
+				class160.addPlayerToScene(Client.players[var5[var6]], true); // L: 4538
+			}
+		}
+
+		DevicePcmPlayerProvider.addNpcsToScene(false); // L: 4541
+		MusicPatchPcmStream.method4762(); // L: 4542
+
+		for (GraphicsObject var15 = (GraphicsObject)Client.graphicsObjects.last(); var15 != null; var15 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4544 4545 4552
+			if (var15.plane == SoundSystem.Client_plane && !var15.isFinished) { // L: 4546
+				if (Client.cycle >= var15.cycleStart) { // L: 4547
+					var15.advance(Client.field683); // L: 4548
+					if (var15.isFinished) { // L: 4549
+						var15.remove();
+					} else {
+						DevicePcmPlayerProvider.scene.drawEntity(var15.plane, var15.x, var15.y, var15.height, 60, var15, 0, -1L, false); // L: 4550
+					}
+				}
+			} else {
+				var15.remove();
+			}
+		}
+
+		Interpreter.setViewportShape(var0, var1, var2, var3, true); // L: 4555
+		var0 = Client.viewportOffsetX; // L: 4556
+		var1 = Client.viewportOffsetY; // L: 4557
+		var2 = Client.viewportWidth; // L: 4558
+		var3 = Client.viewportHeight; // L: 4559
+		Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4560
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4561
+		int var16;
+		if (!Client.isCameraLocked) { // L: 4562
+			var4 = Client.camAngleX; // L: 4563
+			if (Client.field708 / 256 > var4) { // L: 4564
+				var4 = Client.field708 / 256;
+			}
+
+			if (Client.field871[4] && Client.field873[4] + 128 > var4) { // L: 4565
+				var4 = Client.field873[4] + 128;
+			}
+
+			var16 = Client.camAngleY & 2047; // L: 4566
+			VerticalAlignment.method2889(FriendSystem.oculusOrbFocalPointX, class14.field124, VarbitComposition.oculusOrbFocalPointY, var4, var16, NetSocket.method2676(var4), var3); // L: 4567
+		}
+
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		int var11;
+		int var12;
+		if (!Client.isCameraLocked) { // L: 4570
+			if (class4.clientPreferences.roofsHidden) { // L: 4573
+				var16 = SoundSystem.Client_plane; // L: 4574
+			} else {
+				label342: {
+					var6 = 3; // L: 4577
+					if (class69.cameraPitch < 310) { // L: 4578
+						label340: {
+							if (Client.oculusOrbState == 1) { // L: 4581
+								var7 = FriendSystem.oculusOrbFocalPointX >> 7; // L: 4582
+								var8 = VarbitComposition.oculusOrbFocalPointY >> 7; // L: 4583
+							} else {
+								var7 = class262.localPlayer.x >> 7; // L: 4586
+								var8 = class262.localPlayer.y >> 7; // L: 4587
+							}
+
+							var9 = ObjectSound.cameraX >> 7; // L: 4589
+							var10 = Canvas.cameraZ >> 7; // L: 4590
+							if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { // L: 4591
+								if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 4595
+									if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4599
+										var6 = SoundSystem.Client_plane;
+									}
+
+									if (var7 > var9) { // L: 4601
+										var11 = var7 - var9;
+									} else {
+										var11 = var9 - var7; // L: 4602
+									}
+
+									if (var8 > var10) { // L: 4604
+										var12 = var8 - var10;
+									} else {
+										var12 = var10 - var8; // L: 4605
+									}
+
+									int var13;
+									int var14;
+									if (var11 > var12) { // L: 4606
+										var13 = var12 * 65536 / var11; // L: 4607
+										var14 = 32768; // L: 4608
+
+										while (true) {
+											if (var7 == var9) { // L: 4609
+												break label340;
+											}
+
+											if (var9 < var7) { // L: 4610
+												++var9;
+											} else if (var9 > var7) { // L: 4611
+												--var9;
+											}
+
+											if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4612
+												var6 = SoundSystem.Client_plane;
+											}
+
+											var14 += var13; // L: 4613
+											if (var14 >= 65536) { // L: 4614
+												var14 -= 65536; // L: 4615
+												if (var10 < var8) { // L: 4616
+													++var10;
+												} else if (var10 > var8) { // L: 4617
+													--var10;
+												}
+
+												if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4618
+													var6 = SoundSystem.Client_plane;
+												}
+											}
+										}
+									} else {
+										if (var12 > 0) { // L: 4622
+											var13 = var11 * 65536 / var12; // L: 4623
+											var14 = 32768; // L: 4624
+
+											while (var8 != var10) { // L: 4625
+												if (var10 < var8) { // L: 4626
+													++var10;
+												} else if (var10 > var8) { // L: 4627
+													--var10;
+												}
+
+												if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4628
+													var6 = SoundSystem.Client_plane;
+												}
+
+												var14 += var13; // L: 4629
+												if (var14 >= 65536) { // L: 4630
+													var14 -= 65536; // L: 4631
+													if (var9 < var7) { // L: 4632
+														++var9;
+													} else if (var9 > var7) { // L: 4633
+														--var9;
+													}
+
+													if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][var9][var10] & 4) != 0) { // L: 4634
+														var6 = SoundSystem.Client_plane;
+													}
+												}
+											}
+										}
+										break label340;
+									}
+								}
+
+								var16 = SoundSystem.Client_plane; // L: 4596
+								break label342; // L: 4597
+							}
+
+							var16 = SoundSystem.Client_plane; // L: 4592
+							break label342; // L: 4593
+						}
+					}
+
+					if (class262.localPlayer.x >= 0 && class262.localPlayer.y >= 0 && class262.localPlayer.x < 13312 && class262.localPlayer.y < 13312) { // L: 4639
+						if ((Tiles.Tiles_renderFlags[SoundSystem.Client_plane][class262.localPlayer.x >> 7][class262.localPlayer.y >> 7] & 4) != 0) { // L: 4643
+							var6 = SoundSystem.Client_plane;
+						}
+
+						var16 = var6; // L: 4644
+					} else {
+						var16 = SoundSystem.Client_plane; // L: 4640
+					}
+				}
+			}
+
+			var4 = var16; // L: 4646
+		} else {
+			var4 = class106.method2372(); // L: 4648
+		}
+
+		var16 = ObjectSound.cameraX; // L: 4649
+		var6 = class160.cameraY; // L: 4650
+		var7 = Canvas.cameraZ; // L: 4651
+		var8 = class69.cameraPitch; // L: 4652
+		var9 = class32.cameraYaw; // L: 4653
+
+		for (var10 = 0; var10 < 5; ++var10) { // L: 4654
+			if (Client.field871[var10]) { // L: 4655
+				var11 = (int)(Math.random() * (double)(Client.field872[var10] * 2 + 1) - (double)Client.field872[var10] + Math.sin((double)Client.field875[var10] * ((double)Client.field867[var10] / 100.0D)) * (double)Client.field873[var10]); // L: 4656
+				if (var10 == 0) { // L: 4657
+					ObjectSound.cameraX += var11;
+				}
+
+				if (var10 == 1) { // L: 4658
+					class160.cameraY += var11;
+				}
+
+				if (var10 == 2) { // L: 4659
+					Canvas.cameraZ += var11;
+				}
+
+				if (var10 == 3) { // L: 4660
+					class32.cameraYaw = var11 + class32.cameraYaw & 2047;
+				}
+
+				if (var10 == 4) { // L: 4661
+					class69.cameraPitch += var11; // L: 4662
+					if (class69.cameraPitch < 128) { // L: 4663
+						class69.cameraPitch = 128;
+					}
+
+					if (class69.cameraPitch > 383) { // L: 4664
+						class69.cameraPitch = 383;
+					}
+				}
+			}
+		}
+
+		var10 = MouseHandler.MouseHandler_x; // L: 4668
+		var11 = MouseHandler.MouseHandler_y; // L: 4669
+		if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4670
+			var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4671
+			var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4672
+		}
+
+		if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4674
+			class25.method339(var10 - var0, var11 - var1); // L: 4675
+		} else {
+			ViewportMouse.ViewportMouse_isInViewport = false; // L: 4679
+			ViewportMouse.ViewportMouse_entityCount = 0; // L: 4680
+		}
+
+		class233.playPcmPlayers(); // L: 4683
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4684
+		class233.playPcmPlayers(); // L: 4685
+		var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4686
+		Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4687
+		DevicePcmPlayerProvider.scene.draw(ObjectSound.cameraX, class160.cameraY, Canvas.cameraZ, class69.cameraPitch, class32.cameraYaw, var4); // L: 4688
+		Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4689
+		class233.playPcmPlayers(); // L: 4690
+		DevicePcmPlayerProvider.scene.clearTempGameObjects(); // L: 4691
+		WorldMapDecoration.method3710(var0, var1, var2, var3); // L: 4692
+		if (Client.hintArrowType == 2) { // L: 4694
+			ClanChannel.worldToScreen((Client.hintArrowX - class15.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - WorldMapSprite.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4695
+			if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4696
+				Skills.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
+			}
+		}
+
+		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field683); // L: 4698
+		Buddy.method5892(); // L: 4700
+		ObjectSound.cameraX = var16; // L: 4702
+		class160.cameraY = var6; // L: 4703
+		Canvas.cameraZ = var7; // L: 4704
+		class69.cameraPitch = var8; // L: 4705
+		class32.cameraYaw = var9; // L: 4706
+		if (Client.isLoading && Archive.method5061(true, false) == 0) { // L: 4707
+			Client.isLoading = false;
+		}
+
+		if (Client.isLoading) { // L: 4708
+			Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4709
+			class143.drawLoadingMessage("Loading - please wait.", false); // L: 4710
+		}
+
+	} // L: 4712
 }
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index b70ce46dd3..e0f1bb79d6 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -7,34 +7,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lj")
+@ObfuscatedName("ld")
 @Implements("UserList")
 public abstract class UserList {
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -446111369
+		intValue = 670105259
 	)
 	@Export("capacity")
 	final int capacity;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1892768295
+		intValue = -1072926919
 	)
 	@Export("size")
 	int size;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "[Llx;"
+		descriptor = "[Llf;"
 	)
 	@Export("array")
 	User[] array;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("usernamesMap")
 	HashMap usernamesMap;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("previousUsernamesMap")
 	HashMap previousUsernamesMap;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("comparator")
 	Comparator comparator;
 
@@ -47,26 +47,26 @@ public abstract class UserList {
 		this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llx;",
-		garbageValue = "126"
+		descriptor = "(I)Llf;",
+		garbageValue = "1590299985"
 	)
 	@Export("newInstance")
 	abstract User newInstance();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)[Llx;",
-		garbageValue = "1924184817"
+		descriptor = "(II)[Llf;",
+		garbageValue = "-1320557093"
 	)
 	@Export("newTypedArray")
 	abstract User[] newTypedArray(int var1);
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1427653202"
+		garbageValue = "-1302559125"
 	)
 	@Export("clear")
 	public void clear() {
@@ -76,30 +76,30 @@ public abstract class UserList {
 		this.previousUsernamesMap.clear(); // L: 26
 	} // L: 27
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1340173530"
+		garbageValue = "-1883468906"
 	)
 	@Export("getSize")
 	public int getSize() {
 		return this.size; // L: 30
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "54"
+		descriptor = "(I)Z",
+		garbageValue = "1699409765"
 	)
 	@Export("isFull")
 	public boolean isFull() {
-		return this.capacity == this.size; // L: 34
+		return this.size == this.capacity; // L: 34
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;I)Z",
-		garbageValue = "-234571238"
+		descriptor = "(Llc;I)Z",
+		garbageValue = "199834760"
 	)
 	@Export("contains")
 	public boolean contains(Username var1) {
@@ -110,10 +110,10 @@ public abstract class UserList {
 		}
 	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;I)Llx;",
-		garbageValue = "-1108278291"
+		descriptor = "(Llc;I)Llf;",
+		garbageValue = "-1523955611"
 	)
 	@Export("getByUsername")
 	public User getByUsername(Username var1) {
@@ -121,30 +121,30 @@ public abstract class UserList {
 		return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;B)Llx;",
-		garbageValue = "7"
+		descriptor = "(Llc;B)Llf;",
+		garbageValue = "36"
 	)
 	@Export("getByCurrentUsername")
 	User getByCurrentUsername(Username var1) {
 		return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;B)Llx;",
-		garbageValue = "1"
+		descriptor = "(Llc;I)Llf;",
+		garbageValue = "-1982142563"
 	)
 	@Export("getByPreviousUsername")
 	User getByPreviousUsername(Username var1) {
 		return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("aj")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;I)Z",
-		garbageValue = "-787217096"
+		descriptor = "(Llc;B)Z",
+		garbageValue = "0"
 	)
 	@Export("removeByUsername")
 	public final boolean removeByUsername(Username var1) {
@@ -157,10 +157,10 @@ public abstract class UserList {
 		}
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)V",
-		garbageValue = "1934754885"
+		descriptor = "(Llf;I)V",
+		garbageValue = "-2053720408"
 	)
 	@Export("remove")
 	final void remove(User var1) {
@@ -173,18 +173,18 @@ public abstract class UserList {
 
 	@ObfuscatedName("as")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;I)Llx;",
-		garbageValue = "1218204811"
+		descriptor = "(Llc;I)Llf;",
+		garbageValue = "-557964613"
 	)
 	@Export("addLastNoPreviousUsername")
 	User addLastNoPreviousUsername(Username var1) {
 		return this.addLast(var1, (Username)null); // L: 74
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;Lly;I)Llx;",
-		garbageValue = "-656990705"
+		descriptor = "(Llc;Llc;I)Llf;",
+		garbageValue = "-1673270493"
 	)
 	@Export("addLast")
 	User addLast(Username var1, Username var2) {
@@ -199,24 +199,24 @@ public abstract class UserList {
 		}
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Llx;",
-		garbageValue = "-1"
+		descriptor = "(IB)Llf;",
+		garbageValue = "71"
 	)
 	@Export("get")
 	public final User get(int var1) {
 		if (var1 >= 0 && var1 < this.size) { // L: 87
-			return this.array[var1];
+			return this.array[var1]; // L: 88
 		} else {
-			throw new ArrayIndexOutOfBoundsException(var1); // L: 88
+			throw new ArrayIndexOutOfBoundsException(var1);
 		}
 	}
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1406178121"
+		descriptor = "(B)V",
+		garbageValue = "0"
 	)
 	@Export("sort")
 	public final void sort() {
@@ -228,10 +228,10 @@ public abstract class UserList {
 
 	} // L: 98
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;Lly;Lly;B)V",
-		garbageValue = "8"
+		descriptor = "(Llf;Llc;Llc;I)V",
+		garbageValue = "-63927803"
 	)
 	@Export("changeName")
 	final void changeName(User var1, Username var2, Username var3) {
@@ -240,10 +240,10 @@ public abstract class UserList {
 		this.mapPut(var1); // L: 103
 	} // L: 104
 
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;S)I",
-		garbageValue = "400"
+		descriptor = "(Llf;I)I",
+		garbageValue = "1618066383"
 	)
 	@Export("indexOf")
 	final int indexOf(User var1) {
@@ -256,139 +256,86 @@ public abstract class UserList {
 		return -1; // L: 110
 	}
 
-	@ObfuscatedName("at")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)V",
-		garbageValue = "1618016496"
+		descriptor = "(Llf;I)V",
+		garbageValue = "1834723904"
 	)
 	@Export("mapRemove")
 	final void mapRemove(User var1) {
-		if (var1.previousUsername != null) {
-			this.previousUsernamesMap.remove(var1.previousUsername); // L: 115
+		if (this.usernamesMap.remove(var1.username) == null) { // L: 114
+			throw new IllegalStateException();
+		} else {
+			if (var1.previousUsername != null) {
+				this.previousUsernamesMap.remove(var1.previousUsername); // L: 115
+			}
+
 		}
+	} // L: 116
 
-	}
-
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ax")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)V",
-		garbageValue = "-1533955349"
+		descriptor = "(Llf;I)V",
+		garbageValue = "-1220748366"
 	)
 	@Export("arrayAddLast")
 	final void arrayAddLast(User var1) {
-		this.array[++this.size - 1] = var1;
-	}
+		this.array[++this.size - 1] = var1; // L: 119
+	} // L: 120
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		descriptor = "(Llx;I)V",
-		garbageValue = "16776960"
+		descriptor = "(Llf;B)V",
+		garbageValue = "-79"
 	)
 	@Export("mapPut")
 	final void mapPut(User var1) {
-		this.usernamesMap.put(var1.username, var1);
-		if (var1.previousUsername != null) {
-			User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1);
-			if (var2 != null && var2 != var1) {
-				var2.previousUsername = null;
+		this.usernamesMap.put(var1.username, var1); // L: 123
+		if (var1.previousUsername != null) { // L: 124
+			User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 125
+			if (var2 != null && var2 != var1) { // L: 126
+				var2.previousUsername = null; // L: 127
 			}
 		}
 
-	}
-
-	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "1"
-	)
-	@Export("arrayRemove")
-	final void arrayRemove(int var1) {
-		--this.size;
-		if (var1 < this.size) {
-			System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1);
-		}
-
-	}
-
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1532221549"
-	)
-	@Export("removeComparator")
-	public final void removeComparator() {
-		this.comparator = null;
-	}
+	} // L: 130
 
 	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/util/Comparator;I)V",
-		garbageValue = "1224360715"
+		descriptor = "(IB)V",
+		garbageValue = "-50"
+	)
+	@Export("arrayRemove")
+	final void arrayRemove(int var1) {
+		--this.size; // L: 133
+		if (var1 < this.size) { // L: 134
+			System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 135
+		}
+
+	} // L: 137
+
+	@ObfuscatedName("bq")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1914389338"
+	)
+	@Export("removeComparator")
+	public final void removeComparator() {
+		this.comparator = null; // L: 143
+	} // L: 144
+
+	@ObfuscatedName("bx")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/util/Comparator;B)V",
+		garbageValue = "28"
 	)
 	@Export("addComparator")
 	public final void addComparator(Comparator var1) {
-		if (this.comparator == null) {
-			this.comparator = var1;
-		} else if (this.comparator instanceof AbstractUserComparator) {
-			((AbstractUserComparator)this.comparator).addComparator(var1);
+		if (this.comparator == null) { // L: 147
+			this.comparator = var1; // L: 148
+		} else if (this.comparator instanceof AbstractUserComparator) { // L: 150
+			((AbstractUserComparator)this.comparator).addComparator(var1); // L: 151
 		}
 
 	} // L: 153
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "([BI)Lcf;",
-		garbageValue = "1132367592"
-	)
-	@Export("newScript")
-	static Script newScript(byte[] var0) {
-		Script var1 = new Script(); // L: 116
-		Buffer var2 = new Buffer(var0); // L: 117
-		var2.offset = var2.array.length - 2; // L: 118
-		int var3 = var2.readUnsignedShort(); // L: 119
-		int var4 = var2.array.length - 2 - var3 - 12; // L: 120
-		var2.offset = var4; // L: 121
-		int var5 = var2.readInt(); // L: 122
-		var1.localIntCount = var2.readUnsignedShort(); // L: 123
-		var1.localStringCount = var2.readUnsignedShort(); // L: 124
-		var1.intArgumentCount = var2.readUnsignedShort(); // L: 125
-		var1.stringArgumentCount = var2.readUnsignedShort(); // L: 126
-		int var6 = var2.readUnsignedByte(); // L: 127
-		int var7;
-		int var8;
-		if (var6 > 0) { // L: 128
-			var1.switches = var1.newIterableNodeHashTable(var6); // L: 129
-
-			for (var7 = 0; var7 < var6; ++var7) { // L: 130
-				var8 = var2.readUnsignedShort(); // L: 131
-				IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? Player.method2128(var8) : 1); // L: 132
-				var1.switches[var7] = var9; // L: 133
-
-				while (var8-- > 0) { // L: 134
-					int var10 = var2.readInt(); // L: 135
-					int var11 = var2.readInt(); // L: 136
-					var9.put(new IntegerNode(var11), (long)var10); // L: 137
-				}
-			}
-		}
-
-		var2.offset = 0; // L: 141
-		var1.field1084 = var2.readStringCp1252NullTerminatedOrNull(); // L: 142
-		var1.opcodes = new int[var5]; // L: 143
-		var1.intOperands = new int[var5]; // L: 144
-		var1.stringOperands = new String[var5]; // L: 145
-
-		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 146 147 152
-			var8 = var2.readUnsignedShort(); // L: 148
-			if (var8 == 3) { // L: 149
-				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
-			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
-				var1.intOperands[var7] = var2.readInt(); // L: 150
-			} else {
-				var1.intOperands[var7] = var2.readUnsignedByte(); // L: 151
-			}
-		}
-
-		return var1; // L: 154
-	}
 }
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index 11aa22c7cb..b87c11aa2d 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ly")
+@ObfuscatedName("lc")
 @Implements("Username")
 public class Username implements Comparable {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("name")
 	String name;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("cleanName")
 	String cleanName;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Lnc;)V"
+		descriptor = "(Ljava/lang/String;Lnb;)V"
 	)
 	public Username(String var1, LoginType var2) {
 		this.name = var1; // L: 11
@@ -22,224 +22,101 @@ public class Username implements Comparable {
 		if (var1 == null) { // L: 15
 			var4 = null; // L: 16
 		} else {
-			label115: {
-				int var5 = 0; // L: 19
+			int var5 = 0; // L: 19
 
-				int var6;
-				boolean var7;
-				char var8;
-				for (var6 = var1.length(); var5 < var6; ++var5) { // L: 20 23 33
-					var8 = var1.charAt(var5); // L: 25
-					var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 27
-					if (!var7) { // L: 29
-						break;
+			int var6;
+			for (var6 = var1.length(); var5 < var6 && SpriteMask.method4777(var1.charAt(var5)); ++var5) { // L: 20 21
+			}
+
+			while (var6 > var5 && SpriteMask.method4777(var1.charAt(var6 - 1))) { // L: 22
+				--var6;
+			}
+
+			int var7 = var6 - var5; // L: 23
+			if (var7 >= 1 && var7 <= Friend.method5773(var2)) { // L: 24
+				StringBuilder var8 = new StringBuilder(var7); // L: 28
+
+				for (int var9 = var5; var9 < var6; ++var9) { // L: 29
+					char var10 = var1.charAt(var9); // L: 30
+					if (Client.method1746(var10)) { // L: 31
+						char var11 = WorldMapElement.method2732(var10); // L: 32
+						if (var11 != 0) { // L: 33
+							var8.append(var11); // L: 34
+						}
 					}
 				}
 
-				while (var6 > var5) { // L: 37
-					var8 = var1.charAt(var6 - 1); // L: 39
-					var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 41
-					if (!var7) { // L: 43
-						break;
-					}
-
-					--var6; // L: 47
+				if (var8.length() == 0) { // L: 36
+					var4 = null; // L: 37
+				} else {
+					var4 = var8.toString(); // L: 40
 				}
-
-				int var14 = var6 - var5; // L: 49
-				if (var14 >= 1) { // L: 51
-					byte var9;
-					if (var2 == null) { // L: 55
-						var9 = 12; // L: 56
-					} else {
-						switch(var2.field4092) { // L: 59
-						case 8:
-							var9 = 20;
-							break;
-						default:
-							var9 = 12; // L: 64
-						}
-					}
-
-					if (var14 <= var9) { // L: 68
-						StringBuilder var13 = new StringBuilder(var14); // L: 73
-
-						for (int var15 = var5; var15 < var6; ++var15) { // L: 74
-							char var10 = var1.charAt(var15); // L: 75
-							if (class14.method188(var10)) { // L: 76
-								char var11;
-								switch(var10) { // L: 79
-								case ' ':
-								case '-':
-								case '_':
-								case ' ':
-									var11 = '_'; // L: 106
-									break; // L: 107
-								case '#':
-								case '[':
-								case ']':
-									var11 = var10; // L: 97
-									break; // L: 98
-								case 'À':
-								case 'Á':
-								case 'Â':
-								case 'Ã':
-								case 'Ä':
-								case 'à':
-								case 'á':
-								case 'â':
-								case 'ã':
-								case 'ä':
-									var11 = 'a'; // L: 118
-									break; // L: 119
-								case 'Ç':
-								case 'ç':
-									var11 = 'c'; // L: 126
-									break; // L: 127
-								case 'È':
-								case 'É':
-								case 'Ê':
-								case 'Ë':
-								case 'è':
-								case 'é':
-								case 'ê':
-								case 'ë':
-									var11 = 'e'; // L: 88
-									break;
-								case 'Í':
-								case 'Î':
-								case 'Ï':
-								case 'í':
-								case 'î':
-								case 'ï':
-									var11 = 'i'; // L: 137
-									break; // L: 138
-								case 'Ñ':
-								case 'ñ':
-									var11 = 'n'; // L: 122
-									break; // L: 123
-								case 'Ò':
-								case 'Ó':
-								case 'Ô':
-								case 'Õ':
-								case 'Ö':
-								case 'ò':
-								case 'ó':
-								case 'ô':
-								case 'õ':
-								case 'ö':
-									var11 = 'o'; // L: 149
-									break; // L: 150
-								case 'Ù':
-								case 'Ú':
-								case 'Û':
-								case 'Ü':
-								case 'ù':
-								case 'ú':
-								case 'û':
-								case 'ü':
-									var11 = 'u'; // L: 159
-									break;
-								case 'ß':
-									var11 = 'b'; // L: 129
-									break; // L: 130
-								case 'ÿ':
-								case 'Ÿ':
-									var11 = 'y'; // L: 92
-									break; // L: 93
-								default:
-									var11 = Character.toLowerCase(var10); // L: 100
-								}
-
-								if (var11 != 0) { // L: 164
-									var13.append(var11); // L: 165
-								}
-							}
-						}
-
-						if (var13.length() == 0) { // L: 167
-							var4 = null; // L: 168
-						} else {
-							var4 = var13.toString(); // L: 171
-						}
-						break label115;
-					}
-				}
-
-				var4 = null; // L: 70
+			} else {
+				var4 = null; // L: 25
 			}
 		}
 
-		this.cleanName = var4; // L: 173
-	} // L: 174
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "2072568808"
-	)
-	@Export("getName")
-	public String getName() {
-		return this.name; // L: 177
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "0"
-	)
-	@Export("hasCleanName")
-	public boolean hasCleanName() {
-		return this.cleanName != null; // L: 181
-	}
+		this.cleanName = var4; // L: 42
+	} // L: 43
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lly;I)I",
-		garbageValue = "831558423"
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "-55"
+	)
+	@Export("getName")
+	public String getName() {
+		return this.name; // L: 46
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "1"
+	)
+	@Export("hasCleanName")
+	public boolean hasCleanName() {
+		return this.cleanName != null; // L: 50
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Llc;I)I",
+		garbageValue = "-928498828"
 	)
 	@Export("compareToTyped")
 	public int compareToTyped(Username var1) {
-		if (this.cleanName == null) { // L: 205
-			return var1.cleanName == null ? 0 : 1; // L: 206 207
+		if (this.cleanName == null) { // L: 74
+			return var1.cleanName == null ? 0 : 1; // L: 75 76
 		} else {
-			return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 209 210
+			return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 78 79
 		}
 	}
 
 	public boolean equals(Object var1) {
-		if (var1 instanceof Username) { // L: 185
-			Username var2 = (Username)var1; // L: 186
+		if (var1 instanceof Username) { // L: 54
+			Username var2 = (Username)var1; // L: 55
 			if (this.cleanName == null) {
-				return var2.cleanName == null; // L: 187
-			} else if (var2.cleanName == null) { // L: 188
+				return var2.cleanName == null; // L: 56
+			} else if (var2.cleanName == null) { // L: 57
 				return false;
 			} else {
-				return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 189 190
+				return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 58 59
 			}
 		} else {
-			return false; // L: 192
+			return false; // L: 61
 		}
 	}
 
 	public int hashCode() {
-		return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 196 197
+		return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 65 66
 	}
 
 	public String toString() {
-		return this.getName(); // L: 201
+		return this.getName(); // L: 70
 	}
 
 	public int compareTo(Object var1) {
-		return this.compareToTyped((Username)var1); // L: 214
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(CI)C",
-		garbageValue = "717003887"
-	)
-	static char method5877(char var0) {
-		return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 61 62
+		return this.compareToTyped((Username)var1); // L: 83
 	}
 }
diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java
index dc23e6147d..6968f84d60 100644
--- a/runescape-client/src/main/java/Usernamed.java
+++ b/runescape-client/src/main/java/Usernamed.java
@@ -3,13 +3,13 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lc")
+@ObfuscatedName("lz")
 @Implements("Usernamed")
 public interface Usernamed {
-	@ObfuscatedName("ll")
+	@ObfuscatedName("ly")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lly;",
-		garbageValue = "-1180229355"
+		descriptor = "(I)Llc;",
+		garbageValue = "-1312829614"
 	)
 	@Export("username")
 	Username username();
diff --git a/runescape-client/src/main/java/VarbitComposition.java b/runescape-client/src/main/java/VarbitComposition.java
index 0b240f2ad3..c6ab6ed776 100644
--- a/runescape-client/src/main/java/VarbitComposition.java
+++ b/runescape-client/src/main/java/VarbitComposition.java
@@ -1,143 +1,169 @@
-import java.util.LinkedHashMap;
+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("ee")
+@ObfuscatedName("ew")
 @Implements("VarbitComposition")
 public class VarbitComposition extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("VarbitDefinition_archive")
 	public static AbstractArchive VarbitDefinition_archive;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("VarbitDefinition_cached")
 	public static EvictingDualNodeHashTable VarbitDefinition_cached;
-	@ObfuscatedName("j")
-	static final int[] field1702;
-	@ObfuscatedName("l")
-	public static short[][] field1708;
-	@ObfuscatedName("f")
+	@ObfuscatedName("o")
+	static final int[] field1710;
+	@ObfuscatedName("ib")
 	@ObfuscatedGetter(
-		intValue = -2059144841
+		intValue = -1778547945
+	)
+	@Export("oculusOrbFocalPointY")
+	static int oculusOrbFocalPointY;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1244645657
 	)
 	@Export("baseVar")
 	public int baseVar;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1506226221
+		intValue = -1956088267
 	)
 	@Export("startBit")
 	public int startBit;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -354172645
+		intValue = 147814917
 	)
 	@Export("endBit")
 	public int endBit;
 
 	static {
 		VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11
-		field1702 = new int[32]; // L: 15
+		field1710 = new int[32]; // L: 15
 		int var0 = 2; // L: 18
 
 		for (int var1 = 0; var1 < 32; ++var1) { // L: 19
-			field1702[var1] = var0 - 1; // L: 20
+			field1710[var1] = var0 - 1; // L: 20
 			var0 += var0; // L: 21
 		}
 
 	} // L: 23
 
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-683331130"
-	)
-	@Export("decode")
-	public void decode(Buffer var1) {
-		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 41
-			if (var2 == 0) { // L: 42
-				return; // L: 45
-			}
-
-			this.decodeNext(var1, var2); // L: 43
-		}
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "375304564"
-	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 48
-			this.baseVar = var1.readUnsignedShort(); // L: 49
-			this.startBit = var1.readUnsignedByte(); // L: 50
-			this.endBit = var1.readUnsignedByte(); // L: 51
-		}
-
-	} // L: 54
+	VarbitComposition() {
+	} // L: 25
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1858038859"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-699123952"
 	)
-	static void method2859() {
-		if (SoundSystem.loadWorlds()) { // L: 1640
-			Login.worldSelectOpen = true; // L: 1641
-			Login.worldSelectPage = 0; // L: 1642
-			Login.worldSelectPagesCount = 0; // L: 1643
-		}
-
-	} // L: 1645
-
-	@ObfuscatedName("fj")
-	@ObfuscatedSignature(
-		descriptor = "(ZB)V",
-		garbageValue = "-21"
-	)
-	static final void method2849(boolean var0) {
-		if (var0) { // L: 2698
-			Client.field676 = Login.field1043 ? class125.field1469 : class125.field1471; // L: 2699
-		} else {
-			LinkedHashMap var1 = ObjectComposition.clientPreferences.parameters; // L: 2702
-			String var3 = Login.Login_username; // L: 2704
-			int var4 = var3.length(); // L: 2706
-			int var5 = 0; // L: 2707
-
-			for (int var6 = 0; var6 < var4; ++var6) { // L: 2708
-				var5 = (var5 << 5) - var5 + var3.charAt(var6);
+	@Export("decode")
+	void decode(Buffer var1) {
+		while (true) {
+			int var2 = var1.readUnsignedByte(); // L: 39
+			if (var2 == 0) { // L: 40
+				return; // L: 43
 			}
 
-			Client.field676 = var1.containsKey(var5) ? class125.field1470 : class125.field1468; // L: 2711
+			this.decodeNext(var1, var2); // L: 41
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "-59"
+	)
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2) {
+		if (var2 == 1) { // L: 46
+			this.baseVar = var1.readUnsignedShort(); // L: 47
+			this.startBit = var1.readUnsignedByte(); // L: 48
+			this.endBit = var1.readUnsignedByte(); // L: 49
 		}
 
-	} // L: 2713
+	} // L: 52
 
-	@ObfuscatedName("fh")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1518032135"
+		descriptor = "(Llk;ZB)V",
+		garbageValue = "-27"
 	)
-	static final void method2846() {
-		if (class21.field190) { // L: 3408
-			for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 3410
-				Player var1 = Client.players[Players.Players_indices[var0]]; // L: 3411
-				var1.method2147(); // L: 3412
+	public static void method2928(AbstractSocket var0, boolean var1) {
+		if (NetCache.NetCache_socket != null) { // L: 60
+			try {
+				NetCache.NetCache_socket.close(); // L: 62
+			} catch (Exception var6) { // L: 64
 			}
 
-			class21.field190 = false; // L: 3415
+			NetCache.NetCache_socket = null; // L: 65
 		}
 
-	} // L: 3417
+		NetCache.NetCache_socket = var0; // L: 67
+		class105.method2358(var1); // L: 68
+		NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 69
+		class34.NetCache_currentResponse = null; // L: 70
+		class254.NetCache_responseArchiveBuffer = null; // L: 71
+		NetCache.field3615 = 0; // L: 72
+
+		while (true) {
+			NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 74
+			if (var2 == null) { // L: 75
+				while (true) {
+					var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 81
+					if (var2 == null) { // L: 82
+						if (NetCache.field3618 != 0) { // L: 88
+							try {
+								Buffer var7 = new Buffer(4); // L: 90
+								var7.writeByte(4); // L: 91
+								var7.writeByte(NetCache.field3618); // L: 92
+								var7.writeShort(0); // L: 93
+								NetCache.NetCache_socket.write(var7.array, 0, 4); // L: 94
+							} catch (IOException var5) {
+								try {
+									NetCache.NetCache_socket.close(); // L: 98
+								} catch (Exception var4) { // L: 100
+								}
+
+								++NetCache.NetCache_ioExceptions; // L: 101
+								NetCache.NetCache_socket = null; // L: 102
+							}
+						}
+
+						NetCache.NetCache_loadTime = 0; // L: 105
+						NetCache.field3604 = ClientPacket.currentTimeMillis(); // L: 106
+						return; // L: 107
+					}
+
+					NetCache.NetCache_pendingWritesQueue.addLast(var2); // L: 83
+					NetCache.NetCache_pendingWrites.put(var2, var2.key); // L: 84
+					++NetCache.NetCache_pendingWritesCount; // L: 85
+					--NetCache.NetCache_pendingResponsesCount; // L: 86
+				}
+			}
+
+			NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); // L: 76
+			++NetCache.NetCache_pendingPriorityWritesCount; // L: 77
+			--NetCache.NetCache_pendingPriorityResponsesCount; // L: 78
+		}
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "264139195"
+	)
+	public static int method2935(int var0, int var1) {
+		return (-3 - var0 << 8) + var1; // L: 17
+	}
 }
diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java
index aabcb24d97..3c16e2bffb 100644
--- a/runescape-client/src/main/java/VarcInt.java
+++ b/runescape-client/src/main/java/VarcInt.java
@@ -1,24 +1,32 @@
 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("ej")
+@ObfuscatedName("em")
 @Implements("VarcInt")
 public class VarcInt extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("VarcInt_archive")
-	static AbstractArchive VarcInt_archive;
-	@ObfuscatedName("n")
+	public static AbstractArchive VarcInt_archive;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("VarcInt_cached")
 	static EvictingDualNodeHashTable VarcInt_cached;
-	@ObfuscatedName("f")
+	@ObfuscatedName("h")
+	public static short[] field1581;
+	@ObfuscatedName("dt")
+	@ObfuscatedGetter(
+		longValue = 7886092133437125099L
+	)
+	static long field1586;
+	@ObfuscatedName("v")
 	@Export("persist")
 	public boolean persist;
 
@@ -30,95 +38,31 @@ public class VarcInt extends DualNode {
 		this.persist = false; // L: 12
 	} // L: 14
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;B)V",
-		garbageValue = "-17"
+		descriptor = "(Lnt;S)V",
+		garbageValue = "-1375"
 	)
-	void method2656(Buffer var1) {
+	void method2745(Buffer var1) {
 		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 32
-			if (var2 == 0) { // L: 33
-				return; // L: 36
+			int var2 = var1.readUnsignedByte(); // L: 28
+			if (var2 == 0) { // L: 29
+				return; // L: 32
 			}
 
-			this.method2666(var1, var2); // L: 34
+			this.method2748(var1, var2); // L: 30
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;IB)V",
-		garbageValue = "34"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "1509691720"
 	)
-	void method2666(Buffer var1, int var2) {
-		if (var2 == 2) {
-			this.persist = true;
+	void method2748(Buffer var1, int var2) {
+		if (var2 == 2) { // L: 35
+			this.persist = true; // L: 36
 		}
 
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IS)Les;",
-		garbageValue = "-9783"
-	)
-	@Export("SpotAnimationDefinition_get")
-	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
-		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 37
-		if (var1 != null) { // L: 38
-			return var1;
-		} else {
-			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 39
-			var1 = new SpotAnimationDefinition(); // L: 40
-			var1.id = var0; // L: 41
-			if (var2 != null) { // L: 42
-				var1.decode(new Buffer(var2));
-			}
-
-			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 43
-			return var1; // L: 44
-		}
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1100714076"
-	)
-	public static void method2673() {
-		if (NetCache.NetCache_socket != null) { // L: 120
-			NetCache.NetCache_socket.close();
-		}
-
-	} // L: 121
-
-	@ObfuscatedName("jc")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;IIB)V",
-		garbageValue = "8"
-	)
-	@Export("clickWidget")
-	static final void clickWidget(Widget var0, int var1, int var2) {
-		if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10694
-			if (var0 != null && ClanSettings.method125(var0) != null) { // L: 10695
-				Client.clickedWidget = var0; // L: 10696
-				Client.clickedWidgetParent = ClanSettings.method125(var0); // L: 10697
-				Client.widgetClickX = var1; // L: 10698
-				Client.widgetClickY = var2; // L: 10699
-				Actor.widgetDragDuration = 0; // L: 10700
-				Client.isDraggingWidget = false; // L: 10701
-				int var3 = MilliClock.method2588(); // L: 10702
-				if (var3 != -1) { // L: 10703
-					ReflectionCheck.tempMenuAction = new MenuAction(); // L: 10704
-					ReflectionCheck.tempMenuAction.param0 = Client.menuArguments1[var3]; // L: 10705
-					ReflectionCheck.tempMenuAction.param1 = Client.menuArguments2[var3]; // L: 10706
-					ReflectionCheck.tempMenuAction.opcode = Client.menuOpcodes[var3]; // L: 10707
-					ReflectionCheck.tempMenuAction.identifier = Client.menuIdentifiers[var3]; // L: 10708
-					ReflectionCheck.tempMenuAction.action = Client.menuActions[var3]; // L: 10709
-				}
-
-			}
-		}
-	} // L: 10711
+	} // L: 39
 }
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index 2a2e29c311..f47d6e5cc6 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -8,67 +8,80 @@ 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("dc")
+@ObfuscatedName("df")
 @Implements("Varcs")
 public class Varcs {
-	@ObfuscatedName("f")
+	@ObfuscatedName("be")
+	@ObfuscatedSignature(
+		descriptor = "[Loa;"
+	)
+	@Export("worldSelectBackSprites")
+	static SpritePixels[] worldSelectBackSprites;
+	@ObfuscatedName("da")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive12")
+	static Archive archive12;
+	@ObfuscatedName("v")
 	@Export("intsPersistence")
 	boolean[] intsPersistence;
 	@ObfuscatedName("y")
 	@Export("map")
 	Map map;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("strings")
 	String[] strings;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("unwrittenChanges")
 	boolean unwrittenChanges;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = 8820744470819498935L
+		longValue = -4374446863144258723L
 	)
-	long field1385;
+	long field1382;
 
 	Varcs() {
-		this.unwrittenChanges = false;
-		int var1 = class8.archive2.getGroupFileCount(19);
-		this.map = new HashMap();
-		this.intsPersistence = new boolean[var1];
+		this.unwrittenChanges = false; // L: 22
+		int var1 = SecureRandomFuture.archive2.getGroupFileCount(19); // L: 26
+		this.map = new HashMap(); // L: 27
+		this.intsPersistence = new boolean[var1]; // L: 28
 
 		int var2;
 		for (var2 = 0; var2 < var1; ++var2) { // L: 29
-			VarcInt var3 = WorldMapSectionType.method3591(var2); // L: 30
+			VarcInt var3 = Interpreter.method2009(var2); // L: 30
 			this.intsPersistence[var2] = var3.persist; // L: 31
 		}
 
 		var2 = 0; // L: 33
-		if (class8.archive2.method4887(15)) { // L: 34
-			var2 = class8.archive2.getGroupFileCount(15); // L: 35
+		if (SecureRandomFuture.archive2.method5031(15)) { // L: 34
+			var2 = SecureRandomFuture.archive2.getGroupFileCount(15); // L: 35
 		}
 
 		this.strings = new String[var2]; // L: 37
 		this.read(); // L: 38
 	} // L: 39
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(IIB)V",
-		garbageValue = "36"
+		garbageValue = "88"
 	)
 	@Export("setInt")
 	void setInt(int var1, int var2) {
 		this.map.put(var1, var2); // L: 42
-		if (this.intsPersistence[var1]) { // L: 43
-			this.unwrittenChanges = true;
+		if (this.intsPersistence[var1]) {
+			this.unwrittenChanges = true; // L: 43
 		}
 
 	} // L: 44
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-271438249"
+		descriptor = "(IB)I",
+		garbageValue = "-43"
 	)
 	@Export("getInt")
 	int getInt(int var1) {
@@ -76,10 +89,10 @@ public class Varcs {
 		return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;I)V",
-		garbageValue = "1989718678"
+		descriptor = "(ILjava/lang/String;B)V",
+		garbageValue = "-105"
 	)
 	@Export("setString")
 	void setString(int var1, String var2) {
@@ -88,8 +101,8 @@ public class Varcs {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-1757644423"
+		descriptor = "(IB)Ljava/lang/String;",
+		garbageValue = "30"
 	)
 	@Export("getString")
 	String getString(int var1) {
@@ -97,30 +110,30 @@ public class Varcs {
 		return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;S)V",
-		garbageValue = "29886"
+		descriptor = "(ILjava/lang/String;I)V",
+		garbageValue = "1842220205"
 	)
 	@Export("setStringOld")
 	void setStringOld(int var1, String var2) {
 		this.strings[var1] = var2; // L: 67
 	} // L: 68
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IS)Ljava/lang/String;",
-		garbageValue = "-8380"
+		descriptor = "(II)Ljava/lang/String;",
+		garbageValue = "921484764"
 	)
 	@Export("getStringOld")
 	String getStringOld(int var1) {
 		return this.strings[var1]; // L: 71
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1787706587"
+		garbageValue = "1804190455"
 	)
 	@Export("clearTransient")
 	void clearTransient() {
@@ -137,20 +150,20 @@ public class Varcs {
 
 	} // L: 83
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)Lnm;",
-		garbageValue = "-1288257534"
+		descriptor = "(ZI)Lnp;",
+		garbageValue = "609461646"
 	)
 	@Export("getPreferencesFile")
 	AccessFile getPreferencesFile(boolean var1) {
-		return class82.getPreferencesFile("2", SoundSystem.field461.name, var1); // L: 86
+		return class262.getPreferencesFile("2", class182.field2114.name, var1); // L: 86
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-2"
+		descriptor = "(I)V",
+		garbageValue = "-1876168838"
 	)
 	@Export("write")
 	void write() {
@@ -169,8 +182,8 @@ public class Varcs {
 					var2 += 3; // L: 100
 					if (var7 instanceof Integer) { // L: 101
 						var2 += 4;
-					} else if (var7 instanceof String) {
-						var2 += Tiles.stringCp1252NullTerminatedByteSize((String)var7); // L: 102
+					} else if (var7 instanceof String) { // L: 102
+						var2 += class44.stringCp1252NullTerminatedByteSize((String)var7);
 					}
 
 					++var3; // L: 103
@@ -184,165 +197,567 @@ public class Varcs {
 
 			while (var24.hasNext()) {
 				Entry var12 = (Entry)var24.next(); // L: 111
-				int var13 = (Integer)var12.getKey(); // L: 113
+				int var13 = (Integer)var12.getKey();
 				if (this.intsPersistence[var13]) { // L: 114
-					var23.writeShort(var13); // L: 115
-					Object var8 = var12.getValue(); // L: 116
-					class374 var9 = class374.method6479(var8.getClass()); // L: 117
-					var23.writeByte(var9.field4135); // L: 118
-					class374.method6475(var8, var23); // L: 119
+					var23.writeShort(var13);
+					Object var8 = var12.getValue();
+					class375 var9 = class375.method6511(var8.getClass());
+					var23.writeByte(var9.field4137);
+					class375.method6512(var8, var23); // L: 119
 				}
 			}
 
 			var1.write(var23.array, 0, var23.offset); // L: 123
-		} catch (Exception var21) { // L: 125
+		} catch (Exception var21) {
 		} finally {
 			try {
-				var1.close(); // L: 128
-			} catch (Exception var20) { // L: 130
+				var1.close();
+			} catch (Exception var20) {
 			}
 
 		}
 
-		this.unwrittenChanges = false; // L: 132
-		this.field1385 = ObjectComposition.currentTimeMillis(); // L: 133
-	} // L: 134
+		this.unwrittenChanges = false;
+		this.field1382 = ClientPacket.currentTimeMillis();
+	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "54"
+		garbageValue = "124"
 	)
 	@Export("read")
 	void read() {
 		AccessFile var1 = this.getPreferencesFile(false); // L: 137
 
-		label212: {
+		label228: {
 			try {
-				byte[] var2 = new byte[(int)var1.length()]; // L: 139
+				byte[] var2 = new byte[(int)var1.length()];
 
 				int var4;
-				for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 140 141 144
-					var4 = var1.read(var2, var3, var2.length - var3); // L: 142
-					if (var4 == -1) { // L: 143
+				for (int var3 = 0; var3 < var2.length; var3 += var4) {
+					var4 = var1.read(var2, var3, var2.length - var3);
+					if (var4 == -1) {
 						throw new EOFException();
 					}
 				}
 
-				Buffer var14 = new Buffer(var2); // L: 146
-				if (var14.array.length - var14.offset < 1) { // L: 147
-					return;
-				}
+				Buffer var15 = new Buffer(var2);
+				if (var15.array.length - var15.offset >= 1) {
+					int var16 = var15.readUnsignedByte();
+					if (var16 >= 0 && var16 <= 2) {
+						int var7;
+						int var8;
+						int var9;
+						int var17;
+						if (var16 >= 2) {
+							var17 = var15.readUnsignedShort();
+							var7 = 0;
 
-				int var15 = var14.readUnsignedByte(); // L: 148
-				if (var15 >= 0 && var15 <= 2) { // L: 149
-					int var7;
-					int var8;
-					int var9;
-					int var16;
-					if (var15 >= 2) { // L: 150
-						var16 = var14.readUnsignedShort(); // L: 151
-						var7 = 0;
+							while (true) {
+								if (var7 >= var17) {
+									break label228;
+								}
 
-						while (true) {
-							if (var7 >= var16) {
-								break label212;
+								var8 = var15.readUnsignedShort();
+								var9 = var15.readUnsignedByte();
+								class375[] var10 = new class375[]{class375.field4128, class375.field4134, class375.field4127};
+								class375 var11 = (class375)Clock.findEnumerated(var10, var9);
+								Object var12 = var11.method6510(var15); // L: 160
+								if (this.intsPersistence[var8]) { // L: 161
+									this.map.put(var8, var12); // L: 162
+								}
+
+								++var7;
+							}
+						} else {
+							var17 = var15.readUnsignedShort();
+
+							for (var7 = 0; var7 < var17; ++var7) {
+								var8 = var15.readUnsignedShort();
+								var9 = var15.readInt();
+								if (this.intsPersistence[var8]) { // L: 171
+									this.map.put(var8, var9); // L: 172
+								}
 							}
 
-							var8 = var14.readUnsignedShort(); // L: 153
-							var9 = var14.readUnsignedByte(); // L: 154
-							class374 var10 = (class374)Messages.findEnumerated(class374.method6476(), var9); // L: 155
-							Object var11 = var10.method6480(var14); // L: 156
-							if (this.intsPersistence[var8]) { // L: 157
-								this.map.put(var8, var11); // L: 158
+							var7 = var15.readUnsignedShort();
+							var8 = 0;
+
+							while (true) {
+								if (var8 >= var7) {
+									break label228;
+								}
+
+								var15.readUnsignedShort(); // L: 177
+								var15.readStringCp1252NullTerminated();
+								++var8; // L: 176
 							}
-
-							++var7; // L: 152
-						}
-					} else {
-						var16 = var14.readUnsignedShort(); // L: 163
-
-						for (var7 = 0; var7 < var16; ++var7) { // L: 164
-							var8 = var14.readUnsignedShort(); // L: 165
-							var9 = var14.readInt(); // L: 166
-							if (this.intsPersistence[var8]) { // L: 167
-								this.map.put(var8, var9); // L: 168
-							}
-						}
-
-						var7 = var14.readUnsignedShort(); // L: 171
-						var8 = 0;
-
-						while (true) {
-							if (var8 >= var7) {
-								break label212;
-							}
-
-							var14.readUnsignedShort(); // L: 173
-							var14.readStringCp1252NullTerminated(); // L: 174
-							++var8; // L: 172
 						}
 					}
+
+					return; // L: 187
 				}
-			} catch (Exception var25) { // L: 178
-				break label212;
+			} catch (Exception var26) { // L: 182
+				break label228;
 			} finally {
 				try {
-					var1.close(); // L: 181
-				} catch (Exception var24) {
+					var1.close();
+				} catch (Exception var25) {
 				}
 
 			}
 
-			return; // L: 183
+			return;
 		}
 
-		this.unwrittenChanges = false; // L: 185
-	} // L: 186
+		this.unwrittenChanges = false;
+	} // L: 190
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1350770877"
+		garbageValue = "1424878016"
 	)
 	@Export("tryWrite")
 	void tryWrite() {
-		if (this.unwrittenChanges && this.field1385 < ObjectComposition.currentTimeMillis() - 60000L) { // L: 189
-			this.write(); // L: 190
+		if (this.unwrittenChanges && this.field1382 < ClientPacket.currentTimeMillis() - 60000L) {
+			this.write();
 		}
 
-	} // L: 192
+	} // L: 196
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-250797388"
+		garbageValue = "262947682"
 	)
 	@Export("hasUnwrittenChanges")
 	boolean hasUnwrittenChanges() {
-		return this.unwrittenChanges; // L: 195
+		return this.unwrittenChanges;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)Leh;",
-		garbageValue = "-884874334"
+		descriptor = "(Lcs;IIB)V",
+		garbageValue = "-123"
 	)
-	@Export("getParamDefinition")
-	public static ParamComposition getParamDefinition(int var0) {
-		ParamComposition var1 = (ParamComposition)ParamComposition.ParamDefinition_cached.get((long)var0); // L: 21
-		if (var1 != null) { // L: 22
-			return var1;
+	@Export("runScript")
+	static void runScript(ScriptEvent var0, int var1, int var2) {
+		Object[] var3 = var0.args; // L: 113
+		Script var4;
+		int var20;
+		if (Message.isWorldMapEvent(var0.type)) { // L: 115
+			Occluder.worldMapEvent = (WorldMapEvent)var3[0]; // L: 116
+			WorldMapElement var5 = Archive.WorldMapElement_get(Occluder.worldMapEvent.mapElement); // L: 117
+			var4 = StructComposition.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 118
 		} else {
-			byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 23
-			var1 = new ParamComposition(); // L: 24
-			if (var2 != null) { // L: 25
-				var1.decode(new Buffer(var2));
+			var20 = (Integer)var3[0]; // L: 121
+			var4 = class375.getScript(var20); // L: 122
+		}
+
+		if (var4 != null) { // L: 124
+			ChatChannel.Interpreter_intStackSize = 0; // L: 127
+			UserComparator9.Interpreter_stringStackSize = 0; // L: 128
+			var20 = -1; // L: 129
+			int[] var6 = var4.opcodes; // L: 130
+			int[] var7 = var4.intOperands; // L: 131
+			byte var8 = -1; // L: 132
+			Interpreter.Interpreter_frameDepth = 0; // L: 133
+			Interpreter.field963 = false; // L: 134
+			boolean var9 = false; // L: 135
+			int var10 = 0; // L: 136
+			boolean var30 = false;
+
+			label985: {
+				label986: {
+					try {
+						int var13;
+						try {
+							var30 = true; // L: 138
+							class231.Interpreter_intLocals = new int[var4.localIntCount]; // L: 139
+							int var11 = 0; // L: 140
+							UrlRequester.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 141
+							int var12 = 0;
+
+							int var14;
+							String var21;
+							for (var13 = 1; var13 < var3.length; ++var13) { // L: 142
+								if (var3[var13] instanceof Integer) { // L: 143
+									var14 = (Integer)var3[var13]; // L: 144
+									if (var14 == -2147483647) { // L: 145
+										var14 = var0.mouseX;
+									}
+
+									if (var14 == -2147483646) { // L: 146
+										var14 = var0.mouseY;
+									}
+
+									if (var14 == -2147483645) { // L: 147
+										var14 = var0.widget != null ? var0.widget.id * -464746545 * 363798319 : -1;
+									}
+
+									if (var14 == -2147483644) { // L: 148
+										var14 = var0.opIndex;
+									}
+
+									if (var14 == -2147483643) { // L: 149
+										var14 = var0.widget != null ? var0.widget.childIndex * 1482836169 * 576999801 : -1;
+									}
+
+									if (var14 == -2147483642) { // L: 150
+										var14 = var0.dragTarget != null ? var0.dragTarget.id * -464746545 * 363798319 : -1;
+									}
+
+									if (var14 == -2147483641) { // L: 151
+										var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1482836169 * 576999801 : -1;
+									}
+
+									if (var14 == -2147483640) { // L: 152
+										var14 = var0.keyTyped;
+									}
+
+									if (var14 == -2147483639) { // L: 153
+										var14 = var0.keyPressed;
+									}
+
+									class231.Interpreter_intLocals[var11++] = var14; // L: 154
+								} else if (var3[var13] instanceof String) { // L: 156
+									var21 = (String)var3[var13]; // L: 157
+									if (var21.equals("event_opbase")) { // L: 158
+										var21 = var0.targetName;
+									}
+
+									UrlRequester.Interpreter_stringLocals[var12++] = var21; // L: 159
+								}
+							}
+
+							Interpreter.field966 = var0.field1154; // L: 163
+
+							while (true) {
+								++var10; // L: 165
+								if (var10 > var1) { // L: 166
+									throw new RuntimeException();
+								}
+
+								++var20; // L: 167
+								int var33 = var6[var20];
+								if (var33 >= 100) { // L: 168
+									boolean var35;
+									if (var4.intOperands[var20] == 1) { // L: 386
+										var35 = true;
+									} else {
+										var35 = false; // L: 387
+									}
+
+									var14 = class7.method88(var33, var4, var35); // L: 388
+									switch(var14) { // L: 389
+									case 0:
+										var30 = false;
+										break label985;
+									case 1:
+									default:
+										break;
+									case 2:
+										throw new IllegalStateException(); // L: 392
+									}
+								} else if (var33 == 0) { // L: 169
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7[var20]; // L: 170
+								} else if (var33 == ScriptOpcodes.GET_VARP) { // L: 173
+									var13 = var7[var20]; // L: 174
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 175
+								} else if (var33 == ScriptOpcodes.SET_VARP) { // L: 178
+									var13 = var7[var20]; // L: 179
+									Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 180
+									class6.changeGameOptions(var13); // L: 181
+								} else if (var33 == ScriptOpcodes.SCONST) { // L: 184
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.stringOperands[var20]; // L: 185
+								} else if (var33 == ScriptOpcodes.JUMP) { // L: 188
+									var20 += var7[var20]; // L: 189
+								} else if (var33 == ScriptOpcodes.IF_ICMPNE) { // L: 192
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 193
+									if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 194
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPEQ) { // L: 197
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 198
+									if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 199
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPLT) { // L: 202
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 203
+									if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 204
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPGT) { // L: 207
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 208
+									if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 209
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.RETURN) { // L: 212
+									if (Interpreter.Interpreter_frameDepth == 0) { // L: 213
+										var30 = false;
+										break;
+									}
+
+									ScriptFrame var40 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 214
+									var4 = var40.script; // L: 215
+									var6 = var4.opcodes; // L: 216
+									var7 = var4.intOperands; // L: 217
+									var20 = var40.pc; // L: 218
+									class231.Interpreter_intLocals = var40.intLocals; // L: 219
+									UrlRequester.Interpreter_stringLocals = var40.stringLocals; // L: 220
+								} else if (var33 == ScriptOpcodes.GET_VARBIT) { // L: 223
+									var13 = var7[var20]; // L: 224
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ScriptFrame.getVarbit(var13); // L: 225
+								} else if (var33 == ScriptOpcodes.SET_VARBIT) { // L: 228
+									var13 = var7[var20]; // L: 229
+									Archive.method5060(var13, Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 230
+								} else if (var33 == ScriptOpcodes.IF_ICMPLE) { // L: 233
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 234
+									if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 235
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.IF_ICMPGE) { // L: 238
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 239
+									if (Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]) { // L: 240
+										var20 += var7[var20];
+									}
+								} else if (var33 == ScriptOpcodes.ILOAD) { // L: 243
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class231.Interpreter_intLocals[var7[var20]]; // L: 244
+								} else if (var33 == ScriptOpcodes.ISTORE) { // L: 247
+									class231.Interpreter_intLocals[var7[var20]] = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 248
+								} else if (var33 == ScriptOpcodes.SLOAD) { // L: 251
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = UrlRequester.Interpreter_stringLocals[var7[var20]]; // L: 252
+								} else if (var33 == ScriptOpcodes.SSTORE) { // L: 255
+									UrlRequester.Interpreter_stringLocals[var7[var20]] = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 256
+								} else if (var33 == ScriptOpcodes.JOIN_STRING) { // L: 259
+									var13 = var7[var20]; // L: 260
+									UserComparator9.Interpreter_stringStackSize -= var13; // L: 261
+									var21 = MouseRecorder.method2203(Interpreter.Interpreter_stringStack, UserComparator9.Interpreter_stringStackSize, var13); // L: 262
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var21; // L: 263
+								} else if (var33 == ScriptOpcodes.POP_INT) { // L: 266
+									--ChatChannel.Interpreter_intStackSize; // L: 267
+								} else if (var33 == ScriptOpcodes.POP_STRING) { // L: 270
+									--UserComparator9.Interpreter_stringStackSize; // L: 271
+								} else {
+									int var17;
+									if (var33 != ScriptOpcodes.INVOKE) { // L: 274
+										if (var33 == ScriptOpcodes.GET_VARC_INT) { // L: 297
+											Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class20.varcs.getInt(var7[var20]); // L: 298
+										} else if (var33 == ScriptOpcodes.SET_VARC_INT) { // L: 301
+											class20.varcs.setInt(var7[var20], Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 302
+										} else if (var33 == ScriptOpcodes.DEFINE_ARRAY) { // L: 305
+											var13 = var7[var20] >> 16; // L: 306
+											var14 = var7[var20] & 65535; // L: 307
+											int var24 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 308
+											if (var24 < 0 || var24 > 5000) { // L: 309
+												throw new RuntimeException(); // L: 310
+											}
+
+											Interpreter.Interpreter_arrayLengths[var13] = var24; // L: 312
+											byte var25 = -1; // L: 313
+											if (var14 == 105) { // L: 314
+												var25 = 0;
+											}
+
+											for (var17 = 0; var17 < var24; ++var17) { // L: 315
+												Interpreter.Interpreter_arrays[var13][var17] = var25;
+											}
+										} else if (var33 == ScriptOpcodes.GET_ARRAY_INT) { // L: 318
+											var13 = var7[var20]; // L: 319
+											var14 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 320
+											if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 321
+												throw new RuntimeException(); // L: 322
+											}
+
+											Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 324
+										} else if (var33 == ScriptOpcodes.SET_ARRAY_INT) { // L: 327
+											var13 = var7[var20]; // L: 328
+											ChatChannel.Interpreter_intStackSize -= 2; // L: 329
+											var14 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 330
+											if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 331
+												throw new RuntimeException(); // L: 332
+											}
+
+											Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 334
+										} else {
+											String var22;
+											if (var33 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 337
+												var22 = class20.varcs.getStringOld(var7[var20]); // L: 338
+												if (var22 == null) { // L: 339
+													var22 = "null";
+												}
+
+												Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var22; // L: 340
+											} else if (var33 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 343
+												class20.varcs.setStringOld(var7[var20], Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 344
+											} else if (var33 == ScriptOpcodes.GET_VARC_STRING) { // L: 347
+												var22 = class20.varcs.getString(var7[var20]); // L: 348
+												Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var22; // L: 349
+											} else if (var33 == ScriptOpcodes.SET_VARC_STRING) { // L: 352
+												class20.varcs.setString(var7[var20], Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 353
+											} else if (var33 == ScriptOpcodes.SWITCH) { // L: 356
+												IterableNodeHashTable var38 = var4.switches[var7[var20]]; // L: 357
+												IntegerNode var37 = (IntegerNode)var38.get((long)Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 358
+												if (var37 != null) { // L: 359
+													var20 += var37.integer;
+												}
+											} else {
+												Integer var39;
+												if (var33 == ScriptOpcodes.GET_VARCLANSETTING) { // L: 362
+													var39 = DirectByteArrayCopier.field3128.getTitleGroupValue(var7[var20]); // L: 363
+													if (var39 == null) { // L: 364
+														Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 365
+													} else {
+														Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var39; // L: 368
+													}
+												} else {
+													if (var33 != ScriptOpcodes.GET_VARCLAN) { // L: 372
+														throw new IllegalStateException(); // L: 382
+													}
+
+													var39 = class10.field74.method6047(var7[var20]); // L: 373
+													if (var39 == null) { // L: 374
+														Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 375
+													} else {
+														Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var39; // L: 378
+													}
+												}
+											}
+										}
+									} else {
+										var13 = var7[var20]; // L: 275
+										Script var36 = class375.getScript(var13); // L: 276
+										int[] var15 = new int[var36.localIntCount]; // L: 277
+										String[] var16 = new String[var36.localStringCount]; // L: 278
+
+										for (var17 = 0; var17 < var36.intArgumentCount; ++var17) { // L: 279
+											var15[var17] = Interpreter.Interpreter_intStack[var17 + (ChatChannel.Interpreter_intStackSize - var36.intArgumentCount)];
+										}
+
+										for (var17 = 0; var17 < var36.stringArgumentCount; ++var17) { // L: 280
+											var16[var17] = Interpreter.Interpreter_stringStack[var17 + (UserComparator9.Interpreter_stringStackSize - var36.stringArgumentCount)];
+										}
+
+										ChatChannel.Interpreter_intStackSize -= var36.intArgumentCount; // L: 281
+										UserComparator9.Interpreter_stringStackSize -= var36.stringArgumentCount; // L: 282
+										ScriptFrame var23 = new ScriptFrame(); // L: 283
+										var23.script = var4; // L: 284
+										var23.pc = var20; // L: 285
+										var23.intLocals = class231.Interpreter_intLocals; // L: 286
+										var23.stringLocals = UrlRequester.Interpreter_stringLocals; // L: 287
+										Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var23; // L: 288
+										var4 = var36; // L: 289
+										var6 = var36.opcodes; // L: 290
+										var7 = var36.intOperands; // L: 291
+										var20 = -1; // L: 292
+										class231.Interpreter_intLocals = var15; // L: 293
+										UrlRequester.Interpreter_stringLocals = var16; // L: 294
+									}
+								}
+							}
+						} catch (Exception var31) { // L: 402
+							var9 = true; // L: 403
+							StringBuilder var27 = new StringBuilder(30); // L: 405
+							var27.append("").append(var4.key).append(" "); // L: 406
+
+							for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 407
+								var27.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" ");
+							}
+
+							var27.append("").append(var8); // L: 408
+							FriendsChat.RunException_sendStackTrace(var27.toString(), var31); // L: 409
+							var30 = false;
+							break label986;
+						}
+					} finally {
+						if (var30) {
+							if (Interpreter.field963) { // L: 413
+								Interpreter.field951 = true; // L: 414
+							}
+
+							while (Interpreter.field965.size() > 0) { // L: 416
+								class106 var19 = (class106)Interpreter.field965.remove(0); // L: 417
+								MouseHandler.widgetDefaultMenuAction(var19.method2375(), var19.method2360(), var19.method2367(), var19.method2363(), "");
+							}
+
+							if (Interpreter.field951) { // L: 420
+								class20.method288(); // L: 421
+								Interpreter.field951 = false; // L: 422
+								Interpreter.field963 = false; // L: 423
+							}
+
+							if (!var9 && var2 > 0 && var10 >= var2) {
+								FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+							}
+
+						}
+					}
+
+					if (Interpreter.field963) {
+						Interpreter.field951 = true;
+					}
+
+					while (Interpreter.field965.size() > 0) {
+						class106 var41 = (class106)Interpreter.field965.remove(0);
+						MouseHandler.widgetDefaultMenuAction(var41.method2375(), var41.method2360(), var41.method2367(), var41.method2363(), "");
+					}
+
+					if (Interpreter.field951) {
+						class20.method288();
+						Interpreter.field951 = false;
+						Interpreter.field963 = false;
+					}
+
+					if (!var9 && var2 > 0 && var10 >= var2) {
+						FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+					}
+
+					return;
+				}
+
+				if (Interpreter.field963) {
+					Interpreter.field951 = true;
+				}
+
+				while (Interpreter.field965.size() > 0) {
+					class106 var26 = (class106)Interpreter.field965.remove(0);
+					MouseHandler.widgetDefaultMenuAction(var26.method2375(), var26.method2360(), var26.method2367(), var26.method2363(), "");
+				}
+
+				if (Interpreter.field951) {
+					class20.method288();
+					Interpreter.field951 = false;
+					Interpreter.field963 = false;
+				}
+
+				if (!var9 && var2 > 0 && var10 >= var2) {
+					FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
+				}
+
+				return; // L: 429
+			}
+
+			if (Interpreter.field963) {
+				Interpreter.field951 = true;
+			}
+
+			while (Interpreter.field965.size() > 0) {
+				class106 var34 = (class106)Interpreter.field965.remove(0);
+				MouseHandler.widgetDefaultMenuAction(var34.method2375(), var34.method2360(), var34.method2367(), var34.method2363(), ""); // L: 418
+			}
+
+			if (Interpreter.field951) {
+				class20.method288();
+				Interpreter.field951 = false;
+				Interpreter.field963 = false;
+			}
+
+			if (!var9 && var2 > 0 && var10 >= var2) { // L: 425
+				FriendsChat.RunException_sendStackTrace("Warning: Script " + var4.field1069 + " finished at op count " + var10 + " of max " + var1, (Throwable)null); // L: 426
 			}
 
-			var1.postDecode(); // L: 26
-			ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 27
-			return var1; // L: 28
 		}
-	}
+	} // L: 125
 }
diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java
index 6d7189003d..d35770cdd6 100644
--- a/runescape-client/src/main/java/VarpDefinition.java
+++ b/runescape-client/src/main/java/VarpDefinition.java
@@ -1,39 +1,28 @@
+import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ex")
+@ObfuscatedName("eb")
 @Implements("VarpDefinition")
 public class VarpDefinition extends DualNode {
-	@ObfuscatedName("rr")
-	@ObfuscatedGetter(
-		intValue = 634754105
-	)
-	static int field1544;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("VarpDefinition_archive")
 	static AbstractArchive VarpDefinition_archive;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -1782450907
-	)
-	@Export("VarpDefinition_fileCount")
-	public static int VarpDefinition_fileCount;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("VarpDefinition_cached")
-	public static EvictingDualNodeHashTable VarpDefinition_cached;
+	static EvictingDualNodeHashTable VarpDefinition_cached;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 812709151
+		intValue = 1436014737
 	)
 	@Export("type")
 	public int type;
@@ -46,10 +35,10 @@ public class VarpDefinition extends DualNode {
 		this.type = 0; // L: 13
 	} // L: 15
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1856210017"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-383467418"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -65,8 +54,8 @@ public class VarpDefinition extends DualNode {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "1230881703"
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "8"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -76,38 +65,38 @@ public class VarpDefinition extends DualNode {
 
 	} // L: 43
 
-	@ObfuscatedName("p")
-	public static int method2630(long var0) {
-		return (int)(var0 >>> 0 & 127L); // L: 64
-	}
-
-	@ObfuscatedName("k")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-2015232474"
+		descriptor = "(I)Lcn;",
+		garbageValue = "1169872264"
 	)
-	static int method2629(int var0, Script var1, boolean var2) {
-		Widget var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1252
-		if (var0 == ScriptOpcodes.IF_GETX) { // L: 1253
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.x; // L: 1254
-			return 1; // L: 1255
-		} else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1257
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.y; // L: 1258
-			return 1; // L: 1259
-		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1261
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.width; // L: 1262
-			return 1; // L: 1263
-		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1265
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.height; // L: 1266
-			return 1; // L: 1267
-		} else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1269
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1270
-			return 1; // L: 1271
-		} else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1273
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.parentId; // L: 1274
-			return 1; // L: 1275
-		} else {
-			return 2; // L: 1277
+	static ClientPreferences method2715() {
+		AccessFile var0 = null; // L: 95
+		ClientPreferences var1 = new ClientPreferences(); // L: 96
+
+		try {
+			var0 = class262.getPreferencesFile("", class182.field2114.name, false); // L: 98
+			byte[] var2 = new byte[(int)var0.length()]; // L: 99
+
+			int var4;
+			for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 100 101 104
+				var4 = var0.read(var2, var3, var2.length - var3); // L: 102
+				if (var4 == -1) {
+					throw new IOException(); // L: 103
+				}
+			}
+
+			var1 = new ClientPreferences(new Buffer(var2)); // L: 106
+		} catch (Exception var6) { // L: 108
 		}
+
+		try {
+			if (var0 != null) { // L: 110
+				var0.close();
+			}
+		} catch (Exception var5) { // L: 112
+		}
+
+		return var1; // L: 113
 	}
 }
diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java
index 01849690c9..d471bcc81f 100644
--- a/runescape-client/src/main/java/Varps.java
+++ b/runescape-client/src/main/java/Varps.java
@@ -1,24 +1,20 @@
-import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ik")
+@ObfuscatedName("ir")
 @Implements("Varps")
 public class Varps {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("Varps_masks")
 	static int[] Varps_masks;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("Varps_temp")
 	public static int[] Varps_temp;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("Varps_main")
 	public static int[] Varps_main;
-	@ObfuscatedName("bd")
-	@Export("otp")
-	static String otp;
 
 	static {
 		Varps_masks = new int[32]; // L: 6
@@ -33,27 +29,271 @@ public class Varps {
 		Varps_main = new int[4000]; // L: 17
 	}
 
-	@ObfuscatedName("kt")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-1"
+		descriptor = "(Ljava/lang/CharSequence;I)Z",
+		garbageValue = "1691710161"
 	)
-	static final void method4647() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11244
-			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11245
-			var1.clearIsFriend(); // L: 11246
+	@Export("isNumber")
+	public static boolean isNumber(CharSequence var0) {
+		boolean var2 = false; // L: 37
+		boolean var3 = false; // L: 38
+		int var4 = 0; // L: 39
+		int var5 = var0.length(); // L: 40
+		int var6 = 0;
+
+		boolean var1;
+		while (true) {
+			if (var6 >= var5) {
+				var1 = var3; // L: 70
+				break;
+			}
+
+			label83: {
+				char var7 = var0.charAt(var6); // L: 42
+				if (var6 == 0) { // L: 43
+					if (var7 == '-') { // L: 44
+						var2 = true; // L: 45
+						break label83;
+					}
+
+					if (var7 == '+') { // L: 48
+						break label83;
+					}
+				}
+
+				int var9;
+				if (var7 >= '0' && var7 <= '9') { // L: 50
+					var9 = var7 - '0';
+				} else if (var7 >= 'A' && var7 <= 'Z') { // L: 51
+					var9 = var7 - '7';
+				} else {
+					if (var7 < 'a' || var7 > 'z') { // L: 52
+						var1 = false; // L: 54
+						break;
+					}
+
+					var9 = var7 - 'W';
+				}
+
+				if (var9 >= 10) { // L: 57
+					var1 = false; // L: 58
+					break; // L: 59
+				}
+
+				if (var2) { // L: 61
+					var9 = -var9;
+				}
+
+				int var8 = var9 + var4 * 10; // L: 62
+				if (var4 != var8 / 10) { // L: 63
+					var1 = false; // L: 64
+					break; // L: 65
+				}
+
+				var4 = var8; // L: 67
+				var3 = true; // L: 68
+			}
+
+			++var6; // L: 41
 		}
 
-		Iterator var2 = Messages.Messages_hashTable.iterator(); // L: 11249
+		return var1; // L: 72
+	}
 
-		while (var2.hasNext()) {
-			Message var3 = (Message)var2.next(); // L: 11250
-			var3.clearIsFromFriend(); // L: 11252
+	@ObfuscatedName("gh")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1613057014"
+	)
+	static final void method4783() {
+		int var0;
+		int var1;
+		int var2;
+		int var3;
+		int var4;
+		int var5;
+		if (Client.oculusOrbState == 0) { // L: 3960
+			var0 = class262.localPlayer.x; // L: 3961
+			var1 = class262.localPlayer.y; // L: 3962
+			if (FriendSystem.oculusOrbFocalPointX - var0 < -500 || FriendSystem.oculusOrbFocalPointX - var0 > 500 || VarbitComposition.oculusOrbFocalPointY - var1 < -500 || VarbitComposition.oculusOrbFocalPointY - var1 > 500) { // L: 3963
+				FriendSystem.oculusOrbFocalPointX = var0; // L: 3964
+				VarbitComposition.oculusOrbFocalPointY = var1; // L: 3965
+			}
+
+			if (var0 != FriendSystem.oculusOrbFocalPointX) { // L: 3967
+				FriendSystem.oculusOrbFocalPointX += (var0 - FriendSystem.oculusOrbFocalPointX) / 16;
+			}
+
+			if (var1 != VarbitComposition.oculusOrbFocalPointY) { // L: 3968
+				VarbitComposition.oculusOrbFocalPointY += (var1 - VarbitComposition.oculusOrbFocalPointY) / 16;
+			}
+
+			var2 = FriendSystem.oculusOrbFocalPointX >> 7; // L: 3969
+			var3 = VarbitComposition.oculusOrbFocalPointY >> 7; // L: 3970
+			var4 = ItemContainer.getTileHeight(FriendSystem.oculusOrbFocalPointX, VarbitComposition.oculusOrbFocalPointY, SoundSystem.Client_plane); // L: 3971
+			var5 = 0; // L: 3972
+			int var6;
+			if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3973
+				for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3974
+					for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3975
+						int var8 = SoundSystem.Client_plane; // L: 3976
+						if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3977
+							++var8;
+						}
+
+						int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3978
+						if (var9 > var5) { // L: 3979
+							var5 = var9;
+						}
+					}
+				}
+			}
+
+			var6 = var5 * 192; // L: 3983
+			if (var6 > 98048) { // L: 3984
+				var6 = 98048;
+			}
+
+			if (var6 < 32768) { // L: 3985
+				var6 = 32768;
+			}
+
+			if (var6 > Client.field708) { // L: 3986
+				Client.field708 += (var6 - Client.field708) / 24;
+			} else if (var6 < Client.field708) { // L: 3987
+				Client.field708 += (var6 - Client.field708) / 80;
+			}
+
+			class14.field124 = ItemContainer.getTileHeight(class262.localPlayer.x, class262.localPlayer.y, SoundSystem.Client_plane) - Client.camFollowHeight; // L: 3988
+		} else if (Client.oculusOrbState == 1) { // L: 3990
+			if (Client.field705 && class262.localPlayer != null) { // L: 3992
+				var0 = class262.localPlayer.pathX[0]; // L: 3993
+				var1 = class262.localPlayer.pathY[0]; // L: 3994
+				if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3995
+					FriendSystem.oculusOrbFocalPointX = class262.localPlayer.x; // L: 3996
+					var2 = ItemContainer.getTileHeight(class262.localPlayer.x, class262.localPlayer.y, SoundSystem.Client_plane) - Client.camFollowHeight; // L: 3997
+					if (var2 < class14.field124) { // L: 3998
+						class14.field124 = var2;
+					}
+
+					VarbitComposition.oculusOrbFocalPointY = class262.localPlayer.y; // L: 3999
+					Client.field705 = false; // L: 4000
+				}
+			}
+
+			short var10 = -1; // L: 4003
+			if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 4004
+				var10 = 0;
+			} else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 4005
+				var10 = 1024;
+			}
+
+			if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 4006
+				if (var10 == 0) { // L: 4007
+					var10 = 1792;
+				} else if (var10 == 1024) { // L: 4008
+					var10 = 1280;
+				} else {
+					var10 = 1536; // L: 4009
+				}
+			} else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 4011
+				if (var10 == 0) { // L: 4012
+					var10 = 256;
+				} else if (var10 == 1024) { // L: 4013
+					var10 = 768;
+				} else {
+					var10 = 512; // L: 4014
+				}
+			}
+
+			byte var11 = 0; // L: 4016
+			if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 4017
+				var11 = -1;
+			} else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 4018
+				var11 = 1;
+			}
+
+			var2 = 0; // L: 4019
+			if (var10 >= 0 || var11 != 0) { // L: 4020
+				var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * 930603185 * -1091934127 : Client.oculusOrbNormalSpeed * 1556069133 * 1614384069; // L: 4021
+				var2 *= 16; // L: 4022
+				Client.field676 = var10; // L: 4023
+				Client.field857 = var11; // L: 4024
+			}
+
+			if (Client.field699 < var2) { // L: 4026
+				Client.field699 += var2 / 8; // L: 4027
+				if (Client.field699 > var2) { // L: 4028
+					Client.field699 = var2;
+				}
+			} else if (Client.field699 > var2) { // L: 4030
+				Client.field699 = Client.field699 * 9 / 10;
+			}
+
+			if (Client.field699 > 0) { // L: 4031
+				var3 = Client.field699 / 16; // L: 4032
+				if (Client.field676 >= 0) { // L: 4033
+					var0 = Client.field676 - class32.cameraYaw & 2047; // L: 4034
+					var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 4035
+					var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 4036
+					FriendSystem.oculusOrbFocalPointX += var3 * var4 / 65536; // L: 4037
+					VarbitComposition.oculusOrbFocalPointY += var5 * var3 / 65536; // L: 4038
+				}
+
+				if (Client.field857 != 0) { // L: 4040
+					class14.field124 += var3 * Client.field857; // L: 4041
+					if (class14.field124 > 0) { // L: 4042
+						class14.field124 = 0;
+					}
+				}
+			} else {
+				Client.field676 = -1; // L: 4046
+				Client.field857 = -1; // L: 4047
+			}
+
+			if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 4049
+				class35.method421(); // L: 4050
+			}
 		}
 
-		if (WorldMapRegion.friendsChat != null) { // L: 11256
-			WorldMapRegion.friendsChat.clearFriends(); // L: 11257
+		if (MouseHandler.MouseHandler_currentButton == 4 && UserComparator3.mouseCam) { // L: 4053
+			var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 4054
+			Client.camAngleDX = var0 * 2; // L: 4055
+			Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -1895436129 * 1644112735; // L: 4056
+			var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 4057
+			Client.camAngleDY = var1 * 2; // L: 4058
+			Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -356572869 * 1657999347; // L: 4059
+		} else {
+			if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 4062
+				Client.camAngleDY += (-24 - Client.camAngleDY) / 2;
+			} else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 4063
+				Client.camAngleDY += (24 - Client.camAngleDY) / 2;
+			} else {
+				Client.camAngleDY /= 2; // L: 4064
+			}
+
+			if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 4065
+				Client.camAngleDX += (12 - Client.camAngleDX) / 2;
+			} else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 4066
+				Client.camAngleDX += (-12 - Client.camAngleDX) / 2;
+			} else {
+				Client.camAngleDX /= 2; // L: 4067
+			}
+
+			Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 4068
+			Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 4069
 		}
 
-	} // L: 11259
+		Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 4071
+		Client.camAngleX += Client.camAngleDX / 2; // L: 4072
+		if (Client.camAngleX < 128) { // L: 4073
+			Client.camAngleX = 128;
+		}
+
+		if (Client.camAngleX > 383) { // L: 4074
+			Client.camAngleX = 383;
+		}
+
+	} // L: 4075
 }
diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java
index 5dbdf646bb..d32683fd6d 100644
--- a/runescape-client/src/main/java/VertexNormal.java
+++ b/runescape-client/src/main/java/VertexNormal.java
@@ -4,42 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gc")
+@ObfuscatedName("gv")
 @Implements("VertexNormal")
 public class VertexNormal {
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("Widget_fontsArchive")
-	public static AbstractArchive Widget_fontsArchive;
-	@ObfuscatedName("gg")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 697161691
-	)
-	@Export("baseX")
-	static int baseX;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -573742035
+		intValue = -530812609
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -501649501
+		intValue = -2129765855
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 256687101
+		intValue = 1401636457
 	)
 	@Export("z")
 	int z;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1984775097
+		intValue = -1745933887
 	)
 	@Export("magnitude")
 	int magnitude;
@@ -48,22 +36,12 @@ public class VertexNormal {
 	} // L: 9
 
 	@ObfuscatedSignature(
-		descriptor = "(Lgc;)V"
+		descriptor = "(Lgv;)V"
 	)
 	VertexNormal(VertexNormal var1) {
 		this.x = var1.x; // L: 12
 		this.y = var1.y; // L: 13
 		this.z = var1.z; // L: 14
-		this.magnitude = var1.magnitude;
+		this.magnitude = var1.magnitude; // L: 15
 	} // L: 16
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lon;",
-		garbageValue = "-1929062245"
-	)
-	@Export("FillMode_values")
-	public static FillMode[] FillMode_values() {
-		return new FillMode[]{FillMode.field4233, FillMode.SOLID, FillMode.field4232}; // L: 15
-	}
 }
diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java
index 1e475a5645..d06a281676 100644
--- a/runescape-client/src/main/java/VerticalAlignment.java
+++ b/runescape-client/src/main/java/VerticalAlignment.java
@@ -4,35 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("em")
+@ObfuscatedName("ee")
 @Implements("VerticalAlignment")
-public enum VerticalAlignment implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lem;"
-	)
-	field1672(0, 0),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lem;"
-	)
-	@Export("VerticalAlignment_centered")
-	VerticalAlignment_centered(1, 1),
+public enum VerticalAlignment implements Enumerated
+{
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lem;"
+		descriptor = "Lee;"
 	)
-	field1670(2, 2);
+	field1679(2, 0),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lee;"
+	)
+	@Export("VerticalAlignment_centered")
+	VerticalAlignment_centered(0, 1),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lee;"
+	)
+	field1676(1, 2);
 
+	@ObfuscatedName("jp")
+	@ObfuscatedSignature(
+		descriptor = "Liv;"
+	)
+	@Export("dragInventoryWidget")
+	static Widget dragInventoryWidget;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1918765839
+		intValue = -1564632603
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 76672001
+		intValue = -1142333755
 	)
 	@Export("id")
 	final int id;
@@ -42,35 +49,71 @@ public enum VerticalAlignment implements Enumerated {
 		this.id = var4; // L: 19
 	} // L: 20
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id;
+		return this.id; // L: 23
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("hk")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;III)[Lop;",
-		garbageValue = "-178534371"
+		descriptor = "(IIIIIIII)V",
+		garbageValue = "-1250090587"
 	)
-	public static IndexedSprite[] method2799(AbstractArchive var0, int var1, int var2) {
-		return !class339.method6015(var0, var1, var2) ? null : class24.method262(); // L: 23 24
-	}
+	static final void method2889(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		int var8 = var6 - 334; // L: 5476
+		if (var8 < 0) { // L: 5477
+			var8 = 0;
+		} else if (var8 > 100) { // L: 5478
+			var8 = 100;
+		}
 
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;II)V",
-		garbageValue = "1083454679"
-	)
-	static final void method2796(String var0, int var1) {
-		PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2621, Client.packetWriter.isaacCipher); // L: 222
-		var2.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 223
-		var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 224
-		var2.packetBuffer.method6584(var1); // L: 225
-		Client.packetWriter.addNode(var2); // L: 226
-	} // L: 227
+		int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 5479
+		int var7 = var5 * var9 / 256; // L: 5480
+		var8 = 2048 - var3 & 2047; // L: 5483
+		var9 = 2048 - var4 & 2047; // L: 5484
+		int var10 = 0; // L: 5485
+		int var11 = 0; // L: 5486
+		int var12 = var7; // L: 5487
+		int var13;
+		int var14;
+		int var15;
+		if (var8 != 0) { // L: 5488
+			var13 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 5489
+			var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 5490
+			var15 = var14 * var11 - var13 * var7 >> 16; // L: 5491
+			var12 = var11 * var13 + var7 * var14 >> 16; // L: 5492
+			var11 = var15; // L: 5493
+		}
+
+		if (var9 != 0) { // L: 5495
+			var13 = Rasterizer3D.Rasterizer3D_sine[var9]; // L: 5496
+			var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; // L: 5497
+			var15 = var12 * var13 + var14 * var10 >> 16; // L: 5498
+			var12 = var14 * var12 - var10 * var13 >> 16; // L: 5499
+			var10 = var15; // L: 5500
+		}
+
+		ObjectSound.cameraX = var0 - var10; // L: 5502
+		class160.cameraY = var1 - var11; // L: 5503
+		Canvas.cameraZ = var2 - var12; // L: 5504
+		class69.cameraPitch = var3; // L: 5505
+		class32.cameraYaw = var4; // L: 5506
+		if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (FriendSystem.oculusOrbFocalPointX >> 7 != class262.localPlayer.x >> 7 || VarbitComposition.oculusOrbFocalPointY >> 7 != class262.localPlayer.y >> 7)) { // L: 5507 5508
+			var13 = class262.localPlayer.plane; // L: 5509
+			var14 = (FriendSystem.oculusOrbFocalPointX >> 7) + class15.baseX; // L: 5510
+			var15 = (VarbitComposition.oculusOrbFocalPointY >> 7) + WorldMapSprite.baseY; // L: 5511
+			PacketBufferNode var16 = InterfaceParent.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); // L: 5514
+			var16.packetBuffer.writeShort(var14); // L: 5515
+			var16.packetBuffer.method6659(Client.field704); // L: 5516
+			var16.packetBuffer.method6640(var13); // L: 5517
+			var16.packetBuffer.method6648(var15); // L: 5518
+			Client.packetWriter.addNode(var16); // L: 5519
+		}
+
+	} // L: 5523
 }
diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java
index 6eb0727d47..2014781d14 100644
--- a/runescape-client/src/main/java/ViewportMouse.java
+++ b/runescape-client/src/main/java/ViewportMouse.java
@@ -4,57 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gy")
+@ObfuscatedName("gx")
 @Implements("ViewportMouse")
 public class ViewportMouse {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("ViewportMouse_isInViewport")
-	static boolean ViewportMouse_isInViewport;
-	@ObfuscatedName("n")
+	public static boolean ViewportMouse_isInViewport;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 836373803
+		intValue = -859848203
 	)
 	@Export("ViewportMouse_x")
 	static int ViewportMouse_x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1131754581
+		intValue = -1776794129
 	)
 	@Export("ViewportMouse_y")
 	static int ViewportMouse_y;
 	@ObfuscatedName("y")
 	@Export("ViewportMouse_false0")
 	static boolean ViewportMouse_false0;
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1563417631
+		intValue = 1161898267
 	)
-	static int field2492;
-	@ObfuscatedName("r")
+	static int field2490;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1940869639
-	)
-	static int field2497;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -1999867305
-	)
-	static int field2496;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = 253416581
+		intValue = 1274186293
 	)
 	@Export("ViewportMouse_entityCount")
-	static int ViewportMouse_entityCount;
-	@ObfuscatedName("e")
+	public static int ViewportMouse_entityCount;
+	@ObfuscatedName("g")
 	@Export("ViewportMouse_entityTags")
 	public static long[] ViewportMouse_entityTags;
-	@ObfuscatedName("os")
-	@ObfuscatedSignature(
-		descriptor = "Lnu;"
-	)
-	@Export("HitSplatDefinition_cachedSprites")
-	static class369 HitSplatDefinition_cachedSprites;
 
 	static {
 		ViewportMouse_isInViewport = false; // L: 4
@@ -64,4 +48,13 @@ public class ViewportMouse {
 		ViewportMouse_entityCount = 0; // L: 17
 		ViewportMouse_entityTags = new long[1000]; // L: 18
 	}
+
+	@ObfuscatedName("lu")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1871733181"
+	)
+	static void method4410(int var0) {
+		Client.oculusOrbState = var0; // L: 11669
+	} // L: 11670
 }
diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java
index e59f67ae80..2ac964a5af 100644
--- a/runescape-client/src/main/java/VorbisCodebook.java
+++ b/runescape-client/src/main/java/VorbisCodebook.java
@@ -5,20 +5,20 @@ import net.runelite.mapping.ObfuscatedName;
 @ObfuscatedName("bs")
 @Implements("VorbisCodebook")
 public class VorbisCodebook {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("dimensions")
 	int dimensions;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("entries")
 	int entries;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("lengthMap")
 	int[] lengthMap;
 	@ObfuscatedName("y")
-	int[] field504;
-	@ObfuscatedName("p")
-	float[][] field505;
+	int[] field482;
 	@ObfuscatedName("j")
+	float[][] field479;
+	@ObfuscatedName("o")
 	@Export("keys")
 	int[] keys;
 
@@ -35,7 +35,7 @@ public class VorbisCodebook {
 			var2 = 0; // L: 47
 
 			for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 48 49 52
-				int var4 = VorbisSample.readBits(CollisionMap.iLog(this.entries - var2)); // L: 50
+				int var4 = VorbisSample.readBits(class5.iLog(this.entries - var2)); // L: 50
 
 				for (var5 = 0; var5 < var4; ++var5) { // L: 51
 					this.lengthMap[var2++] = var3;
@@ -53,7 +53,7 @@ public class VorbisCodebook {
 			}
 		}
 
-		this.method1017(); // L: 62
+		this.method1112(); // L: 62
 		var2 = VorbisSample.readBits(4); // L: 63
 		if (var2 > 0) { // L: 64
 			float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 65
@@ -67,14 +67,14 @@ public class VorbisCodebook {
 				var7 = this.entries * this.dimensions; // L: 71
 			}
 
-			this.field504 = new int[var7]; // L: 72
+			this.field482 = new int[var7]; // L: 72
 
 			int var8;
 			for (var8 = 0; var8 < var7; ++var8) { // L: 73
-				this.field504[var8] = VorbisSample.readBits(var5);
+				this.field482[var8] = VorbisSample.readBits(var5);
 			}
 
-			this.field505 = new float[this.entries][this.dimensions]; // L: 74
+			this.field479 = new float[this.entries][this.dimensions]; // L: 74
 			float var9;
 			int var10;
 			int var11;
@@ -85,8 +85,8 @@ public class VorbisCodebook {
 
 					for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 79
 						int var12 = var8 / var10 % var7; // L: 80
-						float var13 = (float)this.field504[var12] * var16 + var15 + var9; // L: 81
-						this.field505[var8][var11] = var13; // L: 82
+						float var13 = (float)this.field482[var12] * var16 + var15 + var9; // L: 81
+						this.field479[var8][var11] = var13; // L: 82
 						if (var6) { // L: 83
 							var9 = var13;
 						}
@@ -100,8 +100,8 @@ public class VorbisCodebook {
 					var10 = var8 * this.dimensions; // L: 91
 
 					for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 92
-						float var17 = (float)this.field504[var10] * var16 + var15 + var9; // L: 93
-						this.field505[var8][var11] = var17; // L: 94
+						float var17 = (float)this.field482[var10] * var16 + var15 + var9; // L: 93
+						this.field479[var8][var11] = var17; // L: 94
 						if (var6) { // L: 95
 							var9 = var17;
 						}
@@ -114,8 +114,8 @@ public class VorbisCodebook {
 
 	} // L: 101
 
-	@ObfuscatedName("n")
-	void method1017() {
+	@ObfuscatedName("e")
+	void method1112() {
 		int[] var1 = new int[this.entries]; // L: 104
 		int[] var2 = new int[33]; // L: 106
 
@@ -208,8 +208,8 @@ public class VorbisCodebook {
 
 	} // L: 167
 
-	@ObfuscatedName("f")
-	int method1014() {
+	@ObfuscatedName("v")
+	int method1111() {
 		int var1;
 		for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 170 171
 		}
@@ -218,11 +218,11 @@ public class VorbisCodebook {
 	}
 
 	@ObfuscatedName("y")
-	float[] method1015() {
-		return this.field505[this.method1014()]; // L: 176
+	float[] method1113() {
+		return this.field479[this.method1111()]; // L: 176
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("mapType1QuantValues")
 	static int mapType1QuantValues(int var0, int var1) {
 		int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; // L: 16
diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java
index 5e303e916c..c3ffe1487b 100644
--- a/runescape-client/src/main/java/VorbisFloor.java
+++ b/runescape-client/src/main/java/VorbisFloor.java
@@ -2,43 +2,43 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("an")
+@ObfuscatedName("af")
 @Implements("VorbisFloor")
 public class VorbisFloor {
-	@ObfuscatedName("v")
-	static final int[] field403;
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
+	static final int[] field390;
+	@ObfuscatedName("e")
 	@Export("VorbisFloor_decibelStatics")
 	static final float[] VorbisFloor_decibelStatics;
-	@ObfuscatedName("s")
-	static int[] field410;
-	@ObfuscatedName("u")
-	static int[] field413;
-	@ObfuscatedName("l")
-	static boolean[] field412;
-	@ObfuscatedName("f")
-	int[] field405;
+	@ObfuscatedName("d")
+	static int[] field384;
+	@ObfuscatedName("z")
+	static int[] field394;
+	@ObfuscatedName("b")
+	static boolean[] field393;
+	@ObfuscatedName("v")
+	int[] field386;
 	@ObfuscatedName("y")
 	@Export("multiplier")
 	int multiplier;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("partitionClassList")
 	int[] partitionClassList;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("classDimensions")
 	int[] classDimensions;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("classSubClasses")
 	int[] classSubClasses;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("classMasterbooks")
 	int[] classMasterbooks;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("subclassBooks")
 	int[][] subclassBooks;
 
 	static {
-		field403 = new int[]{256, 128, 86, 64}; // L: 8
+		field390 = new int[]{256, 128, 86, 64}; // L: 8
 		VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9
 	}
 
@@ -92,30 +92,30 @@ public class VorbisFloor {
 				var5 += this.classDimensions[this.partitionClassList[var6]];
 			}
 
-			this.field405 = new int[var5]; // L: 137
-			this.field405[0] = 0; // L: 138
-			this.field405[1] = 1 << var4; // L: 139
+			this.field386 = new int[var5]; // L: 137
+			this.field386[0] = 0; // L: 138
+			this.field386[1] = 1 << var4; // L: 139
 			var5 = 2; // L: 140
 
 			for (var6 = 0; var6 < var2; ++var6) { // L: 141
 				var7 = this.partitionClassList[var6]; // L: 142
 
 				for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143
-					this.field405[var5++] = VorbisSample.readBits(var4);
+					this.field386[var5++] = VorbisSample.readBits(var4);
 				}
 			}
 
-			if (field410 == null || field410.length < var5) { // L: 145
-				field410 = new int[var5]; // L: 146
-				field413 = new int[var5]; // L: 147
-				field412 = new boolean[var5]; // L: 148
+			if (field384 == null || field384.length < var5) { // L: 145
+				field384 = new int[var5]; // L: 146
+				field394 = new int[var5]; // L: 147
+				field393 = new boolean[var5]; // L: 148
 			}
 
 		}
 	} // L: 150
 
-	@ObfuscatedName("f")
-	int method706(int var1, int var2, int var3, int var4, int var5) {
+	@ObfuscatedName("v")
+	int method811(int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var4 - var2; // L: 50
 		int var7 = var3 - var1; // L: 51
 		int var8 = var6 < 0 ? -var6 : var6; // L: 52
@@ -125,7 +125,7 @@ public class VorbisFloor {
 	}
 
 	@ObfuscatedName("y")
-	void method719(int var1, int var2, int var3, int var4, float[] var5, int var6) {
+	void method812(int var1, int var2, int var3, int var4, float[] var5, int var6) {
 		int var7 = var4 - var2; // L: 59
 		int var8 = var3 - var1; // L: 60
 		int var9 = var7 < 0 ? -var7 : var7; // L: 61
@@ -153,54 +153,54 @@ public class VorbisFloor {
 
 	} // L: 80
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("VarbisFloor_sort")
 	void VarbisFloor_sort(int var1, int var2) {
 		if (var1 < var2) { // L: 83
 			int var3 = var1; // L: 84
-			int var4 = field410[var1]; // L: 85
-			int var5 = field413[var1]; // L: 86
-			boolean var6 = field412[var1]; // L: 87
+			int var4 = field384[var1]; // L: 85
+			int var5 = field394[var1]; // L: 86
+			boolean var6 = field393[var1]; // L: 87
 
 			for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88
-				int var8 = field410[var7]; // L: 89
+				int var8 = field384[var7]; // L: 89
 				if (var8 < var4) { // L: 90
-					field410[var3] = var8; // L: 91
-					field413[var3] = field413[var7]; // L: 92
-					field412[var3] = field412[var7]; // L: 93
+					field384[var3] = var8; // L: 91
+					field394[var3] = field394[var7]; // L: 92
+					field393[var3] = field393[var7]; // L: 93
 					++var3; // L: 94
-					field410[var7] = field410[var3]; // L: 95
-					field413[var7] = field413[var3]; // L: 96
-					field412[var7] = field412[var3]; // L: 97
+					field384[var7] = field384[var3]; // L: 95
+					field394[var7] = field394[var3]; // L: 96
+					field393[var7] = field393[var3]; // L: 97
 				}
 			}
 
-			field410[var3] = var4; // L: 100
-			field413[var3] = var5; // L: 101
-			field412[var3] = var6; // L: 102
+			field384[var3] = var4; // L: 100
+			field394[var3] = var5; // L: 101
+			field393[var3] = var6; // L: 102
 			this.VarbisFloor_sort(var1, var3 - 1); // L: 103
 			this.VarbisFloor_sort(var3 + 1, var2); // L: 104
 		}
 	} // L: 105
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("readSubmapFloor")
 	boolean readSubmapFloor() {
 		boolean var1 = VorbisSample.readBit() != 0; // L: 153
 		if (!var1) { // L: 154
 			return false;
 		} else {
-			int var2 = this.field405.length; // L: 155
+			int var2 = this.field386.length; // L: 155
 
 			int var3;
 			for (var3 = 0; var3 < var2; ++var3) { // L: 156
-				field410[var3] = this.field405[var3];
+				field384[var3] = this.field386[var3];
 			}
 
-			var3 = field403[this.multiplier - 1]; // L: 157
-			int var4 = CollisionMap.iLog(var3 - 1); // L: 158
-			field413[0] = VorbisSample.readBits(var4); // L: 159
-			field413[1] = VorbisSample.readBits(var4); // L: 160
+			var3 = field390[this.multiplier - 1]; // L: 157
+			int var4 = class5.iLog(var3 - 1); // L: 158
+			field394[0] = VorbisSample.readBits(var4); // L: 159
+			field394[1] = VorbisSample.readBits(var4); // L: 160
 			int var5 = 2; // L: 161
 
 			for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162
@@ -210,13 +210,13 @@ public class VorbisFloor {
 				int var10 = (1 << var9) - 1; // L: 166
 				int var11 = 0; // L: 167
 				if (var9 > 0) { // L: 168
-					var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1014();
+					var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method1111();
 				}
 
 				for (int var12 = 0; var12 < var8; ++var12) { // L: 169
 					int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170
 					var11 >>>= var9; // L: 171
-					field413[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1014() : 0; // L: 172
+					field394[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method1111() : 0; // L: 172
 				}
 			}
 
@@ -224,12 +224,12 @@ public class VorbisFloor {
 		}
 	}
 
-	@ObfuscatedName("r")
-	void method712(float[] var1, int var2) {
-		int var3 = this.field405.length; // L: 179
-		int var4 = field403[this.multiplier - 1]; // L: 180
-		boolean[] var5 = field412; // L: 181
-		field412[1] = true; // L: 182
+	@ObfuscatedName("m")
+	void method815(float[] var1, int var2) {
+		int var3 = this.field386.length; // L: 179
+		int var4 = field390[this.multiplier - 1]; // L: 180
+		boolean[] var5 = field393; // L: 181
+		field393[1] = true; // L: 182
 		var5[0] = true; // L: 183
 
 		int var6;
@@ -238,37 +238,37 @@ public class VorbisFloor {
 		int var9;
 		int var10;
 		for (var6 = 2; var6 < var3; ++var6) { // L: 184
-			var7 = method705(field410, var6); // L: 185
-			var8 = method721(field410, var6); // L: 186
-			var9 = this.method706(field410[var7], field413[var7], field410[var8], field413[var8], field410[var6]); // L: 187
-			var10 = field413[var6]; // L: 188
+			var7 = method834(field384, var6); // L: 185
+			var8 = method809(field384, var6); // L: 186
+			var9 = this.method811(field384[var7], field394[var7], field384[var8], field394[var8], field384[var6]); // L: 187
+			var10 = field394[var6]; // L: 188
 			int var11 = var4 - var9; // L: 189
 			int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191
 			if (var10 != 0) { // L: 192
-				boolean[] var14 = field412; // L: 193
-				field412[var8] = true; // L: 195
+				boolean[] var14 = field393; // L: 193
+				field393[var8] = true; // L: 195
 				var14[var7] = true; // L: 196
-				field412[var6] = true; // L: 197
+				field393[var6] = true; // L: 197
 				if (var10 >= var13) { // L: 198
-					field413[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199
+					field394[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199
 				} else {
-					field413[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202
+					field394[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202
 				}
 			} else {
-				field412[var6] = false; // L: 206
-				field413[var6] = var9; // L: 207
+				field393[var6] = false; // L: 206
+				field394[var6] = var9; // L: 207
 			}
 		}
 
 		this.VarbisFloor_sort(0, var3 - 1); // L: 210
 		var6 = 0; // L: 211
-		var7 = field413[0] * this.multiplier; // L: 212
+		var7 = field394[0] * this.multiplier; // L: 212
 
 		for (var8 = 1; var8 < var3; ++var8) { // L: 213
-			if (field412[var8]) { // L: 214
-				var9 = field410[var8]; // L: 215
-				var10 = field413[var8] * this.multiplier; // L: 216
-				this.method719(var6, var7, var9, var10, var1, var2); // L: 217
+			if (field393[var8]) { // L: 214
+				var9 = field384[var8]; // L: 215
+				var10 = field394[var8] * this.multiplier; // L: 216
+				this.method812(var6, var7, var9, var10, var1, var2); // L: 217
 				if (var9 >= var2) { // L: 218
 					return;
 				}
@@ -286,8 +286,8 @@ public class VorbisFloor {
 
 	} // L: 225
 
-	@ObfuscatedName("v")
-	static int method705(int[] var0, int var1) {
+	@ObfuscatedName("f")
+	static int method834(int[] var0, int var1) {
 		int var2 = var0[var1]; // L: 22
 		int var3 = -1; // L: 23
 		int var4 = Integer.MIN_VALUE; // L: 24
@@ -303,8 +303,8 @@ public class VorbisFloor {
 		return var3; // L: 32
 	}
 
-	@ObfuscatedName("n")
-	static int method721(int[] var0, int var1) {
+	@ObfuscatedName("e")
+	static int method809(int[] var0, int var1) {
 		int var2 = var0[var1]; // L: 36
 		int var3 = -1; // L: 37
 		int var4 = Integer.MAX_VALUE; // L: 38
diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java
index 0d5b6881b0..60b3fa44a4 100644
--- a/runescape-client/src/main/java/VorbisMapping.java
+++ b/runescape-client/src/main/java/VorbisMapping.java
@@ -2,16 +2,16 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("bz")
+@ObfuscatedName("be")
 @Implements("VorbisMapping")
 public class VorbisMapping {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("submaps")
 	int submaps;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("mappingMux")
 	int mappingMux;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("submapFloor")
 	int[] submapFloor;
 	@ObfuscatedName("y")
diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java
index 22d4f920fb..77407c456e 100644
--- a/runescape-client/src/main/java/VorbisResidue.java
+++ b/runescape-client/src/main/java/VorbisResidue.java
@@ -2,28 +2,28 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("bl")
+@ObfuscatedName("bb")
 @Implements("VorbisResidue")
 public class VorbisResidue {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("residueType")
 	int residueType;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("begin")
 	int begin;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("end")
 	int end;
 	@ObfuscatedName("y")
 	@Export("partitionSize")
 	int partitionSize;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("classifications")
 	int classifications;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("classbook")
 	int classbook;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("cascade")
 	int[] cascade;
 
@@ -56,8 +56,8 @@ public class VorbisResidue {
 
 	} // L: 31
 
-	@ObfuscatedName("v")
-	void method833(float[] var1, int var2, boolean var3) {
+	@ObfuscatedName("f")
+	void method934(float[] var1, int var2, boolean var3) {
 		int var4;
 		for (var4 = 0; var4 < var2; ++var4) { // L: 34
 			var1[var4] = 0.0F;
@@ -76,7 +76,7 @@ public class VorbisResidue {
 					int var10;
 					int var11;
 					if (var8 == 0) { // L: 43
-						var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1014(); // L: 45
+						var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method1111(); // L: 45
 
 						for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46
 							if (var9 + var11 < var6) { // L: 47
@@ -98,7 +98,7 @@ public class VorbisResidue {
 								var15 = this.partitionSize / var14.dimensions; // L: 60
 
 								for (int var19 = 0; var19 < var15; ++var19) { // L: 61
-									float[] var20 = var14.method1015(); // L: 62
+									float[] var20 = var14.method1113(); // L: 62
 
 									for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63
 										var1[var13 + var19 + var18 * var15] += var20[var18];
@@ -108,7 +108,7 @@ public class VorbisResidue {
 								var15 = 0; // L: 67
 
 								while (var15 < this.partitionSize) { // L: 68
-									float[] var16 = var14.method1015(); // L: 69
+									float[] var16 = var14.method1113(); // L: 69
 
 									for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70
 										var1[var13 + var15] += var16[var17]; // L: 71
diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java
index 7bfb291476..09e7ac2f58 100644
--- a/runescape-client/src/main/java/VorbisSample.java
+++ b/runescape-client/src/main/java/VorbisSample.java
@@ -6,112 +6,112 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("br")
 @Implements("VorbisSample")
 public class VorbisSample extends Node {
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("VorbisSample_bytes")
 	static byte[] VorbisSample_bytes;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("VorbisSample_byteOffset")
 	static int VorbisSample_byteOffset;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("VorbisSample_bitOffset")
 	static int VorbisSample_bitOffset;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@Export("VorbisSample_blockSize0")
 	static int VorbisSample_blockSize0;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("VorbisSample_blockSize1")
 	static int VorbisSample_blockSize1;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "[Lbs;"
 	)
 	@Export("VorbisSample_codebooks")
 	static VorbisCodebook[] VorbisSample_codebooks;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "[Lan;"
+		descriptor = "[Laf;"
 	)
 	@Export("VorbisSample_floors")
 	static VorbisFloor[] VorbisSample_floors;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "[Lbl;"
+		descriptor = "[Lbb;"
 	)
 	@Export("VorbisSample_residues")
 	static VorbisResidue[] VorbisSample_residues;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Lbz;"
+		descriptor = "[Lbe;"
 	)
 	@Export("VorbisSample_mappings")
 	static VorbisMapping[] VorbisSample_mappings;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("VorbisSample_blockFlags")
 	static boolean[] VorbisSample_blockFlags;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@Export("VorbisSample_mapping")
 	static int[] VorbisSample_mapping;
-	@ObfuscatedName("k")
-	static boolean field526;
-	@ObfuscatedName("t")
-	static float[] field529;
-	@ObfuscatedName("h")
-	static float[] field530;
-	@ObfuscatedName("q")
-	static float[] field531;
-	@ObfuscatedName("i")
-	static float[] field519;
-	@ObfuscatedName("ae")
-	static float[] field533;
-	@ObfuscatedName("ap")
-	static float[] field514;
-	@ObfuscatedName("ab")
-	static float[] field535;
-	@ObfuscatedName("al")
-	static int[] field536;
-	@ObfuscatedName("ad")
-	static int[] field537;
-	@ObfuscatedName("v")
-	byte[][] field534;
+	@ObfuscatedName("u")
+	static boolean field502;
 	@ObfuscatedName("n")
+	static float[] field507;
+	@ObfuscatedName("l")
+	static float[] field495;
+	@ObfuscatedName("w")
+	static float[] field509;
+	@ObfuscatedName("a")
+	static float[] field510;
+	@ObfuscatedName("aw")
+	static float[] field511;
+	@ObfuscatedName("ak")
+	static float[] field518;
+	@ObfuscatedName("ad")
+	static float[] field513;
+	@ObfuscatedName("at")
+	static int[] field514;
+	@ObfuscatedName("ah")
+	static int[] field515;
+	@ObfuscatedName("f")
+	byte[][] field504;
+	@ObfuscatedName("e")
 	@Export("sampleRate")
 	int sampleRate;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("sampleCount")
 	int sampleCount;
 	@ObfuscatedName("y")
 	@Export("start")
 	int start;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("end")
 	int end;
-	@ObfuscatedName("j")
-	boolean field512;
-	@ObfuscatedName("m")
-	float[] field525;
-	@ObfuscatedName("x")
-	int field524;
-	@ObfuscatedName("z")
-	int field517;
-	@ObfuscatedName("w")
-	boolean field528;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("o")
+	boolean field501;
+	@ObfuscatedName("q")
+	float[] field503;
+	@ObfuscatedName("s")
+	int field508;
+	@ObfuscatedName("p")
+	int field490;
+	@ObfuscatedName("c")
+	boolean field487;
+	@ObfuscatedName("az")
 	@Export("samples")
 	byte[] samples;
-	@ObfuscatedName("ar")
-	int field523;
+	@ObfuscatedName("ap")
+	int field517;
 	@ObfuscatedName("ag")
-	int field540;
+	int field505;
 
 	static {
-		field526 = false; // L: 28
+		field502 = false; // L: 28
 	}
 
 	VorbisSample(byte[] var1) {
-		this.read(var1); // L: 417
-	} // L: 418
+		this.read(var1); // L: 401
+	} // L: 402
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("read")
 	void read(byte[] var1) {
 		Buffer var2 = new Buffer(var1); // L: 89
@@ -121,11 +121,11 @@ public class VorbisSample extends Node {
 		this.end = var2.readInt(); // L: 93
 		if (this.end < 0) { // L: 94
 			this.end = ~this.end; // L: 95
-			this.field512 = true; // L: 96
+			this.field501 = true; // L: 96
 		}
 
 		int var3 = var2.readInt(); // L: 98
-		this.field534 = new byte[var3][]; // L: 99
+		this.field504 = new byte[var3][]; // L: 99
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 100
 			int var5 = 0; // L: 101
@@ -138,320 +138,320 @@ public class VorbisSample extends Node {
 
 			byte[] var7 = new byte[var5]; // L: 107
 			var2.readBytes(var7, 0, var5); // L: 108
-			this.field534[var4] = var7; // L: 109
+			this.field504[var4] = var7; // L: 109
 		}
 
 	} // L: 111
 
-	@ObfuscatedName("r")
-	float[] method1027(int var1) {
-		VorbisSample_setData(this.field534[var1], 0); // L: 198
-		readBit(); // L: 199
-		int var2 = readBits(CollisionMap.iLog(VorbisSample_mapping.length - 1)); // L: 200
-		boolean var3 = VorbisSample_blockFlags[var2]; // L: 201
-		int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 202
-		boolean var5 = false; // L: 203
-		boolean var6 = false; // L: 204
-		if (var3) { // L: 205
-			var5 = readBit() != 0; // L: 206
-			var6 = readBit() != 0; // L: 207
+	@ObfuscatedName("m")
+	float[] method1148(int var1) {
+		VorbisSample_setData(this.field504[var1], 0); // L: 182
+		readBit(); // L: 183
+		int var2 = readBits(class5.iLog(VorbisSample_mapping.length - 1)); // L: 184
+		boolean var3 = VorbisSample_blockFlags[var2]; // L: 185
+		int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186
+		boolean var5 = false; // L: 187
+		boolean var6 = false; // L: 188
+		if (var3) { // L: 189
+			var5 = readBit() != 0; // L: 190
+			var6 = readBit() != 0; // L: 191
 		}
 
-		int var7 = var4 >> 1; // L: 209
+		int var7 = var4 >> 1; // L: 193
 		int var8;
 		int var9;
 		int var10;
-		if (var3 && !var5) { // L: 213
-			var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 214
-			var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 215
-			var10 = VorbisSample_blockSize0 >> 1; // L: 216
+		if (var3 && !var5) { // L: 197
+			var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198
+			var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199
+			var10 = VorbisSample_blockSize0 >> 1; // L: 200
 		} else {
-			var8 = 0; // L: 219
-			var9 = var7; // L: 220
-			var10 = var4 >> 1; // L: 221
+			var8 = 0; // L: 203
+			var9 = var7; // L: 204
+			var10 = var4 >> 1; // L: 205
 		}
 
 		int var11;
 		int var12;
 		int var13;
-		if (var3 && !var6) { // L: 226
-			var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 227
-			var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 228
-			var13 = VorbisSample_blockSize0 >> 1; // L: 229
+		if (var3 && !var6) { // L: 210
+			var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211
+			var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212
+			var13 = VorbisSample_blockSize0 >> 1; // L: 213
 		} else {
-			var11 = var7; // L: 232
-			var12 = var4; // L: 233
-			var13 = var4 >> 1; // L: 234
+			var11 = var7; // L: 216
+			var12 = var4; // L: 217
+			var13 = var4 >> 1; // L: 218
 		}
 
-		VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 236
-		int var16 = var14.mappingMux; // L: 239
-		int var17 = var14.submapFloor[var16]; // L: 240
-		boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 241
-		boolean var45 = var15; // L: 243
+		VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220
+		int var16 = var14.mappingMux; // L: 223
+		int var17 = var14.submapFloor[var16]; // L: 224
+		boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225
+		boolean var45 = var15; // L: 227
 
-		for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 244
-			VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 245
-			float[] var44 = field529; // L: 246
-			var42.method833(var44, var4 >> 1, var45); // L: 247
+		for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228
+			VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229
+			float[] var44 = field507; // L: 230
+			var42.method934(var44, var4 >> 1, var45); // L: 231
 		}
 
 		int var18;
-		if (!var15) { // L: 250
-			var17 = var14.mappingMux; // L: 251
-			var18 = var14.submapFloor[var17]; // L: 252
-			VorbisSample_floors[var18].method712(field529, var4 >> 1); // L: 253
+		if (!var15) { // L: 234
+			var17 = var14.mappingMux; // L: 235
+			var18 = var14.submapFloor[var17]; // L: 236
+			VorbisSample_floors[var18].method815(field507, var4 >> 1); // L: 237
 		}
 
 		int var19;
-		if (var15) { // L: 256
-			for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 257
-				field529[var17] = 0.0F;
+		if (var15) { // L: 240
+			for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241
+				field507[var17] = 0.0F;
 			}
 		} else {
-			var17 = var4 >> 1; // L: 260
-			var18 = var4 >> 2; // L: 261
-			var19 = var4 >> 3; // L: 262
-			float[] var20 = field529; // L: 263
+			var17 = var4 >> 1; // L: 244
+			var18 = var4 >> 2; // L: 245
+			var19 = var4 >> 3; // L: 246
+			float[] var20 = field507; // L: 247
 
 			int var21;
-			for (var21 = 0; var21 < var17; ++var21) { // L: 264
+			for (var21 = 0; var21 < var17; ++var21) { // L: 248
 				var20[var21] *= 0.5F;
 			}
 
-			for (var21 = var17; var21 < var4; ++var21) { // L: 265
+			for (var21 = var17; var21 < var4; ++var21) { // L: 249
 				var20[var21] = -var20[var4 - var21 - 1];
 			}
 
-			float[] var40 = var3 ? field533 : field530; // L: 266
-			float[] var22 = var3 ? field514 : field531; // L: 267
-			float[] var23 = var3 ? field535 : field519; // L: 268
-			int[] var24 = var3 ? field537 : field536; // L: 269
+			float[] var40 = var3 ? field511 : field495; // L: 250
+			float[] var22 = var3 ? field518 : field509; // L: 251
+			float[] var23 = var3 ? field513 : field510; // L: 252
+			int[] var24 = var3 ? field515 : field514; // L: 253
 
 			int var25;
 			float var26;
 			float var27;
 			float var28;
 			float var29;
-			for (var25 = 0; var25 < var18; ++var25) { // L: 270
-				var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 271
-				var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 272
-				var28 = var40[var25 * 2]; // L: 273
-				var29 = var40[var25 * 2 + 1]; // L: 274
-				var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 275
-				var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 276
+			for (var25 = 0; var25 < var18; ++var25) { // L: 254
+				var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255
+				var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256
+				var28 = var40[var25 * 2]; // L: 257
+				var29 = var40[var25 * 2 + 1]; // L: 258
+				var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259
+				var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260
 			}
 
 			float var30;
 			float var31;
-			for (var25 = 0; var25 < var19; ++var25) { // L: 278
-				var26 = var20[var17 + var25 * 4 + 3]; // L: 279
-				var27 = var20[var17 + var25 * 4 + 1]; // L: 280
-				var28 = var20[var25 * 4 + 3]; // L: 281
-				var29 = var20[var25 * 4 + 1]; // L: 282
-				var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 283
-				var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 284
-				var30 = var40[var17 - 4 - var25 * 4]; // L: 285
-				var31 = var40[var17 - 3 - var25 * 4]; // L: 286
-				var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 287
-				var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 288
+			for (var25 = 0; var25 < var19; ++var25) { // L: 262
+				var26 = var20[var17 + var25 * 4 + 3]; // L: 263
+				var27 = var20[var17 + var25 * 4 + 1]; // L: 264
+				var28 = var20[var25 * 4 + 3]; // L: 265
+				var29 = var20[var25 * 4 + 1]; // L: 266
+				var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267
+				var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268
+				var30 = var40[var17 - 4 - var25 * 4]; // L: 269
+				var31 = var40[var17 - 3 - var25 * 4]; // L: 270
+				var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271
+				var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272
 			}
 
-			var25 = CollisionMap.iLog(var4 - 1); // L: 290
+			var25 = class5.iLog(var4 - 1); // L: 274
 
 			int var46;
 			int var47;
 			int var48;
 			int var49;
-			for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 291
-				var47 = var4 >> var46 + 2; // L: 292
-				var48 = 8 << var46; // L: 293
+			for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275
+				var47 = var4 >> var46 + 2; // L: 276
+				var48 = 8 << var46; // L: 277
 
-				for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 294
-					int var50 = var4 - var47 * var49 * 2; // L: 295
-					int var51 = var4 - var47 * (var49 * 2 + 1); // L: 296
+				for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278
+					int var50 = var4 - var47 * var49 * 2; // L: 279
+					int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280
 
-					for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 297
-						int var33 = var32 * 4; // L: 298
-						float var34 = var20[var50 - 1 - var33]; // L: 299
-						float var35 = var20[var50 - 3 - var33]; // L: 300
-						float var36 = var20[var51 - 1 - var33]; // L: 301
-						float var37 = var20[var51 - 3 - var33]; // L: 302
-						var20[var50 - 1 - var33] = var34 + var36; // L: 303
-						var20[var50 - 3 - var33] = var35 + var37; // L: 304
-						float var38 = var40[var32 * var48]; // L: 305
-						float var39 = var40[var32 * var48 + 1]; // L: 306
-						var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 307
-						var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 308
+					for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281
+						int var33 = var32 * 4; // L: 282
+						float var34 = var20[var50 - 1 - var33]; // L: 283
+						float var35 = var20[var50 - 3 - var33]; // L: 284
+						float var36 = var20[var51 - 1 - var33]; // L: 285
+						float var37 = var20[var51 - 3 - var33]; // L: 286
+						var20[var50 - 1 - var33] = var34 + var36; // L: 287
+						var20[var50 - 3 - var33] = var35 + var37; // L: 288
+						float var38 = var40[var32 * var48]; // L: 289
+						float var39 = var40[var32 * var48 + 1]; // L: 290
+						var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291
+						var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292
 					}
 				}
 			}
 
-			for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 312
-				var47 = var24[var46]; // L: 313
-				if (var46 < var47) { // L: 314
-					var48 = var46 * 8; // L: 315
-					var49 = var47 * 8; // L: 316
-					var30 = var20[var48 + 1]; // L: 318
-					var20[var48 + 1] = var20[var49 + 1]; // L: 319
-					var20[var49 + 1] = var30; // L: 320
-					var30 = var20[var48 + 3]; // L: 321
-					var20[var48 + 3] = var20[var49 + 3]; // L: 322
-					var20[var49 + 3] = var30; // L: 323
-					var30 = var20[var48 + 5]; // L: 324
-					var20[var48 + 5] = var20[var49 + 5]; // L: 325
-					var20[var49 + 5] = var30; // L: 326
-					var30 = var20[var48 + 7]; // L: 327
-					var20[var48 + 7] = var20[var49 + 7]; // L: 328
-					var20[var49 + 7] = var30; // L: 329
+			for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296
+				var47 = var24[var46]; // L: 297
+				if (var46 < var47) { // L: 298
+					var48 = var46 * 8; // L: 299
+					var49 = var47 * 8; // L: 300
+					var30 = var20[var48 + 1]; // L: 302
+					var20[var48 + 1] = var20[var49 + 1]; // L: 303
+					var20[var49 + 1] = var30; // L: 304
+					var30 = var20[var48 + 3]; // L: 305
+					var20[var48 + 3] = var20[var49 + 3]; // L: 306
+					var20[var49 + 3] = var30; // L: 307
+					var30 = var20[var48 + 5]; // L: 308
+					var20[var48 + 5] = var20[var49 + 5]; // L: 309
+					var20[var49 + 5] = var30; // L: 310
+					var30 = var20[var48 + 7]; // L: 311
+					var20[var48 + 7] = var20[var49 + 7]; // L: 312
+					var20[var49 + 7] = var30; // L: 313
 				}
 			}
 
-			for (var46 = 0; var46 < var17; ++var46) { // L: 332
+			for (var46 = 0; var46 < var17; ++var46) { // L: 316
 				var20[var46] = var20[var46 * 2 + 1];
 			}
 
-			for (var46 = 0; var46 < var19; ++var46) { // L: 333
-				var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 334
-				var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 335
-				var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 336
-				var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 337
+			for (var46 = 0; var46 < var19; ++var46) { // L: 317
+				var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318
+				var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319
+				var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320
+				var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321
 			}
 
-			for (var46 = 0; var46 < var19; ++var46) { // L: 339
-				var27 = var23[var46 * 2]; // L: 340
-				var28 = var23[var46 * 2 + 1]; // L: 341
-				var29 = var20[var17 + var46 * 2]; // L: 342
-				var30 = var20[var17 + var46 * 2 + 1]; // L: 343
-				var31 = var20[var4 - 2 - var46 * 2]; // L: 344
-				float var52 = var20[var4 - 1 - var46 * 2]; // L: 345
-				float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 346
-				var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 347
-				var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 348
-				var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 349
-				var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 350
-				var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 351
+			for (var46 = 0; var46 < var19; ++var46) { // L: 323
+				var27 = var23[var46 * 2]; // L: 324
+				var28 = var23[var46 * 2 + 1]; // L: 325
+				var29 = var20[var17 + var46 * 2]; // L: 326
+				var30 = var20[var17 + var46 * 2 + 1]; // L: 327
+				var31 = var20[var4 - 2 - var46 * 2]; // L: 328
+				float var52 = var20[var4 - 1 - var46 * 2]; // L: 329
+				float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330
+				var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331
+				var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332
+				var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333
+				var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334
+				var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 353
-				var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 354
-				var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 355
+			for (var46 = 0; var46 < var18; ++var46) { // L: 337
+				var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338
+				var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 357
+			for (var46 = 0; var46 < var18; ++var46) { // L: 341
 				var20[var46 + (var4 - var18)] = -var20[var46];
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 358
+			for (var46 = 0; var46 < var18; ++var46) { // L: 342
 				var20[var46] = var20[var18 + var46];
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 359
+			for (var46 = 0; var46 < var18; ++var46) { // L: 343
 				var20[var18 + var46] = -var20[var18 - var46 - 1];
 			}
 
-			for (var46 = 0; var46 < var18; ++var46) { // L: 360
+			for (var46 = 0; var46 < var18; ++var46) { // L: 344
 				var20[var17 + var46] = var20[var4 - var46 - 1];
 			}
 
 			float[] var10000;
-			for (var46 = var8; var46 < var9; ++var46) { // L: 361
-				var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 362
-				var10000 = field529; // L: 363
+			for (var46 = var8; var46 < var9; ++var46) { // L: 345
+				var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346
+				var10000 = field507; // L: 347
 				var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
 			}
 
-			for (var46 = var11; var46 < var12; ++var46) { // L: 365
-				var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 366
-				var10000 = field529; // L: 367
+			for (var46 = var11; var46 < var12; ++var46) { // L: 349
+				var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350
+				var10000 = field507; // L: 351
 				var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
 			}
 		}
 
-		float[] var41 = null; // L: 370
-		if (this.field524 > 0) { // L: 371
-			var18 = var4 + this.field524 >> 2; // L: 372
-			var41 = new float[var18]; // L: 373
+		float[] var41 = null; // L: 354
+		if (this.field508 > 0) { // L: 355
+			var18 = var4 + this.field508 >> 2; // L: 356
+			var41 = new float[var18]; // L: 357
 			int var43;
-			if (!this.field528) { // L: 374
-				for (var19 = 0; var19 < this.field517; ++var19) { // L: 375
-					var43 = var19 + (this.field524 >> 1); // L: 376
-					var41[var19] += this.field525[var43]; // L: 377
+			if (!this.field487) { // L: 358
+				for (var19 = 0; var19 < this.field490; ++var19) { // L: 359
+					var43 = var19 + (this.field508 >> 1); // L: 360
+					var41[var19] += this.field503[var43]; // L: 361
 				}
 			}
 
-			if (!var15) { // L: 380
-				for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 381
-					var43 = var41.length - (var4 >> 1) + var19; // L: 382
-					var41[var43] += field529[var19]; // L: 383
+			if (!var15) { // L: 364
+				for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365
+					var43 = var41.length - (var4 >> 1) + var19; // L: 366
+					var41[var43] += field507[var19]; // L: 367
 				}
 			}
 		}
 
-		float[] var54 = this.field525; // L: 387
-		this.field525 = field529; // L: 388
-		field529 = var54; // L: 389
-		this.field524 = var4; // L: 390
-		this.field517 = var12 - (var4 >> 1); // L: 391
-		this.field528 = var15; // L: 392
-		return var41; // L: 393
+		float[] var54 = this.field503; // L: 371
+		this.field503 = field507; // L: 372
+		field507 = var54; // L: 373
+		this.field508 = var4; // L: 374
+		this.field490 = var12 - (var4 >> 1); // L: 375
+		this.field487 = var15; // L: 376
+		return var41; // L: 377
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "([I)Lau;"
+		descriptor = "([I)Lar;"
 	)
 	@Export("toRawSound")
 	RawSound toRawSound(int[] var1) {
-		if (var1 != null && var1[0] <= 0) { // L: 421
+		if (var1 != null && var1[0] <= 0) { // L: 405
 			return null;
 		} else {
-			if (this.samples == null) { // L: 422
-				this.field524 = 0; // L: 423
-				this.field525 = new float[VorbisSample_blockSize1]; // L: 424
-				this.samples = new byte[this.sampleCount]; // L: 425
-				this.field523 = 0; // L: 426
-				this.field540 = 0; // L: 427
+			if (this.samples == null) { // L: 406
+				this.field508 = 0; // L: 407
+				this.field503 = new float[VorbisSample_blockSize1]; // L: 408
+				this.samples = new byte[this.sampleCount]; // L: 409
+				this.field517 = 0; // L: 410
+				this.field505 = 0; // L: 411
 			}
 
-			for (; this.field540 < this.field534.length; ++this.field540) { // L: 429 444
-				if (var1 != null && var1[0] <= 0) { // L: 430
+			for (; this.field505 < this.field504.length; ++this.field505) { // L: 413 428
+				if (var1 != null && var1[0] <= 0) { // L: 414
 					return null;
 				}
 
-				float[] var2 = this.method1027(this.field540); // L: 431
-				if (var2 != null) { // L: 432
-					int var3 = this.field523; // L: 433
-					int var4 = var2.length; // L: 434
-					if (var4 > this.sampleCount - var3) { // L: 435
+				float[] var2 = this.method1148(this.field505); // L: 415
+				if (var2 != null) { // L: 416
+					int var3 = this.field517; // L: 417
+					int var4 = var2.length; // L: 418
+					if (var4 > this.sampleCount - var3) { // L: 419
 						var4 = this.sampleCount - var3;
 					}
 
-					for (int var5 = 0; var5 < var4; ++var5) { // L: 436
-						int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 437
-						if ((var6 & -256) != 0) { // L: 438
+					for (int var5 = 0; var5 < var4; ++var5) { // L: 420
+						int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421
+						if ((var6 & -256) != 0) { // L: 422
 							var6 = ~var6 >> 31;
 						}
 
-						this.samples[var3++] = (byte)(var6 - 128); // L: 439
+						this.samples[var3++] = (byte)(var6 - 128); // L: 423
 					}
 
-					if (var1 != null) { // L: 441
-						var1[0] -= var3 - this.field523;
+					if (var1 != null) { // L: 425
+						var1[0] -= var3 - this.field517;
 					}
 
-					this.field523 = var3; // L: 442
+					this.field517 = var3; // L: 426
 				}
 			}
 
-			this.field525 = null; // L: 446
-			byte[] var7 = this.samples; // L: 447
-			this.samples = null; // L: 448
-			return new RawSound(this.sampleRate, var7, this.start, this.end, this.field512); // L: 449
+			this.field503 = null; // L: 430
+			byte[] var7 = this.samples; // L: 431
+			this.samples = null; // L: 432
+			return new RawSound(this.sampleRate, var7, this.start, this.end, this.field501); // L: 433
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("float32Unpack")
 	static float float32Unpack(int var0) {
 		int var1 = var0 & 2097151; // L: 47
@@ -464,7 +464,7 @@ public class VorbisSample extends Node {
 		return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("VorbisSample_setData")
 	static void VorbisSample_setData(byte[] var0, int var1) {
 		VorbisSample_bytes = var0; // L: 55
@@ -472,7 +472,7 @@ public class VorbisSample extends Node {
 		VorbisSample_bitOffset = 0; // L: 57
 	} // L: 58
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("readBit")
 	static int readBit() {
 		int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61
@@ -507,12 +507,12 @@ public class VorbisSample extends Node {
 		return var1; // L: 85
 	}
 
-	@ObfuscatedName("j")
-	static void method1043(byte[] var0) {
+	@ObfuscatedName("o")
+	static void method1133(byte[] var0) {
 		VorbisSample_setData(var0, 0); // L: 114
 		VorbisSample_blockSize0 = 1 << readBits(4); // L: 115
 		VorbisSample_blockSize1 = 1 << readBits(4); // L: 116
-		field529 = new float[VorbisSample_blockSize1]; // L: 117
+		field507 = new float[VorbisSample_blockSize1]; // L: 117
 
 		int var1;
 		int var2;
@@ -524,133 +524,124 @@ public class VorbisSample extends Node {
 			var3 = var2 >> 1; // L: 120
 			var4 = var2 >> 2; // L: 121
 			var5 = var2 >> 3; // L: 122
-			float[] var18 = new float[var3]; // L: 123
+			float[] var12 = new float[var3]; // L: 123
 
 			for (int var7 = 0; var7 < var4; ++var7) { // L: 124
-				var18[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125
-				var18[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126
+				var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125
+				var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126
 			}
 
-			float[] var19 = new float[var3]; // L: 128
+			float[] var13 = new float[var3]; // L: 128
 
 			for (int var8 = 0; var8 < var4; ++var8) { // L: 129
-				var19[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130
-				var19[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131
+				var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130
+				var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131
 			}
 
-			float[] var20 = new float[var4]; // L: 133
+			float[] var14 = new float[var4]; // L: 133
 
 			for (int var9 = 0; var9 < var5; ++var9) { // L: 134
-				var20[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135
-				var20[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136
+				var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135
+				var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136
 			}
 
-			int[] var21 = new int[var5]; // L: 138
-			int var10 = CollisionMap.iLog(var5 - 1); // L: 139
+			int[] var15 = new int[var5]; // L: 138
+			int var10 = class5.iLog(var5 - 1); // L: 139
 
 			for (int var11 = 0; var11 < var5; ++var11) { // L: 140
-				int var15 = var11; // L: 144
-				int var16 = var10; // L: 145
-
-				int var17;
-				for (var17 = 0; var16 > 0; --var16) { // L: 147 148 151
-					var17 = var17 << 1 | var15 & 1; // L: 149
-					var15 >>>= 1; // L: 150
-				}
-
-				var21[var11] = var17; // L: 155
+				var15[var11] = class16.method245(var11, var10);
 			}
 
-			if (var1 != 0) { // L: 157
-				field533 = var18; // L: 158
-				field514 = var19; // L: 159
-				field535 = var20; // L: 160
-				field537 = var21; // L: 161
+			if (var1 != 0) { // L: 141
+				field511 = var12; // L: 142
+				field518 = var13; // L: 143
+				field513 = var14; // L: 144
+				field515 = var15; // L: 145
 			} else {
-				field530 = var18; // L: 164
-				field531 = var19; // L: 165
-				field519 = var20; // L: 166
-				field536 = var21; // L: 167
+				field495 = var12; // L: 148
+				field509 = var13; // L: 149
+				field510 = var14; // L: 150
+				field514 = var15; // L: 151
 			}
 		}
 
-		var1 = readBits(8) + 1; // L: 170
-		VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 171
+		var1 = readBits(8) + 1; // L: 154
+		VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155
 
-		for (var2 = 0; var2 < var1; ++var2) { // L: 172
+		for (var2 = 0; var2 < var1; ++var2) { // L: 156
 			VorbisSample_codebooks[var2] = new VorbisCodebook();
 		}
 
-		var2 = readBits(6) + 1; // L: 174
+		var2 = readBits(6) + 1; // L: 158
 
-		for (var3 = 0; var3 < var2; ++var3) { // L: 175
+		for (var3 = 0; var3 < var2; ++var3) { // L: 159
 			readBits(16);
 		}
 
-		var2 = readBits(6) + 1; // L: 177
-		VorbisSample_floors = new VorbisFloor[var2]; // L: 178
+		var2 = readBits(6) + 1; // L: 161
+		VorbisSample_floors = new VorbisFloor[var2]; // L: 162
 
-		for (var3 = 0; var3 < var2; ++var3) { // L: 179
+		for (var3 = 0; var3 < var2; ++var3) { // L: 163
 			VorbisSample_floors[var3] = new VorbisFloor();
 		}
 
-		var3 = readBits(6) + 1; // L: 180
-		VorbisSample_residues = new VorbisResidue[var3]; // L: 181
+		var3 = readBits(6) + 1; // L: 164
+		VorbisSample_residues = new VorbisResidue[var3]; // L: 165
 
-		for (var4 = 0; var4 < var3; ++var4) { // L: 182
+		for (var4 = 0; var4 < var3; ++var4) { // L: 166
 			VorbisSample_residues[var4] = new VorbisResidue();
 		}
 
-		var4 = readBits(6) + 1; // L: 183
-		VorbisSample_mappings = new VorbisMapping[var4]; // L: 184
+		var4 = readBits(6) + 1; // L: 167
+		VorbisSample_mappings = new VorbisMapping[var4]; // L: 168
 
-		for (var5 = 0; var5 < var4; ++var5) { // L: 185
+		for (var5 = 0; var5 < var4; ++var5) { // L: 169
 			VorbisSample_mappings[var5] = new VorbisMapping();
 		}
 
-		var5 = readBits(6) + 1; // L: 186
-		VorbisSample_blockFlags = new boolean[var5]; // L: 187
-		VorbisSample_mapping = new int[var5]; // L: 188
+		var5 = readBits(6) + 1; // L: 170
+		VorbisSample_blockFlags = new boolean[var5]; // L: 171
+		VorbisSample_mapping = new int[var5]; // L: 172
 
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 189
-			VorbisSample_blockFlags[var6] = readBit() != 0; // L: 190
-			readBits(16); // L: 191
-			readBits(16); // L: 192
-			VorbisSample_mapping[var6] = readBits(8); // L: 193
+		for (int var6 = 0; var6 < var5; ++var6) { // L: 173
+			VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174
+			readBits(16); // L: 175
+			readBits(16); // L: 176
+			VorbisSample_mapping[var6] = readBits(8); // L: 177
 		}
 
-	} // L: 195
+	} // L: 179
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;)Z"
+		descriptor = "(Ljp;)Z"
 	)
-	static boolean method1039(AbstractArchive var0) {
-		if (!field526) { // L: 397
-			byte[] var1 = var0.takeFile(0, 0); // L: 398
-			if (var1 == null) { // L: 399
+	static boolean method1131(AbstractArchive var0) {
+		if (!field502) { // L: 381
+			byte[] var1 = var0.takeFile(0, 0); // L: 382
+			if (var1 == null) { // L: 383
 				return false;
 			}
 
-			method1043(var1); // L: 400
-			field526 = true; // L: 401
+			method1133(var1); // L: 384
+			field502 = true; // L: 385
 		}
 
-		return true; // L: 403
+		return true; // L: 387
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;II)Lbr;"
+		descriptor = "(Ljp;II)Lbr;"
 	)
 	@Export("readMusicSample")
 	static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) {
-		if (!method1039(var0)) { // L: 407
-			var0.tryLoadFile(var1, var2); // L: 408
-			return null; // L: 409
+		if (!method1131(var0)) { // L: 391
+			var0.tryLoadFile(var1, var2); // L: 392
+			return null; // L: 393
 		} else {
-			byte[] var3 = var0.takeFile(var1, var2); // L: 411
-			return var3 == null ? null : new VorbisSample(var3); // L: 412
+			byte[] var3 = var0.takeFile(var1, var2); // L: 395
+			return var3 == null ? null : new VorbisSample(var3); // L: 396
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java
index 4aac10a649..6fcef61290 100644
--- a/runescape-client/src/main/java/WallDecoration.java
+++ b/runescape-client/src/main/java/WallDecoration.java
@@ -4,72 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ho")
+@ObfuscatedName("hd")
 @Implements("WallDecoration")
 public final class WallDecoration {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1988235731
+		intValue = -2070337173
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1511932377
+		intValue = -303392399
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 750074813
+		intValue = 1106759041
 	)
 	@Export("y")
 	int y;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1760283661
+		intValue = -220475681
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1111812521
+		intValue = -954278973
 	)
 	@Export("orientation2")
 	int orientation2;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2026318183
+		intValue = 249572435
 	)
 	@Export("xOffset")
 	int xOffset;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1292762417
+		intValue = -354762285
 	)
 	@Export("yOffset")
 	int yOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("renderable1")
 	public Renderable renderable1;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lgl;"
+		descriptor = "Lgr;"
 	)
 	@Export("renderable2")
 	public Renderable renderable2;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = 3146556658035252985L
+		longValue = 1545388647907384621L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -740686461
+		intValue = 423325183
 	)
 	@Export("flags")
 	int flags;
@@ -78,4 +78,9 @@ public final class WallDecoration {
 		this.tag = 0L; // L: 13
 		this.flags = 0; // L: 14
 	} // L: 16
+
+	@ObfuscatedName("f")
+	static double method4429(double var0) {
+		return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 9
+	}
 }
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index 8b447cda84..2382397732 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -4,695 +4,682 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("io")
+@ObfuscatedName("iv")
 @Implements("Widget")
 public class Widget extends Node {
-	@ObfuscatedName("sr")
-	@ObfuscatedGetter(
-		longValue = 132872656098905307L
-	)
-	static long field3099;
 	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "[[Lio;"
-	)
-	@Export("Widget_interfaceComponents")
-	public static Widget[][] Widget_interfaceComponents;
-	@ObfuscatedName("b")
 	@Export("Widget_loadedInterfaces")
-	public static boolean[] Widget_loadedInterfaces;
-	@ObfuscatedName("o")
+	static boolean[] Widget_loadedInterfaces;
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("Widget_cachedSprites")
 	public static EvictingDualNodeHashTable Widget_cachedSprites;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("Widget_cachedModels")
 	public static EvictingDualNodeHashTable Widget_cachedModels;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("Widget_cachedFonts")
 	public static EvictingDualNodeHashTable Widget_cachedFonts;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("Widget_cachedSpriteMasks")
 	public static EvictingDualNodeHashTable Widget_cachedSpriteMasks;
-	@ObfuscatedName("a")
-	public static boolean field2956;
-	@ObfuscatedName("fv")
-	@ObfuscatedSignature(
-		descriptor = "Lkt;"
-	)
-	@Export("fontBold12")
-	static Font fontBold12;
-	@ObfuscatedName("k")
+	@ObfuscatedName("x")
+	public static boolean field2958;
+	@ObfuscatedName("u")
 	@Export("isIf3")
 	public boolean isIf3;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1722455647
+		intValue = 363798319
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("x")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 41180389
+		intValue = 1482836169
 	)
 	@Export("childIndex")
 	public int childIndex;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1659206769
+		intValue = -562774219
 	)
 	@Export("type")
 	public int type;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 637562399
+		intValue = -1974626303
 	)
 	@Export("buttonType")
 	public int buttonType;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1245218361
+		intValue = 1544814105
 	)
 	@Export("contentType")
 	public int contentType;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 416061409
+		intValue = 627320861
 	)
 	@Export("xAlignment")
 	public int xAlignment;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -843432795
+		intValue = 1854244357
 	)
 	@Export("yAlignment")
 	public int yAlignment;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 718963747
+		intValue = -95025113
 	)
 	@Export("widthAlignment")
 	public int widthAlignment;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = -685885519
+		intValue = -1904389547
 	)
 	@Export("heightAlignment")
 	public int heightAlignment;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 516231807
+		intValue = 836624487
 	)
 	@Export("rawX")
 	public int rawX;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -1017092357
+		intValue = -1601596941
 	)
 	@Export("rawY")
 	public int rawY;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = 1593997171
+		intValue = 2139008707
 	)
 	@Export("rawWidth")
 	public int rawWidth;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -16853095
+		intValue = -1355473233
 	)
 	@Export("rawHeight")
 	public int rawHeight;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 1347538309
+		intValue = -66404377
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -2036682047
+		intValue = -2017763811
 	)
 	@Export("y")
 	public int y;
 	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = 1163271639
+		intValue = 1476009263
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -571887853
+		intValue = 25115113
 	)
 	@Export("height")
 	public int height;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -1702141443
+		intValue = -1087835647
 	)
-	public int field3060;
-	@ObfuscatedName("aj")
+	public int field2977;
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 90095899
+		intValue = 192749483
 	)
-	public int field2976;
-	@ObfuscatedName("am")
+	public int field2957;
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -1338646279
+		intValue = -1196708861
 	)
 	@Export("parentId")
 	public int parentId;
-	@ObfuscatedName("az")
+	@ObfuscatedName("an")
 	@Export("isHidden")
 	public boolean isHidden;
-	@ObfuscatedName("av")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -1662391635
+		intValue = 976115909
 	)
 	@Export("scrollX")
 	public int scrollX;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1974901921
+		intValue = -28685509
 	)
 	@Export("scrollY")
 	public int scrollY;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 1489642403
+		intValue = -1727030445
 	)
 	@Export("scrollWidth")
 	public int scrollWidth;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 1577090123
+		intValue = -2062739769
 	)
 	@Export("scrollHeight")
 	public int scrollHeight;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1017532251
+		intValue = -1286368221
 	)
 	@Export("color")
 	public int color;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = -681284339
+		intValue = -506797087
 	)
 	@Export("color2")
 	public int color2;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("am")
 	@ObfuscatedGetter(
-		intValue = -744384901
+		intValue = -1740449063
 	)
 	@Export("mouseOverColor")
 	public int mouseOverColor;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -242226211
+		intValue = 1715490111
 	)
 	@Export("mouseOverColor2")
 	public int mouseOverColor2;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ai")
 	@Export("fill")
 	public boolean fill;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
-		descriptor = "Lon;"
+		descriptor = "Loj;"
 	)
 	@Export("fillMode")
 	public FillMode fillMode;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = 225521737
+		intValue = -1449839719
 	)
 	@Export("transparencyTop")
 	public int transparencyTop;
-	@ObfuscatedName("au")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = 1352946151
+		intValue = -2085035941
 	)
 	@Export("transparencyBot")
 	public int transparencyBot;
-	@ObfuscatedName("an")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -1982124337
+		intValue = -1723133007
 	)
 	@Export("lineWid")
 	public int lineWid;
-	@ObfuscatedName("bd")
-	public boolean field2992;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bq")
+	public boolean field2994;
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = -1111346119
+		intValue = -241980903
 	)
 	@Export("spriteId2")
 	public int spriteId2;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -1286862071
+		intValue = -1019565859
 	)
 	@Export("spriteId")
 	public int spriteId;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = -1099843227
+		intValue = 1070860823
 	)
 	@Export("spriteAngle")
 	public int spriteAngle;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@Export("spriteTiling")
 	public boolean spriteTiling;
 	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = -713540261
+		intValue = -1470776531
 	)
 	@Export("outline")
 	public int outline;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = -2047701929
+		intValue = -1555949609
 	)
 	@Export("spriteShadow")
 	public int spriteShadow;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@Export("spriteFlipV")
 	public boolean spriteFlipV;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("ba")
 	@Export("spriteFlipH")
 	public boolean spriteFlipH;
 	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = 946573619
+		intValue = -1769374205
 	)
 	@Export("modelType")
 	public int modelType;
 	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 1064486253
+		intValue = 1676521399
 	)
 	@Export("modelId")
 	public int modelId;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = 1387355717
+		intValue = -1490803313
 	)
 	@Export("modelType2")
 	int modelType2;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = 6278113
+		intValue = -1980636949
 	)
 	@Export("modelId2")
 	int modelId2;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 679546321
+		intValue = -4788971
 	)
 	@Export("sequenceId")
 	public int sequenceId;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = -296516383
+		intValue = -1751751309
 	)
 	@Export("sequenceId2")
 	public int sequenceId2;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = 1143287517
+		intValue = -958895997
 	)
 	@Export("modelOffsetX")
 	public int modelOffsetX;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = -712693961
+		intValue = -1127276269
 	)
 	@Export("modelOffsetY")
 	public int modelOffsetY;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = -1005507705
+		intValue = -1281350053
 	)
 	@Export("modelAngleX")
 	public int modelAngleX;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = 490585271
+		intValue = 638768595
 	)
 	@Export("modelAngleY")
 	public int modelAngleY;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = 625190029
+		intValue = -1289880071
 	)
 	@Export("modelAngleZ")
 	public int modelAngleZ;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = 1456177915
+		intValue = 495124129
 	)
 	@Export("modelZoom")
 	public int modelZoom;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = -1993271177
+		intValue = 154966647
 	)
-	public int field3013;
+	public int field3011;
+	@ObfuscatedName("bp")
+	@ObfuscatedGetter(
+		intValue = 415113775
+	)
+	public int field2981;
 	@ObfuscatedName("bk")
-	@ObfuscatedGetter(
-		intValue = 1762860885
-	)
-	public int field3014;
-	@ObfuscatedName("bg")
 	@Export("modelOrthog")
 	public boolean modelOrthog;
-	@ObfuscatedName("by")
+	@ObfuscatedName("bh")
 	@Export("modelTransparency")
 	public boolean modelTransparency;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bf")
 	@ObfuscatedGetter(
-		intValue = -960978093
+		intValue = -455387
 	)
 	@Export("itemQuantityMode")
 	public int itemQuantityMode;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cm")
 	@ObfuscatedGetter(
-		intValue = 1183409535
+		intValue = 1632678803
 	)
 	@Export("fontId")
 	public int fontId;
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cx")
 	@Export("text")
 	public String text;
-	@ObfuscatedName("cv")
+	@ObfuscatedName("cq")
 	@Export("text2")
 	public String text2;
-	@ObfuscatedName("cp")
+	@ObfuscatedName("cz")
 	@ObfuscatedGetter(
-		intValue = 1855839745
+		intValue = -1171015399
 	)
 	@Export("textLineHeight")
 	public int textLineHeight;
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cc")
 	@ObfuscatedGetter(
-		intValue = 1863227195
+		intValue = 1858738259
 	)
 	@Export("textXAlignment")
 	public int textXAlignment;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = 1397843337
+		intValue = -264519941
 	)
 	@Export("textYAlignment")
 	public int textYAlignment;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cp")
 	@Export("textShadowed")
 	public boolean textShadowed;
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cv")
 	@ObfuscatedGetter(
-		intValue = -1116733639
+		intValue = -1938227679
 	)
 	@Export("paddingX")
 	public int paddingX;
 	@ObfuscatedName("cf")
 	@ObfuscatedGetter(
-		intValue = 354722393
+		intValue = -1590211597
 	)
 	@Export("paddingY")
 	public int paddingY;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cb")
 	@Export("inventoryXOffsets")
 	public int[] inventoryXOffsets;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cg")
 	@Export("inventoryYOffsets")
 	public int[] inventoryYOffsets;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("ca")
 	@Export("inventorySprites")
 	public int[] inventorySprites;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cd")
 	@Export("itemActions")
 	public String[] itemActions;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = -721548567
+		intValue = -766759313
 	)
 	@Export("flags")
 	public int flags;
-	@ObfuscatedName("cj")
-	public boolean field3032;
-	@ObfuscatedName("cc")
-	public byte[][] field3033;
-	@ObfuscatedName("cu")
-	public byte[][] field3034;
-	@ObfuscatedName("cz")
-	public int[] field3035;
-	@ObfuscatedName("cb")
-	public int[] field3079;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("cy")
+	public boolean field3034;
+	@ObfuscatedName("ct")
+	public byte[][] field3035;
+	@ObfuscatedName("ci")
+	public byte[][] field3036;
+	@ObfuscatedName("cs")
+	public int[] field3037;
+	@ObfuscatedName("co")
+	public int[] field3038;
+	@ObfuscatedName("ck")
 	@Export("dataText")
 	public String dataText;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cn")
 	@Export("actions")
 	public String[] actions;
-	@ObfuscatedName("cw")
+	@ObfuscatedName("ch")
 	@ObfuscatedSignature(
-		descriptor = "Lio;"
+		descriptor = "Liv;"
 	)
 	@Export("parent")
 	public Widget parent;
-	@ObfuscatedName("db")
+	@ObfuscatedName("du")
 	@ObfuscatedGetter(
-		intValue = -1741236437
+		intValue = -1885239925
 	)
 	@Export("dragZoneSize")
 	public int dragZoneSize;
-	@ObfuscatedName("dz")
+	@ObfuscatedName("db")
 	@ObfuscatedGetter(
-		intValue = -1216934521
+		intValue = -933833781
 	)
 	@Export("dragThreshold")
 	public int dragThreshold;
-	@ObfuscatedName("dj")
+	@ObfuscatedName("dm")
 	@Export("isScrollBar")
 	public boolean isScrollBar;
-	@ObfuscatedName("dr")
+	@ObfuscatedName("dh")
 	@Export("spellActionName")
 	public String spellActionName;
 	@ObfuscatedName("di")
 	@Export("hasListener")
 	public boolean hasListener;
-	@ObfuscatedName("dc")
+	@ObfuscatedName("ds")
 	@Export("onLoad")
 	public Object[] onLoad;
-	@ObfuscatedName("dk")
+	@ObfuscatedName("df")
 	@Export("onClick")
 	public Object[] onClick;
-	@ObfuscatedName("ds")
+	@ObfuscatedName("dg")
 	@Export("onClickRepeat")
 	public Object[] onClickRepeat;
-	@ObfuscatedName("do")
+	@ObfuscatedName("dq")
 	@Export("onRelease")
 	public Object[] onRelease;
-	@ObfuscatedName("df")
+	@ObfuscatedName("dz")
 	@Export("onHold")
 	public Object[] onHold;
-	@ObfuscatedName("dv")
+	@ObfuscatedName("dc")
 	@Export("onMouseOver")
 	public Object[] onMouseOver;
-	@ObfuscatedName("dy")
+	@ObfuscatedName("dt")
 	@Export("onMouseRepeat")
 	public Object[] onMouseRepeat;
-	@ObfuscatedName("dd")
+	@ObfuscatedName("dp")
 	@Export("onMouseLeave")
 	public Object[] onMouseLeave;
-	@ObfuscatedName("da")
+	@ObfuscatedName("do")
 	@Export("onDrag")
 	public Object[] onDrag;
-	@ObfuscatedName("dx")
+	@ObfuscatedName("dl")
 	@Export("onDragComplete")
 	public Object[] onDragComplete;
-	@ObfuscatedName("dg")
+	@ObfuscatedName("de")
 	@Export("onTargetEnter")
 	public Object[] onTargetEnter;
-	@ObfuscatedName("du")
+	@ObfuscatedName("dr")
 	@Export("onTargetLeave")
 	public Object[] onTargetLeave;
-	@ObfuscatedName("dt")
+	@ObfuscatedName("dd")
 	@Export("onVarTransmit")
 	public Object[] onVarTransmit;
-	@ObfuscatedName("dn")
+	@ObfuscatedName("dk")
 	@Export("varTransmitTriggers")
 	public int[] varTransmitTriggers;
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dj")
 	@Export("onInvTransmit")
 	public Object[] onInvTransmit;
-	@ObfuscatedName("dl")
+	@ObfuscatedName("dx")
 	@Export("invTransmitTriggers")
 	public int[] invTransmitTriggers;
-	@ObfuscatedName("dq")
+	@ObfuscatedName("dw")
 	@Export("onStatTransmit")
 	public Object[] onStatTransmit;
-	@ObfuscatedName("de")
+	@ObfuscatedName("dv")
 	@Export("statTransmitTriggers")
 	public int[] statTransmitTriggers;
-	@ObfuscatedName("dp")
+	@ObfuscatedName("dy")
 	@Export("onTimer")
 	public Object[] onTimer;
-	@ObfuscatedName("dm")
+	@ObfuscatedName("da")
 	@Export("onOp")
 	public Object[] onOp;
-	@ObfuscatedName("dw")
+	@ObfuscatedName("dn")
 	@Export("onScroll")
 	public Object[] onScroll;
-	@ObfuscatedName("ec")
+	@ObfuscatedName("ei")
 	@Export("onChatTransmit")
 	public Object[] onChatTransmit;
-	@ObfuscatedName("ea")
+	@ObfuscatedName("ej")
 	@Export("onKey")
 	public Object[] onKey;
-	@ObfuscatedName("ek")
+	@ObfuscatedName("ea")
+	public Object[] field3071;
+	@ObfuscatedName("ec")
+	public Object[] field3000;
+	@ObfuscatedName("el")
 	@Export("onFriendTransmit")
 	public Object[] onFriendTransmit;
-	@ObfuscatedName("eu")
+	@ObfuscatedName("en")
 	@Export("onClanTransmit")
 	public Object[] onClanTransmit;
-	@ObfuscatedName("ez")
-	public Object[] field3043;
-	@ObfuscatedName("ed")
-	public Object[] field3071;
-	@ObfuscatedName("ep")
+	@ObfuscatedName("et")
+	public Object[] field3075;
+	@ObfuscatedName("ex")
+	public Object[] field3076;
+	@ObfuscatedName("eb")
 	@Export("onMiscTransmit")
 	public Object[] onMiscTransmit;
-	@ObfuscatedName("ex")
+	@ObfuscatedName("ek")
 	@Export("onDialogAbort")
 	public Object[] onDialogAbort;
-	@ObfuscatedName("ew")
+	@ObfuscatedName("em")
 	@Export("onSubChange")
 	public Object[] onSubChange;
-	@ObfuscatedName("ej")
+	@ObfuscatedName("er")
 	@Export("onResize")
 	public Object[] onResize;
-	@ObfuscatedName("el")
+	@ObfuscatedName("ey")
 	@Export("onStockTransmit")
 	public Object[] onStockTransmit;
-	@ObfuscatedName("et")
-	public Object[] field3077;
-	@ObfuscatedName("eb")
+	@ObfuscatedName("eg")
+	public Object[] field3082;
+	@ObfuscatedName("ep")
 	@Export("cs1Instructions")
 	public int[][] cs1Instructions;
-	@ObfuscatedName("er")
+	@ObfuscatedName("eq")
 	@Export("cs1Comparisons")
 	public int[] cs1Comparisons;
-	@ObfuscatedName("en")
+	@ObfuscatedName("ev")
 	@Export("cs1ComparisonValues")
 	public int[] cs1ComparisonValues;
-	@ObfuscatedName("ef")
+	@ObfuscatedName("ee")
 	@ObfuscatedGetter(
-		intValue = 898412889
+		intValue = -1679183343
 	)
 	@Export("mouseOverRedirect")
 	public int mouseOverRedirect;
-	@ObfuscatedName("em")
+	@ObfuscatedName("eu")
 	@Export("spellName")
 	public String spellName;
-	@ObfuscatedName("es")
+	@ObfuscatedName("eo")
 	@Export("buttonText")
 	public String buttonText;
-	@ObfuscatedName("ey")
+	@ObfuscatedName("ew")
 	@Export("itemIds")
 	public int[] itemIds;
-	@ObfuscatedName("ee")
+	@ObfuscatedName("ed")
 	@Export("itemQuantities")
 	public int[] itemQuantities;
 	@ObfuscatedName("eh")
 	@ObfuscatedGetter(
-		intValue = 539336237
+		intValue = -1075326629
 	)
 	@Export("itemId")
 	public int itemId;
-	@ObfuscatedName("ei")
+	@ObfuscatedName("es")
 	@ObfuscatedGetter(
-		intValue = 1575834679
+		intValue = 1814169921
 	)
 	@Export("itemQuantity")
 	public int itemQuantity;
-	@ObfuscatedName("ev")
+	@ObfuscatedName("ez")
 	@ObfuscatedGetter(
-		intValue = 903501349
+		intValue = 1965960865
 	)
 	@Export("modelFrame")
 	public int modelFrame;
-	@ObfuscatedName("eg")
+	@ObfuscatedName("ef")
 	@ObfuscatedGetter(
-		intValue = -672258589
+		intValue = 209321267
 	)
 	@Export("modelFrameCycle")
 	public int modelFrameCycle;
-	@ObfuscatedName("eq")
+	@ObfuscatedName("fq")
 	@ObfuscatedSignature(
-		descriptor = "[Lio;"
+		descriptor = "[Liv;"
 	)
 	@Export("children")
 	public Widget[] children;
-	@ObfuscatedName("eo")
+	@ObfuscatedName("fm")
 	@Export("containsMouse")
 	public boolean containsMouse;
 	@ObfuscatedName("fl")
 	@Export("isClicked")
 	public boolean isClicked;
-	@ObfuscatedName("fz")
+	@ObfuscatedName("fv")
 	@ObfuscatedGetter(
-		intValue = -772300497
+		intValue = 798804461
 	)
-	public int field3104;
+	public int field3098;
+	@ObfuscatedName("fx")
+	@ObfuscatedGetter(
+		intValue = 327523393
+	)
+	public int field3089;
+	@ObfuscatedName("fo")
+	@ObfuscatedGetter(
+		intValue = 1440845135
+	)
+	public int field3100;
 	@ObfuscatedName("fc")
 	@ObfuscatedGetter(
-		intValue = 1932726993
+		intValue = -1749487493
 	)
-	public int field2990;
-	@ObfuscatedName("fa")
+	public int field2971;
+	@ObfuscatedName("fg")
 	@ObfuscatedGetter(
-		intValue = 822217447
-	)
-	public int field3095;
-	@ObfuscatedName("ft")
-	@ObfuscatedGetter(
-		intValue = -437140673
-	)
-	public int field3096;
-	@ObfuscatedName("fs")
-	@ObfuscatedGetter(
-		intValue = 1408898685
+		intValue = -80188581
 	)
 	@Export("rootIndex")
 	public int rootIndex;
-	@ObfuscatedName("fp")
+	@ObfuscatedName("fe")
 	@ObfuscatedGetter(
-		intValue = 861366973
+		intValue = -1217907707
 	)
 	@Export("cycle")
 	public int cycle;
-	@ObfuscatedName("fe")
-	public int[] field3012;
-	@ObfuscatedName("fb")
+	@ObfuscatedName("fs")
+	public int[] field3104;
+	@ObfuscatedName("fa")
 	@Export("noClickThrough")
 	public boolean noClickThrough;
-	@ObfuscatedName("fo")
+	@ObfuscatedName("fn")
 	@Export("noScrollThrough")
 	public boolean noScrollThrough;
-	@ObfuscatedName("fq")
+	@ObfuscatedName("ft")
 	@Export("prioritizeMenuEntry")
 	public boolean prioritizeMenuEntry;
 
@@ -701,7 +688,7 @@ public class Widget extends Node {
 		Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32
 		Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33
 		Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34
-		field2956 = false; // L: 35
+		field2958 = false; // L: 35
 	}
 
 	public Widget() {
@@ -722,8 +709,8 @@ public class Widget extends Node {
 		this.y = 0; // L: 51
 		this.width = 0; // L: 52
 		this.height = 0; // L: 53
-		this.field3060 = 1; // L: 54
-		this.field2976 = 1; // L: 55
+		this.field2977 = 1; // L: 54
+		this.field2957 = 1; // L: 55
 		this.parentId = -1; // L: 56
 		this.isHidden = false; // L: 57
 		this.scrollX = 0; // L: 58
@@ -739,7 +726,7 @@ public class Widget extends Node {
 		this.transparencyTop = 0; // L: 68
 		this.transparencyBot = 0; // L: 69
 		this.lineWid = 1; // L: 70
-		this.field2992 = false; // L: 71
+		this.field2994 = false; // L: 71
 		this.spriteId2 = -1; // L: 72
 		this.spriteId = -1; // L: 73
 		this.spriteAngle = 0; // L: 74
@@ -754,16 +741,16 @@ public class Widget extends Node {
 		this.sequenceId2 = -1; // L: 85
 		this.modelOffsetX = 0; // L: 86
 		this.modelOffsetY = 0; // L: 87
-		this.modelAngleX = 0;
-		this.modelAngleY = 0;
-		this.modelAngleZ = 0;
+		this.modelAngleX = 0; // L: 88
+		this.modelAngleY = 0; // L: 89
+		this.modelAngleZ = 0; // L: 90
 		this.modelZoom = 100; // L: 91
-		this.field3013 = 0;
-		this.field3014 = 0; // L: 93
-		this.modelOrthog = false;
+		this.field3011 = 0; // L: 92
+		this.field2981 = 0; // L: 93
+		this.modelOrthog = false; // L: 94
 		this.modelTransparency = false; // L: 95
 		this.itemQuantityMode = 2; // L: 96
-		this.fontId = -1;
+		this.fontId = -1; // L: 97
 		this.text = ""; // L: 98
 		this.text2 = ""; // L: 99
 		this.textLineHeight = 0; // L: 100
@@ -773,7 +760,7 @@ public class Widget extends Node {
 		this.paddingX = 0; // L: 104
 		this.paddingY = 0; // L: 105
 		this.flags = 0; // L: 110
-		this.field3032 = false; // L: 111
+		this.field3034 = false; // L: 111
 		this.dataText = ""; // L: 120
 		this.parent = null; // L: 122
 		this.dragZoneSize = 0; // L: 123
@@ -781,599 +768,599 @@ public class Widget extends Node {
 		this.isScrollBar = false; // L: 125
 		this.spellActionName = ""; // L: 126
 		this.hasListener = false; // L: 127
-		this.mouseOverRedirect = -1; // L: 164
-		this.spellName = ""; // L: 165
-		this.buttonText = "Ok"; // L: 166
-		this.itemId = -1; // L: 169
-		this.itemQuantity = 0; // L: 170
-		this.modelFrame = 0; // L: 171
-		this.modelFrameCycle = 0; // L: 172
-		this.containsMouse = false; // L: 174
-		this.isClicked = false; // L: 175
-		this.field3104 = -1; // L: 176
-		this.field2990 = 0; // L: 177
-		this.field3095 = 0; // L: 178
-		this.field3096 = 0; // L: 179
-		this.rootIndex = -1; // L: 180
-		this.cycle = -1; // L: 181
-		this.noClickThrough = false; // L: 183
-		this.noScrollThrough = false; // L: 184
-		this.prioritizeMenuEntry = false; // L: 185
-	} // L: 684
+		this.mouseOverRedirect = -1; // L: 166
+		this.spellName = ""; // L: 167
+		this.buttonText = "Ok"; // L: 168
+		this.itemId = -1; // L: 171
+		this.itemQuantity = 0; // L: 172
+		this.modelFrame = 0; // L: 173
+		this.modelFrameCycle = 0; // L: 174
+		this.containsMouse = false; // L: 176
+		this.isClicked = false; // L: 177
+		this.field3098 = -1; // L: 178
+		this.field3089 = 0; // L: 179
+		this.field3100 = 0; // L: 180
+		this.field2971 = 0; // L: 181
+		this.rootIndex = -1; // L: 182
+		this.cycle = -1; // L: 183
+		this.noClickThrough = false; // L: 185
+		this.noScrollThrough = false; // L: 186
+		this.prioritizeMenuEntry = false; // L: 187
+	} // L: 711
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1748856001"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1168354029"
 	)
 	@Export("decodeLegacy")
 	void decodeLegacy(Buffer var1) {
-		this.isIf3 = false; // L: 229
-		this.type = var1.readUnsignedByte(); // L: 230
-		this.buttonType = var1.readUnsignedByte(); // L: 231
-		this.contentType = var1.readUnsignedShort(); // L: 232
-		this.rawX = var1.readShort(); // L: 233
-		this.rawY = var1.readShort(); // L: 234
-		this.rawWidth = var1.readUnsignedShort(); // L: 235
-		this.rawHeight = var1.readUnsignedShort(); // L: 236
-		this.transparencyTop = var1.readUnsignedByte(); // L: 237
-		this.parentId = var1.readUnsignedShort(); // L: 238
-		if (this.parentId == 65535) { // L: 239
+		this.isIf3 = false; // L: 256
+		this.type = var1.readUnsignedByte(); // L: 257
+		this.buttonType = var1.readUnsignedByte(); // L: 258
+		this.contentType = var1.readUnsignedShort(); // L: 259
+		this.rawX = var1.readShort(); // L: 260
+		this.rawY = var1.readShort(); // L: 261
+		this.rawWidth = var1.readUnsignedShort(); // L: 262
+		this.rawHeight = var1.readUnsignedShort(); // L: 263
+		this.transparencyTop = var1.readUnsignedByte(); // L: 264
+		this.parentId = var1.readUnsignedShort(); // L: 265
+		if (this.parentId == 65535) { // L: 266
 			this.parentId = -1;
 		} else {
-			this.parentId += this.id & -65536; // L: 240
+			this.parentId += this.id & -65536; // L: 267
 		}
 
-		this.mouseOverRedirect = var1.readUnsignedShort(); // L: 241
-		if (this.mouseOverRedirect == 65535) { // L: 242
+		this.mouseOverRedirect = var1.readUnsignedShort(); // L: 268
+		if (this.mouseOverRedirect == 65535) { // L: 269
 			this.mouseOverRedirect = -1;
 		}
 
-		int var2 = var1.readUnsignedByte(); // L: 243
+		int var2 = var1.readUnsignedByte(); // L: 270
 		int var3;
-		if (var2 > 0) { // L: 244
-			this.cs1Comparisons = new int[var2]; // L: 245
-			this.cs1ComparisonValues = new int[var2]; // L: 246
+		if (var2 > 0) { // L: 271
+			this.cs1Comparisons = new int[var2]; // L: 272
+			this.cs1ComparisonValues = new int[var2]; // L: 273
 
-			for (var3 = 0; var3 < var2; ++var3) { // L: 247
-				this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 248
-				this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 249
+			for (var3 = 0; var3 < var2; ++var3) { // L: 274
+				this.cs1Comparisons[var3] = var1.readUnsignedByte(); // L: 275
+				this.cs1ComparisonValues[var3] = var1.readUnsignedShort(); // L: 276
 			}
 		}
 
-		var3 = var1.readUnsignedByte(); // L: 252
+		var3 = var1.readUnsignedByte(); // L: 279
 		int var4;
 		int var5;
 		int var6;
-		if (var3 > 0) { // L: 253
-			this.cs1Instructions = new int[var3][]; // L: 254
+		if (var3 > 0) { // L: 280
+			this.cs1Instructions = new int[var3][]; // L: 281
 
-			for (var4 = 0; var4 < var3; ++var4) { // L: 255
-				var5 = var1.readUnsignedShort(); // L: 256
-				this.cs1Instructions[var4] = new int[var5]; // L: 257
+			for (var4 = 0; var4 < var3; ++var4) { // L: 282
+				var5 = var1.readUnsignedShort(); // L: 283
+				this.cs1Instructions[var4] = new int[var5]; // L: 284
 
-				for (var6 = 0; var6 < var5; ++var6) { // L: 258
-					this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 259
-					if (this.cs1Instructions[var4][var6] == 65535) { // L: 260
+				for (var6 = 0; var6 < var5; ++var6) { // L: 285
+					this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 286
+					if (this.cs1Instructions[var4][var6] == 65535) { // L: 287
 						this.cs1Instructions[var4][var6] = -1;
 					}
 				}
 			}
 		}
 
-		if (this.type == 0) { // L: 264
-			this.scrollHeight = var1.readUnsignedShort(); // L: 265
-			this.isHidden = var1.readUnsignedByte() == 1; // L: 266
+		if (this.type == 0) { // L: 291
+			this.scrollHeight = var1.readUnsignedShort(); // L: 292
+			this.isHidden = var1.readUnsignedByte() == 1; // L: 293
 		}
 
-		if (this.type == 1) { // L: 268
-			var1.readUnsignedShort(); // L: 269
-			var1.readUnsignedByte(); // L: 270
+		if (this.type == 1) { // L: 295
+			var1.readUnsignedShort(); // L: 296
+			var1.readUnsignedByte(); // L: 297
 		}
 
-		if (this.type == 2) { // L: 272
-			this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 273
-			this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 274
-			var4 = var1.readUnsignedByte(); // L: 275
-			if (var4 == 1) { // L: 276
+		if (this.type == 2) { // L: 299
+			this.itemIds = new int[this.rawHeight * this.rawWidth]; // L: 300
+			this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 301
+			var4 = var1.readUnsignedByte(); // L: 302
+			if (var4 == 1) { // L: 303
 				this.flags |= 268435456;
 			}
 
-			var5 = var1.readUnsignedByte(); // L: 277
-			if (var5 == 1) { // L: 278
+			var5 = var1.readUnsignedByte(); // L: 304
+			if (var5 == 1) { // L: 305
 				this.flags |= 1073741824;
 			}
 
-			var6 = var1.readUnsignedByte(); // L: 279
-			if (var6 == 1) { // L: 280
+			var6 = var1.readUnsignedByte(); // L: 306
+			if (var6 == 1) { // L: 307
 				this.flags |= Integer.MIN_VALUE;
 			}
 
-			int var7 = var1.readUnsignedByte(); // L: 281
-			if (var7 == 1) { // L: 282
+			int var7 = var1.readUnsignedByte(); // L: 308
+			if (var7 == 1) { // L: 309
 				this.flags |= 536870912;
 			}
 
-			this.paddingX = var1.readUnsignedByte(); // L: 283
-			this.paddingY = var1.readUnsignedByte(); // L: 284
-			this.inventoryXOffsets = new int[20]; // L: 285
-			this.inventoryYOffsets = new int[20]; // L: 286
-			this.inventorySprites = new int[20]; // L: 287
+			this.paddingX = var1.readUnsignedByte(); // L: 310
+			this.paddingY = var1.readUnsignedByte(); // L: 311
+			this.inventoryXOffsets = new int[20]; // L: 312
+			this.inventoryYOffsets = new int[20]; // L: 313
+			this.inventorySprites = new int[20]; // L: 314
 
 			int var8;
-			for (var8 = 0; var8 < 20; ++var8) { // L: 288
-				int var11 = var1.readUnsignedByte(); // L: 289
-				if (var11 == 1) { // L: 290
-					this.inventoryXOffsets[var8] = var1.readShort(); // L: 291
-					this.inventoryYOffsets[var8] = var1.readShort(); // L: 292
-					this.inventorySprites[var8] = var1.readInt(); // L: 293
+			for (var8 = 0; var8 < 20; ++var8) { // L: 315
+				int var11 = var1.readUnsignedByte(); // L: 316
+				if (var11 == 1) { // L: 317
+					this.inventoryXOffsets[var8] = var1.readShort(); // L: 318
+					this.inventoryYOffsets[var8] = var1.readShort(); // L: 319
+					this.inventorySprites[var8] = var1.readInt(); // L: 320
 				} else {
-					this.inventorySprites[var8] = -1; // L: 295
+					this.inventorySprites[var8] = -1; // L: 322
 				}
 			}
 
-			this.itemActions = new String[5]; // L: 297
+			this.itemActions = new String[5]; // L: 324
 
-			for (var8 = 0; var8 < 5; ++var8) { // L: 298
-				String var9 = var1.readStringCp1252NullTerminated(); // L: 299
-				if (var9.length() > 0) { // L: 300
-					this.itemActions[var8] = var9; // L: 301
-					this.flags |= 1 << var8 + 23; // L: 302
+			for (var8 = 0; var8 < 5; ++var8) { // L: 325
+				String var9 = var1.readStringCp1252NullTerminated(); // L: 326
+				if (var9.length() > 0) { // L: 327
+					this.itemActions[var8] = var9; // L: 328
+					this.flags |= 1 << var8 + 23; // L: 329
 				}
 			}
 		}
 
-		if (this.type == 3) { // L: 306
-			this.fill = var1.readUnsignedByte() == 1; // L: 307
+		if (this.type == 3) { // L: 333
+			this.fill = var1.readUnsignedByte() == 1; // L: 334
 		}
 
-		if (this.type == 4 || this.type == 1) { // L: 309
-			this.textXAlignment = var1.readUnsignedByte(); // L: 310
-			this.textYAlignment = var1.readUnsignedByte(); // L: 311
-			this.textLineHeight = var1.readUnsignedByte(); // L: 312
-			this.fontId = var1.readUnsignedShort(); // L: 313
-			if (this.fontId == 65535) { // L: 314
+		if (this.type == 4 || this.type == 1) { // L: 336
+			this.textXAlignment = var1.readUnsignedByte(); // L: 337
+			this.textYAlignment = var1.readUnsignedByte(); // L: 338
+			this.textLineHeight = var1.readUnsignedByte(); // L: 339
+			this.fontId = var1.readUnsignedShort(); // L: 340
+			if (this.fontId == 65535) { // L: 341
 				this.fontId = -1;
 			}
 
-			this.textShadowed = var1.readUnsignedByte() == 1; // L: 315
+			this.textShadowed = var1.readUnsignedByte() == 1; // L: 342
 		}
 
-		if (this.type == 4) { // L: 317
-			this.text = var1.readStringCp1252NullTerminated(); // L: 318
-			this.text2 = var1.readStringCp1252NullTerminated(); // L: 319
+		if (this.type == 4) { // L: 344
+			this.text = var1.readStringCp1252NullTerminated(); // L: 345
+			this.text2 = var1.readStringCp1252NullTerminated(); // L: 346
 		}
 
-		if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 321
+		if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 348
 			this.color = var1.readInt();
 		}
 
-		if (this.type == 3 || this.type == 4) { // L: 322
-			this.color2 = var1.readInt(); // L: 323
-			this.mouseOverColor = var1.readInt(); // L: 324
-			this.mouseOverColor2 = var1.readInt(); // L: 325
+		if (this.type == 3 || this.type == 4) { // L: 349
+			this.color2 = var1.readInt(); // L: 350
+			this.mouseOverColor = var1.readInt(); // L: 351
+			this.mouseOverColor2 = var1.readInt(); // L: 352
 		}
 
-		if (this.type == 5) { // L: 327
-			this.spriteId2 = var1.readInt(); // L: 328
-			this.spriteId = var1.readInt(); // L: 329
+		if (this.type == 5) { // L: 354
+			this.spriteId2 = var1.readInt(); // L: 355
+			this.spriteId = var1.readInt(); // L: 356
 		}
 
-		if (this.type == 6) { // L: 331
-			this.modelType = 1; // L: 332
-			this.modelId = var1.readUnsignedShort(); // L: 333
-			if (this.modelId == 65535) { // L: 334
+		if (this.type == 6) { // L: 358
+			this.modelType = 1; // L: 359
+			this.modelId = var1.readUnsignedShort(); // L: 360
+			if (this.modelId == 65535) { // L: 361
 				this.modelId = -1;
 			}
 
-			this.modelType2 = 1; // L: 335
-			this.modelId2 = var1.readUnsignedShort(); // L: 336
-			if (this.modelId2 == 65535) { // L: 337
+			this.modelType2 = 1; // L: 362
+			this.modelId2 = var1.readUnsignedShort(); // L: 363
+			if (this.modelId2 == 65535) { // L: 364
 				this.modelId2 = -1;
 			}
 
-			this.sequenceId = var1.readUnsignedShort(); // L: 338
-			if (this.sequenceId == 65535) { // L: 339
+			this.sequenceId = var1.readUnsignedShort(); // L: 365
+			if (this.sequenceId == 65535) { // L: 366
 				this.sequenceId = -1;
 			}
 
-			this.sequenceId2 = var1.readUnsignedShort(); // L: 340
-			if (this.sequenceId2 == 65535) { // L: 341
+			this.sequenceId2 = var1.readUnsignedShort(); // L: 367
+			if (this.sequenceId2 == 65535) { // L: 368
 				this.sequenceId2 = -1;
 			}
 
-			this.modelZoom = var1.readUnsignedShort(); // L: 342
-			this.modelAngleX = var1.readUnsignedShort(); // L: 343
-			this.modelAngleY = var1.readUnsignedShort(); // L: 344
+			this.modelZoom = var1.readUnsignedShort(); // L: 369
+			this.modelAngleX = var1.readUnsignedShort(); // L: 370
+			this.modelAngleY = var1.readUnsignedShort(); // L: 371
 		}
 
-		if (this.type == 7) { // L: 346
-			this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 347
-			this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 348
-			this.textXAlignment = var1.readUnsignedByte(); // L: 349
-			this.fontId = var1.readUnsignedShort(); // L: 350
-			if (this.fontId == 65535) { // L: 351
+		if (this.type == 7) { // L: 373
+			this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 374
+			this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 375
+			this.textXAlignment = var1.readUnsignedByte(); // L: 376
+			this.fontId = var1.readUnsignedShort(); // L: 377
+			if (this.fontId == 65535) { // L: 378
 				this.fontId = -1;
 			}
 
-			this.textShadowed = var1.readUnsignedByte() == 1; // L: 352
-			this.color = var1.readInt(); // L: 353
-			this.paddingX = var1.readShort(); // L: 354
-			this.paddingY = var1.readShort(); // L: 355
-			var4 = var1.readUnsignedByte(); // L: 356
+			this.textShadowed = var1.readUnsignedByte() == 1; // L: 379
+			this.color = var1.readInt(); // L: 380
+			this.paddingX = var1.readShort(); // L: 381
+			this.paddingY = var1.readShort(); // L: 382
+			var4 = var1.readUnsignedByte(); // L: 383
 			if (var4 == 1) {
-				this.flags |= 1073741824; // L: 357
+				this.flags |= 1073741824; // L: 384
 			}
 
-			this.itemActions = new String[5]; // L: 358
+			this.itemActions = new String[5]; // L: 385
 
-			for (var5 = 0; var5 < 5; ++var5) { // L: 359
-				String var10 = var1.readStringCp1252NullTerminated(); // L: 360
-				if (var10.length() > 0) { // L: 361
-					this.itemActions[var5] = var10; // L: 362
-					this.flags |= 1 << var5 + 23; // L: 363
+			for (var5 = 0; var5 < 5; ++var5) { // L: 386
+				String var10 = var1.readStringCp1252NullTerminated(); // L: 387
+				if (var10.length() > 0) { // L: 388
+					this.itemActions[var5] = var10; // L: 389
+					this.flags |= 1 << var5 + 23; // L: 390
 				}
 			}
 		}
 
-		if (this.type == 8) { // L: 367
-			this.text = var1.readStringCp1252NullTerminated(); // L: 368
+		if (this.type == 8) { // L: 394
+			this.text = var1.readStringCp1252NullTerminated(); // L: 395
 		}
 
-		if (this.buttonType == 2 || this.type == 2) { // L: 370
-			this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 371
-			this.spellName = var1.readStringCp1252NullTerminated(); // L: 372
-			var4 = var1.readUnsignedShort() & 63; // L: 373
-			this.flags |= var4 << 11; // L: 374
+		if (this.buttonType == 2 || this.type == 2) { // L: 397
+			this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 398
+			this.spellName = var1.readStringCp1252NullTerminated(); // L: 399
+			var4 = var1.readUnsignedShort() & 63; // L: 400
+			this.flags |= var4 << 11; // L: 401
 		}
 
-		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 376
-			this.buttonText = var1.readStringCp1252NullTerminated(); // L: 377
-			if (this.buttonText.length() == 0) { // L: 378
-				if (this.buttonType == 1) { // L: 379
+		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 403
+			this.buttonText = var1.readStringCp1252NullTerminated(); // L: 404
+			if (this.buttonText.length() == 0) { // L: 405
+				if (this.buttonType == 1) { // L: 406
 					this.buttonText = "Ok";
 				}
 
-				if (this.buttonType == 4) { // L: 380
+				if (this.buttonType == 4) { // L: 407
 					this.buttonText = "Select";
 				}
 
-				if (this.buttonType == 5) { // L: 381
+				if (this.buttonType == 5) { // L: 408
 					this.buttonText = "Select";
 				}
 
-				if (this.buttonType == 6) { // L: 382
+				if (this.buttonType == 6) { // L: 409
 					this.buttonText = "Continue";
 				}
 			}
 		}
 
-		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 385
-			this.flags |= 4194304; // L: 386
+		if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 412
+			this.flags |= 4194304; // L: 413
 		}
 
-		if (this.buttonType == 6) { // L: 388
-			this.flags |= 1; // L: 389
+		if (this.buttonType == 6) { // L: 415
+			this.flags |= 1; // L: 416
 		}
 
-	} // L: 391
+	} // L: 418
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "107425419"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "1"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
-		var1.readUnsignedByte(); // L: 394
-		this.isIf3 = true; // L: 395
-		this.type = var1.readUnsignedByte(); // L: 396
-		this.contentType = var1.readUnsignedShort(); // L: 397
-		this.rawX = var1.readShort(); // L: 398
-		this.rawY = var1.readShort(); // L: 399
-		this.rawWidth = var1.readUnsignedShort(); // L: 400
-		if (this.type == 9) { // L: 401
+		var1.readUnsignedByte(); // L: 421
+		this.isIf3 = true; // L: 422
+		this.type = var1.readUnsignedByte(); // L: 423
+		this.contentType = var1.readUnsignedShort(); // L: 424
+		this.rawX = var1.readShort(); // L: 425
+		this.rawY = var1.readShort(); // L: 426
+		this.rawWidth = var1.readUnsignedShort(); // L: 427
+		if (this.type == 9) { // L: 428
 			this.rawHeight = var1.readShort();
 		} else {
-			this.rawHeight = var1.readUnsignedShort(); // L: 402
+			this.rawHeight = var1.readUnsignedShort(); // L: 429
 		}
 
-		this.widthAlignment = var1.readByte(); // L: 403
-		this.heightAlignment = var1.readByte(); // L: 404
-		this.xAlignment = var1.readByte(); // L: 405
-		this.yAlignment = var1.readByte(); // L: 406
-		this.parentId = var1.readUnsignedShort(); // L: 407
-		if (this.parentId == 65535) { // L: 408
+		this.widthAlignment = var1.readByte(); // L: 430
+		this.heightAlignment = var1.readByte(); // L: 431
+		this.xAlignment = var1.readByte(); // L: 432
+		this.yAlignment = var1.readByte(); // L: 433
+		this.parentId = var1.readUnsignedShort(); // L: 434
+		if (this.parentId == 65535) { // L: 435
 			this.parentId = -1;
 		} else {
-			this.parentId += this.id & -65536; // L: 409
+			this.parentId += this.id & -65536; // L: 436
 		}
 
-		this.isHidden = var1.readUnsignedByte() == 1; // L: 410
-		if (this.type == 0) { // L: 411
-			this.scrollWidth = var1.readUnsignedShort(); // L: 412
-			this.scrollHeight = var1.readUnsignedShort(); // L: 413
-			this.noClickThrough = var1.readUnsignedByte() == 1; // L: 414
+		this.isHidden = var1.readUnsignedByte() == 1; // L: 437
+		if (this.type == 0) { // L: 438
+			this.scrollWidth = var1.readUnsignedShort(); // L: 439
+			this.scrollHeight = var1.readUnsignedShort(); // L: 440
+			this.noClickThrough = var1.readUnsignedByte() == 1; // L: 441
 		}
 
-		if (this.type == 5) { // L: 416
-			this.spriteId2 = var1.readInt(); // L: 417
-			this.spriteAngle = var1.readUnsignedShort(); // L: 418
-			this.spriteTiling = var1.readUnsignedByte() == 1; // L: 419
-			this.transparencyTop = var1.readUnsignedByte(); // L: 420
-			this.outline = var1.readUnsignedByte(); // L: 421
-			this.spriteShadow = var1.readInt(); // L: 422
-			this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 423
-			this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 424
+		if (this.type == 5) { // L: 443
+			this.spriteId2 = var1.readInt(); // L: 444
+			this.spriteAngle = var1.readUnsignedShort(); // L: 445
+			this.spriteTiling = var1.readUnsignedByte() == 1; // L: 446
+			this.transparencyTop = var1.readUnsignedByte(); // L: 447
+			this.outline = var1.readUnsignedByte(); // L: 448
+			this.spriteShadow = var1.readInt(); // L: 449
+			this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 450
+			this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 451
 		}
 
-		if (this.type == 6) { // L: 426
-			this.modelType = 1; // L: 427
-			this.modelId = var1.readUnsignedShort(); // L: 428
-			if (this.modelId == 65535) { // L: 429
+		if (this.type == 6) { // L: 453
+			this.modelType = 1; // L: 454
+			this.modelId = var1.readUnsignedShort(); // L: 455
+			if (this.modelId == 65535) { // L: 456
 				this.modelId = -1;
 			}
 
-			this.modelOffsetX = var1.readShort(); // L: 430
-			this.modelOffsetY = var1.readShort(); // L: 431
-			this.modelAngleX = var1.readUnsignedShort(); // L: 432
-			this.modelAngleY = var1.readUnsignedShort(); // L: 433
-			this.modelAngleZ = var1.readUnsignedShort(); // L: 434
-			this.modelZoom = var1.readUnsignedShort(); // L: 435
-			this.sequenceId = var1.readUnsignedShort(); // L: 436
-			if (this.sequenceId == 65535) { // L: 437
+			this.modelOffsetX = var1.readShort(); // L: 457
+			this.modelOffsetY = var1.readShort(); // L: 458
+			this.modelAngleX = var1.readUnsignedShort(); // L: 459
+			this.modelAngleY = var1.readUnsignedShort(); // L: 460
+			this.modelAngleZ = var1.readUnsignedShort(); // L: 461
+			this.modelZoom = var1.readUnsignedShort(); // L: 462
+			this.sequenceId = var1.readUnsignedShort(); // L: 463
+			if (this.sequenceId == 65535) { // L: 464
 				this.sequenceId = -1;
 			}
 
-			this.modelOrthog = var1.readUnsignedByte() == 1; // L: 438
-			var1.readUnsignedShort(); // L: 439
-			if (this.widthAlignment != 0) { // L: 440
-				this.field3013 = var1.readUnsignedShort();
+			this.modelOrthog = var1.readUnsignedByte() == 1; // L: 465
+			var1.readUnsignedShort(); // L: 466
+			if (this.widthAlignment != 0) { // L: 467
+				this.field3011 = var1.readUnsignedShort();
 			}
 
-			if (this.heightAlignment != 0) { // L: 441
-				var1.readUnsignedShort(); // L: 442
+			if (this.heightAlignment != 0) { // L: 468
+				var1.readUnsignedShort(); // L: 469
 			}
 		}
 
-		if (this.type == 4) { // L: 445
-			this.fontId = var1.readUnsignedShort(); // L: 446
-			if (this.fontId == 65535) { // L: 447
+		if (this.type == 4) { // L: 472
+			this.fontId = var1.readUnsignedShort(); // L: 473
+			if (this.fontId == 65535) { // L: 474
 				this.fontId = -1;
 			}
 
-			this.text = var1.readStringCp1252NullTerminated(); // L: 448
-			this.textLineHeight = var1.readUnsignedByte(); // L: 449
-			this.textXAlignment = var1.readUnsignedByte(); // L: 450
-			this.textYAlignment = var1.readUnsignedByte(); // L: 451
-			this.textShadowed = var1.readUnsignedByte() == 1; // L: 452
-			this.color = var1.readInt(); // L: 453
+			this.text = var1.readStringCp1252NullTerminated(); // L: 475
+			this.textLineHeight = var1.readUnsignedByte(); // L: 476
+			this.textXAlignment = var1.readUnsignedByte(); // L: 477
+			this.textYAlignment = var1.readUnsignedByte(); // L: 478
+			this.textShadowed = var1.readUnsignedByte() == 1; // L: 479
+			this.color = var1.readInt(); // L: 480
 		}
 
-		if (this.type == 3) { // L: 455
-			this.color = var1.readInt(); // L: 456
-			this.fill = var1.readUnsignedByte() == 1; // L: 457
-			this.transparencyTop = var1.readUnsignedByte(); // L: 458
+		if (this.type == 3) { // L: 482
+			this.color = var1.readInt(); // L: 483
+			this.fill = var1.readUnsignedByte() == 1; // L: 484
+			this.transparencyTop = var1.readUnsignedByte(); // L: 485
 		}
 
-		if (this.type == 9) { // L: 460
-			this.lineWid = var1.readUnsignedByte(); // L: 461
-			this.color = var1.readInt(); // L: 462
-			this.field2992 = var1.readUnsignedByte() == 1; // L: 463
+		if (this.type == 9) { // L: 487
+			this.lineWid = var1.readUnsignedByte(); // L: 488
+			this.color = var1.readInt(); // L: 489
+			this.field2994 = var1.readUnsignedByte() == 1; // L: 490
 		}
 
-		this.flags = var1.readMedium(); // L: 465
-		this.dataText = var1.readStringCp1252NullTerminated(); // L: 466
-		int var2 = var1.readUnsignedByte(); // L: 467
-		if (var2 > 0) { // L: 468
-			this.actions = new String[var2]; // L: 469
+		this.flags = var1.readMedium(); // L: 492
+		this.dataText = var1.readStringCp1252NullTerminated(); // L: 493
+		int var2 = var1.readUnsignedByte(); // L: 494
+		if (var2 > 0) { // L: 495
+			this.actions = new String[var2]; // L: 496
 
-			for (int var3 = 0; var3 < var2; ++var3) { // L: 470
+			for (int var3 = 0; var3 < var2; ++var3) { // L: 497
 				this.actions[var3] = var1.readStringCp1252NullTerminated();
 			}
 		}
 
-		this.dragZoneSize = var1.readUnsignedByte(); // L: 472
-		this.dragThreshold = var1.readUnsignedByte(); // L: 473
-		this.isScrollBar = var1.readUnsignedByte() == 1; // L: 474
-		this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 475
-		this.onLoad = this.readListener(var1); // L: 476
-		this.onMouseOver = this.readListener(var1); // L: 477
-		this.onMouseLeave = this.readListener(var1); // L: 478
-		this.onTargetLeave = this.readListener(var1); // L: 479
-		this.onTargetEnter = this.readListener(var1); // L: 480
-		this.onVarTransmit = this.readListener(var1); // L: 481
-		this.onInvTransmit = this.readListener(var1); // L: 482
-		this.onStatTransmit = this.readListener(var1); // L: 483
-		this.onTimer = this.readListener(var1); // L: 484
-		this.onOp = this.readListener(var1); // L: 485
-		this.onMouseRepeat = this.readListener(var1); // L: 486
-		this.onClick = this.readListener(var1); // L: 487
-		this.onClickRepeat = this.readListener(var1); // L: 488
-		this.onRelease = this.readListener(var1); // L: 489
-		this.onHold = this.readListener(var1); // L: 490
-		this.onDrag = this.readListener(var1); // L: 491
-		this.onDragComplete = this.readListener(var1); // L: 492
-		this.onScroll = this.readListener(var1); // L: 493
-		this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 494
-		this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 495
-		this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 496
-	} // L: 497
+		this.dragZoneSize = var1.readUnsignedByte(); // L: 499
+		this.dragThreshold = var1.readUnsignedByte(); // L: 500
+		this.isScrollBar = var1.readUnsignedByte() == 1; // L: 501
+		this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 502
+		this.onLoad = this.readListener(var1); // L: 503
+		this.onMouseOver = this.readListener(var1); // L: 504
+		this.onMouseLeave = this.readListener(var1); // L: 505
+		this.onTargetLeave = this.readListener(var1); // L: 506
+		this.onTargetEnter = this.readListener(var1); // L: 507
+		this.onVarTransmit = this.readListener(var1); // L: 508
+		this.onInvTransmit = this.readListener(var1); // L: 509
+		this.onStatTransmit = this.readListener(var1); // L: 510
+		this.onTimer = this.readListener(var1); // L: 511
+		this.onOp = this.readListener(var1); // L: 512
+		this.onMouseRepeat = this.readListener(var1); // L: 513
+		this.onClick = this.readListener(var1); // L: 514
+		this.onClickRepeat = this.readListener(var1); // L: 515
+		this.onRelease = this.readListener(var1); // L: 516
+		this.onHold = this.readListener(var1); // L: 517
+		this.onDrag = this.readListener(var1); // L: 518
+		this.onDragComplete = this.readListener(var1); // L: 519
+		this.onScroll = this.readListener(var1); // L: 520
+		this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 521
+		this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 522
+		this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 523
+	} // L: 524
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)[Ljava/lang/Object;",
-		garbageValue = "1385511394"
+		descriptor = "(Lnt;I)[Ljava/lang/Object;",
+		garbageValue = "535834146"
 	)
 	@Export("readListener")
 	Object[] readListener(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 500
-		if (var2 == 0) { // L: 501
+		int var2 = var1.readUnsignedByte(); // L: 527
+		if (var2 == 0) { // L: 528
 			return null;
 		} else {
-			Object[] var3 = new Object[var2]; // L: 502
+			Object[] var3 = new Object[var2]; // L: 529
 
-			for (int var4 = 0; var4 < var2; ++var4) { // L: 503
-				int var5 = var1.readUnsignedByte(); // L: 504
+			for (int var4 = 0; var4 < var2; ++var4) { // L: 530
+				int var5 = var1.readUnsignedByte(); // L: 531
 				if (var5 == 0) {
-					var3[var4] = new Integer(var1.readInt()); // L: 505
-				} else if (var5 == 1) { // L: 506
+					var3[var4] = new Integer(var1.readInt()); // L: 532
+				} else if (var5 == 1) { // L: 533
 					var3[var4] = var1.readStringCp1252NullTerminated();
 				}
 			}
 
-			this.hasListener = true; // L: 508
-			return var3; // L: 509
+			this.hasListener = true; // L: 535
+			return var3; // L: 536
 		}
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)[I",
-		garbageValue = "548579688"
+		descriptor = "(Lnt;B)[I",
+		garbageValue = "-86"
 	)
 	@Export("readListenerTriggers")
 	int[] readListenerTriggers(Buffer var1) {
-		int var2 = var1.readUnsignedByte(); // L: 513
-		if (var2 == 0) { // L: 514
+		int var2 = var1.readUnsignedByte(); // L: 540
+		if (var2 == 0) { // L: 541
 			return null;
 		} else {
-			int[] var3 = new int[var2]; // L: 515
+			int[] var3 = new int[var2]; // L: 542
 
-			for (int var4 = 0; var4 < var2; ++var4) { // L: 516
-				var3[var4] = var1.readInt(); // L: 517
+			for (int var4 = 0; var4 < var2; ++var4) { // L: 543
+				var3[var4] = var1.readInt(); // L: 544
 			}
 
-			return var3; // L: 519
+			return var3; // L: 546
+		}
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-103507162"
+	)
+	@Export("swapItems")
+	public void swapItems(int var1, int var2) {
+		int var3 = this.itemIds[var2]; // L: 550
+		this.itemIds[var2] = this.itemIds[var1]; // L: 551
+		this.itemIds[var1] = var3; // L: 552
+		var3 = this.itemQuantities[var2]; // L: 553
+		this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 554
+		this.itemQuantities[var1] = var3; // L: 555
+	} // L: 556
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(ZB)Loa;",
+		garbageValue = "32"
+	)
+	@Export("getSprite")
+	public SpritePixels getSprite(boolean var1) {
+		field2958 = false; // L: 559
+		int var2;
+		if (var1) { // L: 561
+			var2 = this.spriteId;
+		} else {
+			var2 = this.spriteId2; // L: 562
+		}
+
+		if (var2 == -1) { // L: 563
+			return null;
+		} else {
+			long var3 = (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 564
+			SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 565
+			if (var5 != null) { // L: 566
+				return var5;
+			} else {
+				var5 = Tile.SpriteBuffer_getSprite(class44.Widget_spritesArchive, var2, 0); // L: 567
+				if (var5 == null) { // L: 568
+					field2958 = true; // L: 569
+					return null; // L: 570
+				} else {
+					if (this.spriteFlipV) { // L: 572
+						var5.flipVertically();
+					}
+
+					if (this.spriteFlipH) { // L: 573
+						var5.flipHorizontally();
+					}
+
+					if (this.outline > 0) { // L: 574
+						var5.pad(this.outline);
+					}
+
+					if (this.outline >= 1) { // L: 575
+						var5.outline(1);
+					}
+
+					if (this.outline >= 2) { // L: 576
+						var5.outline(16777215);
+					}
+
+					if (this.spriteShadow != 0) { // L: 577
+						var5.shadow(this.spriteShadow);
+					}
+
+					Widget_cachedSprites.put(var5, var3); // L: 578
+					return var5; // L: 579
+				}
+			}
 		}
 	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-296871230"
-	)
-	@Export("swapItems")
-	public void swapItems(int var1, int var2) {
-		int var3 = this.itemIds[var2]; // L: 523
-		this.itemIds[var2] = this.itemIds[var1]; // L: 524
-		this.itemIds[var1] = var3; // L: 525
-		var3 = this.itemQuantities[var2]; // L: 526
-		this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 527
-		this.itemQuantities[var1] = var3; // L: 528
-	} // L: 529
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)Loh;",
-		garbageValue = "-903165753"
-	)
-	@Export("getSprite")
-	public SpritePixels getSprite(boolean var1) {
-		field2956 = false; // L: 532
-		int var2;
-		if (var1) { // L: 534
-			var2 = this.spriteId;
-		} else {
-			var2 = this.spriteId2; // L: 535
-		}
-
-		if (var2 == -1) { // L: 536
-			return null;
-		} else {
-			long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 537
-			SpritePixels var5 = (SpritePixels)Widget_cachedSprites.get(var3); // L: 538
-			if (var5 != null) { // L: 539
-				return var5;
-			} else {
-				var5 = ClientPacket.SpriteBuffer_getSprite(class245.Widget_spritesArchive, var2, 0); // L: 540
-				if (var5 == null) { // L: 541
-					field2956 = true; // L: 542
-					return null; // L: 543
-				} else {
-					if (this.spriteFlipV) { // L: 545
-						var5.flipVertically();
-					}
-
-					if (this.spriteFlipH) { // L: 546
-						var5.flipHorizontally();
-					}
-
-					if (this.outline > 0) { // L: 547
-						var5.pad(this.outline);
-					}
-
-					if (this.outline >= 1) { // L: 548
-						var5.outline(1);
-					}
-
-					if (this.outline >= 2) { // L: 549
-						var5.outline(16777215);
-					}
-
-					if (this.spriteShadow != 0) { // L: 550
-						var5.shadow(this.spriteShadow);
-					}
-
-					Widget_cachedSprites.put(var5, var3); // L: 551
-					return var5; // L: 552
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lkt;",
-		garbageValue = "363940871"
+		descriptor = "(I)Lkj;",
+		garbageValue = "-1064213642"
 	)
 	@Export("getFont")
 	public Font getFont() {
-		field2956 = false; // L: 556
-		if (this.fontId == -1) { // L: 557
+		field2958 = false; // L: 583
+		if (this.fontId == -1) { // L: 584
 			return null;
 		} else {
-			Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 558
-			if (var1 != null) { // L: 559
+			Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 585
+			if (var1 != null) { // L: 586
 				return var1;
 			} else {
-				var1 = AbstractArchive.method5018(class245.Widget_spritesArchive, VertexNormal.Widget_fontsArchive, this.fontId, 0); // L: 560
+				var1 = Bounds.method6034(class44.Widget_spritesArchive, ChatChannel.Widget_fontsArchive, this.fontId, 0); // L: 587
 				if (var1 != null) {
-					Widget_cachedFonts.put(var1, (long)this.fontId); // L: 561
+					Widget_cachedFonts.put(var1, (long)this.fontId); // L: 588
 				} else {
-					field2956 = true; // L: 562
+					field2958 = true; // L: 589
 				}
 
-				return var1; // L: 563
+				return var1; // L: 590
 			}
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(II)Loh;",
-		garbageValue = "-1449831748"
+		descriptor = "(IB)Loa;",
+		garbageValue = "39"
 	)
 	@Export("getInventorySprite")
 	public SpritePixels getInventorySprite(int var1) {
-		field2956 = false; // L: 567
-		if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 568
-			int var2 = this.inventorySprites[var1]; // L: 569
-			if (var2 == -1) { // L: 570
+		field2958 = false; // L: 594
+		if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 595
+			int var2 = this.inventorySprites[var1]; // L: 596
+			if (var2 == -1) { // L: 597
 				return null;
 			} else {
-				SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 571
-				if (var3 != null) { // L: 572
+				SpritePixels var3 = (SpritePixels)Widget_cachedSprites.get((long)var2); // L: 598
+				if (var3 != null) { // L: 599
 					return var3;
 				} else {
-					var3 = ClientPacket.SpriteBuffer_getSprite(class245.Widget_spritesArchive, var2, 0); // L: 573
-					if (var3 != null) { // L: 574
+					var3 = Tile.SpriteBuffer_getSprite(class44.Widget_spritesArchive, var2, 0); // L: 600
+					if (var3 != null) { // L: 601
 						Widget_cachedSprites.put(var3, (long)var2);
 					} else {
-						field2956 = true; // L: 575
+						field2958 = true; // L: 602
 					}
 
-					return var3; // L: 576
+					return var3; // L: 603
 				}
 			}
 		} else {
@@ -1381,184 +1368,165 @@ public class Widget extends Node {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lfl;IZLic;S)Lgr;",
-		garbageValue = "765"
+		descriptor = "(Lfm;IZLih;B)Lgd;",
+		garbageValue = "-1"
 	)
 	@Export("getModel")
 	public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerComposition var4) {
-		field2956 = false; // L: 580
+		field2958 = false; // L: 607
 		int var5;
 		int var6;
-		if (var3) { // L: 583
-			var5 = this.modelType2; // L: 584
-			var6 = this.modelId2; // L: 585
+		if (var3) { // L: 610
+			var5 = this.modelType2; // L: 611
+			var6 = this.modelId2; // L: 612
 		} else {
-			var5 = this.modelType; // L: 588
-			var6 = this.modelId; // L: 589
+			var5 = this.modelType; // L: 615
+			var6 = this.modelId; // L: 616
 		}
 
-		if (var5 == 0) { // L: 591
+		if (var5 == 0) { // L: 618
 			return null;
-		} else if (var5 == 1 && var6 == -1) { // L: 592
+		} else if (var5 == 1 && var6 == -1) { // L: 619
 			return null;
 		} else {
-			Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 593
-			if (var7 == null) { // L: 594
+			Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 620
+			if (var7 == null) { // L: 621
 				ModelData var8;
-				if (var5 == 1) { // L: 596
-					var8 = ModelData.ModelData_get(SpriteMask.Widget_modelsArchive, var6, 0); // L: 597
-					if (var8 == null) { // L: 598
-						field2956 = true; // L: 599
-						return null; // L: 600
+				if (var5 == 1) { // L: 623
+					var8 = ModelData.ModelData_get(class375.Widget_modelsArchive, var6, 0); // L: 624
+					if (var8 == null) { // L: 625
+						field2958 = true; // L: 626
+						return null; // L: 627
 					}
 
-					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 602
+					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 629
 				}
 
-				if (var5 == 2) { // L: 604
-					var8 = StructComposition.getNpcDefinition(var6).getModelData(); // L: 605
-					if (var8 == null) { // L: 606
-						field2956 = true; // L: 607
-						return null; // L: 608
+				if (var5 == 2) { // L: 631
+					var8 = class248.getNpcDefinition(var6).getModelData(); // L: 632
+					if (var8 == null) { // L: 633
+						field2958 = true; // L: 634
+						return null; // L: 635
 					}
 
-					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 610
+					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 637
 				}
 
-				if (var5 == 3) { // L: 612
-					if (var4 == null) { // L: 613
+				if (var5 == 3) { // L: 639
+					if (var4 == null) { // L: 640
 						return null;
 					}
 
-					var8 = var4.getModelData(); // L: 614
-					if (var8 == null) { // L: 615
-						field2956 = true; // L: 616
-						return null; // L: 617
+					var8 = var4.getModelData(); // L: 641
+					if (var8 == null) { // L: 642
+						field2958 = true; // L: 643
+						return null; // L: 644
 					}
 
-					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 619
+					var7 = var8.toModel(64, 768, -50, -10, -50); // L: 646
 				}
 
-				if (var5 == 4) { // L: 621
-					ItemComposition var9 = class260.ItemDefinition_get(var6); // L: 622
-					var8 = var9.getModelData(10); // L: 623
-					if (var8 == null) { // L: 624
-						field2956 = true; // L: 625
-						return null; // L: 626
+				if (var5 == 4) { // L: 648
+					ItemComposition var9 = class250.ItemDefinition_get(var6); // L: 649
+					var8 = var9.getModelData(10); // L: 650
+					if (var8 == null) { // L: 651
+						field2958 = true; // L: 652
+						return null; // L: 653
 					}
 
-					var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 628
+					var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 655
 				}
 
-				Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 630
+				Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 657
 			}
 
-			if (var1 != null) { // L: 632
-				var7 = var1.transformWidgetModel(var7, var2); // L: 633
+			if (var1 != null) { // L: 659
+				var7 = var1.transformWidgetModel(var7, var2); // L: 660
 			}
 
-			return var7; // L: 635
+			return var7; // L: 662
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)Lit;",
-		garbageValue = "1203194660"
+		descriptor = "(ZI)Liq;",
+		garbageValue = "-1028341940"
 	)
 	@Export("getSpriteMask")
 	public SpriteMask getSpriteMask(boolean var1) {
-		if (this.spriteId == -1) { // L: 639
+		if (this.spriteId == -1) { // L: 666
 			var1 = false;
 		}
 
-		int var2 = var1 ? this.spriteId * 1725494073 * -1286862071 : this.spriteId2 * -879658487 * -1111346119; // L: 640
-		if (var2 == -1) { // L: 641
+		int var2 = var1 ? this.spriteId * -1019565859 * -1228050571 : this.spriteId2 * -241980903 * 218370601; // L: 667
+		if (var2 == -1) { // L: 668
 			return null;
 		} else {
-			long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); // L: 642
-			SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 643
-			if (var5 != null) { // L: 644
+			long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39); // L: 669
+			SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 670
+			if (var5 != null) { // L: 671
 				return var5;
 			} else {
-				SpritePixels var6 = this.getSprite(var1); // L: 645
-				if (var6 == null) { // L: 646
+				SpritePixels var6 = this.getSprite(var1); // L: 672
+				if (var6 == null) { // L: 673
 					return null;
 				} else {
-					SpritePixels var7 = var6.copyNormalized(); // L: 647
-					int[] var8 = new int[var7.subHeight]; // L: 648
-					int[] var9 = new int[var7.subHeight]; // L: 649
+					SpritePixels var7 = var6.copyNormalized(); // L: 674
+					int[] var8 = new int[var7.subHeight]; // L: 675
+					int[] var9 = new int[var7.subHeight]; // L: 676
 
-					for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 650
-						int var11 = 0; // L: 651
-						int var12 = var7.subWidth; // L: 652
+					for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 677
+						int var11 = 0; // L: 678
+						int var12 = var7.subWidth; // L: 679
 
 						int var13;
-						for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 653
-							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 654
-								var11 = var13; // L: 655
+						for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 680
+							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 681
+								var11 = var13; // L: 682
 								break;
 							}
 						}
 
-						for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 659
-							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 660
-								var12 = var13 + 1; // L: 661
+						for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 686
+							if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 687
+								var12 = var13 + 1; // L: 688
 								break;
 							}
 						}
 
-						var8[var10] = var11; // L: 665
-						var9[var10] = var12 - var11; // L: 666
+						var8[var10] = var11; // L: 692
+						var9[var10] = var12 - var11; // L: 693
 					}
 
-					var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 668
-					Widget_cachedSpriteMasks.put(var5, var3); // L: 669
-					return var5; // L: 670
+					var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 695
+					Widget_cachedSpriteMasks.put(var5, var3); // L: 696
+					return var5; // L: 697
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)V",
-		garbageValue = "-22"
+		descriptor = "(ILjava/lang/String;S)V",
+		garbageValue = "16904"
 	)
 	@Export("setAction")
 	public void setAction(int var1, String var2) {
-		if (this.actions == null || this.actions.length <= var1) { // L: 674
-			String[] var3 = new String[var1 + 1]; // L: 675
-			if (this.actions != null) { // L: 676
-				for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 677
+		if (this.actions == null || this.actions.length <= var1) { // L: 701
+			String[] var3 = new String[var1 + 1]; // L: 702
+			if (this.actions != null) { // L: 703
+				for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 704
 					var3[var4] = this.actions[var4];
 				}
 			}
 
-			this.actions = var3; // L: 679
+			this.actions = var3; // L: 706
 		}
 
-		this.actions[var1] = var2; // L: 681
-	} // L: 682
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "3623"
-	)
-	public static void method4759() {
-		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 88
-			if (ArchiveDiskActionHandler.field3562 != 0) { // L: 89
-				ArchiveDiskActionHandler.field3562 = 1; // L: 90
-
-				try {
-					ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 92
-				} catch (InterruptedException var3) { // L: 94
-				}
-			}
-
-		}
-	} // L: 97
+		this.actions[var1] = var2; // L: 708
+	} // L: 709
 }
diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java
index 84e39a00b2..383c657925 100644
--- a/runescape-client/src/main/java/World.java
+++ b/runescape-client/src/main/java/World.java
@@ -3,80 +3,73 @@ 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("bg")
+@ObfuscatedName("bk")
 @Implements("World")
 public class World {
 	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "[Lbk;"
+	)
+	@Export("World_worlds")
+	static World[] World_worlds;
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1267509105
+		intValue = -1728801439
 	)
 	@Export("World_count")
 	static int World_count;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1119546685
+		intValue = -1039031469
 	)
 	@Export("World_listCount")
 	static int World_listCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("World_sortOption2")
 	static int[] World_sortOption2;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("World_sortOption1")
 	static int[] World_sortOption1;
-	@ObfuscatedName("fu")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lmu;"
+		descriptor = "Ldc;"
 	)
-	@Export("WorldMapElement_fonts")
-	static Fonts WorldMapElement_fonts;
-	@ObfuscatedName("jz")
-	@ObfuscatedSignature(
-		descriptor = "Lgh;"
-	)
-	@Export("textureProvider")
-	static TextureProvider textureProvider;
-	@ObfuscatedName("li")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("mousedOverWidgetIf1")
-	static Widget mousedOverWidgetIf1;
-	@ObfuscatedName("u")
+	@Export("World_request")
+	static UrlRequest World_request;
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1428153959
+		intValue = -1045630855
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 264436593
+		intValue = 425898455
 	)
 	@Export("properties")
 	int properties;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -508707417
+		intValue = -372282787
 	)
 	@Export("population")
 	int population;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("host")
 	String host;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("activity")
 	String activity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1484367493
+		intValue = -1961893903
 	)
 	@Export("location")
 	int location;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2005307775
+		intValue = 724778095
 	)
 	@Export("index")
 	int index;
@@ -94,439 +87,248 @@ public class World {
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "2086816927"
+		garbageValue = "1633198198"
 	)
 	@Export("isMembersOnly")
 	boolean isMembersOnly() {
-		return (1 & this.properties) != 0;
+		return (1 & this.properties) != 0; // L: 247
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1823181912"
+		garbageValue = "-896740127"
 	)
-	boolean method1638() {
-		return (2 & this.properties) != 0; // L: 261
+	boolean method1749() {
+		return (2 & this.properties) != 0; // L: 251
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1133674448"
+		garbageValue = "1876446967"
 	)
 	@Export("isPvp")
 	boolean isPvp() {
-		return (4 & this.properties) != 0; // L: 265
+		return (4 & this.properties) != 0; // L: 255
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-1123465891"
+		garbageValue = "-2071254222"
 	)
-	boolean method1640() {
-		return (8 & this.properties) != 0; // L: 269
+	boolean method1757() {
+		return (8 & this.properties) != 0; // L: 259
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "504803099"
+		garbageValue = "1854711947"
 	)
 	@Export("isDeadman")
 	boolean isDeadman() {
-		return (536870912 & this.properties) != 0;
+		return (536870912 & this.properties) != 0; // L: 263
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(S)Z",
-		garbageValue = "255"
+		descriptor = "(I)Z",
+		garbageValue = "39105033"
 	)
 	@Export("isBeta")
 	boolean isBeta() {
-		return (33554432 & this.properties) != 0;
+		return (33554432 & this.properties) != 0; // L: 267
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(S)Z",
+		garbageValue = "-31490"
+	)
+	boolean method1778() {
+		return (1073741824 & this.properties) != 0; // L: 271
 	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "12"
+		descriptor = "(III)V",
+		garbageValue = "-2001631546"
 	)
-	boolean method1643() {
-		return (1073741824 & this.properties) != 0;
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-577854303"
-	)
-	@Export("addGameMessage")
-	static void addGameMessage(int var0, String var1, String var2) {
-		class5.addChatMessage(var0, var1, var2, (String)null); // L: 19
-	} // L: 20
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Lcz;III)V",
-		garbageValue = "704254621"
-	)
-	@Export("runScript")
-	static void runScript(ScriptEvent var0, int var1, int var2) {
-		Object[] var3 = var0.args; // L: 110
-		Script var4;
-		int var19;
-		if (NPC.isWorldMapEvent(var0.type)) { // L: 112
-			class69.worldMapEvent = (WorldMapEvent)var3[0]; // L: 113
-			WorldMapElement var5 = class6.WorldMapElement_get(class69.worldMapEvent.mapElement); // L: 114
-			var4 = class43.getWorldMapScript(var0.type, var5.objectId, var5.category); // L: 115
-		} else {
-			var19 = (Integer)var3[0]; // L: 118
-			var4 = ApproximateRouteStrategy.getScript(var19); // L: 119
-		}
-
-		if (var4 != null) { // L: 121
-			class44.Interpreter_intStackSize = 0; // L: 124
-			Interpreter.Interpreter_stringStackSize = 0; // L: 125
-			var19 = -1; // L: 126
-			int[] var6 = var4.opcodes; // L: 127
-			int[] var7 = var4.intOperands; // L: 128
-			byte var8 = -1; // L: 129
-			Interpreter.Interpreter_frameDepth = 0; // L: 130
-			Interpreter.field973 = false; // L: 131
-			boolean var9 = false; // L: 132
-			int var10 = 0; // L: 133
-
-			try {
-				int var13;
-				try {
-					class368.Interpreter_intLocals = new int[var4.localIntCount]; // L: 135
-					int var11 = 0; // L: 136
-					Interpreter.Interpreter_stringLocals = new String[var4.localStringCount]; // L: 137
-					int var12 = 0; // L: 138
-
-					int var14;
-					String var20;
-					for (var13 = 1; var13 < var3.length; ++var13) { // L: 139
-						if (var3[var13] instanceof Integer) { // L: 140
-							var14 = (Integer)var3[var13]; // L: 141
-							if (var14 == -2147483647) { // L: 142
-								var14 = var0.mouseX;
-							}
-
-							if (var14 == -2147483646) { // L: 143
-								var14 = var0.mouseY;
-							}
-
-							if (var14 == -2147483645) { // L: 144
-								var14 = var0.widget != null ? var0.widget.id * 1969535585 * -1722455647 : -1;
-							}
-
-							if (var14 == -2147483644) { // L: 145
-								var14 = var0.opIndex;
-							}
-
-							if (var14 == -2147483643) { // L: 146
-								var14 = var0.widget != null ? var0.widget.childIndex * 41180389 * 1926103277 : -1;
-							}
-
-							if (var14 == -2147483642) { // L: 147
-								var14 = var0.dragTarget != null ? var0.dragTarget.id * 1969535585 * -1722455647 : -1;
-							}
-
-							if (var14 == -2147483641) { // L: 148
-								var14 = var0.dragTarget != null ? var0.dragTarget.childIndex * 41180389 * 1926103277 : -1;
-							}
-
-							if (var14 == -2147483640) { // L: 149
-								var14 = var0.keyTyped;
-							}
-
-							if (var14 == -2147483639) { // L: 150
-								var14 = var0.keyPressed;
-							}
-
-							class368.Interpreter_intLocals[var11++] = var14; // L: 151
-						} else if (var3[var13] instanceof String) { // L: 153
-							var20 = (String)var3[var13]; // L: 154
-							if (var20.equals("event_opbase")) { // L: 155
-								var20 = var0.targetName;
-							}
-
-							Interpreter.Interpreter_stringLocals[var12++] = var20; // L: 156
-						}
-					}
-
-					Interpreter.field987 = var0.field1180; // L: 160
-
-					while (true) {
-						++var10; // L: 162
-						if (var10 > var1) { // L: 163
-							throw new RuntimeException();
-						}
-
-						++var19; // L: 164
-						int var31 = var6[var19];
-						if (var31 >= 100) { // L: 165
-							boolean var32;
-							if (var4.intOperands[var19] == 1) { // L: 383
-								var32 = true;
-							} else {
-								var32 = false; // L: 384
-							}
-
-							var14 = IgnoreList.method5628(var31, var4, var32); // L: 385
-							switch(var14) { // L: 386
-							case 0:
-								return;
-							case 1:
-							default:
-								break;
-							case 2:
-								throw new IllegalStateException(); // L: 393
-							}
-						} else if (var31 == 0) { // L: 166
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7[var19]; // L: 167
-						} else if (var31 == ScriptOpcodes.GET_VARP) { // L: 170
-							var13 = var7[var19]; // L: 171
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Varps.Varps_main[var13]; // L: 172
-						} else if (var31 == ScriptOpcodes.SET_VARP) { // L: 175
-							var13 = var7[var19]; // L: 176
-							Varps.Varps_main[var13] = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 177
-							ApproximateRouteStrategy.changeGameOptions(var13); // L: 178
-						} else if (var31 == ScriptOpcodes.SCONST) { // L: 181
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.stringOperands[var19]; // L: 182
-						} else if (var31 == ScriptOpcodes.JUMP) { // L: 185
-							var19 += var7[var19]; // L: 186
-						} else if (var31 == ScriptOpcodes.IF_ICMPNE) { // L: 189
-							class44.Interpreter_intStackSize -= 2; // L: 190
-							if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 191
-								var19 += var7[var19];
-							}
-						} else if (var31 == ScriptOpcodes.IF_ICMPEQ) { // L: 194
-							class44.Interpreter_intStackSize -= 2; // L: 195
-							if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 196
-								var19 += var7[var19];
-							}
-						} else if (var31 == ScriptOpcodes.IF_ICMPLT) { // L: 199
-							class44.Interpreter_intStackSize -= 2; // L: 200
-							if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 201
-								var19 += var7[var19];
-							}
-						} else if (var31 == ScriptOpcodes.IF_ICMPGT) { // L: 204
-							class44.Interpreter_intStackSize -= 2; // L: 205
-							if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 206
-								var19 += var7[var19];
-							}
-						} else if (var31 == ScriptOpcodes.RETURN) { // L: 209
-							if (Interpreter.Interpreter_frameDepth == 0) { // L: 210
-								return; // L: 417
-							}
-
-							ScriptFrame var37 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 211
-							var4 = var37.script; // L: 212
-							var6 = var4.opcodes; // L: 213
-							var7 = var4.intOperands; // L: 214
-							var19 = var37.pc; // L: 215
-							class368.Interpreter_intLocals = var37.intLocals; // L: 216
-							Interpreter.Interpreter_stringLocals = var37.stringLocals; // L: 217
-						} else if (var31 == ScriptOpcodes.GET_VARBIT) { // L: 220
-							var13 = var7[var19]; // L: 221
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Skeleton.getVarbit(var13); // L: 222
-						} else if (var31 == ScriptOpcodes.SET_VARBIT) { // L: 225
-							var13 = var7[var19]; // L: 226
-							Login.method1951(var13, Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 227
-						} else if (var31 == ScriptOpcodes.IF_ICMPLE) { // L: 230
-							class44.Interpreter_intStackSize -= 2; // L: 231
-							if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 232
-								var19 += var7[var19];
-							}
-						} else if (var31 == ScriptOpcodes.IF_ICMPGE) { // L: 235
-							class44.Interpreter_intStackSize -= 2; // L: 236
-							if (Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]) { // L: 237
-								var19 += var7[var19];
-							}
-						} else if (var31 == ScriptOpcodes.ILOAD) { // L: 240
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class368.Interpreter_intLocals[var7[var19]]; // L: 241
-						} else if (var31 == ScriptOpcodes.ISTORE) { // L: 244
-							class368.Interpreter_intLocals[var7[var19]] = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 245
-						} else if (var31 == ScriptOpcodes.SLOAD) { // L: 248
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var7[var19]]; // L: 249
-						} else if (var31 == ScriptOpcodes.SSTORE) { // L: 252
-							Interpreter.Interpreter_stringLocals[var7[var19]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 253
-						} else if (var31 == ScriptOpcodes.JOIN_STRING) { // L: 256
-							var13 = var7[var19]; // L: 257
-							Interpreter.Interpreter_stringStackSize -= var13; // L: 258
-							var20 = BuddyRankComparator.method2484(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var13); // L: 259
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var20; // L: 260
-						} else if (var31 == ScriptOpcodes.POP_INT) { // L: 263
-							--class44.Interpreter_intStackSize; // L: 264
-						} else if (var31 == ScriptOpcodes.POP_STRING) { // L: 267
-							--Interpreter.Interpreter_stringStackSize; // L: 268
-						} else {
-							int var17;
-							if (var31 != ScriptOpcodes.INVOKE) { // L: 271
-								if (var31 == ScriptOpcodes.GET_VARC_INT) { // L: 294
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.varcs.getInt(var7[var19]); // L: 295
-								} else if (var31 == ScriptOpcodes.SET_VARC_INT) { // L: 298
-									GrandExchangeOfferOwnWorldComparator.varcs.setInt(var7[var19], Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 299
-								} else if (var31 == ScriptOpcodes.DEFINE_ARRAY) { // L: 302
-									var13 = var7[var19] >> 16; // L: 303
-									var14 = var7[var19] & 65535; // L: 304
-									int var23 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 305
-									if (var23 < 0 || var23 > 5000) { // L: 306
-										throw new RuntimeException(); // L: 307
-									}
-
-									Interpreter.Interpreter_arrayLengths[var13] = var23; // L: 309
-									byte var24 = -1; // L: 310
-									if (var14 == 105) { // L: 311
-										var24 = 0;
-									}
-
-									for (var17 = 0; var17 < var23; ++var17) { // L: 312
-										Interpreter.Interpreter_arrays[var13][var17] = var24;
-									}
-								} else if (var31 == ScriptOpcodes.GET_ARRAY_INT) { // L: 315
-									var13 = var7[var19]; // L: 316
-									var14 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 317
-									if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 318
-										throw new RuntimeException(); // L: 319
-									}
-
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var13][var14]; // L: 321
-								} else if (var31 == ScriptOpcodes.SET_ARRAY_INT) { // L: 324
-									var13 = var7[var19]; // L: 325
-									class44.Interpreter_intStackSize -= 2; // L: 326
-									var14 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 327
-									if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var13]) { // L: 328
-										throw new RuntimeException(); // L: 329
-									}
-
-									Interpreter.Interpreter_arrays[var13][var14] = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 331
-								} else {
-									String var21;
-									if (var31 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 334
-										var21 = GrandExchangeOfferOwnWorldComparator.varcs.getStringOld(var7[var19]); // L: 335
-										if (var21 == null) { // L: 336
-											var21 = "null";
-										}
-
-										Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 337
-									} else if (var31 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 340
-										GrandExchangeOfferOwnWorldComparator.varcs.setStringOld(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 341
-									} else if (var31 == ScriptOpcodes.GET_VARC_STRING) { // L: 344
-										var21 = GrandExchangeOfferOwnWorldComparator.varcs.getString(var7[var19]); // L: 345
-										Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var21; // L: 346
-									} else if (var31 == ScriptOpcodes.SET_VARC_STRING) { // L: 349
-										GrandExchangeOfferOwnWorldComparator.varcs.setString(var7[var19], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 350
-									} else if (var31 == ScriptOpcodes.SWITCH) { // L: 353
-										IterableNodeHashTable var35 = var4.switches[var7[var19]]; // L: 354
-										IntegerNode var34 = (IntegerNode)var35.get((long)Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 355
-										if (var34 != null) { // L: 356
-											var19 += var34.integer;
-										}
-									} else {
-										Integer var36;
-										if (var31 == 74) { // L: 359
-											var36 = class26.field220.getTitleGroupValue(var7[var19]); // L: 360
-											if (var36 == null) { // L: 361
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 362
-											} else {
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var36; // L: 365
-											}
-										} else {
-											if (var31 != 76) { // L: 369
-												throw new IllegalStateException(); // L: 379
-											}
-
-											var36 = class34.field254.method6014(var7[var19]); // L: 370
-											if (var36 == null) { // L: 371
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 372
-											} else {
-												Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var36; // L: 375
-											}
-										}
-									}
-								}
-							} else {
-								var13 = var7[var19]; // L: 272
-								Script var33 = ApproximateRouteStrategy.getScript(var13); // L: 273
-								int[] var15 = new int[var33.localIntCount]; // L: 274
-								String[] var16 = new String[var33.localStringCount]; // L: 275
-
-								for (var17 = 0; var17 < var33.intArgumentCount; ++var17) { // L: 276
-									var15[var17] = Interpreter.Interpreter_intStack[var17 + (class44.Interpreter_intStackSize - var33.intArgumentCount)];
-								}
-
-								for (var17 = 0; var17 < var33.stringArgumentCount; ++var17) { // L: 277
-									var16[var17] = Interpreter.Interpreter_stringStack[var17 + (Interpreter.Interpreter_stringStackSize - var33.stringArgumentCount)];
-								}
-
-								class44.Interpreter_intStackSize -= var33.intArgumentCount; // L: 278
-								Interpreter.Interpreter_stringStackSize -= var33.stringArgumentCount; // L: 279
-								ScriptFrame var22 = new ScriptFrame(); // L: 280
-								var22.script = var4; // L: 281
-								var22.pc = var19; // L: 282
-								var22.intLocals = class368.Interpreter_intLocals; // L: 283
-								var22.stringLocals = Interpreter.Interpreter_stringLocals; // L: 284
-								Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var22; // L: 285
-								var4 = var33; // L: 286
-								var6 = var33.opcodes; // L: 287
-								var7 = var33.intOperands; // L: 288
-								var19 = -1; // L: 289
-								class368.Interpreter_intLocals = var15; // L: 290
-								Interpreter.Interpreter_stringLocals = var16; // L: 291
-							}
-						}
-					}
-				} catch (Exception var29) { // L: 399
-					var9 = true; // L: 400
-					StringBuilder var26 = new StringBuilder(30); // L: 402
-					var26.append("").append(var4.key).append(" "); // L: 403
-
-					for (var13 = Interpreter.Interpreter_frameDepth - 1; var13 >= 0; --var13) { // L: 404
-						var26.append("").append(Interpreter.Interpreter_frames[var13].script.key).append(" ");
-					}
-
-					var26.append("").append(var8); // L: 405
-					class266.RunException_sendStackTrace(var26.toString(), var29); // L: 406
-				}
-			} finally {
-				if (Interpreter.field973) { // L: 410
-					Interpreter.field986 = true; // L: 411
-					class4.method47(); // L: 412
-					Interpreter.field986 = false; // L: 413
-					Interpreter.field973 = false; // L: 414
-				}
-
-				if (!var9 && var2 > 0 && var10 >= var2) { // L: 416
-					class266.RunException_sendStackTrace("Warning: Script " + var4.field1084 + " finished at op count " + var10 + " of max " + var1, (Throwable)null);
-				}
+	@Export("changeWorldSelectSorting")
+	static void changeWorldSelectSorting(int var0, int var1) {
+		int[] var2 = new int[4]; // L: 63
+		int[] var3 = new int[4]; // L: 64
+		var2[0] = var0; // L: 65
+		var3[0] = var1; // L: 66
+		int var4 = 1; // L: 67
 
+		for (int var5 = 0; var5 < 4; ++var5) { // L: 68
+			if (World_sortOption1[var5] != var0) { // L: 69
+				var2[var4] = World_sortOption1[var5]; // L: 70
+				var3[var4] = World_sortOption2[var5]; // L: 71
+				++var4; // L: 72
 			}
 		}
-	} // L: 122 420
 
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IIIS)I",
-		garbageValue = "24074"
-	)
-	public static int method1685(int var0, int var1, int var2) {
-		int var3 = CollisionMap.method3185(var2 - var1 + 1); // L: 51
-		var3 <<= var1; // L: 52
-		return var0 & ~var3; // L: 53
-	}
+		World_sortOption1 = var2; // L: 75
+		World_sortOption2 = var3; // L: 76
+		FileSystem.sortWorlds(World_worlds, 0, World_worlds.length - 1, World_sortOption1, World_sortOption2); // L: 77
+	} // L: 78
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("ge")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1461307480"
+		descriptor = "(Lcl;IS)V",
+		garbageValue = "-356"
 	)
-	public static boolean method1663(int var0) {
-		return (var0 >> 30 & 1) != 0; // L: 29
-	}
+	@Export("updateActorSequence")
+	static final void updateActorSequence(Actor var0, int var1) {
+		if (var0.field1276 >= Client.cycle) { // L: 4089
+			Messages.method2461(var0);
+		} else if (var0.field1269 >= Client.cycle) { // L: 4090
+			WorldMapLabelSize.method3279(var0);
+		} else {
+			SoundCache.method930(var0); // L: 4091
+		}
+
+		if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 4092
+			var0.sequence = -1; // L: 4093
+			var0.spotAnimation = -1; // L: 4094
+			var0.field1276 = 0; // L: 4095
+			var0.field1269 = 0; // L: 4096
+			var0.x = var0.pathX[0] * 128 + var0.field1225 * 64; // L: 4097
+			var0.y = var0.field1225 * 64 + var0.pathY[0] * 128; // L: 4098
+			var0.method2263(); // L: 4099
+		}
+
+		if (class262.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 4101 4102
+			var0.sequence = -1; // L: 4103
+			var0.spotAnimation = -1; // L: 4104
+			var0.field1276 = 0; // L: 4105
+			var0.field1269 = 0; // L: 4106
+			var0.x = var0.field1225 * 64 + var0.pathX[0] * 128; // L: 4107
+			var0.y = var0.field1225 * 64 + var0.pathY[0] * 128; // L: 4108
+			var0.method2263(); // L: 4109
+		}
+
+		if (var0.field1275 != 0) { // L: 4113
+			if (var0.targetIndex != -1) { // L: 4114
+				Object var2 = null; // L: 4115
+				if (var0.targetIndex < 32768) { // L: 4116
+					var2 = Client.npcs[var0.targetIndex];
+				} else if (var0.targetIndex >= 32768) { // L: 4117
+					var2 = Client.players[var0.targetIndex - 32768];
+				}
+
+				if (var2 != null) { // L: 4118
+					int var3 = var0.x - ((Actor)var2).x; // L: 4119
+					int var4 = var0.y - ((Actor)var2).y; // L: 4120
+					if (var3 != 0 || var4 != 0) { // L: 4121
+						var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047;
+					}
+				} else if (var0.false0) { // L: 4123
+					var0.targetIndex = -1; // L: 4124
+					var0.false0 = false; // L: 4125
+				}
+			}
+
+			if (var0.field1280 != -1 && (var0.pathLength == 0 || var0.field1242 > 0)) { // L: 4128
+				var0.orientation = var0.field1280; // L: 4129
+				var0.field1280 = -1; // L: 4130
+			}
+
+			int var5 = var0.orientation - var0.rotation & 2047; // L: 4132
+			if (var5 == 0 && var0.false0) { // L: 4133
+				var0.targetIndex = -1; // L: 4134
+				var0.false0 = false; // L: 4135
+			}
+
+			if (var5 != 0) { // L: 4137
+				++var0.field1274; // L: 4138
+				boolean var7;
+				if (var5 > 1024) { // L: 4139
+					var0.rotation -= var0.field1275; // L: 4140
+					var7 = true; // L: 4141
+					if (var5 < var0.field1275 || var5 > 2048 - var0.field1275) { // L: 4142
+						var0.rotation = var0.orientation; // L: 4143
+						var7 = false; // L: 4144
+					}
+
+					if (var0.idleSequence == var0.movementSequence && (var0.field1274 > 25 || var7)) { // L: 4146
+						if (var0.turnLeftSequence != -1) { // L: 4147
+							var0.movementSequence = var0.turnLeftSequence;
+						} else {
+							var0.movementSequence = var0.walkSequence; // L: 4148
+						}
+					}
+				} else {
+					var0.rotation += var0.field1275; // L: 4152
+					var7 = true; // L: 4153
+					if (var5 < var0.field1275 || var5 > 2048 - var0.field1275) { // L: 4154
+						var0.rotation = var0.orientation; // L: 4155
+						var7 = false; // L: 4156
+					}
+
+					if (var0.idleSequence == var0.movementSequence && (var0.field1274 > 25 || var7)) { // L: 4158
+						if (var0.turnRightSequence != -1) { // L: 4159
+							var0.movementSequence = var0.turnRightSequence;
+						} else {
+							var0.movementSequence = var0.walkSequence; // L: 4160
+						}
+					}
+				}
+
+				var0.rotation &= 2047; // L: 4164
+			} else {
+				var0.field1274 = 0; // L: 4166
+			}
+		}
+
+		class0.method11(var0); // L: 4168
+	} // L: 4169
+
+	@ObfuscatedName("gq")
+	@ObfuscatedSignature(
+		descriptor = "(Lcj;IIB)V",
+		garbageValue = "2"
+	)
+	@Export("performPlayerAnimation")
+	static void performPlayerAnimation(Player var0, int var1, int var2) {
+		if (var0.sequence == var1 && var1 != -1) { // L: 4371
+			int var3 = WorldMapScaleHandler.SequenceDefinition_get(var1).field1894; // L: 4372
+			if (var3 == 1) { // L: 4373
+				var0.sequenceFrame = 0; // L: 4374
+				var0.sequenceFrameCycle = 0; // L: 4375
+				var0.sequenceDelay = var2; // L: 4376
+				var0.field1258 = 0; // L: 4377
+			}
+
+			if (var3 == 2) { // L: 4379
+				var0.field1258 = 0; // L: 4380
+			}
+		} else if (var1 == -1 || var0.sequence == -1 || WorldMapScaleHandler.SequenceDefinition_get(var1).field1892 >= WorldMapScaleHandler.SequenceDefinition_get(var0.sequence).field1892) { // L: 4383
+			var0.sequence = var1; // L: 4384
+			var0.sequenceFrame = 0; // L: 4385
+			var0.sequenceFrameCycle = 0; // L: 4386
+			var0.sequenceDelay = var2; // L: 4387
+			var0.field1258 = 0; // L: 4388
+			var0.field1281 = var0.pathLength; // L: 4389
+		}
+
+	} // L: 4391
+
+	@ObfuscatedName("kp")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1994807431"
+	)
+	@Export("FriendSystem_invalidateIgnoreds")
+	static final void FriendSystem_invalidateIgnoreds() {
+		class233.method4541(); // L: 11436
+		if (class289.friendsChat != null) { // L: 11437
+			class289.friendsChat.invalidateIgnoreds(); // L: 11438
+		}
+
+	} // L: 11440
 }
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index 27ff1f688c..7670e4bf67 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -10,280 +10,280 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mc")
+@ObfuscatedName("me")
 @Implements("WorldMap")
 public class WorldMap {
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("fontNameVerdana11")
 	static final FontName fontNameVerdana11;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("fontNameVerdana13")
 	static final FontName fontNameVerdana13;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lmv;"
+		descriptor = "Lmb;"
 	)
 	@Export("fontNameVerdana15")
 	static final FontName fontNameVerdana15;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("WorldMap_archive")
 	AbstractArchive WorldMap_archive;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("WorldMap_geographyArchive")
 	AbstractArchive WorldMap_geographyArchive;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("WorldMap_groundArchive")
 	AbstractArchive WorldMap_groundArchive;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "Lkt;"
+		descriptor = "Lkj;"
 	)
 	@Export("font")
 	Font font;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("fonts")
 	HashMap fonts;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "[Lof;"
 	)
 	@Export("mapSceneSprites")
 	IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@Export("details")
 	HashMap details;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lfa;"
 	)
 	@Export("mainMapArea")
 	WorldMapArea mainMapArea;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lfa;"
 	)
 	@Export("currentMapArea")
 	WorldMapArea currentMapArea;
-	@ObfuscatedName("m")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "Lfo;"
+		descriptor = "Lfa;"
 	)
-	WorldMapArea field4005;
-	@ObfuscatedName("x")
+	WorldMapArea field4007;
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "Lff;"
+		descriptor = "Lft;"
 	)
 	@Export("worldMapManager")
 	WorldMapManager worldMapManager;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lma;"
+		descriptor = "Lmx;"
 	)
 	@Export("cacheLoader")
 	WorldMapArchiveLoader cacheLoader;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 832010327
+		intValue = -24822515
 	)
 	@Export("centerTileX")
 	int centerTileX;
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1742821169
+		intValue = 1439876257
 	)
 	@Export("centerTileY")
 	int centerTileY;
-	@ObfuscatedName("h")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1917021433
+		intValue = 824727721
 	)
 	@Export("worldMapTargetX")
 	int worldMapTargetX;
-	@ObfuscatedName("q")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 608372165
+		intValue = -495123055
 	)
 	@Export("worldMapTargetY")
 	int worldMapTargetY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@Export("zoom")
 	float zoom;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@Export("zoomTarget")
 	float zoomTarget;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -713333301
+		intValue = 1381841547
 	)
 	@Export("worldMapDisplayWidth")
 	int worldMapDisplayWidth;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 1104674959
+		intValue = 2081300499
 	)
 	@Export("worldMapDisplayHeight")
 	int worldMapDisplayHeight;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -1688617501
+		intValue = -2113167105
 	)
 	@Export("worldMapDisplayX")
 	int worldMapDisplayX;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = -530472683
+		intValue = -702073087
 	)
 	@Export("worldMapDisplayY")
 	int worldMapDisplayY;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 1572937001
+		intValue = -1344926445
 	)
 	@Export("maxFlashCount")
 	int maxFlashCount;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -1112417039
+		intValue = 642877669
 	)
 	@Export("cyclesPerFlash")
 	int cyclesPerFlash;
 	@ObfuscatedName("ag")
 	@Export("perpetualFlash")
 	boolean perpetualFlash;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@Export("flashingElements")
 	HashSet flashingElements;
-	@ObfuscatedName("as")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 930560977
+		intValue = 947484267
 	)
 	@Export("flashCount")
 	int flashCount;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1851163185
+		intValue = -2115600229
 	)
 	@Export("flashCycle")
 	int flashCycle;
-	@ObfuscatedName("am")
-	@ObfuscatedGetter(
-		intValue = 951497435
-	)
-	int field4024;
-	@ObfuscatedName("az")
-	@ObfuscatedGetter(
-		intValue = 1329336223
-	)
-	int field4025;
-	@ObfuscatedName("av")
-	@ObfuscatedGetter(
-		intValue = 1506589769
-	)
-	int field4026;
-	@ObfuscatedName("ac")
-	@ObfuscatedGetter(
-		intValue = -1142772071
-	)
-	int field4027;
-	@ObfuscatedName("at")
-	@ObfuscatedGetter(
-		longValue = 5467077858169346091L
-	)
-	long field4034;
-	@ObfuscatedName("ah")
-	@ObfuscatedGetter(
-		intValue = 1480322263
-	)
-	int field4041;
 	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -559799129
+		intValue = -294067895
+	)
+	int field4011;
+	@ObfuscatedName("an")
+	@ObfuscatedGetter(
+		intValue = 987503049
+	)
+	int field4027;
+	@ObfuscatedName("al")
+	@ObfuscatedGetter(
+		intValue = 1736170551
+	)
+	int field4028;
+	@ObfuscatedName("aj")
+	@ObfuscatedGetter(
+		intValue = 655380945
 	)
 	int field4022;
-	@ObfuscatedName("aq")
-	boolean field3999;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ac")
+	@ObfuscatedGetter(
+		longValue = -1876007755272833433L
+	)
+	long field3992;
+	@ObfuscatedName("as")
+	@ObfuscatedGetter(
+		intValue = -1902935505
+	)
+	int field3996;
+	@ObfuscatedName("au")
+	@ObfuscatedGetter(
+		intValue = -2007971713
+	)
+	int field4032;
+	@ObfuscatedName("ay")
+	boolean field4033;
+	@ObfuscatedName("ai")
 	@Export("enabledElements")
 	HashSet enabledElements;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("av")
 	@Export("enabledCategories")
 	HashSet enabledCategories;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ax")
 	@Export("enabledElementIds")
 	HashSet enabledElementIds;
-	@ObfuscatedName("au")
-	HashSet field4008;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ar")
+	HashSet field4037;
+	@ObfuscatedName("af")
 	@Export("elementsDisabled")
 	boolean elementsDisabled;
-	@ObfuscatedName("bd")
-	@ObfuscatedGetter(
-		intValue = -366242899
-	)
-	int field4037;
 	@ObfuscatedName("bq")
+	@ObfuscatedGetter(
+		intValue = -1319766615
+	)
+	int field3999;
+	@ObfuscatedName("bi")
 	@Export("menuOpcodes")
 	final int[] menuOpcodes;
-	@ObfuscatedName("bu")
-	List field4039;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bz")
+	List field4041;
+	@ObfuscatedName("bb")
 	@Export("iconIterator")
 	Iterator iconIterator;
 	@ObfuscatedName("bv")
-	HashSet field4031;
-	@ObfuscatedName("bm")
+	HashSet field4043;
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liw;"
 	)
 	@Export("mouseCoord")
 	Coord mouseCoord;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@Export("showCoord")
 	public boolean showCoord;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("ba")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
+		descriptor = "Loa;"
 	)
 	@Export("sprite")
 	SpritePixels sprite;
 	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -330827285
+		intValue = 451764491
 	)
 	@Export("cachedPixelsPerTile")
 	int cachedPixelsPerTile;
 	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 420522837
+		intValue = 2118190899
 	)
 	@Export("minCachedTileX")
 	int minCachedTileX;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = 789017035
+		intValue = 1403776455
 	)
 	@Export("minCachedTileY")
 	int minCachedTileY;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -451939943
+		intValue = 736851519
 	)
-	int field4006;
+	int field4026;
 
 	static {
 		fontNameVerdana11 = FontName.FontName_verdana11; // L: 46
@@ -304,30 +304,30 @@ public class WorldMap {
 		this.flashingElements = null; // L: 71
 		this.flashCount = -1; // L: 72
 		this.flashCycle = -1; // L: 73
-		this.field4024 = -1; // L: 74
-		this.field4025 = -1; // L: 75
-		this.field4026 = -1; // L: 76
-		this.field4027 = -1; // L: 77
-		this.field3999 = true; // L: 81
+		this.field4011 = -1; // L: 74
+		this.field4027 = -1; // L: 75
+		this.field4028 = -1; // L: 76
+		this.field4022 = -1; // L: 77
+		this.field4033 = true; // L: 81
 		this.enabledElements = new HashSet(); // L: 84
 		this.enabledCategories = new HashSet(); // L: 85
 		this.enabledElementIds = new HashSet(); // L: 86
-		this.field4008 = new HashSet(); // L: 87
+		this.field4037 = new HashSet(); // L: 87
 		this.elementsDisabled = false; // L: 88
-		this.field4037 = 0; // L: 89
+		this.field3999 = 0; // L: 89
 		this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91
-		this.field4031 = new HashSet(); // L: 94
+		this.field4043 = new HashSet(); // L: 94
 		this.mouseCoord = null; // L: 95
 		this.showCoord = false; // L: 96
 		this.minCachedTileX = -1; // L: 99
 		this.minCachedTileY = -1; // L: 100
-		this.field4006 = -1; // L: 101
+		this.field4026 = -1; // L: 101
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;Ljv;Lkt;Ljava/util/HashMap;[Lop;I)V",
-		garbageValue = "1276633974"
+		descriptor = "(Ljp;Ljp;Ljp;Lkj;Ljava/util/HashMap;[Lof;I)V",
+		garbageValue = "-1791711936"
 	)
 	@Export("init")
 	public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) {
@@ -341,7 +341,7 @@ public class WorldMap {
 		this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112
 		this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113
 		this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114
-		int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2137.name); // L: 115
+		int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field2131.name); // L: 115
 		int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116
 		this.details = new HashMap(var8.length); // L: 117
 
@@ -356,22 +356,22 @@ public class WorldMap {
 		}
 
 		this.setCurrentMapArea(this.mainMapArea); // L: 127
-		this.field4005 = null; // L: 128
+		this.field4007 = null; // L: 128
 	} // L: 129
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
 		garbageValue = "2"
 	)
-	public void method6100() {
+	public void method6239() {
 		WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133
 	} // L: 135
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIZIIIII)V",
-		garbageValue = "-814941662"
+		descriptor = "(IIZIIIIB)V",
+		garbageValue = "4"
 	)
 	@Export("onCycle")
 	public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) {
@@ -381,27 +381,27 @@ public class WorldMap {
 			if (var3) { // L: 143
 				int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146
 				int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147
-				List var10 = this.worldMapManager.method3465(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148
+				List var10 = this.worldMapManager.method3526(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148
 				HashSet var11 = new HashSet(); // L: 149
 
 				Iterator var12;
 				AbstractWorldMapIcon var13;
 				ScriptEvent var14;
 				WorldMapEvent var15;
-				for (var12 = var10.iterator(); var12.hasNext(); PacketWriter.runScriptEvent(var14)) { // L: 150 163
+				for (var12 = var10.iterator(); var12.hasNext(); WorldMapSection1.runScriptEvent(var14)) { // L: 150 163
 					var13 = (AbstractWorldMapIcon)var12.next(); // L: 151
 					var11.add(var13); // L: 153
 					var14 = new ScriptEvent(); // L: 154
 					var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155
 					var14.setArgs(new Object[]{var15, var1, var2}); // L: 156
-					if (this.field4031.contains(var13)) { // L: 157
+					if (this.field4043.contains(var13)) { // L: 157
 						var14.setType(17); // L: 158
 					} else {
 						var14.setType(15); // L: 161
 					}
 				}
 
-				var12 = this.field4031.iterator(); // L: 166
+				var12 = this.field4043.iterator(); // L: 166
 
 				while (var12.hasNext()) {
 					var13 = (AbstractWorldMapIcon)var12.next(); // L: 167
@@ -410,11 +410,11 @@ public class WorldMap {
 						var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171
 						var14.setArgs(new Object[]{var15, var1, var2}); // L: 172
 						var14.setType(16); // L: 173
-						PacketWriter.runScriptEvent(var14); // L: 174
+						WorldMapSection1.runScriptEvent(var14); // L: 174
 					}
 				}
 
-				this.field4031 = var11; // L: 178
+				this.field4043 = var11; // L: 178
 			}
 		}
 	} // L: 139 144 179
@@ -422,1018 +422,1031 @@ public class WorldMap {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IIZZI)V",
-		garbageValue = "-882854276"
+		garbageValue = "-1544897880"
 	)
-	public void method6188(int var1, int var2, boolean var3, boolean var4) {
-		long var5 = ObjectComposition.currentTimeMillis(); // L: 182
-		this.method6250(var1, var2, var4, var5); // L: 183
+	public void method6133(int var1, int var2, boolean var3, boolean var4) {
+		long var5 = ClientPacket.currentTimeMillis(); // L: 182
+		this.method6160(var1, var2, var4, var5); // L: 183
 		if (this.hasTarget() || !var4 && !var3) { // L: 184
-			this.method6107(); // L: 198
+			this.method6138(); // L: 198
 		} else {
 			if (var4) { // L: 185
-				this.field4026 = var1; // L: 186
-				this.field4027 = var2; // L: 187
-				this.field4024 = this.centerTileX; // L: 188
-				this.field4025 = this.centerTileY; // L: 189
+				this.field4028 = var1; // L: 186
+				this.field4022 = var2; // L: 187
+				this.field4011 = this.centerTileX; // L: 188
+				this.field4027 = this.centerTileY; // L: 189
 			}
 
-			if (this.field4024 != -1) { // L: 191
-				int var7 = var1 - this.field4026; // L: 192
-				int var8 = var2 - this.field4027; // L: 193
-				this.setWorldMapPosition(this.field4024 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4025, false); // L: 194
+			if (this.field4011 != -1) { // L: 191
+				int var7 = var1 - this.field4028; // L: 192
+				int var8 = var2 - this.field4022; // L: 193
+				this.setWorldMapPosition(this.field4011 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4027, false); // L: 194
 			}
 		}
 
 		if (var4) { // L: 200
-			this.field4034 = var5; // L: 201
-			this.field4041 = var1; // L: 202
-			this.field4022 = var2; // L: 203
+			this.field3992 = var5; // L: 201
+			this.field3996 = var1; // L: 202
+			this.field4032 = var2; // L: 203
 		}
 
 	} // L: 205
 
-	@ObfuscatedName("p")
-	void method6250(int var1, int var2, boolean var3, long var4) {
+	@ObfuscatedName("j")
+	void method6160(int var1, int var2, boolean var3, long var4) {
 		if (this.currentMapArea != null) { // L: 208
 			int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209
 			int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210
 			this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211
 			if (this.mouseCoord != null && var3) { // L: 212
-				if (FontName.method6297() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213
-					class4.method50(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214
+				boolean var8 = Client.staffModLevel >= 2; // L: 215
+				int var10;
+				int var11;
+				if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 217
+					int var14 = this.mouseCoord.x; // L: 218
+					var10 = this.mouseCoord.y; // L: 219
+					var11 = this.mouseCoord.plane; // L: 220
+					PacketBufferNode var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); // L: 223
+					var12.packetBuffer.writeShort(var14); // L: 224
+					var12.packetBuffer.method6659(0); // L: 225
+					var12.packetBuffer.method6640(var11); // L: 226
+					var12.packetBuffer.method6648(var10); // L: 227
+					Client.packetWriter.addNode(var12); // L: 228
 				} else {
-					boolean var8 = true; // L: 217
-					if (this.field3999) { // L: 218
-						int var9 = var1 - this.field4041; // L: 219
-						int var10 = var2 - this.field4022; // L: 220
-						if (var4 - this.field4034 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221
-							var8 = false; // L: 222
+					boolean var9 = true; // L: 232
+					if (this.field4033) { // L: 233
+						var10 = var1 - this.field3996; // L: 234
+						var11 = var2 - this.field4032; // L: 235
+						if (var4 - this.field3992 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { // L: 236
+							var9 = false; // L: 237
 						}
 					}
 
-					if (var8) { // L: 225
-						PacketBufferNode var11 = class21.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); // L: 226
-						var11.packetBuffer.method6611(this.mouseCoord.packed()); // L: 227
-						Client.packetWriter.addNode(var11); // L: 228
-						this.field4034 = 0L; // L: 229
+					if (var9) { // L: 240
+						PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2575, Client.packetWriter.isaacCipher); // L: 241
+						var13.packetBuffer.writeIntME(this.mouseCoord.packed()); // L: 242
+						Client.packetWriter.addNode(var13); // L: 243
+						this.field3992 = 0L; // L: 244
 					}
 				}
 			}
 		} else {
-			this.mouseCoord = null; // L: 234
+			this.mouseCoord = null; // L: 249
 		}
 
-	} // L: 235
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1756925450"
-	)
-	@Export("smoothZoom")
-	void smoothZoom() {
-		if (UserComparator3.field1444 != null) { // L: 238
-			this.zoom = this.zoomTarget; // L: 239
-		} else {
-			if (this.zoom < this.zoomTarget) { // L: 242
-				this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 243
-			}
-
-			if (this.zoom > this.zoomTarget) { // L: 245
-				this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 246
-			}
-
-		}
-	} // L: 240 248
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "110"
-	)
-	@Export("scrollToTarget")
-	void scrollToTarget() {
-		if (this.hasTarget()) { // L: 251
-			int var1 = this.worldMapTargetX - this.centerTileX; // L: 254
-			int var2 = this.worldMapTargetY - this.centerTileY; // L: 255
-			if (var1 != 0) { // L: 256
-				var1 /= Math.min(8, Math.abs(var1)); // L: 257
-			}
-
-			if (var2 != 0) { // L: 259
-				var2 /= Math.min(8, Math.abs(var2)); // L: 260
-			}
-
-			this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 262
-			if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 263
-				this.worldMapTargetX = -1; // L: 264
-				this.worldMapTargetY = -1; // L: 265
-			}
-
-		}
-	} // L: 252 267
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(IIZI)V",
-		garbageValue = "-1122278202"
-	)
-	@Export("setWorldMapPosition")
-	final void setWorldMapPosition(int var1, int var2, boolean var3) {
-		this.centerTileX = var1; // L: 270
-		this.centerTileY = var2; // L: 271
-		ObjectComposition.currentTimeMillis(); // L: 272
-		if (var3) {
-			this.method6107(); // L: 273
-		}
-
-	} // L: 274
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-37"
-	)
-	final void method6107() {
-		this.field4027 = -1; // L: 277
-		this.field4026 = -1; // L: 278
-		this.field4025 = -1; // L: 279
-		this.field4024 = -1; // L: 280
-	} // L: 281
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-2015544194"
-	)
-	@Export("hasTarget")
-	boolean hasTarget() {
-		return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Lfo;",
-		garbageValue = "-437395298"
-	)
-	@Export("mapAreaAtCoord")
-	public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
-		Iterator var4 = this.details.values().iterator(); // L: 288
-
-		WorldMapArea var5;
-		do {
-			if (!var4.hasNext()) {
-				return null; // L: 296
-			}
-
-			var5 = (WorldMapArea)var4.next(); // L: 289
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 291
-
-		return var5; // L: 292
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(IIIZI)V",
-		garbageValue = "-1628705271"
-	)
-	public void method6110(int var1, int var2, int var3, boolean var4) {
-		WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 300
-		if (var5 == null) { // L: 301
-			if (!var4) { // L: 302
-				return; // L: 305
-			}
-
-			var5 = this.mainMapArea; // L: 303
-		}
-
-		boolean var6 = false; // L: 307
-		if (var5 != this.field4005 || var4) { // L: 308
-			this.field4005 = var5; // L: 309
-			this.setCurrentMapArea(var5); // L: 310
-			var6 = true; // L: 311
-		}
-
-		if (var6 || var4) { // L: 313
-			this.jump(var1, var2, var3); // L: 314
-		}
-
-	} // L: 316
+	} // L: 250
 
 	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-792089188"
+		descriptor = "(I)V",
+		garbageValue = "1153461919"
+	)
+	@Export("smoothZoom")
+	void smoothZoom() {
+		if (LoginPacket.field2800 != null) { // L: 253
+			this.zoom = this.zoomTarget; // L: 254
+		} else {
+			if (this.zoom < this.zoomTarget) { // L: 257
+				this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 258
+			}
+
+			if (this.zoom > this.zoomTarget) { // L: 260
+				this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 261
+			}
+
+		}
+	} // L: 255 263
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1583682530"
+	)
+	@Export("scrollToTarget")
+	void scrollToTarget() {
+		if (this.hasTarget()) { // L: 266
+			int var1 = this.worldMapTargetX - this.centerTileX; // L: 269
+			int var2 = this.worldMapTargetY - this.centerTileY; // L: 270
+			if (var1 != 0) { // L: 271
+				var1 /= Math.min(8, Math.abs(var1)); // L: 272
+			}
+
+			if (var2 != 0) { // L: 274
+				var2 /= Math.min(8, Math.abs(var2)); // L: 275
+			}
+
+			this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 277
+			if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { // L: 278
+				this.worldMapTargetX = -1; // L: 279
+				this.worldMapTargetY = -1; // L: 280
+			}
+
+		}
+	} // L: 267 282
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(IIZI)V",
+		garbageValue = "-962488922"
+	)
+	@Export("setWorldMapPosition")
+	final void setWorldMapPosition(int var1, int var2, boolean var3) {
+		this.centerTileX = var1; // L: 285
+		this.centerTileY = var2; // L: 286
+		ClientPacket.currentTimeMillis(); // L: 287
+		if (var3) {
+			this.method6138(); // L: 288
+		}
+
+	} // L: 289
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "259207971"
+	)
+	final void method6138() {
+		this.field4022 = -1; // L: 292
+		this.field4028 = -1; // L: 293
+		this.field4027 = -1; // L: 294
+		this.field4011 = -1; // L: 295
+	} // L: 296
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "-89"
+	)
+	@Export("hasTarget")
+	boolean hasTarget() {
+		return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 299
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(IIIB)Lfa;",
+		garbageValue = "-8"
+	)
+	@Export("mapAreaAtCoord")
+	public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
+		Iterator var4 = this.details.values().iterator(); // L: 303
+
+		WorldMapArea var5;
+		do {
+			if (!var4.hasNext()) { // L: 310
+				return null; // L: 311
+			}
+
+			var5 = (WorldMapArea)var4.next(); // L: 304
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 306
+
+		return var5; // L: 307
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(IIIZI)V",
+		garbageValue = "2011089652"
+	)
+	public void method6287(int var1, int var2, int var3, boolean var4) {
+		WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 315
+		if (var5 == null) { // L: 316
+			if (!var4) { // L: 317
+				return; // L: 320
+			}
+
+			var5 = this.mainMapArea; // L: 318
+		}
+
+		boolean var6 = false; // L: 322
+		if (var5 != this.field4007 || var4) { // L: 323
+			this.field4007 = var5; // L: 324
+			this.setCurrentMapArea(var5); // L: 325
+			var6 = true; // L: 326
+		}
+
+		if (var6 || var4) { // L: 328
+			this.jump(var1, var2, var3); // L: 329
+		}
+
+	} // L: 331
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "50"
 	)
 	@Export("setCurrentMapAreaId")
 	public void setCurrentMapAreaId(int var1) {
-		WorldMapArea var2 = this.getMapArea(var1); // L: 319
-		if (var2 != null) { // L: 320
-			this.setCurrentMapArea(var2); // L: 321
+		WorldMapArea var2 = this.getMapArea(var1); // L: 334
+		if (var2 != null) { // L: 335
+			this.setCurrentMapArea(var2); // L: 336
 		}
 
-	} // L: 323
+	} // L: 338
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "127"
+		descriptor = "(I)I",
+		garbageValue = "1020439482"
 	)
 	@Export("currentMapAreaId")
 	public int currentMapAreaId() {
-		return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lfo;",
-		garbageValue = "-443198878"
-	)
-	@Export("getCurrentMapArea")
-	public WorldMapArea getCurrentMapArea() {
-		return this.currentMapArea; // L: 333
+		return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 341 342 344
 	}
 
 	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "-652584652"
+		descriptor = "(B)Lfa;",
+		garbageValue = "25"
 	)
-	@Export("setCurrentMapArea")
-	void setCurrentMapArea(WorldMapArea var1) {
-		if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337
-			this.initializeWorldMapManager(var1); // L: 340
-			this.jump(-1, -1, -1); // L: 341
-		}
-	} // L: 338 342
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "1690698622"
-	)
-	@Export("initializeWorldMapManager")
-	void initializeWorldMapManager(WorldMapArea var1) {
-		this.currentMapArea = var1; // L: 345
-		this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 346
-		this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 347
-	} // L: 348
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(Lfo;Lii;Lii;ZI)V",
-		garbageValue = "1149896139"
-	)
-	public void method6291(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
-		if (var1 != null) { // L: 351
-			if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 354
-				this.initializeWorldMapManager(var1); // L: 355
-			}
-
-			if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 357
-				this.jump(var2.plane, var2.x, var2.y); // L: 361
-			} else {
-				this.jump(var3.plane, var3.x, var3.y); // L: 358
-			}
-
-		}
-	} // L: 352 363
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)V",
-		garbageValue = "1764750343"
-	)
-	@Export("jump")
-	void jump(int var1, int var2, int var3) {
-		if (this.currentMapArea != null) { // L: 366
-			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 369
-			if (var4 == null) { // L: 370
-				var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 371
-			}
-
-			this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 373
-			this.worldMapTargetX = -1; // L: 374
-			this.worldMapTargetY = -1; // L: 375
-			this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 376
-			this.zoomTarget = this.zoom; // L: 377
-			this.field4039 = null; // L: 378
-			this.iconIterator = null; // L: 379
-			this.worldMapManager.clearIcons(); // L: 380
-		}
-	} // L: 367 381
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIII)V",
-		garbageValue = "-1017239320"
-	)
-	@Export("draw")
-	public void draw(int var1, int var2, int var3, int var4, int var5) {
-		int[] var6 = new int[4]; // L: 384
-		Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 385
-		Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 386
-		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 387
-		int var7 = this.cacheLoader.getPercentLoaded(); // L: 388
-		if (var7 < 100) { // L: 389
-			this.drawLoading(var1, var2, var3, var4, var7); // L: 390
-		} else {
-			if (!this.worldMapManager.isLoaded()) { // L: 393
-				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 394
-				if (!this.worldMapManager.isLoaded()) { // L: 395
-					return; // L: 396
-				}
-			}
-
-			if (this.flashingElements != null) { // L: 399
-				++this.flashCycle; // L: 400
-				if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 401
-					this.flashCycle = 0; // L: 402
-					++this.flashCount; // L: 403
-				}
-
-				if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 405
-					this.flashingElements = null; // L: 406
-				}
-			}
-
-			int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 409
-			int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 410
-			this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 411
-			if (!this.elementsDisabled) { // L: 412
-				boolean var10 = false; // L: 413
-				if (var5 - this.field4037 > 100) { // L: 414
-					this.field4037 = var5; // L: 415
-					var10 = true; // L: 416
-				}
-
-				this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4008, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418
-			}
-
-			this.method6120(var1, var2, var3, var4, var8, var9); // L: 420
-			if (FontName.method6297() && this.showCoord && this.mouseCoord != null) { // L: 421
-				this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
-			}
-
-			this.worldMapDisplayWidth = var8; // L: 422
-			this.worldMapDisplayHeight = var9; // L: 423
-			this.worldMapDisplayX = var1; // L: 424
-			this.worldMapDisplayY = var2; // L: 425
-			Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 426
-		}
-	} // L: 391 427
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)Z",
-		garbageValue = "-787270257"
-	)
-	boolean method6119(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (this.sprite == null) { // L: 430
-			return true;
-		} else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 431
-			if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 432
-				return true;
-			} else if (this.field4006 != Client.field717) {
-				return true; // L: 433
-			} else if (var3 <= 0 && var4 <= 0) { // L: 434
-				return var3 + var1 < var5 || var2 + var4 < var6; // L: 435
-			} else {
-				return true; // L: 436
-			}
-		} else {
-			return true;
-		}
+	@Export("getCurrentMapArea")
+	public WorldMapArea getCurrentMapArea() {
+		return this.currentMapArea; // L: 348
 	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIII)V",
-		garbageValue = "-511459104"
-	)
-	void method6120(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (UserComparator3.field1444 != null) { // L: 440
-			int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 441
-			int var8 = var3 + 512; // L: 442
-			int var9 = var4 + 512; // L: 443
-			float var10 = 1.0F; // L: 444
-			var8 = (int)((float)var8 / var10); // L: 445
-			var9 = (int)((float)var9 / var10); // L: 446
-			int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 447
-			int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 448
-			int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 449
-			int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 450
-			if (this.method6119(var8, var9, var13, var14, var3, var4)) { // L: 451
-				if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 452
-					Arrays.fill(this.sprite.pixels, 0); // L: 455
-				} else {
-					this.sprite = new SpritePixels(var8, var9); // L: 453
-				}
-
-				this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 456
-				this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 457
-				this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 458
-				UserComparator3.field1444.method5116(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459
-				this.field4006 = Client.field717; // L: 460
-				var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 461
-				var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 462
-			}
-
-			Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 464
-			if (1.0F == var10) { // L: 465
-				this.sprite.method7002(var13, var14, 192); // L: 466
-			} else {
-				this.sprite.method6986(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 469
-			}
-		}
-
-	} // L: 472
-
 	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)V",
-		garbageValue = "-14"
+		descriptor = "(Lfa;I)V",
+		garbageValue = "-1508783399"
 	)
-	@Export("drawOverview")
-	public void drawOverview(int var1, int var2, int var3, int var4) {
-		if (this.cacheLoader.isLoaded()) { // L: 475
-			if (!this.worldMapManager.isLoaded()) { // L: 478
-				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 479
-				if (!this.worldMapManager.isLoaded()) { // L: 480
-					return; // L: 481
-				}
+	@Export("setCurrentMapArea")
+	void setCurrentMapArea(WorldMapArea var1) {
+		if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 352
+			this.initializeWorldMapManager(var1); // L: 355
+			this.jump(-1, -1, -1); // L: 356
+		}
+	} // L: 353 357
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(Lfa;I)V",
+		garbageValue = "908397980"
+	)
+	@Export("initializeWorldMapManager")
+	void initializeWorldMapManager(WorldMapArea var1) {
+		this.currentMapArea = var1; // L: 360
+		this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 361
+		this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 362
+	} // L: 363
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(Lfa;Liw;Liw;ZI)V",
+		garbageValue = "-749408227"
+	)
+	public void method6147(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
+		if (var1 != null) { // L: 366
+			if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 369
+				this.initializeWorldMapManager(var1); // L: 370
 			}
 
-			this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 484
-		}
-	} // L: 476 485
+			if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 372
+				this.jump(var2.plane, var2.x, var2.y); // L: 376
+			} else {
+				this.jump(var3.plane, var3.x, var3.y); // L: 373
+			}
 
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
-	)
-	@Export("setZoomPercentage")
-	public void setZoomPercentage(int var1) {
-		this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488
-	} // L: 489
+		}
+	} // L: 367 378
 
 	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)V",
+		garbageValue = "2083556923"
+	)
+	@Export("jump")
+	void jump(int var1, int var2, int var3) {
+		if (this.currentMapArea != null) { // L: 381
+			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 384
+			if (var4 == null) { // L: 385
+				var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 386
+			}
+
+			this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 388
+			this.worldMapTargetX = -1; // L: 389
+			this.worldMapTargetY = -1; // L: 390
+			this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 391
+			this.zoomTarget = this.zoom; // L: 392
+			this.field4041 = null; // L: 393
+			this.iconIterator = null; // L: 394
+			this.worldMapManager.clearIcons(); // L: 395
+		}
+	} // L: 382 396
+
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIII)V",
-		garbageValue = "176616611"
+		garbageValue = "1081774257"
+	)
+	@Export("draw")
+	public void draw(int var1, int var2, int var3, int var4, int var5) {
+		int[] var6 = new int[4]; // L: 399
+		Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 400
+		Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 401
+		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 402
+		int var7 = this.cacheLoader.getPercentLoaded(); // L: 403
+		if (var7 < 100) { // L: 404
+			this.drawLoading(var1, var2, var3, var4, var7); // L: 405
+		} else {
+			if (!this.worldMapManager.isLoaded()) { // L: 408
+				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 409
+				if (!this.worldMapManager.isLoaded()) { // L: 410
+					return; // L: 411
+				}
+			}
+
+			if (this.flashingElements != null) { // L: 414
+				++this.flashCycle; // L: 415
+				if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 416
+					this.flashCycle = 0; // L: 417
+					++this.flashCount; // L: 418
+				}
+
+				if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 420
+					this.flashingElements = null; // L: 421
+				}
+			}
+
+			int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 424
+			int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 425
+			this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 426
+			boolean var10;
+			if (!this.elementsDisabled) { // L: 427
+				var10 = false; // L: 428
+				if (var5 - this.field3999 > 100) { // L: 429
+					this.field3999 = var5; // L: 430
+					var10 = true; // L: 431
+				}
+
+				this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4037, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 433
+			}
+
+			this.method6151(var1, var2, var3, var4, var8, var9); // L: 435
+			var10 = Client.staffModLevel >= 2; // L: 438
+			if (var10 && this.showCoord && this.mouseCoord != null) { // L: 440
+				this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
+			}
+
+			this.worldMapDisplayWidth = var8; // L: 441
+			this.worldMapDisplayHeight = var9; // L: 442
+			this.worldMapDisplayX = var1; // L: 443
+			this.worldMapDisplayY = var2; // L: 444
+			Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 445
+		}
+	} // L: 406 446
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIII)Z",
+		garbageValue = "-38980544"
+	)
+	boolean method6142(int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (this.sprite == null) { // L: 449
+			return true;
+		} else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 450
+			if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 451
+				return true;
+			} else if (this.field4026 != Client.field798) {
+				return true; // L: 452
+			} else if (var3 <= 0 && var4 <= 0) { // L: 453
+				return var3 + var1 < var5 || var2 + var4 < var6; // L: 454
+			} else {
+				return true; // L: 455
+			}
+		} else {
+			return true;
+		}
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIII)V",
+		garbageValue = "166660592"
+	)
+	void method6151(int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (LoginPacket.field2800 != null) { // L: 459
+			int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 460
+			int var8 = var3 + 512; // L: 461
+			int var9 = var4 + 512; // L: 462
+			float var10 = 1.0F; // L: 463
+			var8 = (int)((float)var8 / var10); // L: 464
+			var9 = (int)((float)var9 / var10); // L: 465
+			int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 466
+			int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 467
+			int var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 468
+			int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 469
+			if (this.method6142(var8, var9, var13, var14, var3, var4)) { // L: 470
+				if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 471
+					Arrays.fill(this.sprite.pixels, 0); // L: 474
+				} else {
+					this.sprite = new SpritePixels(var8, var9); // L: 472
+				}
+
+				this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 475
+				this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 476
+				this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 477
+				LoginPacket.field2800.method5247(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 478
+				this.field4026 = Client.field798; // L: 479
+				var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 480
+				var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 481
+			}
+
+			Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 483
+			if (var10 == 1.0F) { // L: 484
+				this.sprite.method7035(var13, var14, 192); // L: 485
+			} else {
+				this.sprite.method7038(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); // L: 488
+			}
+		}
+
+	} // L: 491
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "-2047077811"
+	)
+	@Export("drawOverview")
+	public void drawOverview(int var1, int var2, int var3, int var4) {
+		if (this.cacheLoader.isLoaded()) { // L: 494
+			if (!this.worldMapManager.isLoaded()) { // L: 497
+				this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 498
+				if (!this.worldMapManager.isLoaded()) { // L: 499
+					return; // L: 500
+				}
+			}
+
+			this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 503
+		}
+	} // L: 495 504
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-1733790373"
+	)
+	@Export("setZoomPercentage")
+	public void setZoomPercentage(int var1) {
+		this.zoomTarget = this.getZoomFromPercentage(var1); // L: 507
+	} // L: 508
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIII)V",
+		garbageValue = "-263376647"
 	)
 	@Export("drawLoading")
 	void drawLoading(int var1, int var2, int var3, int var4, int var5) {
-		byte var6 = 20; // L: 492
-		int var7 = var3 / 2 + var1; // L: 493
-		int var8 = var4 / 2 + var2 - 18 - var6; // L: 494
-		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 495
-		Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 496
-		Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 497
-		this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); // L: 498
-	} // L: 499
+		byte var6 = 20; // L: 511
+		int var7 = var3 / 2 + var1; // L: 512
+		int var8 = var4 / 2 + var2 - 18 - var6; // L: 513
+		Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 514
+		Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 515
+		Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 516
+		this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 517
+	} // L: 518
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(II)F",
-		garbageValue = "397334458"
+		descriptor = "(IB)F",
+		garbageValue = "10"
 	)
 	@Export("getZoomFromPercentage")
 	float getZoomFromPercentage(int var1) {
-		if (var1 == 25) { // L: 502
+		if (var1 == 25) { // L: 521
 			return 1.0F;
-		} else if (var1 == 37) { // L: 503
+		} else if (var1 == 37) { // L: 522
 			return 1.5F;
-		} else if (var1 == 50) {
-			return 2.0F; // L: 504
-		} else if (var1 == 75) { // L: 505
+		} else if (var1 == 50) { // L: 523
+			return 2.0F;
+		} else if (var1 == 75) { // L: 524
 			return 3.0F;
 		} else {
-			return var1 == 100 ? 4.0F : 8.0F; // L: 506 507
+			return var1 == 100 ? 4.0F : 8.0F; // L: 525 526
 		}
 	}
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "54"
+		descriptor = "(I)I",
+		garbageValue = "-801808132"
 	)
 	@Export("getZoomLevel")
 	public int getZoomLevel() {
-		if (1.0D == (double)this.zoomTarget) { // L: 511
+		if ((double)this.zoomTarget == 1.0D) { // L: 530
 			return 25;
-		} else if ((double)this.zoomTarget == 1.5D) { // L: 512
+		} else if (1.5D == (double)this.zoomTarget) { // L: 531
 			return 37;
-		} else if (2.0D == (double)this.zoomTarget) { // L: 513
+		} else if ((double)this.zoomTarget == 2.0D) { // L: 532
 			return 50;
 		} else if ((double)this.zoomTarget == 3.0D) {
-			return 75; // L: 514
+			return 75; // L: 533
 		} else {
-			return 4.0D == (double)this.zoomTarget ? 100 : 200; // L: 515 516
+			return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 534 535
 		}
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1698217576"
+		garbageValue = "-1078712730"
 	)
 	@Export("loadCache")
 	public void loadCache() {
-		this.cacheLoader.load(); // L: 520
-	} // L: 521
-
-	@ObfuscatedName("ab")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-701591619"
-	)
-	@Export("isCacheLoaded")
-	public boolean isCacheLoaded() {
-		return this.cacheLoader.isLoaded(); // L: 524
-	}
-
-	@ObfuscatedName("al")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lfo;",
-		garbageValue = "-861486958"
-	)
-	@Export("getMapArea")
-	public WorldMapArea getMapArea(int var1) {
-		Iterator var2 = this.details.values().iterator(); // L: 528
-
-		WorldMapArea var3;
-		do {
-			if (!var2.hasNext()) { // L: 535
-				return null; // L: 536
-			}
-
-			var3 = (WorldMapArea)var2.next(); // L: 529
-		} while(var3.getId() != var1); // L: 531
-
-		return var3; // L: 532
-	}
+		this.cacheLoader.load(); // L: 539
+	} // L: 540
 
 	@ObfuscatedName("ad")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "114"
+	)
+	@Export("isCacheLoaded")
+	public boolean isCacheLoaded() {
+		return this.cacheLoader.isLoaded(); // L: 543
+	}
+
+	@ObfuscatedName("at")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfa;",
+		garbageValue = "1247262475"
+	)
+	@Export("getMapArea")
+	public WorldMapArea getMapArea(int var1) {
+		Iterator var2 = this.details.values().iterator(); // L: 547
+
+		WorldMapArea var3;
+		do {
+			if (!var2.hasNext()) {
+				return null; // L: 555
+			}
+
+			var3 = (WorldMapArea)var2.next(); // L: 548
+		} while(var3.getId() != var1); // L: 550
+
+		return var3; // L: 551
+	}
+
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
 		descriptor = "(III)V",
-		garbageValue = "704726635"
+		garbageValue = "902836069"
 	)
 	@Export("setWorldMapPositionTarget")
 	public void setWorldMapPositionTarget(int var1, int var2) {
-		if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 540
-			this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 543
-			this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 544
+		if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 559
+			this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 562
+			this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 563
 		}
-	} // L: 541 545
+	} // L: 560 564
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "19"
+		descriptor = "(III)V",
+		garbageValue = "-462808636"
 	)
 	@Export("setWorldMapPositionTargetInstant")
 	public void setWorldMapPositionTargetInstant(int var1, int var2) {
-		if (this.currentMapArea != null) { // L: 548
-			this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 551
-			this.worldMapTargetX = -1; // L: 552
-			this.worldMapTargetY = -1; // L: 553
+		if (this.currentMapArea != null) { // L: 567
+			this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 570
+			this.worldMapTargetX = -1; // L: 571
+			this.worldMapTargetY = -1; // L: 572
 		}
-	} // L: 549 554
+	} // L: 568 573
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "-2147483648"
+		garbageValue = "-1944417243"
 	)
 	@Export("jumpToSourceCoord")
 	public void jumpToSourceCoord(int var1, int var2, int var3) {
-		if (this.currentMapArea != null) { // L: 557
-			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 560
-			if (var4 != null) { // L: 561
-				this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 562
+		if (this.currentMapArea != null) { // L: 576
+			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 579
+			if (var4 != null) { // L: 580
+				this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 581
 			}
 
 		}
-	} // L: 558 564
+	} // L: 577 583
 
 	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "1982259081"
+		garbageValue = "-2114706132"
 	)
 	@Export("jumpToSourceCoordInstant")
 	public void jumpToSourceCoordInstant(int var1, int var2, int var3) {
-		if (this.currentMapArea != null) { // L: 567
-			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 570
-			if (var4 != null) { // L: 571
-				this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 572
+		if (this.currentMapArea != null) { // L: 586
+			int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 589
+			if (var4 != null) { // L: 590
+				this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 591
 			}
 
 		}
-	} // L: 568 574
+	} // L: 587 593
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1572270275"
+		garbageValue = "-407384794"
 	)
 	@Export("getDisplayX")
 	public int getDisplayX() {
-		return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580
+		return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 596 597 599
 	}
 
-	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1626949316"
-	)
-	@Export("getDisplayY")
-	public int getDisplayY() {
-		return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587
-	}
-
-	@ObfuscatedName("aj")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lii;",
-		garbageValue = "-1013146399"
-	)
-	@Export("getDisplayCoord")
-	public Coord getDisplayCoord() {
-		return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594
-	}
-
-	@ObfuscatedName("am")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1641590896"
-	)
-	@Export("getDisplayWith")
-	public int getDisplayWith() {
-		return this.worldMapDisplayWidth; // L: 598
-	}
-
-	@ObfuscatedName("az")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-227030851"
-	)
-	@Export("getDisplayHeight")
-	public int getDisplayHeight() {
-		return this.worldMapDisplayHeight; // L: 602
-	}
-
-	@ObfuscatedName("av")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1448408300"
-	)
-	@Export("setMaxFlashCount")
-	public void setMaxFlashCount(int var1) {
-		if (var1 >= 1) { // L: 606
-			this.maxFlashCount = var1; // L: 607
-		}
-
-	} // L: 609
-
-	@ObfuscatedName("ac")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-502541875"
-	)
-	@Export("resetMaxFlashCount")
-	public void resetMaxFlashCount() {
-		this.maxFlashCount = 3; // L: 612
-	} // L: 613
-
-	@ObfuscatedName("at")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "56"
-	)
-	@Export("setCyclesPerFlash")
-	public void setCyclesPerFlash(int var1) {
-		if (var1 >= 1) { // L: 616
-			this.cyclesPerFlash = var1; // L: 617
-		}
-
-	} // L: 619
-
-	@ObfuscatedName("ah")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1912925429"
-	)
-	@Export("resetCyclesPerFlash")
-	public void resetCyclesPerFlash() {
-		this.cyclesPerFlash = 50; // L: 622
-	} // L: 623
-
-	@ObfuscatedName("ao")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-4019536"
-	)
-	@Export("setPerpetualFlash")
-	public void setPerpetualFlash(boolean var1) {
-		this.perpetualFlash = var1; // L: 626
-	} // L: 627
-
 	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1468516539"
+		descriptor = "(I)I",
+		garbageValue = "1052524051"
 	)
-	@Export("flashElement")
-	public void flashElement(int var1) {
-		this.flashingElements = new HashSet(); // L: 630
-		this.flashingElements.add(var1); // L: 631
-		this.flashCount = 0; // L: 632
-		this.flashCycle = 0; // L: 633
-	} // L: 634
+	@Export("getDisplayY")
+	public int getDisplayY() {
+		return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 603 604 606
+	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-46"
+		descriptor = "(I)Liw;",
+		garbageValue = "680807554"
 	)
-	@Export("flashCategory")
-	public void flashCategory(int var1) {
-		this.flashingElements = new HashSet(); // L: 637
-		this.flashCount = 0; // L: 638
-		this.flashCycle = 0; // L: 639
+	@Export("getDisplayCoord")
+	public Coord getDisplayCoord() {
+		return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 610 611 613
+	}
 
-		for (int var2 = 0; var2 < class311.WorldMapElement_count; ++var2) { // L: 640
-			if (class6.WorldMapElement_get(var2) != null && class6.WorldMapElement_get(var2).category == var1) { // L: 641 644
-				this.flashingElements.add(class6.WorldMapElement_get(var2).objectId); // L: 645
-			}
-		}
-
-	} // L: 648
-
-	@ObfuscatedName("af")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-961557070"
+		descriptor = "(S)I",
+		garbageValue = "-12956"
 	)
-	@Export("stopCurrentFlashes")
-	public void stopCurrentFlashes() {
-		this.flashingElements = null; // L: 651
-	} // L: 652
-
-	@ObfuscatedName("ak")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-1424708564"
-	)
-	@Export("setElementsDisabled")
-	public void setElementsDisabled(boolean var1) {
-		this.elementsDisabled = !var1; // L: 655
-	} // L: 656
-
-	@ObfuscatedName("ay")
-	@ObfuscatedSignature(
-		descriptor = "(IZI)V",
-		garbageValue = "-898032976"
-	)
-	@Export("disableElement")
-	public void disableElement(int var1, boolean var2) {
-		if (!var2) { // L: 659
-			this.enabledElements.add(var1); // L: 660
-		} else {
-			this.enabledElements.remove(var1); // L: 663
-		}
-
-		this.method6103(); // L: 665
-	} // L: 666
-
-	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		descriptor = "(IZI)V",
-		garbageValue = "-1754090683"
-	)
-	@Export("setCategoryDisabled")
-	public void setCategoryDisabled(int var1, boolean var2) {
-		if (!var2) { // L: 669
-			this.enabledCategories.add(var1); // L: 670
-		} else {
-			this.enabledCategories.remove(var1); // L: 673
-		}
-
-		for (int var3 = 0; var3 < class311.WorldMapElement_count; ++var3) { // L: 675
-			if (class6.WorldMapElement_get(var3) != null && class6.WorldMapElement_get(var3).category == var1) { // L: 676 679
-				int var4 = class6.WorldMapElement_get(var3).objectId; // L: 680
-				if (!var2) { // L: 681
-					this.enabledElementIds.add(var4); // L: 682
-				} else {
-					this.enabledElementIds.remove(var4); // L: 685
-				}
-			}
-		}
-
-		this.method6103(); // L: 689
-	} // L: 690
-
-	@ObfuscatedName("au")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "-7"
-	)
-	@Export("getElementsDisabled")
-	public boolean getElementsDisabled() {
-		return !this.elementsDisabled; // L: 693
+	@Export("getDisplayWith")
+	public int getDisplayWith() {
+		return this.worldMapDisplayWidth; // L: 617
 	}
 
 	@ObfuscatedName("an")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "16"
+	)
+	@Export("getDisplayHeight")
+	public int getDisplayHeight() {
+		return this.worldMapDisplayHeight; // L: 621
+	}
+
+	@ObfuscatedName("al")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "69"
+	)
+	@Export("setMaxFlashCount")
+	public void setMaxFlashCount(int var1) {
+		if (var1 >= 1) { // L: 625
+			this.maxFlashCount = var1; // L: 626
+		}
+
+	} // L: 628
+
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-2107849699"
+	)
+	@Export("resetMaxFlashCount")
+	public void resetMaxFlashCount() {
+		this.maxFlashCount = 3; // L: 631
+	} // L: 632
+
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "2136117532"
+	)
+	@Export("setCyclesPerFlash")
+	public void setCyclesPerFlash(int var1) {
+		if (var1 >= 1) { // L: 635
+			this.cyclesPerFlash = var1; // L: 636
+		}
+
+	} // L: 638
+
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-23"
+	)
+	@Export("resetCyclesPerFlash")
+	public void resetCyclesPerFlash() {
+		this.cyclesPerFlash = 50; // L: 641
+	} // L: 642
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "-1146559262"
+	)
+	@Export("setPerpetualFlash")
+	public void setPerpetualFlash(boolean var1) {
+		this.perpetualFlash = var1; // L: 645
+	} // L: 646
+
+	@ObfuscatedName("ay")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "9389136"
+	)
+	@Export("flashElement")
+	public void flashElement(int var1) {
+		this.flashingElements = new HashSet(); // L: 649
+		this.flashingElements.add(var1); // L: 650
+		this.flashCount = 0; // L: 651
+		this.flashCycle = 0; // L: 652
+	} // L: 653
+
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "156861495"
+	)
+	@Export("flashCategory")
+	public void flashCategory(int var1) {
+		this.flashingElements = new HashSet(); // L: 656
+		this.flashCount = 0; // L: 657
+		this.flashCycle = 0; // L: 658
+
+		for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 659
+			if (Archive.WorldMapElement_get(var2) != null && Archive.WorldMapElement_get(var2).category == var1) { // L: 660 663
+				this.flashingElements.add(Archive.WorldMapElement_get(var2).objectId); // L: 664
+			}
+		}
+
+	} // L: 667
+
+	@ObfuscatedName("aa")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1840445078"
+	)
+	@Export("stopCurrentFlashes")
+	public void stopCurrentFlashes() {
+		this.flashingElements = null; // L: 670
+	} // L: 671
+
+	@ObfuscatedName("ai")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "1467263825"
+	)
+	@Export("setElementsDisabled")
+	public void setElementsDisabled(boolean var1) {
+		this.elementsDisabled = !var1; // L: 674
+	} // L: 675
+
+	@ObfuscatedName("av")
+	@ObfuscatedSignature(
+		descriptor = "(IZI)V",
+		garbageValue = "-1998904362"
+	)
+	@Export("disableElement")
+	public void disableElement(int var1, boolean var2) {
+		if (!var2) { // L: 678
+			this.enabledElements.add(var1); // L: 679
+		} else {
+			this.enabledElements.remove(var1); // L: 682
+		}
+
+		this.method6182(); // L: 684
+	} // L: 685
+
+	@ObfuscatedName("ax")
+	@ObfuscatedSignature(
+		descriptor = "(IZI)V",
+		garbageValue = "-1964224308"
+	)
+	@Export("setCategoryDisabled")
+	public void setCategoryDisabled(int var1, boolean var2) {
+		if (!var2) { // L: 688
+			this.enabledCategories.add(var1); // L: 689
+		} else {
+			this.enabledCategories.remove(var1); // L: 692
+		}
+
+		for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 694
+			if (Archive.WorldMapElement_get(var3) != null && Archive.WorldMapElement_get(var3).category == var1) { // L: 695 698
+				int var4 = Archive.WorldMapElement_get(var3).objectId; // L: 699
+				if (!var2) { // L: 700
+					this.enabledElementIds.add(var4); // L: 701
+				} else {
+					this.enabledElementIds.remove(var4); // L: 704
+				}
+			}
+		}
+
+		this.method6182(); // L: 708
+	} // L: 709
+
+	@ObfuscatedName("ar")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-268102441"
+	)
+	@Export("getElementsDisabled")
+	public boolean getElementsDisabled() {
+		return !this.elementsDisabled; // L: 712
+	}
+
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
 		descriptor = "(IB)Z",
-		garbageValue = "55"
+		garbageValue = "-89"
 	)
 	@Export("isElementDisabled")
 	public boolean isElementDisabled(int var1) {
-		return !this.enabledElements.contains(var1); // L: 697
+		return !this.enabledElements.contains(var1); // L: 716
 	}
 
-	@ObfuscatedName("bd")
-	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "679463737"
-	)
-	@Export("isCategoryDisabled")
-	public boolean isCategoryDisabled(int var1) {
-		return !this.enabledCategories.contains(var1); // L: 701
-	}
-
-	@ObfuscatedName("bt")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "2115531770"
-	)
-	void method6103() {
-		this.field4008.clear(); // L: 705
-		this.field4008.addAll(this.enabledElements); // L: 706
-		this.field4008.addAll(this.enabledElementIds); // L: 707
-	} // L: 708
-
 	@ObfuscatedName("bq")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-348662358"
+	)
+	@Export("isCategoryDisabled")
+	public boolean isCategoryDisabled(int var1) {
+		return !this.enabledCategories.contains(var1); // L: 720
+	}
+
+	@ObfuscatedName("bx")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1439307571"
+	)
+	void method6182() {
+		this.field4037.clear(); // L: 724
+		this.field4037.addAll(this.enabledElements); // L: 725
+		this.field4037.addAll(this.enabledElementIds); // L: 726
+	} // L: 727
+
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIII)V",
-		garbageValue = "-2083431744"
+		garbageValue = "1475137861"
 	)
 	@Export("addElementMenuOptions")
 	public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (this.cacheLoader.isLoaded()) { // L: 711
-			int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 714
-			int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 715
-			List var9 = this.worldMapManager.method3465(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 716
-			if (!var9.isEmpty()) { // L: 717
+		if (this.cacheLoader.isLoaded()) { // L: 730
+			int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 733
+			int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 734
+			List var9 = this.worldMapManager.method3526(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 735
+			if (!var9.isEmpty()) { // L: 736
 				Iterator var10 = var9.iterator();
 
 				boolean var13;
 				do {
-					if (!var10.hasNext()) { // L: 720
-						return; // L: 736
+					if (!var10.hasNext()) { // L: 739
+						return; // L: 755
 					}
 
-					AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 721
-					WorldMapElement var12 = class6.WorldMapElement_get(var11.getElement()); // L: 723
-					var13 = false; // L: 724
+					AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 740
+					WorldMapElement var12 = Archive.WorldMapElement_get(var11.getElement()); // L: 742
+					var13 = false; // L: 743
 
-					for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 725
-						if (var12.menuActions[var14] != null) { // L: 726
-							Occluder.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727
-							var13 = true; // L: 728
+					for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 744
+						if (var12.menuActions[var14] != null) { // L: 745
+							class22.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 746
+							var13 = true; // L: 747
 						}
 					}
-				} while(!var13); // L: 731
+				} while(!var13); // L: 750
 
 			}
 		}
-	} // L: 712 718 732
+	} // L: 731 737 751
 
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bz")
 	@ObfuscatedSignature(
-		descriptor = "(ILii;I)Lii;",
-		garbageValue = "-1053768057"
+		descriptor = "(ILiw;I)Liw;",
+		garbageValue = "1919686510"
 	)
-	public Coord method6153(int var1, Coord var2) {
-		if (!this.cacheLoader.isLoaded()) { // L: 739
-			return null; // L: 740
-		} else if (!this.worldMapManager.isLoaded()) { // L: 742
-			return null; // L: 743
-		} else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 745
-			return null; // L: 746
+	public Coord method6184(int var1, Coord var2) {
+		if (!this.cacheLoader.isLoaded()) { // L: 758
+			return null; // L: 759
+		} else if (!this.worldMapManager.isLoaded()) { // L: 761
+			return null; // L: 762
+		} else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 764
+			return null; // L: 765
 		} else {
-			HashMap var3 = this.worldMapManager.buildIcons(); // L: 748
-			List var4 = (List)var3.get(var1); // L: 749
-			if (var4 != null && !var4.isEmpty()) { // L: 750
-				AbstractWorldMapIcon var5 = null; // L: 753
-				int var6 = -1; // L: 754
-				Iterator var7 = var4.iterator(); // L: 755
+			HashMap var3 = this.worldMapManager.buildIcons(); // L: 767
+			List var4 = (List)var3.get(var1); // L: 768
+			if (var4 != null && !var4.isEmpty()) { // L: 769
+				AbstractWorldMapIcon var5 = null; // L: 772
+				int var6 = -1; // L: 773
+				Iterator var7 = var4.iterator(); // L: 774
 
 				while (true) {
 					AbstractWorldMapIcon var8;
 					int var11;
 					do {
 						if (!var7.hasNext()) {
-							return var5.coord2; // L: 770
+							return var5.coord2; // L: 789
 						}
 
-						var8 = (AbstractWorldMapIcon)var7.next(); // L: 756
-						int var9 = var8.coord2.x - var2.x; // L: 758
-						int var10 = var8.coord2.y - var2.y; // L: 759
-						var11 = var10 * var10 + var9 * var9; // L: 760
-						if (var11 == 0) { // L: 761
-							return var8.coord2; // L: 762
+						var8 = (AbstractWorldMapIcon)var7.next(); // L: 775
+						int var9 = var8.coord2.x - var2.x; // L: 777
+						int var10 = var8.coord2.y - var2.y; // L: 778
+						var11 = var10 * var10 + var9 * var9; // L: 779
+						if (var11 == 0) { // L: 780
+							return var8.coord2; // L: 781
 						}
-					} while(var11 >= var6 && var5 != null); // L: 764
+					} while(var11 >= var6 && var5 != null); // L: 783
 
-					var5 = var8; // L: 765
-					var6 = var11; // L: 766
+					var5 = var8; // L: 784
+					var6 = var11; // L: 785
 				}
 			} else {
-				return null; // L: 751
+				return null; // L: 770
 			}
 		}
 	}
 
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		descriptor = "(IILii;Lii;I)V",
-		garbageValue = "1568785181"
+		descriptor = "(IILiw;Liw;B)V",
+		garbageValue = "89"
 	)
 	@Export("worldMapMenuAction")
 	public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) {
-		ScriptEvent var5 = new ScriptEvent(); // L: 774
-		WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 775
-		var5.setArgs(new Object[]{var6}); // L: 776
-		switch(var1) { // L: 777
+		ScriptEvent var5 = new ScriptEvent(); // L: 793
+		WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 794
+		var5.setArgs(new Object[]{var6}); // L: 795
+		switch(var1) { // L: 796
 		case 1008:
-			var5.setType(10); // L: 800
-			break;
+			var5.setType(10); // L: 804
+			break; // L: 805
 		case 1009:
-			var5.setType(11); // L: 790
-			break; // L: 791
+			var5.setType(11); // L: 819
+			break;
 		case 1010:
-			var5.setType(12); // L: 795
-			break; // L: 796
+			var5.setType(12); // L: 809
+			break; // L: 810
 		case 1011:
-			var5.setType(13); // L: 785
-			break; // L: 786
+			var5.setType(13); // L: 814
+			break; // L: 815
 		case 1012:
-			var5.setType(14); // L: 780
+			var5.setType(14); // L: 799
 		}
 
-		PacketWriter.runScriptEvent(var5); // L: 804
-	} // L: 805
+		WorldMapSection1.runScriptEvent(var5); // L: 823
+	} // L: 824
 
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lgq;",
-		garbageValue = "1"
+		descriptor = "(I)Lgh;",
+		garbageValue = "604534686"
 	)
 	@Export("iconStart")
 	public AbstractWorldMapIcon iconStart() {
-		if (!this.cacheLoader.isLoaded()) { // L: 808
-			return null; // L: 809
-		} else if (!this.worldMapManager.isLoaded()) { // L: 811
-			return null; // L: 812
+		if (!this.cacheLoader.isLoaded()) { // L: 827
+			return null; // L: 828
+		} else if (!this.worldMapManager.isLoaded()) { // L: 830
+			return null; // L: 831
 		} else {
-			HashMap var1 = this.worldMapManager.buildIcons(); // L: 814
-			this.field4039 = new LinkedList(); // L: 815
-			Iterator var2 = var1.values().iterator(); // L: 816
+			HashMap var1 = this.worldMapManager.buildIcons(); // L: 833
+			this.field4041 = new LinkedList(); // L: 834
+			Iterator var2 = var1.values().iterator(); // L: 835
 
 			while (var2.hasNext()) {
-				List var3 = (List)var2.next(); // L: 817
-				this.field4039.addAll(var3); // L: 819
+				List var3 = (List)var2.next(); // L: 836
+				this.field4041.addAll(var3); // L: 838
 			}
 
-			this.iconIterator = this.field4039.iterator(); // L: 822
-			return this.iconNext(); // L: 823
+			this.iconIterator = this.field4041.iterator(); // L: 841
+			return this.iconNext(); // L: 842
 		}
 	}
 
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lgq;",
-		garbageValue = "558434467"
+		descriptor = "(I)Lgh;",
+		garbageValue = "-379304026"
 	)
 	@Export("iconNext")
 	public AbstractWorldMapIcon iconNext() {
-		if (this.iconIterator == null) { // L: 827
-			return null; // L: 828
+		if (this.iconIterator == null) { // L: 846
+			return null; // L: 847
 		} else {
 			AbstractWorldMapIcon var1;
 			do {
-				if (!this.iconIterator.hasNext()) { // L: 830
-					return null; // L: 836
+				if (!this.iconIterator.hasNext()) { // L: 849
+					return null; // L: 855
 				}
 
-				var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 831
-			} while(var1.getElement() == -1); // L: 832
+				var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 850
+			} while(var1.getElement() == -1); // L: 851
 
-			return var1; // L: 833
+			return var1; // L: 852
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java
index 398cb3554d..28a134354d 100644
--- a/runescape-client/src/main/java/WorldMapArchiveLoader.java
+++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java
@@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ma")
+@ObfuscatedName("mx")
 @Implements("WorldMapArchiveLoader")
 public class WorldMapArchiveLoader {
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("cacheName")
 	String cacheName;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("archive")
 	AbstractArchive archive;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 134811513
+		intValue = 470808673
 	)
 	@Export("percentLoaded")
 	int percentLoaded;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("loaded")
 	boolean loaded;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;)V"
+		descriptor = "(Ljp;)V"
 	)
 	WorldMapArchiveLoader(AbstractArchive var1) {
 		this.percentLoaded = 0; // L: 13
@@ -35,10 +35,10 @@ public class WorldMapArchiveLoader {
 		this.archive = var1; // L: 17
 	} // L: 18
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "87"
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1390594183"
 	)
 	@Export("reset")
 	void reset(String var1) {
@@ -52,15 +52,15 @@ public class WorldMapArchiveLoader {
 		}
 	} // L: 22 25 31
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-69"
+		descriptor = "(I)I",
+		garbageValue = "-1812007653"
 	)
 	@Export("load")
 	int load() {
 		if (this.percentLoaded < 33) { // L: 34
-			if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2132.name, this.cacheName)) { // L: 35
+			if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field2134.name, this.cacheName)) { // L: 35
 				return this.percentLoaded; // L: 36
 			}
 
@@ -68,7 +68,7 @@ public class WorldMapArchiveLoader {
 		}
 
 		if (this.percentLoaded == 33) { // L: 40
-			if (this.archive.isValidFileName(WorldMapCacheName.field2134.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2134.name, this.cacheName)) { // L: 41 42
+			if (this.archive.isValidFileName(WorldMapCacheName.field2130.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field2130.name, this.cacheName)) { // L: 41 42
 				return this.percentLoaded; // L: 43
 			}
 
@@ -76,7 +76,7 @@ public class WorldMapArchiveLoader {
 		}
 
 		if (this.percentLoaded == 66) { // L: 48
-			if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2135.name)) { // L: 49
+			if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field2129.name)) { // L: 49
 				return this.percentLoaded; // L: 50
 			}
 
@@ -87,10 +87,10 @@ public class WorldMapArchiveLoader {
 		return this.percentLoaded; // L: 55
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "1213842170"
+		garbageValue = "-1542978500"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
@@ -100,7 +100,7 @@ public class WorldMapArchiveLoader {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-192788125"
+		garbageValue = "1748006282"
 	)
 	@Export("getPercentLoaded")
 	int getPercentLoaded() {
diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java
index d606e2b86d..a5182663d1 100644
--- a/runescape-client/src/main/java/WorldMapArea.java
+++ b/runescape-client/src/main/java/WorldMapArea.java
@@ -6,73 +6,67 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fo")
+@ObfuscatedName("fa")
 @Implements("WorldMapArea")
 public class WorldMapArea {
-	@ObfuscatedName("hb")
-	@ObfuscatedSignature(
-		descriptor = "[Loh;"
-	)
-	@Export("mapMarkerSprites")
-	static SpritePixels[] mapMarkerSprites;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1076767211
+		intValue = 1578989981
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("internalName")
 	String internalName;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@Export("externalName")
 	String externalName;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1286502133
+		intValue = -1093781253
 	)
 	@Export("backGroundColor")
 	int backGroundColor;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1817380147
+		intValue = 1026096533
 	)
 	@Export("zoom")
 	int zoom;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liw;"
 	)
 	@Export("origin")
 	Coord origin;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -214984287
+		intValue = 1868545785
 	)
 	@Export("regionLowX")
 	int regionLowX;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 1975622015
+		intValue = 2043667075
 	)
 	@Export("regionHighX")
 	int regionHighX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1153356879
+		intValue = 491098273
 	)
 	@Export("regionLowY")
 	int regionLowY;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1020551999
+		intValue = -380417961
 	)
 	@Export("regionHighY")
 	int regionHighY;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("isMain")
 	boolean isMain;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("sections")
 	LinkedList sections;
 
@@ -88,10 +82,10 @@ public class WorldMapArea {
 		this.isMain = false; // L: 19
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1949118640"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-458748855"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -113,82 +107,81 @@ public class WorldMapArea {
 		this.setBounds(); // L: 36
 	} // L: 37
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Lgi;",
-		garbageValue = "2132246021"
+		descriptor = "(Lnt;S)Lge;",
+		garbageValue = "2606"
 	)
 	@Export("readWorldMapSection")
 	WorldMapSection readWorldMapSection(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 40
-		WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE0}; // L: 43
-		WorldMapSectionType var4 = (WorldMapSectionType)Messages.findEnumerated(var3, var2); // L: 45
-		Object var5 = null; // L: 46
-		switch(var4.type) { // L: 47
+		WorldMapSectionType var3 = (WorldMapSectionType)Clock.findEnumerated(WorldMapSectionType.method3676(), var2); // L: 41
+		Object var4 = null; // L: 42
+		switch(var3.type) { // L: 43
 		case 0:
-			var5 = new WorldMapSection2(); // L: 49
+			var4 = new WorldMapSection2(); // L: 45
 			break;
 		case 1:
-			var5 = new WorldMapSection0(); // L: 55
-			break; // L: 56
+			var4 = new WorldMapSection1(); // L: 48
+			break; // L: 49
 		case 2:
-			var5 = new WorldMapSection1(); // L: 52
-			break; // L: 53
+			var4 = new WorldMapSection0(); // L: 56
+			break;
 		case 3:
-			var5 = new class169(); // L: 58
-			break; // L: 59
+			var4 = new class170(); // L: 53
+			break; // L: 54
 		default:
-			throw new IllegalStateException(""); // L: 61
+			throw new IllegalStateException(""); // L: 51
 		}
 
-		((WorldMapSection)var5).read(var1); // L: 63
-		return (WorldMapSection)var5; // L: 64
+		((WorldMapSection)var4).read(var1); // L: 59
+		return (WorldMapSection)var4; // L: 60
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)Z",
-		garbageValue = "-1800856455"
+		garbageValue = "-1448523684"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		Iterator var4 = this.sections.iterator(); // L: 68
+		Iterator var4 = this.sections.iterator(); // L: 64
 
 		WorldMapSection var5;
 		do {
 			if (!var4.hasNext()) {
-				return false; // L: 76
+				return false; // L: 72
 			}
 
-			var5 = (WorldMapSection)var4.next(); // L: 69
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 71
+			var5 = (WorldMapSection)var4.next(); // L: 65
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 67
 
-		return true; // L: 72
+		return true; // L: 68
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "621143817"
+		garbageValue = "-579774048"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		int var3 = var1 / 64; // L: 80
-		int var4 = var2 / 64; // L: 81
-		if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82
-			if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83
-				Iterator var5 = this.sections.iterator(); // L: 84
+		int var3 = var1 / 64; // L: 76
+		int var4 = var2 / 64; // L: 77
+		if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78
+			if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79
+				Iterator var5 = this.sections.iterator(); // L: 80
 
 				WorldMapSection var6;
 				do {
 					if (!var5.hasNext()) {
-						return false; // L: 92
+						return false; // L: 88
 					}
 
-					var6 = (WorldMapSection)var5.next(); // L: 85
-				} while(!var6.containsPosition(var1, var2)); // L: 87
+					var6 = (WorldMapSection)var5.next(); // L: 81
+				} while(!var6.containsPosition(var1, var2)); // L: 83
 
-				return true; // L: 88
+				return true; // L: 84
 			} else {
 				return false;
 			}
@@ -197,201 +190,201 @@ public class WorldMapArea {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IIIB)[I",
-		garbageValue = "-18"
+		descriptor = "(IIIS)[I",
+		garbageValue = "-1315"
 	)
 	@Export("position")
 	public int[] position(int var1, int var2, int var3) {
-		Iterator var4 = this.sections.iterator(); // L: 96
+		Iterator var4 = this.sections.iterator(); // L: 92
 
 		WorldMapSection var5;
 		do {
 			if (!var4.hasNext()) {
-				return null; // L: 104
+				return null; // L: 100
 			}
 
-			var5 = (WorldMapSection)var4.next(); // L: 97
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 99
+			var5 = (WorldMapSection)var4.next(); // L: 93
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 95
 
-		return var5.getBorderTileLengths(var1, var2, var3); // L: 100
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lii;",
-		garbageValue = "-1073728046"
-	)
-	@Export("coord")
-	public Coord coord(int var1, int var2) {
-		Iterator var3 = this.sections.iterator(); // L: 108
-
-		WorldMapSection var4;
-		do {
-			if (!var3.hasNext()) { // L: 115
-				return null; // L: 116
-			}
-
-			var4 = (WorldMapSection)var3.next(); // L: 109
-		} while(!var4.containsPosition(var1, var2)); // L: 111
-
-		return var4.coord(var1, var2); // L: 112
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1729266298"
-	)
-	@Export("setBounds")
-	void setBounds() {
-		Iterator var1 = this.sections.iterator(); // L: 120
-
-		while (var1.hasNext()) {
-			WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121
-			var2.expandBounds(this); // L: 123
-		}
-
-	} // L: 126
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-113246387"
-	)
-	@Export("getId")
-	public int getId() {
-		return this.id; // L: 129
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "1"
-	)
-	@Export("getIsMain")
-	public boolean getIsMain() {
-		return this.isMain; // L: 133
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "-62"
-	)
-	@Export("getInternalName")
-	public String getInternalName() {
-		return this.internalName; // L: 137
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "772000133"
-	)
-	@Export("getExternalName")
-	public String getExternalName() {
-		return this.externalName; // L: 141
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "897083194"
-	)
-	@Export("getBackGroundColor")
-	int getBackGroundColor() {
-		return this.backGroundColor; // L: 145
+		return var5.getBorderTileLengths(var1, var2, var3); // L: 96
 	}
 
 	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(III)Liw;",
+		garbageValue = "-464379344"
+	)
+	@Export("coord")
+	public Coord coord(int var1, int var2) {
+		Iterator var3 = this.sections.iterator(); // L: 104
+
+		WorldMapSection var4;
+		do {
+			if (!var3.hasNext()) {
+				return null; // L: 112
+			}
+
+			var4 = (WorldMapSection)var3.next(); // L: 105
+		} while(!var4.containsPosition(var1, var2)); // L: 107
+
+		return var4.coord(var1, var2); // L: 108
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "126"
+	)
+	@Export("setBounds")
+	void setBounds() {
+		Iterator var1 = this.sections.iterator(); // L: 116
+
+		while (var1.hasNext()) {
+			WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117
+			var2.expandBounds(this); // L: 119
+		}
+
+	} // L: 122
+
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1426603184"
+		garbageValue = "-362615212"
+	)
+	@Export("getId")
+	public int getId() {
+		return this.id; // L: 125
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "58"
+	)
+	@Export("getIsMain")
+	public boolean getIsMain() {
+		return this.isMain; // L: 129
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "-118"
+	)
+	@Export("getInternalName")
+	public String getInternalName() {
+		return this.internalName; // L: 133
+	}
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "117"
+	)
+	@Export("getExternalName")
+	public String getExternalName() {
+		return this.externalName; // L: 137
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(S)I",
+		garbageValue = "18217"
+	)
+	@Export("getBackGroundColor")
+	int getBackGroundColor() {
+		return this.backGroundColor; // L: 141
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "4"
 	)
 	@Export("getZoom")
 	public int getZoom() {
-		return this.zoom; // L: 149
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1057202329"
-	)
-	@Export("getRegionLowX")
-	public int getRegionLowX() {
-		return this.regionLowX; // L: 153
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "644199469"
-	)
-	@Export("getRegionHighX")
-	public int getRegionHighX() {
-		return this.regionHighX; // L: 157
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-6"
-	)
-	@Export("getRegionLowY")
-	public int getRegionLowY() {
-		return this.regionLowY; // L: 161
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "494327385"
-	)
-	@Export("getRegionHighY")
-	public int getRegionHighY() {
-		return this.regionHighY; // L: 165
+		return this.zoom; // L: 145
 	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1792528249"
+		garbageValue = "-53355558"
 	)
-	@Export("getOriginX")
-	public int getOriginX() {
-		return this.origin.x; // L: 169
+	@Export("getRegionLowX")
+	public int getRegionLowX() {
+		return this.regionLowX; // L: 149
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-1473064469"
+		garbageValue = "-1437577168"
 	)
-	@Export("getOriginPlane")
-	public int getOriginPlane() {
-		return this.origin.plane; // L: 173
+	@Export("getRegionHighX")
+	public int getRegionHighX() {
+		return this.regionHighX; // L: 153
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-51"
+	)
+	@Export("getRegionLowY")
+	public int getRegionLowY() {
+		return this.regionLowY; // L: 157
 	}
 
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-202586272"
+		garbageValue = "-2076656857"
+	)
+	@Export("getRegionHighY")
+	public int getRegionHighY() {
+		return this.regionHighY; // L: 161
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-195979201"
+	)
+	@Export("getOriginX")
+	public int getOriginX() {
+		return this.origin.x; // L: 165
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "263093788"
+	)
+	@Export("getOriginPlane")
+	public int getOriginPlane() {
+		return this.origin.plane; // L: 169
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-2050680691"
 	)
 	@Export("getOriginY")
 	public int getOriginY() {
-		return this.origin.y; // L: 177
+		return this.origin.y; // L: 173
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lii;",
-		garbageValue = "-71"
+		descriptor = "(I)Liw;",
+		garbageValue = "2115040321"
 	)
 	@Export("getOrigin")
 	public Coord getOrigin() {
-		return new Coord(this.origin); // L: 181
+		return new Coord(this.origin); // L: 177
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index a4fafebf11..4fac1a97bf 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -6,29 +6,32 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gz")
+@ObfuscatedName("gg")
 @Implements("WorldMapAreaData")
 public class WorldMapAreaData extends WorldMapArea {
-	@ObfuscatedName("gx")
-	@Export("xteaKeys")
-	static int[][] xteaKeys;
-	@ObfuscatedName("o")
+	@ObfuscatedName("rq")
+	@ObfuscatedSignature(
+		descriptor = "Lbt;"
+	)
+	@Export("decimator")
+	static Decimator decimator;
+	@ObfuscatedName("i")
 	@Export("worldMapData0Set")
 	HashSet worldMapData0Set;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("worldMapData1Set")
 	HashSet worldMapData1Set;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("iconList")
 	List iconList;
 
 	WorldMapAreaData() {
 	} // L: 14
 
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bu")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Lnd;IZI)V",
-		garbageValue = "1129445653"
+		descriptor = "(Lnt;Lnt;IZI)V",
+		garbageValue = "-1962435243"
 	)
 	@Export("init")
 	void init(Buffer var1, Buffer var2, int var3, boolean var4) {
@@ -67,10 +70,10 @@ public class WorldMapAreaData extends WorldMapArea {
 		this.initIconsList(var2, var4); // L: 42
 	} // L: 43
 
-	@ObfuscatedName("be")
+	@ObfuscatedName("bl")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;ZI)V",
-		garbageValue = "1182006206"
+		descriptor = "(Lnt;ZB)V",
+		garbageValue = "-62"
 	)
 	@Export("initIconsList")
 	void initIconsList(Buffer var1, boolean var2) {
@@ -78,7 +81,7 @@ public class WorldMapAreaData extends WorldMapArea {
 		int var3 = var1.readUnsignedShort(); // L: 47
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 48
-			int var5 = var1.method6583(); // L: 49
+			int var5 = var1.method6630(); // L: 49
 			Coord var6 = new Coord(var1.readInt()); // L: 50
 			boolean var7 = var1.readUnsignedByte() == 1; // L: 51
 			if (var2 || !var7) { // L: 52
@@ -87,495 +90,4 @@ public class WorldMapAreaData extends WorldMapArea {
 		}
 
 	} // L: 56
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;IIIIIIB)V",
-		garbageValue = "-20"
-	)
-	@Export("loadTerrain")
-	static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		int var7;
-		if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 126
-			Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 127
-
-			while (true) {
-				var7 = var0.readUnsignedByte(); // L: 129
-				if (var7 == 0) { // L: 130
-					if (var1 == 0) { // L: 131
-						int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 132
-						int var11 = var2 + var4 + 932731; // L: 135
-						int var12 = var3 + var5 + 556238; // L: 136
-						int var13 = Skeleton.method3920(var11 + 45365, var12 + 91923, 4) - 128 + (Skeleton.method3920(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Skeleton.method3920(var11, var12, 1) - 128 >> 2); // L: 138
-						var13 = (int)((double)var13 * 0.3D) + 35; // L: 139
-						if (var13 < 10) { // L: 140
-							var13 = 10;
-						} else if (var13 > 60) { // L: 141
-							var13 = 60;
-						}
-
-						var14[var3] = -var13 * 8; // L: 144
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 146
-					}
-					break;
-				}
-
-				if (var7 == 1) { // L: 149
-					int var8 = var0.readUnsignedByte(); // L: 150
-					if (var8 == 1) { // L: 151
-						var8 = 0;
-					}
-
-					if (var1 == 0) { // L: 152
-						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 153
-					}
-					break;
-				}
-
-				if (var7 <= 49) { // L: 156
-					class253.field3130[var1][var2][var3] = var0.readByte(); // L: 157
-					class20.field182[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 158
-					DirectByteArrayCopier.field3128[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 159
-				} else if (var7 <= 81) { // L: 162
-					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 163
-				} else {
-					Tiles.field1120[var1][var2][var3] = (byte)(var7 - 81); // L: 166
-				}
-			}
-		} else {
-			while (true) {
-				var7 = var0.readUnsignedByte(); // L: 171
-				if (var7 == 0) { // L: 172
-					break;
-				}
-
-				if (var7 == 1) { // L: 173
-					var0.readUnsignedByte(); // L: 174
-					break;
-				}
-
-				if (var7 <= 49) { // L: 177
-					var0.readUnsignedByte();
-				}
-			}
-		}
-
-	} // L: 180
-
-	@ObfuscatedName("hf")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "0"
-	)
-	static final void method3708() {
-		TextureProvider.method4142(false); // L: 5242
-		Client.field694 = 0; // L: 5243
-		boolean var0 = true; // L: 5244
-
-		int var1;
-		for (var1 = 0; var1 < class18.regionLandArchives.length; ++var1) { // L: 5245
-			if (class16.regionMapArchiveIds[var1] != -1 && class18.regionLandArchives[var1] == null) { // L: 5246 5247
-				class18.regionLandArchives[var1] = class247.archive5.takeFile(class16.regionMapArchiveIds[var1], 0); // L: 5248
-				if (class18.regionLandArchives[var1] == null) { // L: 5249
-					var0 = false; // L: 5250
-					++Client.field694; // L: 5251
-				}
-			}
-
-			if (class24.regionLandArchiveIds[var1] != -1 && class82.regionMapArchives[var1] == null) { // L: 5255 5256
-				class82.regionMapArchives[var1] = class247.archive5.takeFileEncrypted(class24.regionLandArchiveIds[var1], 0, xteaKeys[var1]); // L: 5257
-				if (class82.regionMapArchives[var1] == null) { // L: 5258
-					var0 = false; // L: 5259
-					++Client.field694; // L: 5260
-				}
-			}
-		}
-
-		if (!var0) { // L: 5265
-			Client.field698 = 1; // L: 5266
-		} else {
-			Client.field696 = 0; // L: 5269
-			var0 = true; // L: 5270
-
-			int var3;
-			int var4;
-			int var9;
-			int var10;
-			int var11;
-			int var14;
-			int var15;
-			int var16;
-			int var17;
-			Buffer var34;
-			int var35;
-			int var36;
-			for (var1 = 0; var1 < class18.regionLandArchives.length; ++var1) { // L: 5271
-				byte[] var39 = class82.regionMapArchives[var1]; // L: 5272
-				if (var39 != null) { // L: 5273
-					var3 = (PlayerComposition.regions[var1] >> 8) * 64 - VertexNormal.baseX; // L: 5274
-					var4 = (PlayerComposition.regions[var1] & 255) * 64 - SoundSystem.baseY; // L: 5275
-					if (Client.isInInstance) { // L: 5276
-						var3 = 10; // L: 5277
-						var4 = 10; // L: 5278
-					}
-
-					boolean var7 = true; // L: 5283
-					var34 = new Buffer(var39); // L: 5284
-					var9 = -1; // L: 5285
-
-					label594:
-					while (true) {
-						var10 = var34.method6560(); // L: 5287
-						if (var10 == 0) { // L: 5288
-							var0 &= var7; // L: 5321
-							break;
-						}
-
-						var9 += var10; // L: 5289
-						var11 = 0; // L: 5290
-						boolean var12 = false; // L: 5291
-
-						while (true) {
-							while (!var12) { // L: 5293
-								var35 = var34.readUShortSmart(); // L: 5299
-								if (var35 == 0) { // L: 5300
-									continue label594;
-								}
-
-								var11 += var35 - 1; // L: 5301
-								var14 = var11 & 63; // L: 5302
-								var15 = var11 >> 6 & 63; // L: 5303
-								var16 = var34.readUnsignedByte() >> 2; // L: 5304
-								var17 = var15 + var3; // L: 5305
-								var36 = var4 + var14; // L: 5306
-								if (var17 > 0 && var36 > 0 && var17 < 103 && var36 < 103) { // L: 5307
-									ObjectComposition var31 = class23.getObjectDefinition(var9); // L: 5308
-									if (var16 != 22 || !Client.isLowDetail || var31.int1 != 0 || var31.interactType == 1 || var31.boolean2) { // L: 5309
-										if (!var31.needsModelFiles()) { // L: 5310
-											++Client.field696; // L: 5311
-											var7 = false; // L: 5312
-										}
-
-										var12 = true; // L: 5314
-									}
-								}
-							}
-
-							var35 = var34.readUShortSmart(); // L: 5294
-							if (var35 == 0) { // L: 5295
-								break;
-							}
-
-							var34.readUnsignedByte(); // L: 5296
-						}
-					}
-				}
-			}
-
-			if (!var0) { // L: 5324
-				Client.field698 = 2; // L: 5325
-			} else {
-				if (Client.field698 != 0) { // L: 5328
-					DirectByteArrayCopier.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
-				}
-
-				HealthBarUpdate.playPcmPlayers(); // L: 5329
-				AbstractSocket.scene.clear(); // L: 5330
-
-				for (var1 = 0; var1 < 4; ++var1) { // L: 5331
-					Client.collisionMaps[var1].clear();
-				}
-
-				int var2;
-				for (var1 = 0; var1 < 4; ++var1) { // L: 5332
-					for (var2 = 0; var2 < 104; ++var2) { // L: 5333
-						for (var3 = 0; var3 < 104; ++var3) { // L: 5334
-							Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 5335
-						}
-					}
-				}
-
-				HealthBarUpdate.playPcmPlayers(); // L: 5339
-				class34.method327(); // L: 5340
-				var1 = class18.regionLandArchives.length; // L: 5341
-				WorldMapSprite.method3631(); // L: 5342
-				TextureProvider.method4142(true); // L: 5343
-				int var5;
-				int var19;
-				int var20;
-				int var21;
-				int var42;
-				if (!Client.isInInstance) { // L: 5344
-					byte[] var38;
-					for (var2 = 0; var2 < var1; ++var2) { // L: 5345
-						var3 = (PlayerComposition.regions[var2] >> 8) * 64 - VertexNormal.baseX; // L: 5346
-						var4 = (PlayerComposition.regions[var2] & 255) * 64 - SoundSystem.baseY; // L: 5347
-						var38 = class18.regionLandArchives[var2]; // L: 5348
-						if (var38 != null) { // L: 5349
-							HealthBarUpdate.playPcmPlayers(); // L: 5350
-							WorldMapLabel.method3632(var38, var3, var4, GrandExchangeOfferOwnWorldComparator.field632 * 8 - 48, UserComparator4.field1427 * 8 - 48, Client.collisionMaps); // L: 5351
-						}
-					}
-
-					for (var2 = 0; var2 < var1; ++var2) { // L: 5354
-						var3 = (PlayerComposition.regions[var2] >> 8) * 64 - VertexNormal.baseX; // L: 5355
-						var4 = (PlayerComposition.regions[var2] & 255) * 64 - SoundSystem.baseY; // L: 5356
-						var38 = class18.regionLandArchives[var2]; // L: 5357
-						if (var38 == null && UserComparator4.field1427 < 800) { // L: 5358
-							HealthBarUpdate.playPcmPlayers(); // L: 5359
-							ItemComposition.method3085(var3, var4, 64, 64); // L: 5360
-						}
-					}
-
-					TextureProvider.method4142(true); // L: 5363
-
-					for (var2 = 0; var2 < var1; ++var2) { // L: 5364
-						byte[] var30 = class82.regionMapArchives[var2]; // L: 5365
-						if (var30 != null) { // L: 5366
-							var4 = (PlayerComposition.regions[var2] >> 8) * 64 - VertexNormal.baseX; // L: 5367
-							var5 = (PlayerComposition.regions[var2] & 255) * 64 - SoundSystem.baseY; // L: 5368
-							HealthBarUpdate.playPcmPlayers(); // L: 5369
-							Scene var32 = AbstractSocket.scene; // L: 5370
-							CollisionMap[] var33 = Client.collisionMaps; // L: 5371
-							var34 = new Buffer(var30); // L: 5373
-							var9 = -1; // L: 5374
-
-							while (true) {
-								var10 = var34.method6560(); // L: 5376
-								if (var10 == 0) { // L: 5377
-									break;
-								}
-
-								var9 += var10; // L: 5378
-								var11 = 0; // L: 5379
-
-								while (true) {
-									var42 = var34.readUShortSmart(); // L: 5381
-									if (var42 == 0) { // L: 5382
-										break;
-									}
-
-									var11 += var42 - 1; // L: 5383
-									var35 = var11 & 63; // L: 5384
-									var14 = var11 >> 6 & 63; // L: 5385
-									var15 = var11 >> 12; // L: 5386
-									var16 = var34.readUnsignedByte(); // L: 5387
-									var17 = var16 >> 2; // L: 5388
-									var36 = var16 & 3; // L: 5389
-									var19 = var4 + var14; // L: 5390
-									var20 = var5 + var35; // L: 5391
-									if (var19 > 0 && var20 > 0 && var19 < 103 && var20 < 103) { // L: 5392
-										var21 = var15; // L: 5393
-										if ((Tiles.Tiles_renderFlags[1][var19][var20] & 2) == 2) { // L: 5394
-											var21 = var15 - 1;
-										}
-
-										CollisionMap var37 = null; // L: 5395
-										if (var21 >= 0) { // L: 5396
-											var37 = var33[var21];
-										}
-
-										ClanChannelMember.method89(var15, var19, var20, var9, var36, var17, var32, var37); // L: 5397
-									}
-								}
-							}
-						}
-					}
-				}
-
-				int var6;
-				int var8;
-				int var41;
-				if (Client.isInInstance) { // L: 5405
-					for (var2 = 0; var2 < 4; ++var2) { // L: 5406
-						HealthBarUpdate.playPcmPlayers(); // L: 5407
-
-						for (var3 = 0; var3 < 13; ++var3) { // L: 5408
-							for (var4 = 0; var4 < 13; ++var4) { // L: 5409
-								boolean var40 = false; // L: 5410
-								var6 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5411
-								if (var6 != -1) { // L: 5412
-									var41 = var6 >> 24 & 3; // L: 5413
-									var8 = var6 >> 1 & 3; // L: 5414
-									var9 = var6 >> 14 & 1023; // L: 5415
-									var10 = var6 >> 3 & 2047; // L: 5416
-									var11 = (var9 / 8 << 8) + var10 / 8; // L: 5417
-
-									for (var42 = 0; var42 < PlayerComposition.regions.length; ++var42) { // L: 5418
-										if (PlayerComposition.regions[var42] == var11 && class18.regionLandArchives[var42] != null) { // L: 5419
-											byte[] var13 = class18.regionLandArchives[var42]; // L: 5420
-											var14 = var3 * 8; // L: 5421
-											var15 = var4 * 8; // L: 5422
-											var16 = (var9 & 7) * 8; // L: 5423
-											var17 = (var10 & 7) * 8; // L: 5424
-											CollisionMap[] var18 = Client.collisionMaps; // L: 5425
-
-											for (var19 = 0; var19 < 8; ++var19) { // L: 5427
-												for (var20 = 0; var20 < 8; ++var20) { // L: 5428
-													if (var14 + var19 > 0 && var14 + var19 < 103 && var15 + var20 > 0 && var20 + var15 < 103) { // L: 5429
-														int[] var10000 = var18[var2].flags[var19 + var14];
-														var10000[var20 + var15] &= -16777217;
-													}
-												}
-											}
-
-											Buffer var45 = new Buffer(var13); // L: 5432
-
-											for (var20 = 0; var20 < 4; ++var20) { // L: 5433
-												for (var21 = 0; var21 < 64; ++var21) { // L: 5434
-													for (int var22 = 0; var22 < 64; ++var22) { // L: 5435
-														if (var41 == var20 && var21 >= var16 && var21 < var16 + 8 && var22 >= var17 && var22 < var17 + 8) { // L: 5436
-															int var27 = var21 & 7; // L: 5441
-															int var28 = var22 & 7; // L: 5442
-															int var29 = var8 & 3; // L: 5445
-															int var26;
-															if (var29 == 0) { // L: 5446
-																var26 = var27; // L: 5447
-															} else if (var29 == 1) { // L: 5450
-																var26 = var28; // L: 5451
-															} else if (var29 == 2) { // L: 5454
-																var26 = 7 - var27; // L: 5455
-															} else {
-																var26 = 7 - var28; // L: 5458
-															}
-
-															loadTerrain(var45, var2, var26 + var14, var15 + ClanChannelMember.method86(var21 & 7, var22 & 7, var8), 0, 0, var8); // L: 5460
-														} else {
-															loadTerrain(var45, 0, -1, -1, 0, 0, 0); // L: 5462
-														}
-													}
-												}
-											}
-
-											var40 = true; // L: 5467
-											break;
-										}
-									}
-								}
-
-								if (!var40) { // L: 5472
-									MouseRecorder.method2099(var2, var3 * 8, var4 * 8); // L: 5473
-								}
-							}
-						}
-					}
-
-					for (var2 = 0; var2 < 13; ++var2) { // L: 5478
-						for (var3 = 0; var3 < 13; ++var3) { // L: 5479
-							var4 = Client.instanceChunkTemplates[0][var2][var3]; // L: 5480
-							if (var4 == -1) { // L: 5481
-								ItemComposition.method3085(var2 * 8, var3 * 8, 8, 8); // L: 5482
-							}
-						}
-					}
-
-					TextureProvider.method4142(true); // L: 5486
-
-					for (var2 = 0; var2 < 4; ++var2) { // L: 5487
-						HealthBarUpdate.playPcmPlayers(); // L: 5488
-
-						for (var3 = 0; var3 < 13; ++var3) { // L: 5489
-							for (var4 = 0; var4 < 13; ++var4) { // L: 5490
-								var5 = Client.instanceChunkTemplates[var2][var3][var4]; // L: 5491
-								if (var5 != -1) { // L: 5492
-									var6 = var5 >> 24 & 3; // L: 5493
-									var41 = var5 >> 1 & 3; // L: 5494
-									var8 = var5 >> 14 & 1023; // L: 5495
-									var9 = var5 >> 3 & 2047; // L: 5496
-									var10 = (var8 / 8 << 8) + var9 / 8; // L: 5497
-
-									for (var11 = 0; var11 < PlayerComposition.regions.length; ++var11) { // L: 5498
-										if (PlayerComposition.regions[var11] == var10 && class82.regionMapArchives[var11] != null) { // L: 5499
-											FontName.method6296(class82.regionMapArchives[var11], var2, var3 * 8, var4 * 8, var6, (var8 & 7) * 8, (var9 & 7) * 8, var41, AbstractSocket.scene, Client.collisionMaps); // L: 5500
-											break; // L: 5501
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-
-				TextureProvider.method4142(true); // L: 5509
-				HealthBarUpdate.playPcmPlayers(); // L: 5510
-				class17.method210(AbstractSocket.scene, Client.collisionMaps); // L: 5511
-				TextureProvider.method4142(true); // L: 5512
-				var2 = Tiles.Tiles_minPlane; // L: 5513
-				if (var2 > class22.Client_plane) { // L: 5514
-					var2 = class22.Client_plane;
-				}
-
-				if (var2 < class22.Client_plane - 1) { // L: 5515
-					var2 = class22.Client_plane - 1;
-				}
-
-				if (Client.isLowDetail) { // L: 5516
-					AbstractSocket.scene.init(Tiles.Tiles_minPlane);
-				} else {
-					AbstractSocket.scene.init(0); // L: 5517
-				}
-
-				for (var3 = 0; var3 < 104; ++var3) { // L: 5518
-					for (var4 = 0; var4 < 104; ++var4) { // L: 5519
-						ClanSettings.updateItemPile(var3, var4); // L: 5520
-					}
-				}
-
-				HealthBarUpdate.playPcmPlayers(); // L: 5523
-
-				for (PendingSpawn var43 = (PendingSpawn)Client.pendingSpawns.last(); var43 != null; var43 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5525 5526 5532
-					if (var43.hitpoints == -1) { // L: 5527
-						var43.delay = 0; // L: 5528
-						UserComparator5.method2448(var43); // L: 5529
-					} else {
-						var43.remove(); // L: 5531
-					}
-				}
-
-				ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 5535
-				PacketBufferNode var44;
-				if (class23.client.hasFrame()) { // L: 5536
-					var44 = class21.getPacketBufferNode(ClientPacket.field2583, Client.packetWriter.isaacCipher); // L: 5538
-					var44.packetBuffer.writeInt(1057001181); // L: 5539
-					Client.packetWriter.addNode(var44); // L: 5540
-				}
-
-				if (!Client.isInInstance) { // L: 5542
-					var3 = (GrandExchangeOfferOwnWorldComparator.field632 - 6) / 8; // L: 5543
-					var4 = (GrandExchangeOfferOwnWorldComparator.field632 + 6) / 8; // L: 5544
-					var5 = (UserComparator4.field1427 - 6) / 8; // L: 5545
-					var6 = (UserComparator4.field1427 + 6) / 8; // L: 5546
-
-					for (var41 = var3 - 1; var41 <= var4 + 1; ++var41) { // L: 5547
-						for (var8 = var5 - 1; var8 <= var6 + 1; ++var8) { // L: 5548
-							if (var41 < var3 || var41 > var4 || var8 < var5 || var8 > var6) { // L: 5549
-								class247.archive5.loadRegionFromName("m" + var41 + "_" + var8); // L: 5550
-								class247.archive5.loadRegionFromName("l" + var41 + "_" + var8); // L: 5551
-							}
-						}
-					}
-				}
-
-				class12.updateGameState(30); // L: 5555
-				HealthBarUpdate.playPcmPlayers(); // L: 5556
-				class34.method328(); // L: 5557
-				var44 = class21.getPacketBufferNode(ClientPacket.field2669, Client.packetWriter.isaacCipher); // L: 5558
-				Client.packetWriter.addNode(var44); // L: 5559
-				GameEngine.clock.mark(); // L: 5561
-
-				for (var4 = 0; var4 < 32; ++var4) { // L: 5562
-					GameEngine.graphicsTickTimes[var4] = 0L;
-				}
-
-				for (var4 = 0; var4 < 32; ++var4) { // L: 5563
-					GameEngine.clientTickTimes[var4] = 0L;
-				}
-
-				class260.gameCyclesToDo = 0; // L: 5564
-			}
-		}
-	} // L: 5267 5326 5566
 }
diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java
index 72b985348b..7b5cc384b4 100644
--- a/runescape-client/src/main/java/WorldMapCacheName.java
+++ b/runescape-client/src/main/java/WorldMapCacheName.java
@@ -3,60 +3,80 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gw")
+@ObfuscatedName("gt")
 @Implements("WorldMapCacheName")
 public class WorldMapCacheName {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lgw;"
-	)
-	public static final WorldMapCacheName field2137;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lgw;"
-	)
-	public static final WorldMapCacheName field2132;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lgw;"
+		descriptor = "Lgt;"
+	)
+	public static final WorldMapCacheName field2131;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lgt;"
 	)
 	public static final WorldMapCacheName field2134;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lgt;"
+	)
+	public static final WorldMapCacheName field2130;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lgw;"
+		descriptor = "Lgt;"
 	)
-	static final WorldMapCacheName field2131;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lgw;"
-	)
-	public static final WorldMapCacheName field2135;
+	static final WorldMapCacheName field2136;
 	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lgt;"
+	)
+	public static final WorldMapCacheName field2129;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lof;"
+	)
+	@Export("options_buttons_2Sprite")
+	static IndexedSprite options_buttons_2Sprite;
+	@ObfuscatedName("nw")
+	@ObfuscatedSignature(
+		descriptor = "[Liv;"
+	)
+	static Widget[] field2135;
+	@ObfuscatedName("o")
 	@Export("name")
 	public final String name;
 
 	static {
-		field2137 = new WorldMapCacheName("details"); // L: 4
-		field2132 = new WorldMapCacheName("compositemap"); // L: 5
-		field2134 = new WorldMapCacheName("compositetexture"); // L: 6
-		field2131 = new WorldMapCacheName("area"); // L: 7
-		field2135 = new WorldMapCacheName("labels"); // L: 8
+		field2131 = new WorldMapCacheName("details"); // L: 4
+		field2134 = new WorldMapCacheName("compositemap"); // L: 5
+		field2130 = new WorldMapCacheName("compositetexture"); // L: 6
+		field2136 = new WorldMapCacheName("area"); // L: 7
+		field2129 = new WorldMapCacheName("labels"); // L: 8
 	}
 
 	WorldMapCacheName(String var1) {
 		this.name = var1; // L: 12
 	} // L: 13
 
-	@ObfuscatedName("jb")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lio;B)V",
-		garbageValue = "90"
+		descriptor = "(Lix;I)V",
+		garbageValue = "-715270644"
 	)
-	@Export("invalidateWidget")
-	static void invalidateWidget(Widget var0) {
-		if (var0.cycle == Client.field849) { // L: 10792
-			Client.field719[var0.rootIndex] = true; // L: 10793
+	public static void method3789(Huffman var0) {
+		class250.huffman = var0; // L: 14
+	} // L: 15
+
+	@ObfuscatedName("kb")
+	@ObfuscatedSignature(
+		descriptor = "(S)V",
+		garbageValue = "3274"
+	)
+	static final void method3788() {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) { // L: 11443
+			Player var1 = Client.players[Players.Players_indices[var0]]; // L: 11444
+			var1.clearIsInFriendsChat(); // L: 11445
 		}
 
-	} // L: 10795
+	} // L: 11447
 }
diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java
index 8c7aee3af5..2d52032e97 100644
--- a/runescape-client/src/main/java/WorldMapData_0.java
+++ b/runescape-client/src/main/java/WorldMapData_0.java
@@ -3,21 +3,21 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ft")
+@ObfuscatedName("fo")
 @Implements("WorldMapData_0")
 public class WorldMapData_0 extends AbstractWorldMapData {
 	WorldMapData_0() {
 	} // L: 6
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1254081030"
+		descriptor = "(Lnt;B)V",
+		garbageValue = "68"
 	)
 	@Export("init")
 	void init(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 9
-		if (var2 != WorldMapID.field2110.value) { // L: 10
+		if (var2 != WorldMapID.field2111.value) { // L: 10
 			throw new IllegalStateException(""); // L: 11
 		} else {
 			super.minPlane = var1.readUnsignedByte(); // L: 13
@@ -26,26 +26,26 @@ public class WorldMapData_0 extends AbstractWorldMapData {
 			super.regionYLow = var1.readUnsignedShort(); // L: 16
 			super.regionX = var1.readUnsignedShort(); // L: 17
 			super.regionY = var1.readUnsignedShort(); // L: 18
-			super.groupId = var1.method6583(); // L: 19
-			super.fileId = var1.method6583(); // L: 20
+			super.groupId = var1.method6630(); // L: 19
+			super.fileId = var1.method6630(); // L: 20
 		}
 	} // L: 21
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1223315238"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1563875465"
 	)
 	@Export("readGeography")
 	void readGeography(Buffer var1) {
 		super.planes = Math.min(super.planes, 4); // L: 24
 		super.floorUnderlayIds = new short[1][64][64]; // L: 25
 		super.floorOverlayIds = new short[super.planes][64][64]; // L: 26
-		super.field2067 = new byte[super.planes][64][64]; // L: 27
-		super.field2065 = new byte[super.planes][64][64]; // L: 28
+		super.field2068 = new byte[super.planes][64][64]; // L: 27
+		super.field2074 = new byte[super.planes][64][64]; // L: 28
 		super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 29
 		int var2 = var1.readUnsignedByte(); // L: 30
-		if (var2 != class179.field2100.value) { // L: 31
+		if (var2 != class180.field2102.value) { // L: 31
 			throw new IllegalStateException(""); // L: 32
 		} else {
 			int var3 = var1.readUnsignedByte(); // L: 34
@@ -63,16 +63,36 @@ public class WorldMapData_0 extends AbstractWorldMapData {
 		}
 	} // L: 44
 
+	public int hashCode() {
+		return super.regionX | super.regionY << 8; // L: 55
+	}
+
 	public boolean equals(Object var1) {
 		if (!(var1 instanceof WorldMapData_0)) { // L: 47
 			return false; // L: 48
 		} else {
 			WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50
-			return var2.regionX == super.regionX && var2.regionY == super.regionY; // L: 51
+			return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51
 		}
 	}
 
-	public int hashCode() {
-		return super.regionX | super.regionY << 8; // L: 55
+	@ObfuscatedName("ak")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-1824219320"
+	)
+	static int method3267(int var0, Script var1, boolean var2) {
+		if (var0 != 3700 && var0 != 3701) { // L: 2442
+			if (var0 == 3702) { // L: 2447
+				++ChatChannel.Interpreter_intStackSize; // L: 2448
+				return 1; // L: 2449
+			} else {
+				return 2; // L: 2451
+			}
+		} else {
+			--ChatChannel.Interpreter_intStackSize; // L: 2443
+			--UserComparator9.Interpreter_stringStackSize; // L: 2444
+			return 1; // L: 2445
+		}
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java
index 74c49c7868..ec0f9e0486 100644
--- a/runescape-client/src/main/java/WorldMapData_1.java
+++ b/runescape-client/src/main/java/WorldMapData_1.java
@@ -4,35 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fw")
+@ObfuscatedName("fu")
 @Implements("WorldMapData_1")
 public class WorldMapData_1 extends AbstractWorldMapData {
-	@ObfuscatedName("ee")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -232137213
-	)
-	static int field2008;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1553419655
+		intValue = -624362671
 	)
 	@Export("chunkXLow")
 	int chunkXLow;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 558324401
+		intValue = -2082539499
 	)
 	@Export("chunkYLow")
 	int chunkYLow;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 2120333981
+		intValue = -2054670475
 	)
 	@Export("chunkX")
 	int chunkX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1464921775
+		intValue = -1388655107
 	)
 	@Export("chunkY")
 	int chunkY;
@@ -40,47 +35,47 @@ public class WorldMapData_1 extends AbstractWorldMapData {
 	WorldMapData_1() {
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1665401809"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1149185778"
 	)
 	@Export("init")
 	void init(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 14
-		if (var2 != WorldMapID.field2107.value) { // L: 15
+		if (var2 != WorldMapID.field2108.value) { // L: 15
 			throw new IllegalStateException(""); // L: 16
 		} else {
 			super.minPlane = var1.readUnsignedByte(); // L: 18
 			super.planes = var1.readUnsignedByte(); // L: 19
 			super.regionXLow = var1.readUnsignedShort(); // L: 20
 			super.regionYLow = var1.readUnsignedShort(); // L: 21
-			this.chunkXLow = var1.readUnsignedByte(); // L: 22
-			this.chunkYLow = var1.readUnsignedByte(); // L: 23
+			this.chunkXLow = var1.readUnsignedByte();
+			this.chunkYLow = var1.readUnsignedByte();
 			super.regionX = var1.readUnsignedShort(); // L: 24
 			super.regionY = var1.readUnsignedShort(); // L: 25
 			this.chunkX = var1.readUnsignedByte(); // L: 26
 			this.chunkY = var1.readUnsignedByte(); // L: 27
-			super.groupId = var1.method6583(); // L: 28
-			super.fileId = var1.method6583(); // L: 29
+			super.groupId = var1.method6630(); // L: 28
+			super.fileId = var1.method6630(); // L: 29
 		}
 	} // L: 30
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1223315238"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1563875465"
 	)
 	@Export("readGeography")
 	void readGeography(Buffer var1) {
 		super.planes = Math.min(super.planes, 4); // L: 33
 		super.floorUnderlayIds = new short[1][64][64]; // L: 34
-		super.floorOverlayIds = new short[super.planes][64][64];
-		super.field2067 = new byte[super.planes][64][64]; // L: 36
-		super.field2065 = new byte[super.planes][64][64]; // L: 37
+		super.floorOverlayIds = new short[super.planes][64][64]; // L: 35
+		super.field2068 = new byte[super.planes][64][64]; // L: 36
+		super.field2074 = new byte[super.planes][64][64]; // L: 37
 		super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38
 		int var2 = var1.readUnsignedByte(); // L: 39
-		if (var2 != class179.field2099.value) { // L: 40
+		if (var2 != class180.field2103.value) { // L: 40
 			throw new IllegalStateException(""); // L: 41
 		} else {
 			int var3 = var1.readUnsignedByte(); // L: 43
@@ -100,10 +95,10 @@ public class WorldMapData_1 extends AbstractWorldMapData {
 		}
 	} // L: 55
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-225746465"
+		descriptor = "(S)I",
+		garbageValue = "24313"
 	)
 	@Export("getChunkXLow")
 	int getChunkXLow() {
@@ -113,17 +108,17 @@ public class WorldMapData_1 extends AbstractWorldMapData {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-528787257"
+		garbageValue = "-1571205738"
 	)
 	@Export("getChunkYLow")
 	int getChunkYLow() {
 		return this.chunkYLow; // L: 77
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-20705095"
+		descriptor = "(B)I",
+		garbageValue = "-115"
 	)
 	@Export("getChunkX")
 	int getChunkX() {
@@ -132,37 +127,65 @@ public class WorldMapData_1 extends AbstractWorldMapData {
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1881961313"
+		descriptor = "(B)I",
+		garbageValue = "-29"
 	)
 	@Export("getChunkY")
 	int getChunkY() {
 		return this.chunkY; // L: 85
 	}
 
+	public int hashCode() {
+		return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69
+	}
+
 	public boolean equals(Object var1) {
 		if (!(var1 instanceof WorldMapData_1)) { // L: 58
 			return false; // L: 59
 		} else {
 			WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61
-			if (super.regionX == var2.regionX && super.regionY == var2.regionY) { // L: 62
-				return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; // L: 65
+			if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 62
+				return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; // L: 65
 			} else {
 				return false; // L: 63
 			}
 		}
 	}
 
-	public int hashCode() {
-		return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lhg;",
+		garbageValue = "1853252899"
+	)
+	public static PacketBufferNode method3583() {
+		return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Ljw;",
-		garbageValue = "1606153053"
+		descriptor = "(B)[Lhj;",
+		garbageValue = "1"
 	)
-	static class261[] method3525() {
-		return new class261[]{class261.field3201, class261.field3200}; // L: 35
+	public static class226[] method3582() {
+		return new class226[]{class226.field2688, class226.field2683, class226.field2684, class226.field2692, class226.field2693, class226.field2687, class226.field2686, class226.field2689, class226.field2690, class226.field2691}; // L: 17
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(II)Liv;",
+		garbageValue = "1896933792"
+	)
+	@Export("getWidget")
+	public static Widget getWidget(int var0) {
+		int var1 = var0 >> 16; // L: 199
+		int var2 = var0 & 65535; // L: 200
+		if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1] == null || GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1][var2] == null) { // L: 201
+			boolean var3 = class20.loadInterface(var1); // L: 202
+			if (!var3) { // L: 203
+				return null;
+			}
+		}
+
+		return GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1][var2]; // L: 205
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java
index 0a5872f5c3..dd5b450061 100644
--- a/runescape-client/src/main/java/WorldMapDecoration.java
+++ b/runescape-client/src/main/java/WorldMapDecoration.java
@@ -1,41 +1,36 @@
+import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fh")
+@ObfuscatedName("fw")
 @Implements("WorldMapDecoration")
 public class WorldMapDecoration {
-	@ObfuscatedName("y")
-	@Export("SpriteBuffer_xOffsets")
-	public static int[] SpriteBuffer_xOffsets;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = -1317870659
-	)
-	static int field2082;
-	@ObfuscatedName("hf")
+	@ObfuscatedName("j")
+	@Export("cacheDir")
+	public static File cacheDir;
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "Ljs;"
 	)
-	@Export("modIconSprites")
-	static IndexedSprite[] modIconSprites;
-	@ObfuscatedName("v")
+	static GameBuild field2084;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1952293629
+		intValue = -2029148241
 	)
 	@Export("objectDefinitionId")
 	final int objectDefinitionId;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 739729953
+		intValue = 968273187
 	)
 	@Export("decoration")
 	final int decoration;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -184500109
+		intValue = -576802065
 	)
 	@Export("rotation")
 	final int rotation;
@@ -46,37 +41,162 @@ public class WorldMapDecoration {
 		this.rotation = var3; // L: 11
 	} // L: 12
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("hy")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Loz;"
+		descriptor = "(IIIII)V",
+		garbageValue = "1240184930"
 	)
-	@Export("newRunException")
-	public static RunException newRunException(Throwable var0, String var1) {
-		RunException var2;
-		if (var0 instanceof RunException) { // L: 99
-			var2 = (RunException)var0; // L: 100
-			var2.message = var2.message + ' ' + var1; // L: 101
-		} else {
-			var2 = new RunException(var0, var1); // L: 103
+	static final void method3710(int var0, int var1, int var2, int var3) {
+		Client.overheadTextCount = 0; // L: 5322
+		boolean var4 = false; // L: 5323
+		int var5 = -1; // L: 5324
+		int var6 = -1; // L: 5325
+		int var7 = Players.Players_count; // L: 5326
+		int[] var8 = Players.Players_indices; // L: 5327
+
+		int var9;
+		for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 5328
+			Object var20;
+			if (var9 < var7) { // L: 5330
+				var20 = Client.players[var8[var9]]; // L: 5331
+				if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 5332
+					var4 = true; // L: 5333
+					var5 = var9; // L: 5334
+					continue;
+				}
+
+				if (var20 == class262.localPlayer) { // L: 5337
+					var6 = var9; // L: 5338
+					continue; // L: 5339
+				}
+			} else {
+				var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 5342
+			}
+
+			UserComparator4.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 5343
 		}
 
-		return var2; // L: 104
-	}
-
-	@ObfuscatedName("hb")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-1091351445"
-	)
-	static int method3627(int var0, int var1) {
-		int var2 = var1 - 334; // L: 5040
-		if (var2 < 0) { // L: 5041
-			var2 = 0;
-		} else if (var2 > 100) { // L: 5042
-			var2 = 100;
+		if (Client.renderSelf && var6 != -1) { // L: 5345
+			UserComparator4.drawActor2d(class262.localPlayer, var6, var0, var1, var2, var3); // L: 5346
 		}
 
-		int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; // L: 5043
-		return var0 * var3 / 256; // L: 5044
-	}
+		if (var4) { // L: 5348
+			UserComparator4.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 5349
+		}
+
+		for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 5351
+			int var10 = Client.overheadTextXs[var9]; // L: 5352
+			int var11 = Client.overheadTextYs[var9]; // L: 5353
+			int var12 = Client.overheadTextXOffsets[var9]; // L: 5354
+			int var13 = Client.overheadTextAscents[var9]; // L: 5355
+			boolean var14 = true; // L: 5356
+
+			while (var14) {
+				var14 = false; // L: 5358
+
+				for (int var19 = 0; var19 < var9; ++var19) { // L: 5359
+					if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 5360 5361
+						var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 5362
+						var14 = true; // L: 5363
+					}
+				}
+			}
+
+			Client.viewportTempX = Client.overheadTextXs[var9]; // L: 5368
+			Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 5369
+			String var15 = Client.overheadText[var9]; // L: 5370
+			if (Client.chatEffects == 0) { // L: 5371
+				int var16 = 16776960; // L: 5372
+				if (Client.overheadTextColors[var9] < 6) { // L: 5373
+					var16 = Client.field725[Client.overheadTextColors[var9]];
+				}
+
+				if (Client.overheadTextColors[var9] == 6) { // L: 5374
+					var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
+				}
+
+				if (Client.overheadTextColors[var9] == 7) { // L: 5375
+					var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
+				}
+
+				if (Client.overheadTextColors[var9] == 8) { // L: 5376
+					var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
+				}
+
+				int var17;
+				if (Client.overheadTextColors[var9] == 9) { // L: 5377
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5378
+					if (var17 < 50) { // L: 5379
+						var16 = var17 * 1280 + 16711680;
+					} else if (var17 < 100) { // L: 5380
+						var16 = 16776960 - (var17 - 50) * 327680;
+					} else if (var17 < 150) { // L: 5381
+						var16 = (var17 - 100) * 5 + 65280;
+					}
+				}
+
+				if (Client.overheadTextColors[var9] == 10) { // L: 5383
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5384
+					if (var17 < 50) { // L: 5385
+						var16 = var17 * 5 + 16711680;
+					} else if (var17 < 100) { // L: 5386
+						var16 = 16711935 - (var17 - 50) * 327680;
+					} else if (var17 < 150) { // L: 5387
+						var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
+					}
+				}
+
+				if (Client.overheadTextColors[var9] == 11) { // L: 5389
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5390
+					if (var17 < 50) { // L: 5391
+						var16 = 16777215 - var17 * 327685;
+					} else if (var17 < 100) { // L: 5392
+						var16 = (var17 - 50) * 327685 + 65280;
+					} else if (var17 < 150) { // L: 5393
+						var16 = 16777215 - (var17 - 100) * 327680;
+					}
+				}
+
+				if (Client.overheadTextEffects[var9] == 0) { // L: 5395
+					class309.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
+				}
+
+				if (Client.overheadTextEffects[var9] == 1) { // L: 5396
+					class309.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var9] == 2) { // L: 5397
+					class309.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
+				}
+
+				if (Client.overheadTextEffects[var9] == 3) { // L: 5398
+					class309.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
+				}
+
+				if (Client.overheadTextEffects[var9] == 4) { // L: 5399
+					var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class309.fontBold12.stringWidth(var15) + 100) / 150; // L: 5400
+					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 5401
+					class309.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 5402
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5403
+				}
+
+				if (Client.overheadTextEffects[var9] == 5) { // L: 5405
+					var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 5406
+					int var18 = 0; // L: 5407
+					if (var17 < 25) { // L: 5408
+						var18 = var17 - 25;
+					} else if (var17 > 125) { // L: 5409
+						var18 = var17 - 125;
+					}
+
+					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class309.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 5410
+					class309.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 5411
+					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 5412
+				}
+			} else {
+				class309.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 5416
+			}
+		}
+
+	} // L: 5419
 }
diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java
index cb8e077bc6..fc0169ba3e 100644
--- a/runescape-client/src/main/java/WorldMapDecorationType.java
+++ b/runescape-client/src/main/java/WorldMapDecorationType.java
@@ -3,130 +3,133 @@ 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("ix")
+@ObfuscatedName("is")
 @Implements("WorldMapDecorationType")
-public enum WorldMapDecorationType implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3149(0, 0),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3143(1, 0),
+public enum WorldMapDecorationType implements Enumerated
+{
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3167(2, 0),
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3145(3, 0),
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3146(9, 2),
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3147(4, 1),
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3148(5, 1),
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3164(6, 1),
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3150(7, 1),
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3151(8, 1),
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3142(12, 2),
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3156(13, 2),
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3163(14, 2),
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "Lix;"
-	)
-	field3155(15, 2),
+	field3160(0, 0),
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3166(16, 2),
-	@ObfuscatedName("g")
+	field3147(1, 0),
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3157(17, 2),
-	@ObfuscatedName("a")
+	field3148(2, 0),
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3158(18, 2),
-	@ObfuscatedName("k")
+	field3170(3, 0),
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3159(19, 2),
+	field3150(9, 2),
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3149(4, 1),
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3152(20, 2),
-	@ObfuscatedName("x")
+	field3152(5, 1),
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3161(21, 2),
+	field3158(6, 1),
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3151(7, 1),
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3155(8, 1),
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3162(10, 2),
-	@ObfuscatedName("w")
+	field3156(12, 2),
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3144(11, 2),
+	field3157(13, 2),
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3166(14, 2),
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3159(15, 2),
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3146(16, 2),
 	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lix;"
+		descriptor = "Lis;"
 	)
-	field3154(22, 3);
+	field3161(17, 2),
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3162(18, 2),
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3163(19, 2),
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3164(20, 2),
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3165(21, 2),
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3154(10, 2),
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3167(11, 2),
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		descriptor = "Lis;"
+	)
+	field3168(22, 3);
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("gn")
+	@Export("regionMapArchives")
+	static byte[][] regionMapArchives;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -2083476425
+		intValue = 1689741145
 	)
 	@Export("id")
 	public final int id;
@@ -139,140 +142,137 @@ public enum WorldMapDecorationType implements Enumerated {
 		this.id = var3; // L: 34
 	} // L: 35
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id; // L: 38
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("ft")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "29"
+		descriptor = "(IB)V",
+		garbageValue = "10"
 	)
-	static int method4833(int var0, Script var1, boolean var2) {
-		int var4;
-		int var9;
-		if (var0 == ScriptOpcodes.CC_CREATE) { // L: 472
-			class44.Interpreter_intStackSize -= 3; // L: 473
-			var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 474
-			var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 475
-			int var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 476
-			if (var4 == 0) { // L: 477
-				throw new RuntimeException(); // L: 478
+	@Export("getLoginError")
+	static void getLoginError(int var0) {
+		if (var0 == -3) { // L: 3009
+			CollisionMap.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
+		} else if (var0 == -2) { // L: 3010
+			CollisionMap.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
+		} else if (var0 == -1) { // L: 3011
+			CollisionMap.setLoginResponseString("No response from server.", "Please try using a different world.", "");
+		} else if (var0 == 3) { // L: 3012
+			Login.loginIndex = 3; // L: 3013
+			Login.field1012 = 1; // L: 3014
+		} else if (var0 == 4) { // L: 3016
+			Login.loginIndex = 12; // L: 3018
+			Login.field1011 = 0; // L: 3019
+		} else if (var0 == 5) { // L: 3022
+			Login.field1012 = 2; // L: 3023
+			CollisionMap.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 3024
+		} else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 3026
+			if (var0 == 7) { // L: 3029
+				CollisionMap.setLoginResponseString("This world is full.", "Please use a different world.", "");
+			} else if (var0 == 8) { // L: 3030
+				CollisionMap.setLoginResponseString("Unable to connect.", "Login server offline.", "");
+			} else if (var0 == 9) { // L: 3031
+				CollisionMap.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
+			} else if (var0 == 10) { // L: 3032
+				CollisionMap.setLoginResponseString("Unable to connect.", "Bad session id.", "");
+			} else if (var0 == 11) { // L: 3033
+				CollisionMap.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+			} else if (var0 == 12) { // L: 3034
+				CollisionMap.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
+			} else if (var0 == 13) { // L: 3035
+				CollisionMap.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
+			} else if (var0 == 14) { // L: 3036
+				CollisionMap.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
+			} else if (var0 == 16) { // L: 3037
+				CollisionMap.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
+			} else if (var0 == 17) { // L: 3038
+				CollisionMap.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
+			} else if (var0 == 18) { // L: 3039
+				Login.loginIndex = 12; // L: 3041
+				Login.field1011 = 1; // L: 3042
+			} else if (var0 == 19) { // L: 3045
+				CollisionMap.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
+			} else if (var0 == 20) { // L: 3046
+				CollisionMap.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
+			} else if (var0 == 22) { // L: 3047
+				CollisionMap.setLoginResponseString("Malformed login packet.", "Please try again.", "");
+			} else if (var0 == 23) { // L: 3048
+				CollisionMap.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
+			} else if (var0 == 24) { // L: 3049
+				CollisionMap.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
+			} else if (var0 == 25) { // L: 3050
+				CollisionMap.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
+			} else if (var0 == 26) { // L: 3051
+				CollisionMap.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
+			} else if (var0 == 27) { // L: 3052
+				CollisionMap.setLoginResponseString("", "Service unavailable.", "");
+			} else if (var0 == 31) { // L: 3053
+				CollisionMap.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) {
+				CollisionMap.setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system."); // L: 3054
+			} else if (var0 == 37) { // L: 3055
+				CollisionMap.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
+			} else if (var0 == 38) { // L: 3056
+				CollisionMap.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
+			} else if (var0 == 55) { // L: 3057
+				Login.loginIndex = 8; // L: 3058
 			} else {
-				Widget var6 = Frames.getWidget(var9); // L: 480
-				if (var6.children == null) { // L: 481
-					var6.children = new Widget[var11 + 1];
+				if (var0 == 56) { // L: 3060
+					CollisionMap.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 3061
+					Projectile.updateGameState(11); // L: 3062
+					return; // L: 3063
 				}
 
-				if (var6.children.length <= var11) { // L: 482
-					Widget[] var7 = new Widget[var11 + 1]; // L: 483
-
-					for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 484
-						var7[var8] = var6.children[var8];
-					}
-
-					var6.children = var7; // L: 485
+				if (var0 == 57) { // L: 3065
+					CollisionMap.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 3066
+					Projectile.updateGameState(11); // L: 3067
+					return; // L: 3068
 				}
 
-				if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 487
-					throw new RuntimeException("" + (var11 - 1));
+				if (var0 == 61) { // L: 3070
+					Login.loginIndex = 7; // L: 3071
 				} else {
-					Widget var12 = new Widget(); // L: 488
-					var12.type = var4; // L: 489
-					var12.parentId = var12.id = var6.id; // L: 490
-					var12.childIndex = var11; // L: 491
-					var12.isIf3 = true; // L: 492
-					var6.children[var11] = var12; // L: 493
-					if (var2) { // L: 494
-						class13.scriptDotWidget = var12;
-					} else {
-						Interpreter.scriptActiveWidget = var12; // L: 495
-					}
-
-					WorldMapCacheName.invalidateWidget(var6); // L: 496
-					return 1; // L: 497
+					CollisionMap.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3073
 				}
 			}
 		} else {
-			Widget var3;
-			if (var0 == ScriptOpcodes.CC_DELETE) { // L: 499
-				var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 500
-				Widget var10 = Frames.getWidget(var3.id); // L: 501
-				var10.children[var3.childIndex] = null; // L: 502
-				WorldMapCacheName.invalidateWidget(var10); // L: 503
-				return 1; // L: 504
-			} else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 506
-				var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 507
-				var3.children = null; // L: 508
-				WorldMapCacheName.invalidateWidget(var3); // L: 509
-				return 1; // L: 510
-			} else if (var0 == 103) { // L: 512
-				class44.Interpreter_intStackSize -= 3; // L: 513
-				return 1; // L: 514
-			} else if (var0 == 104) { // L: 516
-				--class44.Interpreter_intStackSize; // L: 517
-				return 1; // L: 518
-			} else if (var0 != ScriptOpcodes.CC_FIND) { // L: 520
-				if (var0 == ScriptOpcodes.IF_FIND) { // L: 533
-					var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 534
-					if (var3 != null) { // L: 535
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 536
-						if (var2) { // L: 537
-							class13.scriptDotWidget = var3;
-						} else {
-							Interpreter.scriptActiveWidget = var3; // L: 538
-						}
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 540
-					}
-
-					return 1; // L: 541
-				} else if (var0 == 202) { // L: 543
-					Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] = 0; // L: 544
-					return 1; // L: 545
-				} else if (var0 == 203) {
-					Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize + 1] = 0;
-					return 1; // L: 549
-				} else {
-					return 2; // L: 551
-				}
-			} else {
-				class44.Interpreter_intStackSize -= 2; // L: 521
-				var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 522
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 523
-				Widget var5 = ModeWhere.getWidgetChild(var9, var4); // L: 524
-				if (var5 != null && var4 != -1) { // L: 525
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 526
-					if (var2) { // L: 527
-						class13.scriptDotWidget = var5;
-					} else {
-						Interpreter.scriptActiveWidget = var5; // L: 528
-					}
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 530
-				}
-
-				return 1; // L: 531
-			}
+			CollisionMap.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 3027
 		}
-	}
 
-	@ObfuscatedName("z")
+		Projectile.updateGameState(10); // L: 3074
+	} // L: 3075
+
+	@ObfuscatedName("gz")
 	@ObfuscatedSignature(
-		descriptor = "(ZI)V",
-		garbageValue = "-59563077"
+		descriptor = "(II)V",
+		garbageValue = "618302230"
 	)
-	public static void method4834(boolean var0) {
-		if (var0 != ItemContainer.ItemDefinition_inMembersWorld) { // L: 546
-			SceneTilePaint.method4259(); // L: 547
-			ItemContainer.ItemDefinition_inMembersWorld = var0; // L: 548
+	@Export("setWindowedMode")
+	static void setWindowedMode(int var0) {
+		Client.field839 = 0L; // L: 4398
+		if (var0 >= 2) { // L: 4399
+			Client.isResizable = true;
+		} else {
+			Client.isResizable = false; // L: 4400
 		}
 
-	} // L: 550
+		if (class302.getWindowedMode() == 1) { // L: 4401
+			class1.client.setMaxCanvasSize(765, 503); // L: 4402
+		} else {
+			class1.client.setMaxCanvasSize(7680, 2160); // L: 4405
+		}
+
+		if (Client.gameState >= 25) { // L: 4407
+			BufferedSink.method5992();
+		}
+
+	} // L: 4408
 }
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index c6c9cf6040..02d7fc7c55 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -1,119 +1,117 @@
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
 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("ew")
+@ObfuscatedName("ek")
 @Implements("WorldMapElement")
 public class WorldMapElement extends DualNode {
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("WorldMapElement_archive")
-	static AbstractArchive WorldMapElement_archive;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "[Lew;"
+		descriptor = "[Lek;"
 	)
 	@Export("WorldMapElement_cached")
-	static WorldMapElement[] WorldMapElement_cached;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+	public static WorldMapElement[] WorldMapElement_cached;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1856527829
 	)
-	@Export("soundEffectsArchive")
-	public static AbstractArchive soundEffectsArchive;
+	@Export("WorldMapElement_count")
+	public static int WorldMapElement_count;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lhz;"
+		descriptor = "Lht;"
 	)
 	@Export("WorldMapElement_cachedSprites")
 	public static EvictingDualNodeHashTable WorldMapElement_cachedSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -298295867
+		intValue = -334819521
 	)
 	@Export("objectId")
 	public final int objectId;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 300345687
+		intValue = 1578997885
 	)
 	@Export("sprite1")
 	public int sprite1;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1973945717
+		intValue = -1711364077
 	)
 	@Export("sprite2")
 	int sprite2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@Export("name")
 	public String name;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -1034605975
+	)
+	public int field1563;
 	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1016348217
-	)
-	public int field1557;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 945546823
+		intValue = 1720690587
 	)
 	@Export("textSize")
 	public int textSize;
-	@ObfuscatedName("l")
-	public boolean field1560;
-	@ObfuscatedName("o")
-	public boolean field1561;
-	@ObfuscatedName("c")
+	@ObfuscatedName("b")
+	public boolean field1569;
+	@ObfuscatedName("i")
+	public boolean field1567;
+	@ObfuscatedName("k")
 	@Export("menuActions")
 	public String[] menuActions;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("menuTargetName")
 	public String menuTargetName;
-	@ObfuscatedName("g")
-	int[] field1564;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = 61627465
-	)
-	int field1565;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = -1855572569
-	)
-	int field1574;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 1059928721
-	)
-	int field1567;
+	@ObfuscatedName("t")
+	int[] field1570;
 	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1980828279
+		intValue = 1625174781
 	)
-	int field1568;
-	@ObfuscatedName("z")
+	int field1573;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 796441921
+	)
+	int field1566;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = 110963729
+	)
+	int field1571;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -1540991657
+	)
+	int field1556;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Len;"
+		descriptor = "Leq;"
 	)
 	@Export("horizontalAlignment")
 	public HorizontalAlignment horizontalAlignment;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "Lem;"
+		descriptor = "Lee;"
 	)
 	@Export("verticalAlignment")
 	public VerticalAlignment verticalAlignment;
-	@ObfuscatedName("t")
-	int[] field1571;
-	@ObfuscatedName("h")
-	byte[] field1572;
-	@ObfuscatedName("q")
+	@ObfuscatedName("n")
+	int[] field1577;
+	@ObfuscatedName("l")
+	byte[] field1578;
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 41328569
+		intValue = 477871251
 	)
 	@Export("category")
 	public int category;
@@ -122,232 +120,324 @@ public class WorldMapElement extends DualNode {
 		WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16
 	}
 
-	WorldMapElement(int var1) {
+	public WorldMapElement(int var1) {
 		this.sprite1 = -1; // L: 18
 		this.sprite2 = -1; // L: 19
 		this.textSize = 0; // L: 22
-		this.field1560 = true; // L: 24
-		this.field1561 = false; // L: 25
+		this.field1569 = true; // L: 24
+		this.field1567 = false; // L: 25
 		this.menuActions = new String[5]; // L: 26
-		this.field1565 = Integer.MAX_VALUE; // L: 29
-		this.field1574 = Integer.MAX_VALUE; // L: 30
-		this.field1567 = Integer.MIN_VALUE; // L: 31
-		this.field1568 = Integer.MIN_VALUE; // L: 32
-		this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 33
-		this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 34
-		this.category = -1; // L: 37
-		this.objectId = var1; // L: 40
-	} // L: 41
+		this.field1573 = Integer.MAX_VALUE; // L: 29
+		this.field1566 = Integer.MAX_VALUE; // L: 30
+		this.field1571 = Integer.MIN_VALUE; // L: 31
+		this.field1556 = Integer.MIN_VALUE; // L: 32
+		this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered;
+		this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered;
+		this.category = -1;
+		this.objectId = var1;
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;S)V",
+		garbageValue = "28368"
+	)
+	@Export("decode")
+	public void decode(Buffer var1) {
+		while (true) {
+			int var2 = var1.readUnsignedByte();
+			if (var2 == 0) { // L: 53
+				return;
+			}
+
+			this.decodeNext(var1, var2); // L: 54
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;II)V",
+		garbageValue = "1992527916"
+	)
+	@Export("decodeNext")
+	void decodeNext(Buffer var1, int var2) {
+		if (var2 == 1) {
+			this.sprite1 = var1.method6630();
+		} else if (var2 == 2) {
+			this.sprite2 = var1.method6630();
+		} else if (var2 == 3) { // L: 61
+			this.name = var1.readStringCp1252NullTerminated();
+		} else if (var2 == 4) { // L: 62
+			this.field1563 = var1.readMedium();
+		} else if (var2 == 5) {
+			var1.readMedium(); // L: 64
+		} else if (var2 == 6) {
+			this.textSize = var1.readUnsignedByte();
+		} else {
+			int var3;
+			if (var2 == 7) { // L: 67
+				var3 = var1.readUnsignedByte(); // L: 68
+				if ((var3 & 1) == 0) { // L: 69
+					this.field1569 = false;
+				}
+
+				if ((var3 & 2) == 2) { // L: 70
+					this.field1567 = true;
+				}
+			} else if (var2 == 8) { // L: 72
+				var1.readUnsignedByte();
+			} else if (var2 >= 10 && var2 <= 14) { // L: 75
+				this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated();
+			} else if (var2 == 15) { // L: 76
+				var3 = var1.readUnsignedByte(); // L: 77
+				this.field1570 = new int[var3 * 2]; // L: 78
+
+				int var4;
+				for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 79
+					this.field1570[var4] = var1.readShort();
+				}
+
+				var1.readInt(); // L: 80
+				var4 = var1.readUnsignedByte(); // L: 81
+				this.field1577 = new int[var4]; // L: 82
+
+				int var5;
+				for (var5 = 0; var5 < this.field1577.length; ++var5) { // L: 83
+					this.field1577[var5] = var1.readInt();
+				}
+
+				this.field1578 = new byte[var3];
+
+				for (var5 = 0; var5 < var3; ++var5) { // L: 85
+					this.field1578[var5] = var1.readByte();
+				}
+			} else if (var2 != 16) { // L: 87
+				if (var2 == 17) {
+					this.menuTargetName = var1.readStringCp1252NullTerminated();
+				} else if (var2 == 18) { // L: 89
+					var1.method6630(); // L: 90
+				} else if (var2 == 19) { // L: 92
+					this.category = var1.readUnsignedShort();
+				} else if (var2 == 21) {
+					var1.readInt(); // L: 94
+				} else if (var2 == 22) { // L: 96
+					var1.readInt(); // L: 97
+				} else if (var2 == 23) { // L: 99
+					var1.readUnsignedByte(); // L: 100
+					var1.readUnsignedByte(); // L: 101
+					var1.readUnsignedByte();
+				} else if (var2 == 24) { // L: 104
+					var1.readShort(); // L: 105
+					var1.readShort(); // L: 106
+				} else if (var2 == 25) { // L: 108
+					var1.method6630();
+				} else if (var2 == 28) { // L: 111
+					var1.readUnsignedByte(); // L: 112
+				} else if (var2 == 29) { // L: 114
+					this.horizontalAlignment = (HorizontalAlignment)Clock.findEnumerated(MouseHandler.method726(), var1.readUnsignedByte()); // L: 115
+				} else if (var2 == 30) { // L: 117
+					this.verticalAlignment = (VerticalAlignment)Clock.findEnumerated(class106.method2373(), var1.readUnsignedByte());
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "33"
+	)
+	public void method2724() {
+		if (this.field1570 != null) { // L: 124
+			for (int var1 = 0; var1 < this.field1570.length; var1 += 2) { // L: 125
+				if (this.field1570[var1] < this.field1573) { // L: 126
+					this.field1573 = this.field1570[var1];
+				} else if (this.field1570[var1] > this.field1571) {
+					this.field1571 = this.field1570[var1]; // L: 127
+				}
+
+				if (this.field1570[var1 + 1] < this.field1566) { // L: 128
+					this.field1566 = this.field1570[var1 + 1];
+				} else if (this.field1570[var1 + 1] > this.field1556) {
+					this.field1556 = this.field1570[var1 + 1]; // L: 129
+				}
+			}
+		}
+
+	} // L: 132
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(ZB)Loa;",
+		garbageValue = "1"
+	)
+	@Export("getSpriteBool")
+	public SpritePixels getSpriteBool(boolean var1) {
+		int var2 = this.sprite1; // L: 135
+		return this.getSprite(var2); // L: 136
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Loa;",
+		garbageValue = "112"
+	)
+	@Export("getSprite")
+	SpritePixels getSprite(int var1) {
+		if (var1 < 0) { // L: 140
+			return null;
+		} else {
+			SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 141
+			if (var2 != null) { // L: 142
+				return var2;
+			} else {
+				var2 = Tile.SpriteBuffer_getSprite(class244.WorldMapElement_archive, var1, 0); // L: 143
+				if (var2 != null) { // L: 144
+					WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 145
+				}
+
+				return var2; // L: 147
+			}
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "78"
+	)
+	@Export("getObjectId")
+	public int getObjectId() {
+		return this.objectId; // L: 151
+	}
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1509060370"
+		descriptor = "(I)J",
+		garbageValue = "1243419683"
 	)
-	@Export("decode")
-	void decode(Buffer var1) {
-		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 70
-			if (var2 == 0) { // L: 71
-				return; // L: 74
-			}
+	static long method2721() {
+		try {
+			URL var0 = new URL(class19.method283("services", false) + "m=accountappeal/login.ws");
+			URLConnection var1 = var0.openConnection(); // L: 37
+			var1.setRequestProperty("connection", "close"); // L: 38
+			var1.setDoInput(true); // L: 39
+			var1.setDoOutput(true); // L: 40
+			var1.setConnectTimeout(5000); // L: 41
+			OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42
+			var2.write("data1=req"); // L: 43
+			var2.flush(); // L: 44
+			InputStream var3 = var1.getInputStream(); // L: 45
+			Buffer var4 = new Buffer(new byte[1000]); // L: 46
 
-			this.decodeNext(var1, var2); // L: 72
+			do {
+				int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48
+				if (var5 == -1) { // L: 49
+					var4.offset = 0; // L: 55
+					long var7 = var4.readLong(); // L: 56
+					return var7; // L: 57
+				}
+
+				var4.offset += var5; // L: 50
+			} while(var4.offset < 1000); // L: 51
+
+			return 0L;
+		} catch (Exception var9) { // L: 59
+			return 0L; // L: 60
+		}
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lmo;ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "1387320814"
+	)
+	static String method2742(IterableNodeHashTable var0, int var1, String var2) {
+		if (var0 == null) { // L: 33
+			return var2;
+		} else {
+			ObjectNode var3 = (ObjectNode)var0.get((long)var1); // L: 34
+			return var3 == null ? var2 : (String)var3.obj; // L: 35 36
 		}
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1414929060"
+		descriptor = "(CI)C",
+		garbageValue = "1458799604"
 	)
-	@Export("decodeNext")
-	void decodeNext(Buffer var1, int var2) {
-		if (var2 == 1) { // L: 77
-			this.sprite1 = var1.method6583();
-		} else if (var2 == 2) { // L: 78
-			this.sprite2 = var1.method6583();
-		} else if (var2 == 3) { // L: 79
-			this.name = var1.readStringCp1252NullTerminated();
-		} else if (var2 == 4) { // L: 80
-			this.field1557 = var1.readMedium();
-		} else if (var2 == 5) { // L: 81
-			var1.readMedium(); // L: 82
-		} else if (var2 == 6) { // L: 84
-			this.textSize = var1.readUnsignedByte();
-		} else {
-			int var3;
-			if (var2 == 7) { // L: 85
-				var3 = var1.readUnsignedByte(); // L: 86
-				if ((var3 & 1) == 0) { // L: 87
-					this.field1560 = false;
-				}
-
-				if ((var3 & 2) == 2) { // L: 88
-					this.field1561 = true;
-				}
-			} else if (var2 == 8) { // L: 90
-				var1.readUnsignedByte(); // L: 91
-			} else if (var2 >= 10 && var2 <= 14) { // L: 93
-				this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated();
-			} else if (var2 == 15) { // L: 94
-				var3 = var1.readUnsignedByte(); // L: 95
-				this.field1564 = new int[var3 * 2]; // L: 96
-
-				int var4;
-				for (var4 = 0; var4 < var3 * 2; ++var4) { // L: 97
-					this.field1564[var4] = var1.readShort();
-				}
-
-				var1.readInt(); // L: 98
-				var4 = var1.readUnsignedByte(); // L: 99
-				this.field1571 = new int[var4]; // L: 100
-
-				int var5;
-				for (var5 = 0; var5 < this.field1571.length; ++var5) { // L: 101
-					this.field1571[var5] = var1.readInt();
-				}
-
-				this.field1572 = new byte[var3]; // L: 102
-
-				for (var5 = 0; var5 < var3; ++var5) { // L: 103
-					this.field1572[var5] = var1.readByte();
-				}
-			} else if (var2 != 16) { // L: 105
-				if (var2 == 17) { // L: 106
-					this.menuTargetName = var1.readStringCp1252NullTerminated();
-				} else if (var2 == 18) { // L: 107
-					var1.method6583(); // L: 108
-				} else if (var2 == 19) { // L: 110
-					this.category = var1.readUnsignedShort();
-				} else if (var2 == 21) { // L: 111
-					var1.readInt(); // L: 112
-				} else if (var2 == 22) { // L: 114
-					var1.readInt(); // L: 115
-				} else if (var2 == 23) { // L: 117
-					var1.readUnsignedByte(); // L: 118
-					var1.readUnsignedByte(); // L: 119
-					var1.readUnsignedByte(); // L: 120
-				} else if (var2 == 24) { // L: 122
-					var1.readShort(); // L: 123
-					var1.readShort(); // L: 124
-				} else if (var2 == 25) { // L: 126
-					var1.method6583(); // L: 127
-				} else if (var2 == 28) { // L: 129
-					var1.readUnsignedByte(); // L: 130
-				} else if (var2 == 29) { // L: 132
-					this.horizontalAlignment = (HorizontalAlignment)Messages.findEnumerated(FloorOverlayDefinition.method3103(), var1.readUnsignedByte()); // L: 133
-				} else if (var2 == 30) { // L: 135
-					this.verticalAlignment = (VerticalAlignment)Messages.findEnumerated(MouseRecorder.method2095(), var1.readUnsignedByte()); // L: 136
-				}
-			}
+	public static char method2732(char var0) {
+		switch(var0) { // L: 52
+		case ' ':
+		case '-':
+		case '_':
+		case ' ':
+			return '_'; // L: 107
+		case '#':
+		case '[':
+		case ']':
+			return var0; // L: 88
+		case 'À':
+		case 'Á':
+		case 'Â':
+		case 'Ã':
+		case 'Ä':
+		case 'à':
+		case 'á':
+		case 'â':
+		case 'ã':
+		case 'ä':
+			return 'a'; // L: 84
+		case 'Ç':
+		case 'ç':
+			return 'c'; // L: 91
+		case 'È':
+		case 'É':
+		case 'Ê':
+		case 'Ë':
+		case 'è':
+		case 'é':
+		case 'ê':
+		case 'ë':
+			return 'e'; // L: 118
+		case 'Í':
+		case 'Î':
+		case 'Ï':
+		case 'í':
+		case 'î':
+		case 'ï':
+			return 'i'; // L: 73
+		case 'Ñ':
+		case 'ñ':
+			return 'n'; // L: 66
+		case 'Ò':
+		case 'Ó':
+		case 'Ô':
+		case 'Õ':
+		case 'Ö':
+		case 'ò':
+		case 'ó':
+		case 'ô':
+		case 'õ':
+		case 'ö':
+			return 'o'; // L: 63
+		case 'Ù':
+		case 'Ú':
+		case 'Û':
+		case 'Ü':
+		case 'ù':
+		case 'ú':
+		case 'û':
+		case 'ü':
+			return 'u'; // L: 102
+		case 'ß':
+			return 'b'; // L: 93
+		case 'ÿ':
+		case 'Ÿ':
+			return 'y'; // L: 121
+		default:
+			return Character.toLowerCase(var0); // L: 109
 		}
-
-	} // L: 139
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-505496297"
-	)
-	void method2634() {
-		if (this.field1564 != null) { // L: 142
-			for (int var1 = 0; var1 < this.field1564.length; var1 += 2) { // L: 143
-				if (this.field1564[var1] < this.field1565) { // L: 144
-					this.field1565 = this.field1564[var1];
-				} else if (this.field1564[var1] > this.field1567) {
-					this.field1567 = this.field1564[var1]; // L: 145
-				}
-
-				if (this.field1564[var1 + 1] < this.field1574) { // L: 146
-					this.field1574 = this.field1564[var1 + 1];
-				} else if (this.field1564[var1 + 1] > this.field1568) {
-					this.field1568 = this.field1564[var1 + 1]; // L: 147
-				}
-			}
-		}
-
-	} // L: 150
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(ZI)Loh;",
-		garbageValue = "-2060838679"
-	)
-	@Export("getSpriteBool")
-	public SpritePixels getSpriteBool(boolean var1) {
-		int var2 = this.sprite1; // L: 153
-		return this.getSprite(var2); // L: 154
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(II)Loh;",
-		garbageValue = "2134541760"
-	)
-	@Export("getSprite")
-	SpritePixels getSprite(int var1) {
-		if (var1 < 0) { // L: 158
-			return null;
-		} else {
-			SpritePixels var2 = (SpritePixels)WorldMapElement_cachedSprites.get((long)var1); // L: 159
-			if (var2 != null) { // L: 160
-				return var2;
-			} else {
-				var2 = ClientPacket.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 161
-				if (var2 != null) { // L: 162
-					WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 163
-				}
-
-				return var2; // L: 165
-			}
-		}
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1931066057"
-	)
-	@Export("getObjectId")
-	public int getObjectId() {
-		return this.objectId; // L: 169
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(CS)Z",
-		garbageValue = "-28639"
-	)
-	@Export("isCharAlphabetic")
-	public static boolean isCharAlphabetic(char var0) {
-		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 134
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "-1291818540"
-	)
-	@Export("hslToRgb")
-	static final int hslToRgb(int var0, int var1, int var2) {
-		if (var2 > 179) { // L: 868
-			var1 /= 2;
-		}
-
-		if (var2 > 192) { // L: 869
-			var1 /= 2;
-		}
-
-		if (var2 > 217) { // L: 870
-			var1 /= 2;
-		}
-
-		if (var2 > 243) { // L: 871
-			var1 /= 2;
-		}
-
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 872
-		return var3; // L: 873
 	}
 }
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index 7cfff54482..011f058ef8 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -4,34 +4,139 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gs")
+@ObfuscatedName("gu")
 @Implements("WorldMapEvent")
 public class WorldMapEvent {
-	@ObfuscatedName("v")
+	@ObfuscatedName("sr")
 	@ObfuscatedGetter(
-		intValue = 1617367683
+		longValue = 74587707976866895L
+	)
+	static long field2150;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = -861680435
+	)
+	static int field2146;
+	@ObfuscatedName("ea")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive19")
+	static Archive archive19;
+	@ObfuscatedName("eu")
+	@ObfuscatedGetter(
+		intValue = -1550671291
+	)
+	static int field2152;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -733594899
 	)
 	@Export("mapElement")
 	public int mapElement;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liw;"
 	)
 	@Export("coord1")
 	public Coord coord1;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lii;"
+		descriptor = "Liw;"
 	)
 	@Export("coord2")
 	public Coord coord2;
 
 	@ObfuscatedSignature(
-		descriptor = "(ILii;Lii;)V"
+		descriptor = "(ILiw;Liw;)V"
 	)
 	public WorldMapEvent(int var1, Coord var2, Coord var3) {
 		this.mapElement = var1; // L: 11
 		this.coord1 = var2; // L: 12
 		this.coord2 = var3; // L: 13
 	} // L: 14
+
+	@ObfuscatedName("hj")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIII)V",
+		garbageValue = "-1811227158"
+	)
+	@Export("addPendingSpawnToScene")
+	static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7400
+			if (Client.isLowDetail && var0 != SoundSystem.Client_plane) { // L: 7401
+				return;
+			}
+
+			long var7 = 0L; // L: 7402
+			boolean var9 = true; // L: 7403
+			boolean var10 = false; // L: 7404
+			boolean var11 = false; // L: 7405
+			if (var1 == 0) { // L: 7406
+				var7 = DevicePcmPlayerProvider.scene.getBoundaryObjectTag(var0, var2, var3);
+			}
+
+			if (var1 == 1) { // L: 7407
+				var7 = DevicePcmPlayerProvider.scene.getWallDecorationTag(var0, var2, var3);
+			}
+
+			if (var1 == 2) { // L: 7408
+				var7 = DevicePcmPlayerProvider.scene.getGameObjectTag(var0, var2, var3);
+			}
+
+			if (var1 == 3) { // L: 7409
+				var7 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(var0, var2, var3);
+			}
+
+			int var12;
+			if (0L != var7) { // L: 7410
+				var12 = DevicePcmPlayerProvider.scene.getObjectFlags(var0, var2, var3, var7); // L: 7411
+				int var14 = Message.Entity_unpackID(var7); // L: 7412
+				int var15 = var12 & 31; // L: 7413
+				int var16 = var12 >> 6 & 3; // L: 7414
+				ObjectComposition var13;
+				if (var1 == 0) { // L: 7415
+					DevicePcmPlayerProvider.scene.removeBoundaryObject(var0, var2, var3); // L: 7416
+					var13 = Tiles.getObjectDefinition(var14); // L: 7417
+					if (var13.interactType != 0) { // L: 7418
+						Client.collisionMaps[var0].method3217(var2, var3, var15, var16, var13.boolean1);
+					}
+				}
+
+				if (var1 == 1) { // L: 7420
+					DevicePcmPlayerProvider.scene.removeWallDecoration(var0, var2, var3);
+				}
+
+				if (var1 == 2) { // L: 7421
+					DevicePcmPlayerProvider.scene.removeGameObject(var0, var2, var3); // L: 7422
+					var13 = Tiles.getObjectDefinition(var14); // L: 7423
+					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7424
+						return;
+					}
+
+					if (var13.interactType != 0) { // L: 7425
+						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1);
+					}
+				}
+
+				if (var1 == 3) { // L: 7427
+					DevicePcmPlayerProvider.scene.removeFloorDecoration(var0, var2, var3); // L: 7428
+					var13 = Tiles.getObjectDefinition(var14); // L: 7429
+					if (var13.interactType == 1) { // L: 7430
+						Client.collisionMaps[var0].method3206(var2, var3);
+					}
+				}
+			}
+
+			if (var4 >= 0) { // L: 7433
+				var12 = var0; // L: 7434
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7435
+					var12 = var0 + 1;
+				}
+
+				Decimator.method1167(var0, var12, var2, var3, var4, var5, var6, DevicePcmPlayerProvider.scene, Client.collisionMaps[var0]); // L: 7436
+			}
+		}
+
+	} // L: 7439
 }
diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java
index 76153adeb6..8729623fbe 100644
--- a/runescape-client/src/main/java/WorldMapID.java
+++ b/runescape-client/src/main/java/WorldMapID.java
@@ -4,59 +4,127 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fr")
+@ObfuscatedName("ff")
 @Implements("WorldMapID")
 public class WorldMapID {
-	@ObfuscatedName("v")
+	@ObfuscatedName("sb")
 	@ObfuscatedSignature(
-		descriptor = "Lfr;"
+		descriptor = "Lla;"
 	)
-	static final WorldMapID field2110;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lfr;"
-	)
-	static final WorldMapID field2107;
-	@ObfuscatedName("d")
-	static int[] field2112;
-	@ObfuscatedName("be")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	@Export("worldSelectRightSprite")
-	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("do")
-	@ObfuscatedSignature(
-		descriptor = "Lls;"
-	)
-	@Export("js5Socket")
-	static AbstractSocket js5Socket;
+	@Export("masterDisk")
+	static ArchiveDisk masterDisk;
 	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lff;"
+	)
+	static final WorldMapID field2111;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lff;"
+	)
+	static final WorldMapID field2108;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1539271557
+		intValue = 1292015261
 	)
 	@Export("value")
 	final int value;
 
 	static {
-		field2110 = new WorldMapID(0); // L: 4
-		field2107 = new WorldMapID(1); // L: 5
+		field2111 = new WorldMapID(0); // L: 4
+		field2108 = new WorldMapID(1); // L: 5
 	}
 
 	WorldMapID(int var1) {
 		this.value = var1; // L: 9
 	} // L: 10
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;Ljv;Lhp;I)Z",
-		garbageValue = "-670462193"
+		descriptor = "(IIB)I",
+		garbageValue = "-115"
 	)
-	public static boolean method3636(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
-		class232.musicPatchesArchive = var0; // L: 26
-		class232.musicSamplesArchive = var1; // L: 27
-		WorldMapElement.soundEffectsArchive = var2; // L: 28
-		class124.midiPcmStream = var3; // L: 29
-		return true; // L: 30
+	static int method3718(int var0, int var1) {
+		if (var0 == -2) { // L: 15
+			return 12345678;
+		} else if (var0 == -1) { // L: 16
+			if (var1 < 0) { // L: 17
+				var1 = 0; // L: 18
+			} else if (var1 > 127) { // L: 20
+				var1 = 127; // L: 21
+			}
+
+			var1 = 127 - var1; // L: 23
+			return var1; // L: 24
+		} else {
+			var1 = (var0 & 127) * var1 / 128; // L: 26
+			if (var1 < 2) { // L: 27
+				var1 = 2;
+			} else if (var1 > 126) { // L: 28
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1; // L: 29
+		}
 	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "2096657321"
+	)
+	static final int method3716(int var0, int var1) {
+		if (var0 == -2) { // L: 852
+			return 12345678;
+		} else if (var0 == -1) { // L: 853
+			if (var1 < 2) {
+				var1 = 2; // L: 854
+			} else if (var1 > 126) { // L: 855
+				var1 = 126;
+			}
+
+			return var1; // L: 856
+		} else {
+			var1 = (var0 & 127) * var1 / 128; // L: 858
+			if (var1 < 2) { // L: 859
+				var1 = 2;
+			} else if (var1 > 126) { // L: 860
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1; // L: 861
+		}
+	}
+
+	@ObfuscatedName("kc")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-2067762103"
+	)
+	static void method3717() {
+		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11019
+			int var1 = var0.group; // L: 11020
+			if (class20.loadInterface(var1)) { // L: 11021
+				boolean var2 = true; // L: 11022
+				Widget[] var3 = GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var1]; // L: 11023
+
+				int var4;
+				for (var4 = 0; var4 < var3.length; ++var4) { // L: 11024
+					if (var3[var4] != null) { // L: 11025
+						var2 = var3[var4].isIf3; // L: 11026
+						break;
+					}
+				}
+
+				if (!var2) { // L: 11030
+					var4 = (int)var0.key; // L: 11031
+					Widget var5 = WorldMapData_1.getWidget(var4); // L: 11032
+					if (var5 != null) { // L: 11033
+						Script.invalidateWidget(var5);
+					}
+				}
+			}
+		}
+
+	} // L: 11037
 }
diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java
index 664b3318c4..646c89f6a2 100644
--- a/runescape-client/src/main/java/WorldMapIcon_0.java
+++ b/runescape-client/src/main/java/WorldMapIcon_0.java
@@ -7,39 +7,49 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("fi")
 @Implements("WorldMapIcon_0")
 public class WorldMapIcon_0 extends AbstractWorldMapIcon {
-	@ObfuscatedName("v")
+	@ObfuscatedName("rv")
 	@ObfuscatedGetter(
-		intValue = -1937738349
+		intValue = -439578227
+	)
+	static int field2029;
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "Ly;"
+	)
+	static ClanChannel field2031;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -1437380799
 	)
 	@Export("element")
 	final int element;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lfv;"
+		descriptor = "Lfd;"
 	)
 	@Export("label")
 	final WorldMapLabel label;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 520142189
+		intValue = -1704027019
 	)
 	@Export("subWidth")
 	final int subWidth;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 960204223
+		intValue = 96075769
 	)
 	@Export("subHeight")
 	final int subHeight;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lii;Lii;ILfv;)V"
+		descriptor = "(Liw;Liw;ILfd;)V"
 	)
 	WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) {
 		super(var1, var2); // L: 14
 		this.element = var3; // L: 15
 		this.label = var4; // L: 16
-		WorldMapElement var5 = class6.WorldMapElement_get(this.getElement()); // L: 17
+		WorldMapElement var5 = Archive.WorldMapElement_get(this.getElement()); // L: 17
 		SpritePixels var6 = var5.getSpriteBool(false); // L: 18
 		if (var6 != null) { // L: 19
 			this.subWidth = var6.subWidth; // L: 20
@@ -51,20 +61,20 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
 
 	} // L: 27
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2145882550"
+		garbageValue = "1717389517"
 	)
 	@Export("getElement")
 	public int getElement() {
 		return this.element; // L: 30
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lfv;",
-		garbageValue = "39460369"
+		descriptor = "(I)Lfd;",
+		garbageValue = "1736510941"
 	)
 	@Export("getLabel")
 	WorldMapLabel getLabel() {
@@ -73,21 +83,194 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1949510660"
+		descriptor = "(B)I",
+		garbageValue = "-60"
 	)
 	@Export("getSubWidth")
 	int getSubWidth() {
 		return this.subWidth; // L: 38
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-85"
+		descriptor = "(I)I",
+		garbageValue = "-401407374"
 	)
 	@Export("getSubHeight")
 	int getSubHeight() {
 		return this.subHeight; // L: 42
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(B)[Lhs;",
+		garbageValue = "0"
+	)
+	@Export("ServerPacket_values")
+	public static ServerPacket[] ServerPacket_values() {
+		return new ServerPacket[]{ServerPacket.field2752, ServerPacket.field2704, ServerPacket.field2705, ServerPacket.field2706, ServerPacket.field2707, ServerPacket.field2708, ServerPacket.field2709, ServerPacket.field2746, ServerPacket.field2711, ServerPacket.field2728, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2715, ServerPacket.field2716, ServerPacket.field2721, ServerPacket.field2718, ServerPacket.field2719, ServerPacket.field2778, ServerPacket.field2765, ServerPacket.field2722, ServerPacket.field2720, ServerPacket.field2724, ServerPacket.field2725, ServerPacket.field2726, ServerPacket.field2712, ServerPacket.field2753, ServerPacket.field2732, ServerPacket.field2773, ServerPacket.field2731, ServerPacket.field2798, ServerPacket.field2733, ServerPacket.field2734, ServerPacket.field2735, ServerPacket.field2717, ServerPacket.field2737, ServerPacket.field2738, ServerPacket.field2739, ServerPacket.field2740, ServerPacket.field2741, ServerPacket.field2742, ServerPacket.field2743, ServerPacket.field2744, ServerPacket.field2710, ServerPacket.field2793, ServerPacket.field2747, ServerPacket.field2723, ServerPacket.field2749, ServerPacket.field2748, ServerPacket.field2751, ServerPacket.field2727, ServerPacket.field2736, ServerPacket.field2754, ServerPacket.field2755, ServerPacket.field2703, ServerPacket.field2757, ServerPacket.field2758, ServerPacket.field2799, ServerPacket.field2760, ServerPacket.field2761, ServerPacket.field2762, ServerPacket.field2763, ServerPacket.field2764, ServerPacket.field2794, ServerPacket.field2766, ServerPacket.field2767, ServerPacket.field2768, ServerPacket.field2769, ServerPacket.field2770, ServerPacket.field2771, ServerPacket.field2772, ServerPacket.field2759, ServerPacket.field2774, ServerPacket.field2775, ServerPacket.field2776, ServerPacket.field2777, ServerPacket.field2780, ServerPacket.field2779, ServerPacket.field2730, ServerPacket.field2781, ServerPacket.field2750, ServerPacket.field2782, ServerPacket.field2784, ServerPacket.field2785, ServerPacket.field2786, ServerPacket.field2729, ServerPacket.field2792, ServerPacket.field2789, ServerPacket.field2790, ServerPacket.field2783, ServerPacket.field2791, ServerPacket.field2745, ServerPacket.field2756, ServerPacket.field2795, ServerPacket.field2796, ServerPacket.field2797}; // L: 104
+	}
+
+	@ObfuscatedName("hh")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIS)V",
+		garbageValue = "-23293"
+	)
+	@Export("drawObject")
+	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
+		long var5 = DevicePcmPlayerProvider.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5720
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		int var13;
+		int var14;
+		if (0L != var5) { // L: 5721
+			var7 = DevicePcmPlayerProvider.scene.getObjectFlags(var0, var1, var2, var5); // L: 5722
+			var8 = var7 >> 6 & 3; // L: 5723
+			var9 = var7 & 31; // L: 5724
+			var10 = var3; // L: 5725
+			boolean var11 = var5 != 0L && !class24.method329(var5); // L: 5728
+			if (var11) { // L: 5730
+				var10 = var4;
+			}
+
+			int[] var12 = class69.sceneMinimapSprite.pixels; // L: 5731
+			var13 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5732
+			var14 = Message.Entity_unpackID(var5); // L: 5733
+			ObjectComposition var15 = Tiles.getObjectDefinition(var14); // L: 5734
+			if (var15.mapSceneId != -1) { // L: 5735
+				IndexedSprite var16 = FloorDecoration.mapSceneSprites[var15.mapSceneId]; // L: 5736
+				if (var16 != null) { // L: 5737
+					int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; // L: 5738
+					int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; // L: 5739
+					var16.drawAt(var17 + var1 * 4 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48); // L: 5740
+				}
+			} else {
+				if (var9 == 0 || var9 == 2) { // L: 5744
+					if (var8 == 0) { // L: 5745
+						var12[var13] = var10; // L: 5746
+						var12[var13 + 512] = var10; // L: 5747
+						var12[var13 + 1024] = var10; // L: 5748
+						var12[var13 + 1536] = var10; // L: 5749
+					} else if (var8 == 1) { // L: 5751
+						var12[var13] = var10; // L: 5752
+						var12[var13 + 1] = var10; // L: 5753
+						var12[var13 + 2] = var10; // L: 5754
+						var12[var13 + 3] = var10; // L: 5755
+					} else if (var8 == 2) { // L: 5757
+						var12[var13 + 3] = var10; // L: 5758
+						var12[var13 + 512 + 3] = var10; // L: 5759
+						var12[var13 + 1024 + 3] = var10; // L: 5760
+						var12[var13 + 1536 + 3] = var10; // L: 5761
+					} else if (var8 == 3) { // L: 5763
+						var12[var13 + 1536] = var10; // L: 5764
+						var12[var13 + 1536 + 1] = var10; // L: 5765
+						var12[var13 + 1536 + 2] = var10; // L: 5766
+						var12[var13 + 1536 + 3] = var10; // L: 5767
+					}
+				}
+
+				if (var9 == 3) { // L: 5770
+					if (var8 == 0) { // L: 5771
+						var12[var13] = var10;
+					} else if (var8 == 1) { // L: 5772
+						var12[var13 + 3] = var10;
+					} else if (var8 == 2) { // L: 5773
+						var12[var13 + 1536 + 3] = var10;
+					} else if (var8 == 3) { // L: 5774
+						var12[var13 + 1536] = var10;
+					}
+				}
+
+				if (var9 == 2) { // L: 5776
+					if (var8 == 3) { // L: 5777
+						var12[var13] = var10; // L: 5778
+						var12[var13 + 512] = var10; // L: 5779
+						var12[var13 + 1024] = var10; // L: 5780
+						var12[var13 + 1536] = var10; // L: 5781
+					} else if (var8 == 0) { // L: 5783
+						var12[var13] = var10; // L: 5784
+						var12[var13 + 1] = var10; // L: 5785
+						var12[var13 + 2] = var10; // L: 5786
+						var12[var13 + 3] = var10; // L: 5787
+					} else if (var8 == 1) { // L: 5789
+						var12[var13 + 3] = var10; // L: 5790
+						var12[var13 + 512 + 3] = var10; // L: 5791
+						var12[var13 + 1024 + 3] = var10; // L: 5792
+						var12[var13 + 1536 + 3] = var10; // L: 5793
+					} else if (var8 == 2) { // L: 5795
+						var12[var13 + 1536] = var10; // L: 5796
+						var12[var13 + 1536 + 1] = var10; // L: 5797
+						var12[var13 + 1536 + 2] = var10; // L: 5798
+						var12[var13 + 1536 + 3] = var10; // L: 5799
+					}
+				}
+			}
+		}
+
+		var5 = DevicePcmPlayerProvider.scene.getGameObjectTag(var0, var1, var2); // L: 5804
+		if (0L != var5) { // L: 5805
+			var7 = DevicePcmPlayerProvider.scene.getObjectFlags(var0, var1, var2, var5); // L: 5806
+			var8 = var7 >> 6 & 3; // L: 5807
+			var9 = var7 & 31; // L: 5808
+			var10 = Message.Entity_unpackID(var5); // L: 5809
+			ObjectComposition var19 = Tiles.getObjectDefinition(var10); // L: 5810
+			if (var19.mapSceneId != -1) { // L: 5811
+				IndexedSprite var26 = FloorDecoration.mapSceneSprites[var19.mapSceneId]; // L: 5812
+				if (var26 != null) { // L: 5813
+					var13 = (var19.sizeX * 4 - var26.subWidth) / 2; // L: 5814
+					var14 = (var19.sizeY * 4 - var26.subHeight) / 2; // L: 5815
+					var26.drawAt(var13 + var1 * 4 + 48, var14 + (104 - var2 - var19.sizeY) * 4 + 48); // L: 5816
+				}
+			} else if (var9 == 9) { // L: 5819
+				int var20 = 15658734; // L: 5820
+				boolean var27 = 0L != var5 && !class24.method329(var5); // L: 5823
+				if (var27) { // L: 5825
+					var20 = 15597568;
+				}
+
+				int[] var21 = class69.sceneMinimapSprite.pixels; // L: 5826
+				int var22 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5827
+				if (var8 != 0 && var8 != 2) { // L: 5828
+					var21[var22] = var20; // L: 5835
+					var21[var22 + 1 + 512] = var20; // L: 5836
+					var21[var22 + 1024 + 2] = var20; // L: 5837
+					var21[var22 + 1536 + 3] = var20; // L: 5838
+				} else {
+					var21[var22 + 1536] = var20; // L: 5829
+					var21[var22 + 1 + 1024] = var20; // L: 5830
+					var21[var22 + 512 + 2] = var20; // L: 5831
+					var21[var22 + 3] = var20; // L: 5832
+				}
+			}
+		}
+
+		var5 = DevicePcmPlayerProvider.scene.getFloorDecorationTag(var0, var1, var2); // L: 5842
+		if (0L != var5) { // L: 5843
+			var7 = Message.Entity_unpackID(var5); // L: 5844
+			ObjectComposition var23 = Tiles.getObjectDefinition(var7); // L: 5845
+			if (var23.mapSceneId != -1) { // L: 5846
+				IndexedSprite var24 = FloorDecoration.mapSceneSprites[var23.mapSceneId]; // L: 5847
+				if (var24 != null) { // L: 5848
+					var10 = (var23.sizeX * 4 - var24.subWidth) / 2; // L: 5849
+					int var25 = (var23.sizeY * 4 - var24.subHeight) / 2; // L: 5850
+					var24.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var23.sizeY) * 4 + var25 + 48); // L: 5851
+				}
+			}
+		}
+
+	} // L: 5855
+
+	@ObfuscatedName("ln")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "360913539"
+	)
+	@Export("Clan_leaveChat")
+	static final void Clan_leaveChat() {
+		PacketBufferNode var0 = InterfaceParent.getPacketBufferNode(ClientPacket.field2667, Client.packetWriter.isaacCipher); // L: 11489
+		var0.packetBuffer.writeByte(0); // L: 11490
+		Client.packetWriter.addNode(var0); // L: 11491
+	} // L: 11492
 }
diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java
index fac2da0f74..021936fe6e 100644
--- a/runescape-client/src/main/java/WorldMapIcon_1.java
+++ b/runescape-client/src/main/java/WorldMapIcon_1.java
@@ -7,50 +7,45 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("fe")
 @Implements("WorldMapIcon_1")
 public class WorldMapIcon_1 extends AbstractWorldMapIcon {
-	@ObfuscatedName("ay")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1028024263
-	)
-	static int field1937;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 523010301
+		intValue = -1566048417
 	)
 	@Export("objectDefId")
 	final int objectDefId;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lfq;"
+		descriptor = "Lfn;"
 	)
 	@Export("region")
 	final WorldMapRegion region;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 626777191
+		intValue = -211441443
 	)
 	@Export("element")
 	int element;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lfv;"
+		descriptor = "Lfd;"
 	)
 	@Export("label")
 	WorldMapLabel label;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 445427727
+		intValue = 1002959697
 	)
 	@Export("subWidth")
 	int subWidth;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1833440401
+		intValue = 711676767
 	)
 	@Export("subHeight")
 	int subHeight;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lii;Lii;ILfq;)V"
+		descriptor = "(Liw;Liw;ILfn;)V"
 	)
 	WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) {
 		super(var1, var2); // L: 17
@@ -59,41 +54,41 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
 		this.init(); // L: 20
 	} // L: 21
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "25929"
+		descriptor = "(I)V",
+		garbageValue = "-819350446"
 	)
 	@Export("init")
 	void init() {
-		this.element = class23.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24
-		this.label = this.region.createMapLabel(class6.WorldMapElement_get(this.element)); // L: 25
-		WorldMapElement var1 = class6.WorldMapElement_get(this.getElement()); // L: 26
+		this.element = Tiles.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24
+		this.label = this.region.createMapLabel(Archive.WorldMapElement_get(this.element)); // L: 25
+		WorldMapElement var1 = Archive.WorldMapElement_get(this.getElement()); // L: 26
 		SpritePixels var2 = var1.getSpriteBool(false); // L: 27
 		if (var2 != null) { // L: 28
 			this.subWidth = var2.subWidth; // L: 29
 			this.subHeight = var2.subHeight; // L: 30
 		} else {
-			this.subWidth = 0;
-			this.subHeight = 0;
+			this.subWidth = 0; // L: 33
+			this.subHeight = 0; // L: 34
 		}
 
-	}
+	} // L: 36
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2145882550"
+		garbageValue = "1717389517"
 	)
 	@Export("getElement")
 	public int getElement() {
-		return this.element;
+		return this.element; // L: 39
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lfv;",
-		garbageValue = "39460369"
+		descriptor = "(I)Lfd;",
+		garbageValue = "1736510941"
 	)
 	@Export("getLabel")
 	WorldMapLabel getLabel() {
@@ -102,73 +97,74 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1949510660"
+		descriptor = "(B)I",
+		garbageValue = "-60"
 	)
 	@Export("getSubWidth")
 	int getSubWidth() {
 		return this.subWidth; // L: 47
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "-85"
+		descriptor = "(I)I",
+		garbageValue = "-401407374"
 	)
 	@Export("getSubHeight")
 	int getSubHeight() {
-		return this.subHeight; // L: 51
+		return this.subHeight;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Lel;",
-		garbageValue = "45"
+		descriptor = "(Lnt;I)Ljava/lang/String;",
+		garbageValue = "242028315"
 	)
-	@Export("KitDefinition_get")
-	public static KitDefinition KitDefinition_get(int var0) {
-		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33
-		if (var1 != null) { // L: 34
-			return var1;
-		} else {
-			byte[] var2 = class404.KitDefinition_archive.takeFile(3, var0); // L: 35
-			var1 = new KitDefinition(); // L: 36
-			if (var2 != null) { // L: 37
-				var1.decode(new Buffer(var2));
+	public static String method3304(Buffer var0) {
+		String var1;
+		try {
+			int var2 = var0.readUShortSmart(); // L: 67
+			if (var2 > 32767) { // L: 68
+				var2 = 32767;
 			}
 
-			KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38
-			return var1; // L: 39
+			byte[] var3 = new byte[var2]; // L: 69
+			var0.offset += class250.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 70
+			String var4 = Actor.decodeStringCp1252(var3, 0, var2); // L: 71
+			var1 = var4; // L: 72
+		} catch (Exception var6) { // L: 74
+			var1 = "Cabbage"; // L: 75
 		}
+
+		return var1; // L: 78
 	}
 
-	@ObfuscatedName("gr")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lce;I)Z",
-		garbageValue = "2063432840"
+		descriptor = "(ILjp;IIIZI)V",
+		garbageValue = "-554182310"
 	)
-	static boolean method3232(Player var0) {
-		if (Client.drawPlayerNames == 0) { // L: 4434
-			return false;
-		} else if (class93.localPlayer == var0) { // L: 4435
-			return MidiPcmStream.method4445(); // L: 4446
-		} else {
-			boolean var1 = Client.method1514(); // L: 4436
-			if (!var1) { // L: 4437
-				boolean var2 = (Client.drawPlayerNames & 1) != 0; // L: 4440
-				var1 = var2 && var0.isFriend(); // L: 4442
-			}
+	public static void method3300(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) {
+		class233.musicPlayerStatus = 1; // L: 50
+		InvDefinition.musicTrackArchive = var1; // L: 51
+		class233.musicTrackGroupId = var2; // L: 52
+		class233.musicTrackFileId = var3; // L: 53
+		class233.musicTrackVolume = var4; // L: 54
+		GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var5; // L: 55
+		FaceNormal.pcmSampleLength = var0; // L: 56
+	} // L: 57
 
-			return var1 || class44.method451() && var0.isFriendsChatMember(); // L: 4444
-		}
-	}
-
-	@ObfuscatedName("hu")
+	@ObfuscatedName("jx")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1393020648"
+		descriptor = "(II)V",
+		garbageValue = "-1274785577"
 	)
-	static final boolean method3235() {
-		return Client.isMenuOpen; // L: 7614
-	}
+	static void method3305(int var0) {
+		class29.tempMenuAction = new MenuAction(); // L: 11004
+		class29.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 11005
+		class29.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 11006
+		class29.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 11007
+		class29.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 11008
+		class29.tempMenuAction.action = Client.menuActions[var0]; // L: 11009
+	} // L: 11010
 }
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index 1ddafcef1f..e56fcfd232 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -3,34 +3,41 @@ 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("fv")
+@ObfuscatedName("fd")
 @Implements("WorldMapLabel")
 public class WorldMapLabel {
-	@ObfuscatedName("v")
+	@ObfuscatedName("el")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive20")
+	static Archive archive20;
+	@ObfuscatedName("f")
 	@Export("text")
 	String text;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1781114869
+		intValue = 797016481
 	)
 	@Export("width")
 	int width;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -733130897
+		intValue = 2014432723
 	)
 	@Export("height")
 	int height;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lfp;"
+		descriptor = "Lfg;"
 	)
 	@Export("size")
 	WorldMapLabelSize size;
 
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;IILfp;)V"
+		descriptor = "(Ljava/lang/String;IILfg;)V"
 	)
 	WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) {
 		this.text = var1; // L: 10
@@ -39,34 +46,71 @@ public class WorldMapLabel {
 		this.size = var4; // L: 13
 	} // L: 14
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "([BIIII[Lfz;I)V",
-		garbageValue = "1162395561"
+		descriptor = "(IIII)I",
+		garbageValue = "427619994"
 	)
-	static final void method3632(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
-		int var7;
-		int var8;
-		for (int var6 = 0; var6 < 4; ++var6) { // L: 93
-			for (var7 = 0; var7 < 64; ++var7) { // L: 94
-				for (var8 = 0; var8 < 64; ++var8) { // L: 95
-					if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) { // L: 96
-						int[] var10000 = var5[var6].flags[var7 + var1];
-						var10000[var8 + var2] &= -16777217;
-					}
+	public static int method3714(int var0, int var1, int var2) {
+		int var3 = UserComparator2.method6890(var2 - var1 + 1); // L: 57
+		var3 <<= var1; // L: 58
+		var0 |= var3; // L: 59
+		return var0; // L: 60
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-481933347"
+	)
+	static int method3715(int var0, Script var1, boolean var2) {
+		Widget var7;
+		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1223
+			int var4;
+			if (var0 == ScriptOpcodes.CC_TRIGGEROP) { // L: 1240
+				var7 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1241
+				var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1242
+				if (var4 >= 1 && var4 <= 10) { // L: 1243
+					class106 var8 = new class106(var4, var7.id, var7.childIndex, var7.itemId); // L: 1246
+					Interpreter.field965.add(var8); // L: 1247
+					return 1; // L: 1248
+				} else {
+					throw new RuntimeException(); // L: 1244
 				}
+			} else if (var0 == ScriptOpcodes.IF_TRIGGEROP) { // L: 1250
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 1251
+				int var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1252
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1253
+				int var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 1254
+				if (var5 >= 1 && var5 <= 10) { // L: 1255
+					class106 var6 = new class106(var5, var3, var4, WorldMapData_1.getWidget(var3).itemId); // L: 1258
+					Interpreter.field965.add(var6); // L: 1259
+					return 1; // L: 1260
+				} else {
+					throw new RuntimeException(); // L: 1256
+				}
+			} else {
+				return 2; // L: 1262
+			}
+		} else if (Interpreter.field966 >= 10) { // L: 1224
+			throw new RuntimeException(); // L: 1225
+		} else {
+			if (var0 >= 2000) { // L: 1228
+				var7 = WorldMapData_1.getWidget(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]); // L: 1229
+			} else {
+				var7 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1231
+			}
+
+			if (var7.onResize == null) { // L: 1232
+				return 0;
+			} else {
+				ScriptEvent var9 = new ScriptEvent(); // L: 1233
+				var9.widget = var7; // L: 1234
+				var9.args = var7.onResize; // L: 1235
+				var9.field1154 = Interpreter.field966 + 1; // L: 1236
+				Client.scriptEvents.addFirst(var9); // L: 1237
+				return 1; // L: 1238
 			}
 		}
-
-		Buffer var10 = new Buffer(var0); // L: 100
-
-		for (var7 = 0; var7 < 4; ++var7) { // L: 101
-			for (var8 = 0; var8 < 64; ++var8) { // L: 102
-				for (int var9 = 0; var9 < 64; ++var9) { // L: 103
-					WorldMapAreaData.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); // L: 104
-				}
-			}
-		}
-
-	} // L: 108
+	}
 }
diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java
index dc457a37ed..e81c527d6f 100644
--- a/runescape-client/src/main/java/WorldMapLabelSize.java
+++ b/runescape-client/src/main/java/WorldMapLabelSize.java
@@ -3,92 +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("fp")
+@ObfuscatedName("fg")
 @Implements("WorldMapLabelSize")
 public class WorldMapLabelSize {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lfp;"
+		descriptor = "Lfg;"
 	)
 	@Export("WorldMapLabelSize_small")
 	public static final WorldMapLabelSize WorldMapLabelSize_small;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lfp;"
+		descriptor = "Lfg;"
 	)
 	@Export("WorldMapLabelSize_medium")
 	public static final WorldMapLabelSize WorldMapLabelSize_medium;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lfp;"
+		descriptor = "Lfg;"
 	)
 	@Export("WorldMapLabelSize_large")
 	public static final WorldMapLabelSize WorldMapLabelSize_large;
-	@ObfuscatedName("en")
-	@ObfuscatedGetter(
-		intValue = -1635992925
-	)
-	@Export("worldPort")
-	static int worldPort;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 945036671
+		intValue = -543167351
 	)
-	final int field1935;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -2000938127
-	)
-	final int field1933;
+	final int field1943;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -514580693
+		intValue = -12875383
 	)
-	final int field1932;
+	final int field1948;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -210309675
+	)
+	final int field1945;
 
 	static {
-		WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7
-		WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); // L: 8
-		WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); // L: 9
+		WorldMapLabelSize_small = new WorldMapLabelSize(2, 0, 4); // L: 7
+		WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); // L: 8
+		WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0); // L: 9
 	}
 
 	WorldMapLabelSize(int var1, int var2, int var3) {
-		this.field1935 = var1; // L: 19
-		this.field1933 = var2; // L: 20
-		this.field1932 = var3; // L: 21
+		this.field1943 = var1; // L: 19
+		this.field1948 = var2; // L: 20
+		this.field1945 = var3; // L: 21
 	} // L: 22
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(FI)Z",
-		garbageValue = "535854948"
+		garbageValue = "1269824536"
 	)
-	boolean method3215(float var1) {
-		return var1 >= (float)this.field1932; // L: 25
+	boolean method3278(float var1) {
+		return var1 >= (float)this.field1945; // L: 25
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lfg;",
+		garbageValue = "589843549"
+	)
+	static WorldMapLabelSize[] method3280() {
+		return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large}; // L: 15
 	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lfp;",
-		garbageValue = "368638280"
+		descriptor = "(IB)Lfg;",
+		garbageValue = "2"
 	)
-	static WorldMapLabelSize[] method3221() {
-		return new WorldMapLabelSize[]{WorldMapLabelSize_medium, WorldMapLabelSize_large, WorldMapLabelSize_small}; // L: 15
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lfp;",
-		garbageValue = "658176697"
-	)
-	static WorldMapLabelSize method3208(int var0) {
-		WorldMapLabelSize[] var1 = method3221(); // L: 30
+	static WorldMapLabelSize method3281(int var0) {
+		WorldMapLabelSize[] var1 = method3280(); // L: 30
 
 		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31
 			WorldMapLabelSize var3 = var1[var2]; // L: 32
-			if (var0 == var3.field1933) { // L: 34
+			if (var0 == var3.field1948) { // L: 34
 				return var3; // L: 35
 			}
 		}
@@ -96,426 +89,100 @@ public class WorldMapLabelSize {
 		return null; // L: 40
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(CLkk;B)I",
-		garbageValue = "4"
+		descriptor = "(Ljp;Ljava/lang/String;Ljava/lang/String;I)[Lof;",
+		garbageValue = "652881992"
 	)
-	@Export("lowercaseChar")
-	static int lowercaseChar(char var0, Language var1) {
-		int var2 = var0 << 4; // L: 104
-		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 105
-			var0 = Character.toLowerCase(var0); // L: 106
-			var2 = (var0 << 4) + 1; // L: 107
+	public static IndexedSprite[] method3268(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1); // L: 44
+		int var4 = var0.getFileId(var3, var2); // L: 45
+		IndexedSprite[] var5;
+		if (!Message.method1263(var0, var3, var4)) { // L: 48
+			var5 = null; // L: 49
+		} else {
+			IndexedSprite[] var7 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 54
+
+			for (int var8 = 0; var8 < class397.SpriteBuffer_spriteCount; ++var8) { // L: 55
+				IndexedSprite var9 = var7[var8] = new IndexedSprite(); // L: 56
+				var9.width = class397.SpriteBuffer_spriteWidth; // L: 57
+				var9.height = class244.SpriteBuffer_spriteHeight; // L: 58
+				var9.xOffset = class397.SpriteBuffer_xOffsets[var8]; // L: 59
+				var9.yOffset = class26.SpriteBuffer_yOffsets[var8]; // L: 60
+				var9.subWidth = Canvas.SpriteBuffer_spriteWidths[var8]; // L: 61
+				var9.subHeight = Clock.SpriteBuffer_spriteHeights[var8]; // L: 62
+				var9.palette = class397.SpriteBuffer_spritePalette; // L: 63
+				var9.pixels = class126.SpriteBuffer_pixels[var8]; // L: 64
+			}
+
+			ArchiveDisk.method5993(); // L: 66
+			var5 = var7; // L: 69
 		}
 
-		if (var0 == 241 && var1 == Language.Language_ES) { // L: 109
-			var2 = 1762;
-		}
-
-		return var2; // L: 110
+		return var5; // L: 71
 	}
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "4"
-	)
-	public static int method3206() {
-		return KeyHandler.KeyHandler_idleCycles; // L: 172
-	}
-
-	@ObfuscatedName("a")
+	@ObfuscatedName("gt")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1934362980"
+		garbageValue = "191984233"
 	)
-	static void method3218() {
-		Login.loginIndex = 24; // L: 1653
-		class260.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 1654
-	} // L: 1655
+	static final void method3274() {
+		int var0 = Players.Players_count; // L: 4078
+		int[] var1 = Players.Players_indices; // L: 4079
 
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1091146417"
-	)
-	static int method3217(int var0, Script var1, boolean var2) {
-		int var3;
-		int var6;
-		int var9;
-		if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2001
-			class44.Interpreter_intStackSize -= 2; // L: 2002
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2003
-			var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2004
-			EnumComposition var10 = InterfaceParent.getEnum(var3); // L: 2005
-			if (var10.outputType != 's') { // L: 2006
-			}
-
-			for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2007
-				if (var9 == var10.keys[var6]) { // L: 2008
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2009
-					var10 = null; // L: 2010
-					break;
-				}
-			}
-
-			if (var10 != null) { // L: 2014
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10.defaultStr;
-			}
-
-			return 1; // L: 2015
-		} else if (var0 != ScriptOpcodes.ENUM) { // L: 2017
-			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2043
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2044
-				EnumComposition var4 = InterfaceParent.getEnum(var3); // L: 2045
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.size(); // L: 2046
-				return 1; // L: 2047
-			} else {
-				return 2; // L: 2049
-			}
-		} else {
-			class44.Interpreter_intStackSize -= 4; // L: 2018
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2019
-			var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2020
-			int var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2021
-			var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 2022
-			EnumComposition var7 = InterfaceParent.getEnum(var5); // L: 2023
-			if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2024
-				for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2029
-					if (var6 == var7.keys[var8]) { // L: 2030
-						if (var9 == 115) { // L: 2031
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8];
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2032
-						}
-
-						var7 = null; // L: 2033
-						break;
-					}
-				}
-
-				if (var7 != null) { // L: 2037
-					if (var9 == 115) { // L: 2038
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2039
-					}
-				}
-
-				return 1; // L: 2041
-			} else {
-				if (var9 == 115) { // L: 2025
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null";
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2026
-				}
-
-				return 1; // L: 2027
+		for (int var2 = 0; var2 < var0; ++var2) { // L: 4080
+			Player var3 = Client.players[var1[var2]]; // L: 4081
+			if (var3 != null) { // L: 4082
+				World.updateActorSequence(var3, 1); // L: 4083
 			}
 		}
-	}
 
-	@ObfuscatedName("ap")
+	} // L: 4086
+
+	@ObfuscatedName("gs")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZS)I",
-		garbageValue = "-12947"
+		descriptor = "(Lcl;I)V",
+		garbageValue = "-2040471803"
 	)
-	static int method3219(int var0, Script var1, boolean var2) {
-		if (var0 == 3800) { // L: 2422
-			if (NPCComposition.guestClanSettings != null) { // L: 2423
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2424
-				class26.field220 = NPCComposition.guestClanSettings; // L: 2425
-			} else {
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2427
-			}
-
-			return 1; // L: 2428
-		} else {
-			int var3;
-			if (var0 == 3801) { // L: 2430
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2431
-				if (Client.currentClanSettings[var3] != null) { // L: 2432
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2433
-					class26.field220 = Client.currentClanSettings[var3]; // L: 2434
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2436
-				}
-
-				return 1; // L: 2437
-			} else if (var0 == 3802) { // L: 2439
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class26.field220.name; // L: 2440
-				return 1; // L: 2441
-			} else if (var0 == 3803) { // L: 2443
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.allowGuests ? 1 : 0; // L: 2444
-				return 1; // L: 2445
-			} else if (var0 == 3804) { // L: 2447
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field103; // L: 2448
-				return 1; // L: 2449
-			} else if (var0 == 3805) { // L: 2451
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field113; // L: 2452
-				return 1; // L: 2453
-			} else if (var0 == 3806) { // L: 2455
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field98; // L: 2456
-				return 1; // L: 2457
-			} else if (var0 == 3807) { // L: 2459
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field96; // L: 2460
-				return 1; // L: 2461
-			} else if (var0 == 3809) { // L: 2463
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.memberCount; // L: 2464
-				return 1; // L: 2465
-			} else if (var0 == 3810) { // L: 2467
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2468
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class26.field220.memberNames[var3]; // L: 2469
-				return 1; // L: 2470
-			} else if (var0 == 3811) { // L: 2472
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2473
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.memberRanks[var3]; // L: 2474
-				return 1; // L: 2475
-			} else if (var0 == 3812) { // L: 2477
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.bannedMemberCount; // L: 2478
-				return 1; // L: 2479
-			} else if (var0 == 3813) { // L: 2481
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2482
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class26.field220.bannedMemberNames[var3]; // L: 2483
-				return 1; // L: 2484
-			} else {
-				int var5;
-				int var6;
-				if (var0 == 3814) { // L: 2486
-					class44.Interpreter_intStackSize -= 3; // L: 2487
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2488
-					var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2489
-					var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2490
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.method100(var3, var6, var5); // L: 2491
-					return 1; // L: 2492
-				} else if (var0 == 3815) { // L: 2494
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.currentOwner; // L: 2495
-					return 1; // L: 2496
-				} else if (var0 == 3816) { // L: 2498
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field99; // L: 2499
-					return 1; // L: 2500
-				} else if (var0 == 3817) { // L: 2502
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.method99(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2503
-					return 1; // L: 2504
-				} else if (var0 == 3818) { // L: 2506
-					Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1] = class26.field220.getSortedMembers()[Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1]]; // L: 2507
-					return 1; // L: 2508
-				} else if (var0 == 3819) { // L: 2510
-					class44.Interpreter_intStackSize -= 2; // L: 2511
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2512
-					var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 2513
-					class305.method5533(var6, var3); // L: 2514
-					return 1; // L: 2515
-				} else if (var0 == 3820) { // L: 2517
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2518
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field101[var3]; // L: 2519
-					return 1; // L: 2520
-				} else {
-					if (var0 == 3821) { // L: 2522
-						class44.Interpreter_intStackSize -= 3; // L: 2523
-						var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 2524
-						boolean var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 2525
-						var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 2526
-						class18.method216(var5, var3, var4); // L: 2527
-					}
-
-					if (var0 == 3822) { // L: 2529
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2530
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class26.field220.field108[var3] ? 1 : 0; // L: 2531
-						return 1; // L: 2532
-					} else if (var0 == 3850) { // L: 2534
-						if (ApproximateRouteStrategy.guestClanChannel != null) { // L: 2535
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2536
-							ArchiveLoader.field1147 = ApproximateRouteStrategy.guestClanChannel; // L: 2537
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2539
-						}
-
-						return 1; // L: 2540
-					} else if (var0 == 3851) { // L: 2542
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2543
-						if (Client.currentClanChannels[var3] != null) { // L: 2544
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2545
-							ArchiveLoader.field1147 = Client.currentClanChannels[var3]; // L: 2546
-							Interpreter.field982 = var3; // L: 2547
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2549
-						}
-
-						return 1; // L: 2550
-					} else if (var0 == 3852) { // L: 2552
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ArchiveLoader.field1147.name; // L: 2553
-						return 1; // L: 2554
-					} else if (var0 == 3853) { // L: 2556
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.field26; // L: 2557
-						return 1; // L: 2558
-					} else if (var0 == 3854) { // L: 2560
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.field32; // L: 2561
-						return 1; // L: 2562
-					} else if (var0 == 3855) { // L: 2564
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.method27(); // L: 2565
-						return 1; // L: 2566
-					} else if (var0 == 3856) { // L: 2568
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2569
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ((ClanChannelMember)ArchiveLoader.field1147.members.get(var3)).name; // L: 2570
-						return 1; // L: 2571
-					} else if (var0 == 3857) { // L: 2573
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2574
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((ClanChannelMember)ArchiveLoader.field1147.members.get(var3)).rank; // L: 2575
-						return 1; // L: 2576
-					} else if (var0 == 3858) { // L: 2578
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2579
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((ClanChannelMember)ArchiveLoader.field1147.members.get(var3)).world; // L: 2580
-						return 1; // L: 2581
-					} else if (var0 == 3859) { // L: 2583
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2584
-						class1.method7(Interpreter.field982, var3); // L: 2585
-						return 1; // L: 2586
-					} else if (var0 == 3860) { // L: 2588
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.method30(Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); // L: 2589
-						return 1; // L: 2590
-					} else if (var0 == 3861) { // L: 2592
-						Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1] = ArchiveLoader.field1147.getSortedMembers()[Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize - 1]]; // L: 2593
-						return 1; // L: 2594
-					} else if (var0 == 3890) { // L: 2596
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class34.field254 != null ? 1 : 0; // L: 2597
-						return 1; // L: 2598
-					} else {
-						return 2; // L: 2600
-					}
-				}
-			}
+	static final void method3279(Actor var0) {
+		if (var0.field1269 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapScaleHandler.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 4182
+			int var1 = var0.field1269 - var0.field1276; // L: 4183
+			int var2 = Client.cycle - var0.field1276; // L: 4184
+			int var3 = var0.field1225 * 64 + var0.field1264 * 128; // L: 4185
+			int var4 = var0.field1225 * 64 + var0.field1268 * 128; // L: 4186
+			int var5 = var0.field1225 * 64 + var0.field1265 * 128; // L: 4187
+			int var6 = var0.field1225 * 64 + var0.field1267 * 128; // L: 4188
+			var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 4189
+			var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; // L: 4190
 		}
-	}
 
-	@ObfuscatedName("ai")
+		var0.field1242 = 0; // L: 4192
+		var0.orientation = var0.field1270; // L: 4193
+		var0.rotation = var0.orientation; // L: 4194
+	} // L: 4195
+
+	@ObfuscatedName("jg")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "-41"
+		descriptor = "([Liv;Liv;ZI)V",
+		garbageValue = "-1843640686"
 	)
-	static int method3209(int var0, Script var1, boolean var2) {
-		int var6;
-		if (var0 == ScriptOpcodes.OC_NAME) { // L: 3120
-			var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3121
-			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class260.ItemDefinition_get(var6).name; // L: 3122
-			return 1; // L: 3123
-		} else {
-			int var4;
-			ItemComposition var5;
-			if (var0 == ScriptOpcodes.OC_OP) { // L: 3125
-				class44.Interpreter_intStackSize -= 2; // L: 3126
-				var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3127
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3128
-				var5 = class260.ItemDefinition_get(var6); // L: 3129
-				if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 3130
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
-				} else {
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3131
-				}
-
-				return 1; // L: 3132
-			} else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3134
-				class44.Interpreter_intStackSize -= 2; // L: 3135
-				var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3136
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3137
-				var5 = class260.ItemDefinition_get(var6); // L: 3138
-				if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3139
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
-				} else {
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3140
-				}
-
-				return 1; // L: 3141
-			} else if (var0 == ScriptOpcodes.OC_COST) { // L: 3143
-				var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3144
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var6).price; // L: 3145
-				return 1; // L: 3146
-			} else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3148
-				var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3149
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 3150
-				return 1; // L: 3151
-			} else {
-				ItemComposition var7;
-				if (var0 == ScriptOpcodes.OC_CERT) { // L: 3153
-					var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3154
-					var7 = class260.ItemDefinition_get(var6); // L: 3155
-					if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3156
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.note;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3157
-					}
-
-					return 1; // L: 3158
-				} else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3160
-					var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3161
-					var7 = class260.ItemDefinition_get(var6); // L: 3162
-					if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3163
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.note;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3164
-					}
-
-					return 1; // L: 3165
-				} else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3167
-					var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3168
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class260.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 3169
-					return 1; // L: 3170
-				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3172
-					var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3173
-					var7 = class260.ItemDefinition_get(var6); // L: 3174
-					if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3175
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.placeholder;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3176
-					}
-
-					return 1; // L: 3177
-				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3179
-					var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3180
-					var7 = class260.ItemDefinition_get(var6); // L: 3181
-					if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3182
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var7.placeholder;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var6; // L: 3183
-					}
-
-					return 1; // L: 3184
-				} else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3186
-					String var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3187
-					var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3188
-					ObjectComposition.findItemDefinitions(var3, var4 == 1); // L: 3189
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ClanSettings.foundItemIdCount; // L: 3190
-					return 1; // L: 3191
-				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3193
-					if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3198
-						Canvas.foundItemIndex = 0; // L: 3199
-						return 1; // L: 3200
-					} else {
-						return 2; // L: 3202
-					}
-				} else {
-					if (Clock.foundItemIds != null && Canvas.foundItemIndex < ClanSettings.foundItemIdCount) { // L: 3194
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Clock.foundItemIds[++Canvas.foundItemIndex - 1] & '\uffff'; // L: 3195
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1;
-					}
-
-					return 1; // L: 3196
-				}
-			}
+	@Export("revalidateWidgetScroll")
+	static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
+		int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1327325403 * -1727030445 : var1.width * 1476009263 * -527414833; // L: 9936
+		int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 845859575 * -2062739769 : var1.height * -1001050535 * 25115113; // L: 9937
+		DynamicObject.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9938
+		if (var1.children != null) { // L: 9939
+			DynamicObject.resizeInterface(var1.children, var1.id, var3, var4, var2);
 		}
-	}
 
-	@ObfuscatedName("kj")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "2028267498"
-	)
-	@Export("updateSoundEffectVolume")
-	static final void updateSoundEffectVolume(int var0) {
-		var0 = Math.min(Math.max(var0, 0), 127); // L: 10920
-		ObjectComposition.clientPreferences.soundEffectsVolume = var0; // L: 10921
-		TileItem.savePreferences(); // L: 10922
-	} // L: 10923
+		InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9940
+		if (var5 != null) { // L: 9941
+			JagexCache.method2637(var5.group, var3, var4, var2);
+		}
+
+		if (var1.contentType == 1337) { // L: 9942
+		}
+
+	} // L: 9943
 }
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index cd01111822..3794f12a28 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -1,9 +1,3 @@
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -15,99 +9,99 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ff")
+@ObfuscatedName("ft")
 @Implements("WorldMapManager")
 public final class WorldMapManager {
-	@ObfuscatedName("dp")
+	@ObfuscatedName("qn")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Lb;"
 	)
-	@Export("archive11")
-	static Archive archive11;
-	@ObfuscatedName("v")
+	@Export("guestClanSettings")
+	static ClanSettings guestClanSettings;
+	@ObfuscatedName("f")
 	@Export("loaded")
 	boolean loaded;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("loadStarted")
 	boolean loadStarted;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lgz;"
+		descriptor = "Lgg;"
 	)
 	@Export("mapAreaData")
 	WorldMapAreaData mapAreaData;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
+		descriptor = "Loa;"
 	)
 	@Export("compositeTextureSprite")
 	SpritePixels compositeTextureSprite;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@Export("icons")
 	HashMap icons;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "[[Lfq;"
+		descriptor = "[[Lfn;"
 	)
 	@Export("regions")
 	WorldMapRegion[][] regions;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@Export("scaleHandlers")
 	HashMap scaleHandlers;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "[Lof;"
 	)
 	@Export("mapSceneSprites")
 	IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("geographyArchive")
 	final AbstractArchive geographyArchive;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+		descriptor = "Ljp;"
 	)
 	@Export("groundArchive")
 	final AbstractArchive groundArchive;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@Export("fonts")
 	final HashMap fonts;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 758122357
+		intValue = 303896089
 	)
 	@Export("tileX")
 	int tileX;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 197299753
+		intValue = 1832860335
 	)
 	@Export("tileY")
 	int tileY;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 274838579
+		intValue = 590568685
 	)
 	@Export("tileWidth")
 	int tileWidth;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1210430205
+		intValue = -1476623753
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("g")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -978895597
+		intValue = -1546416373
 	)
 	@Export("pixelsPerTile")
 	public int pixelsPerTile;
 
 	@ObfuscatedSignature(
-		descriptor = "([Lop;Ljava/util/HashMap;Ljv;Ljv;)V"
+		descriptor = "([Lof;Ljava/util/HashMap;Ljp;Ljp;)V"
 	)
 	public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
 		this.loaded = false; // L: 16
@@ -120,10 +114,10 @@ public final class WorldMapManager {
 		this.groundArchive = var4; // L: 37
 	} // L: 38
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljava/lang/String;ZB)V",
-		garbageValue = "-19"
+		descriptor = "(Ljp;Ljava/lang/String;ZS)V",
+		garbageValue = "-5214"
 	)
 	@Export("load")
 	public void load(AbstractArchive var1, String var2, boolean var3) {
@@ -131,10 +125,10 @@ public final class WorldMapManager {
 			this.loaded = false; // L: 44
 			this.loadStarted = true; // L: 45
 			System.nanoTime(); // L: 46
-			int var4 = var1.getGroupId(WorldMapCacheName.field2137.name); // L: 47
+			int var4 = var1.getGroupId(WorldMapCacheName.field2131.name); // L: 47
 			int var5 = var1.getFileId(var4, var2); // L: 48
-			Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2137.name, var2)); // L: 49
-			Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2132.name, var2)); // L: 50
+			Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2131.name, var2)); // L: 49
+			Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field2134.name, var2)); // L: 50
 			System.nanoTime(); // L: 51
 			System.nanoTime(); // L: 52
 			this.mapAreaData = new WorldMapAreaData(); // L: 53
@@ -156,1532 +150,450 @@ public final class WorldMapManager {
 			int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68
 			System.nanoTime(); // L: 69
 			System.nanoTime(); // L: 70
-			WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 72
-			this.regions = new WorldMapRegion[var16][var9]; // L: 74
-			Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 75
+			class44.method532(); // L: 71
+			this.regions = new WorldMapRegion[var16][var9]; // L: 72
+			Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73
 
 			while (var10.hasNext()) {
-				WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 76
-				int var12 = var11.regionX; // L: 78
-				int var13 = var11.regionY; // L: 79
-				int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 80
-				int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 81
-				this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 82
-				this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 83
+				WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74
+				int var12 = var11.regionX; // L: 76
+				int var13 = var11.regionY; // L: 77
+				int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78
+				int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79
+				this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 80
+				this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 81
 			}
 
-			for (int var17 = 0; var17 < var16; ++var17) { // L: 86
-				for (int var18 = 0; var18 < var9; ++var18) { // L: 87
-					if (this.regions[var17][var18] == null) { // L: 88
-						this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 89
-						this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 90
+			for (int var17 = 0; var17 < var16; ++var17) { // L: 84
+				for (int var18 = 0; var18 < var9; ++var18) { // L: 85
+					if (this.regions[var17][var18] == null) { // L: 86
+						this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87
+						this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88
 					}
 				}
 			}
 
-			System.nanoTime(); // L: 94
-			System.nanoTime(); // L: 95
-			if (var1.isValidFileName(WorldMapCacheName.field2134.name, var2)) { // L: 96
-				byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2134.name, var2); // L: 97
-				this.compositeTextureSprite = ParamComposition.convertJpgToSprite(var20); // L: 98
+			System.nanoTime(); // L: 92
+			System.nanoTime(); // L: 93
+			if (var1.isValidFileName(WorldMapCacheName.field2130.name, var2)) { // L: 94
+				byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field2130.name, var2); // L: 95
+				this.compositeTextureSprite = class125.convertJpgToSprite(var20); // L: 96
 			}
 
-			System.nanoTime(); // L: 100
-			var1.clearGroups(); // L: 101
-			var1.clearFiles(); // L: 102
-			this.loaded = true; // L: 103
+			System.nanoTime(); // L: 98
+			var1.clearGroups(); // L: 99
+			var1.clearFiles(); // L: 100
+			this.loaded = true; // L: 101
 		}
-	} // L: 42 104
+	} // L: 42 102
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "768"
+		descriptor = "(I)V",
+		garbageValue = "-1914125455"
 	)
 	@Export("clearIcons")
 	public final void clearIcons() {
-		this.icons = null; // L: 107
-	} // L: 108
+		this.icons = null; // L: 105
+	} // L: 106
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIII)V",
-		garbageValue = "181464110"
+		descriptor = "(IIIIIIIIB)V",
+		garbageValue = "1"
 	)
 	@Export("drawTiles")
 	public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 111
-		int var10 = Rasterizer2D.Rasterizer2D_width; // L: 112
-		int var11 = Rasterizer2D.Rasterizer2D_height; // L: 113
-		int[] var12 = new int[4]; // L: 114
-		Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 115
-		WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 116
-		float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 117
-		int var15 = (int)Math.ceil((double)var14); // L: 118
-		this.pixelsPerTile = var15; // L: 119
-		if (!this.scaleHandlers.containsKey(var15)) { // L: 120
-			WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15);
-			var16.init(); // L: 122
-			this.scaleHandlers.put(var15, var16);
+		int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109
+		int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110
+		int var11 = Rasterizer2D.Rasterizer2D_height; // L: 111
+		int[] var12 = new int[4]; // L: 112
+		Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 113
+		WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114
+		float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 115
+		int var15 = (int)Math.ceil((double)var14); // L: 116
+		this.pixelsPerTile = var15; // L: 117
+		if (!this.scaleHandlers.containsKey(var15)) { // L: 118
+			WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 119
+			var16.init(); // L: 120
+			this.scaleHandlers.put(var15, var16); // L: 121
 		}
 
-		int var23 = var13.width + var13.x - 1;
-		int var17 = var13.height + var13.y - 1; // L: 126
+		int var23 = var13.x + var13.width - 1; // L: 123
+		int var17 = var13.height + var13.y - 1; // L: 124
 
 		int var18;
 		int var19;
-		for (var18 = var13.x; var18 <= var23; ++var18) { // L: 127
-			for (var19 = var13.y; var19 <= var17; ++var19) { // L: 128
-				this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 129
+		for (var18 = var13.x; var18 <= var23; ++var18) { // L: 125
+			for (var19 = var13.y; var19 <= var17; ++var19) { // L: 126
+				this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 127
 			}
 		}
 
-		Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 132
-		Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 133
-		var18 = (int)(var14 * 64.0F); // L: 134
-		var19 = this.tileX + var1; // L: 135
-		int var20 = var2 + this.tileY; // L: 136
+		Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130
+		Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131
+		var18 = (int)(64.0F * var14); // L: 132
+		var19 = this.tileX + var1; // L: 133
+		int var20 = var2 + this.tileY; // L: 134
 
-		for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 137
-			for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 138
-				this.regions[var21][var22].method3328(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 139
+		for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { // L: 135
+			for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { // L: 136
+				this.regions[var21][var22].method3407(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137
 			}
 		}
 
-	} // L: 142
+	} // L: 140
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V",
-		garbageValue = "-1554077956"
+		descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
+		garbageValue = "-95"
 	)
 	@Export("drawElements")
 	public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) {
-		WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 145
-		float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 146
-		int var16 = (int)(var15 * 64.0F); // L: 147
-		int var17 = this.tileX + var1; // L: 148
-		int var18 = var2 + this.tileY; // L: 149
+		WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143
+		float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144
+		int var16 = (int)(var15 * 64.0F); // L: 145
+		int var17 = this.tileX + var1; // L: 146
+		int var18 = var2 + this.tileY; // L: 147
 
 		int var19;
 		int var20;
-		for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 150
-			for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 151
-				if (var13) { // L: 152
-					this.regions[var19][var20].initWorldMapIcon1s(); // L: 153
+		for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 148
+			for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 149
+				if (var13) { // L: 150
+					this.regions[var19][var20].initWorldMapIcon1s(); // L: 151
 				}
 
-				this.regions[var19][var20].method3353(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 155
+				this.regions[var19][var20].method3417(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153
 			}
 		}
 
-		if (var10 != null && var11 > 0) { // L: 158
-			for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 159
-				for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 160
-					this.regions[var19][var20].flashElements(var10, var11, var12); // L: 161
+		if (var10 != null && var11 > 0) { // L: 156
+			for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { // L: 157
+				for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 158
+					this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159
 				}
 			}
 		}
 
-	} // L: 165
+	} // L: 163
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(IIIILjava/util/HashSet;III)V",
-		garbageValue = "-397966592"
+		garbageValue = "-1541196041"
 	)
 	@Export("drawOverview")
 	public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
-		if (this.compositeTextureSprite != null) { // L: 168
-			this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 171
-			if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 172
-				if (this.icons == null) { // L: 175
-					this.buildIcons0(); // L: 176
+		if (this.compositeTextureSprite != null) { // L: 166
+			this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169
+			if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170
+				if (this.icons == null) { // L: 173
+					this.buildIcons0(); // L: 174
 				}
 
-				Iterator var8 = var5.iterator(); // L: 178
+				Iterator var8 = var5.iterator(); // L: 176
 
 				while (true) {
 					List var10;
 					do {
 						if (!var8.hasNext()) {
-							return; // L: 195
+							return; // L: 193
 						}
 
-						int var9 = (Integer)var8.next(); // L: 179
-						var10 = (List)this.icons.get(var9); // L: 181
-					} while(var10 == null); // L: 182
+						int var9 = (Integer)var8.next(); // L: 177
+						var10 = (List)this.icons.get(var9); // L: 179
+					} while(var10 == null); // L: 180
 
-					Iterator var11 = var10.iterator(); // L: 185
+					Iterator var11 = var10.iterator();
 
-					while (var11.hasNext()) {
-						AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 186
-						int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 188
-						int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 189
-						Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 190
+					while (var11.hasNext()) { // L: 183
+						AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 184
+						int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 186
+						int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 187
+						Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 188
 					}
 				}
 			}
 		}
-	} // L: 169 173
+	} // L: 167 171
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(IIIIIIIIIII)Ljava/util/List;",
-		garbageValue = "533098241"
+		garbageValue = "1811762017"
 	)
-	public List method3465(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
-		LinkedList var11 = new LinkedList(); // L: 198
-		if (!this.loaded) { // L: 199
-			return var11; // L: 200
+	public List method3526(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
+		LinkedList var11 = new LinkedList(); // L: 196
+		if (!this.loaded) { // L: 197
+			return var11; // L: 198
 		} else {
-			WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 202
-			float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 203
-			int var14 = (int)(var13 * 64.0F);
-			int var15 = this.tileX + var1;
-			int var16 = var2 + this.tileY;
+			WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200
+			float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201
+			int var14 = (int)(64.0F * var13); // L: 202
+			int var15 = this.tileX + var1; // L: 203
+			int var16 = var2 + this.tileY; // L: 204
 
-			for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 207
-				for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) {
-					List var19 = this.regions[var17][var18].method3359(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10);
-					if (!var19.isEmpty()) {
-						var11.addAll(var19);
+			for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { // L: 205
+				for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { // L: 206
+					List var19 = this.regions[var17][var18].method3437(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207
+					if (!var19.isEmpty()) { // L: 208
+						var11.addAll(var19); // L: 209
 					}
 				}
 			}
 
-			return var11;
+			return var11; // L: 213
 		}
 	}
 
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)Lfh;",
+		garbageValue = "-2057635793"
+	)
+	@Export("createWorldMapRectangle")
+	WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) {
+		WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217
+		int var6 = this.tileX + var1; // L: 218
+		int var7 = var2 + this.tileY; // L: 219
+		int var8 = var3 + this.tileX; // L: 220
+		int var9 = var4 + this.tileY; // L: 221
+		int var10 = var6 / 64; // L: 222
+		int var11 = var7 / 64; // L: 223
+		int var12 = var8 / 64; // L: 224
+		int var13 = var9 / 64; // L: 225
+		var5.width = var12 - var10 + 1; // L: 226
+		var5.height = var13 - var11 + 1; // L: 227
+		var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 228
+		var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 229
+		if (var5.x < 0) { // L: 230
+			var5.width += var5.x; // L: 231
+			var5.x = 0; // L: 232
+		}
+
+		if (var5.x > this.regions.length - var5.width) { // L: 234
+			var5.width = this.regions.length - var5.x; // L: 235
+		}
+
+		if (var5.y < 0) { // L: 237
+			var5.height += var5.y; // L: 238
+			var5.y = 0; // L: 239
+		}
+
+		if (var5.y > this.regions[0].length - var5.height) { // L: 241
+			var5.height = this.regions[0].length - var5.y; // L: 242
+		}
+
+		var5.width = Math.min(var5.width, this.regions.length); // L: 244
+		var5.height = Math.min(var5.height, this.regions[0].length); // L: 245
+		return var5; // L: 246
+	}
+
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIB)Lfu;",
-		garbageValue = "-6"
-	)
-	@Export("createWorldMapRectangle")
-	WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) {
-		WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 219
-		int var6 = this.tileX + var1;
-		int var7 = var2 + this.tileY;
-		int var8 = var3 + this.tileX;
-		int var9 = var4 + this.tileY; // L: 223
-		int var10 = var6 / 64; // L: 224
-		int var11 = var7 / 64;
-		int var12 = var8 / 64;
-		int var13 = var9 / 64;
-		var5.width = var12 - var10 + 1; // L: 228
-		var5.height = var13 - var11 + 1;
-		var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 230
-		var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 231
-		if (var5.x < 0) {
-			var5.width += var5.x;
-			var5.x = 0; // L: 234
-		}
-
-		if (var5.x > this.regions.length - var5.width) {
-			var5.width = this.regions.length - var5.x;
-		}
-
-		if (var5.y < 0) {
-			var5.height += var5.y;
-			var5.y = 0; // L: 241
-		}
-
-		if (var5.y > this.regions[0].length - var5.height) { // L: 243
-			var5.height = this.regions[0].length - var5.y;
-		}
-
-		var5.width = Math.min(var5.width, this.regions.length);
-		var5.height = Math.min(var5.height, this.regions[0].length);
-		return var5;
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "831698872"
+		descriptor = "(B)Z",
+		garbageValue = "-10"
 	)
 	@Export("isLoaded")
 	public boolean isLoaded() {
-		return this.loaded; // L: 252
+		return this.loaded; // L: 250
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/util/HashMap;",
+		garbageValue = "-1763373289"
+	)
+	@Export("buildIcons")
+	public HashMap buildIcons() {
+		this.buildIcons0(); // L: 254
+		return this.icons; // L: 255
 	}
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/util/HashMap;",
-		garbageValue = "1724645516"
-	)
-	@Export("buildIcons")
-	public HashMap buildIcons() {
-		this.buildIcons0();
-		return this.icons;
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "582634997"
+		descriptor = "(B)V",
+		garbageValue = "-112"
 	)
 	@Export("buildIcons0")
 	void buildIcons0() {
-		if (this.icons == null) {
-			this.icons = new HashMap();
+		if (this.icons == null) { // L: 259
+			this.icons = new HashMap(); // L: 260
 		}
 
-		this.icons.clear(); // L: 264
+		this.icons.clear(); // L: 262
 
-		for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 265
-			for (int var2 = 0; var2 < this.regions[var1].length; ++var2) {
-				List var3 = this.regions[var1][var2].icons(); // L: 267
-				Iterator var4 = var3.iterator();
+		for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263
+			for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264
+				List var3 = this.regions[var1][var2].icons(); // L: 265
+				Iterator var4 = var3.iterator(); // L: 266
 
 				while (var4.hasNext()) {
-					AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-					if (var5.hasValidElement()) {
-						int var6 = var5.getElement();
-						if (!this.icons.containsKey(var6)) {
-							LinkedList var7 = new LinkedList(); // L: 274
-							var7.add(var5);
-							this.icons.put(var6, var7);
+					AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267
+					if (var5.hasValidElement()) { // L: 269
+						int var6 = var5.getElement(); // L: 270
+						if (!this.icons.containsKey(var6)) { // L: 271
+							LinkedList var7 = new LinkedList(); // L: 272
+							var7.add(var5); // L: 273
+							this.icons.put(var6, var7); // L: 274
 						} else {
-							List var8 = (List)this.icons.get(var6);
-							var8.add(var5);
+							List var8 = (List)this.icons.get(var6); // L: 277
+							var8.add(var5); // L: 278
 						}
 					}
 				}
 			}
 		}
 
-	}
+	} // L: 284
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)F",
-		garbageValue = "20"
+		descriptor = "(III)F",
+		garbageValue = "1764352522"
 	)
 	@Export("getPixelsPerTile")
 	float getPixelsPerTile(int var1, int var2) {
-		float var3 = (float)var1 / (float)var2;
-		if (var3 > 8.0F) {
+		float var3 = (float)var1 / (float)var2; // L: 287
+		if (var3 > 8.0F) { // L: 288
 			return 8.0F;
-		} else if (var3 < 1.0F) {
+		} else if (var3 < 1.0F) { // L: 289
 			return 1.0F;
 		} else {
-			int var4 = Math.round(var3);
-			return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3;
+			int var4 = Math.round(var3); // L: 290
+			return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(Laf;B)V",
-		garbageValue = "-51"
+		descriptor = "(Laa;I)V",
+		garbageValue = "59413416"
 	)
-	@Export("doCycleTitle")
-	static void doCycleTitle(GameEngine var0) {
-		if (Login.worldSelectOpen) { // L: 204
-			class20.method230(var0); // L: 205
-		} else {
-			if ((MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 208
-				ObjectComposition.clientPreferences.titleMusicDisabled = !ObjectComposition.clientPreferences.titleMusicDisabled; // L: 209
-				TileItem.savePreferences(); // L: 210
-				if (!ObjectComposition.clientPreferences.titleMusicDisabled) { // L: 211
-					Archive var1 = UrlRequest.archive6; // L: 212
-					int var2 = var1.getGroupId("scape main"); // L: 214
-					int var3 = var1.getFileId(var2, ""); // L: 215
-					LoginScreenAnimation.method2219(var1, var2, var3, 255, false); // L: 216
-				} else {
-					class124.midiPcmStream.clear(); // L: 220
-					class232.musicPlayerStatus = 1; // L: 221
-					ModelData0.musicTrackArchive = null; // L: 222
-				}
+	static void method3538(GameEngine var0) {
+		while (SecureRandomCallable.isKeyDown()) { // L: 1409
+			if (SoundCache.field446 == 13) { // L: 1410
+				Login.worldSelectOpen = false; // L: 1412
+				class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1413
+				class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1414
+				Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 1415
+				return; // L: 1417
 			}
 
-			if (Client.gameState != 5) { // L: 225
-				if (Login.field1050 == -1L) { // L: 226
-					Login.field1050 = ObjectComposition.currentTimeMillis() + 1000L; // L: 227
-				}
-
-				long var21 = ObjectComposition.currentTimeMillis(); // L: 229
-				boolean var31;
-				if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 232
-					while (true) {
-						if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 236
-							var31 = true; // L: 244
-							break;
-						}
-
-						ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 237
-						if (!var4.isLoaded()) { // L: 238
-							var31 = false; // L: 239
-							break; // L: 240
-						}
-
-						++Client.archiveLoadersDone; // L: 242
-					}
-				} else {
-					var31 = true; // L: 233
-				}
-
-				if (var31 && -1L == Login.field1022) { // L: 246 247
-					Login.field1022 = var21; // L: 248
-					if (Login.field1022 > Login.field1050) { // L: 249
-						Login.field1050 = Login.field1022; // L: 250
-					}
-				}
-
-				if (Client.gameState == 10 || Client.gameState == 11) { // L: 254
-					int var23;
-					if (Language.Language_EN == class378.clientLanguage) { // L: 255
-						if (MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 256
-							var23 = Login.xPadding + 5; // L: 257
-							short var5 = 463; // L: 258
-							byte var6 = 100; // L: 259
-							byte var7 = 35; // L: 260
-							if (MouseHandler.MouseHandler_lastPressedX >= var23 && MouseHandler.MouseHandler_lastPressedX <= var23 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { // L: 261
-								VarbitComposition.method2859(); // L: 262
-								return; // L: 263
-							}
-						}
-
-						if (MilliClock.World_request != null) { // L: 266
-							VarbitComposition.method2859();
-						}
-					}
-
-					var23 = MouseHandler.MouseHandler_lastButton; // L: 268
-					int var32 = MouseHandler.MouseHandler_lastPressedX; // L: 269
-					int var33 = MouseHandler.MouseHandler_lastPressedY; // L: 270
-					if (var23 == 0) { // L: 271
-						var32 = MouseHandler.MouseHandler_x; // L: 272
-						var33 = MouseHandler.MouseHandler_y; // L: 273
-					}
-
-					if (!Client.mouseCam && var23 == 4) { // L: 275
-						var23 = 1;
-					}
-
-					short var36;
-					int var37;
-					if (Login.loginIndex == 0) { // L: 276
-						boolean var41 = false; // L: 277
-
-						while (ClanChannelMember.isKeyDown()) { // L: 278
-							if (ItemComposition.field1859 == 84) { // L: 279
-								var41 = true; // L: 280
-							}
-						}
-
-						var37 = UserComparator4.loginBoxCenter - 80; // L: 283
-						var36 = 291; // L: 284
-						if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 285
-							Players.openURL(KitDefinition.method2705("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 286
-						}
-
-						var37 = UserComparator4.loginBoxCenter + 80; // L: 288
-						if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20 || var41) { // L: 289
-							if ((Client.worldProperties & 33554432) != 0) { // L: 290
-								Login.Login_response0 = ""; // L: 291
-								Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world."; // L: 292
-								Login.Login_response2 = "Your normal account will not be affected."; // L: 293
-								Login.Login_response3 = ""; // L: 294
-								Login.loginIndex = 1; // L: 295
-								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 297
-									Login.currentLoginField = 1; // L: 298
-								} else {
-									Login.currentLoginField = 0; // L: 301
-								}
-							} else if ((Client.worldProperties & 4) != 0) { // L: 305
-								if ((Client.worldProperties & 1024) != 0) { // L: 306
-									Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world."; // L: 307
-									Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 308
-									Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 309
-								} else {
-									Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world."; // L: 312
-									Login.Login_response2 = "Players can attack each other"; // L: 313
-									Login.Login_response3 = "almost everywhere."; // L: 314
-								}
-
-								Login.Login_response0 = "Warning!"; // L: 316
-								Login.loginIndex = 1; // L: 317
-								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 319
-									Login.currentLoginField = 1; // L: 320
-								} else {
-									Login.currentLoginField = 0; // L: 323
-								}
-							} else if ((Client.worldProperties & 1024) != 0) { // L: 327
-								Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world."; // L: 328
-								Login.Login_response2 = "The Protect Item prayer will"; // L: 329
-								Login.Login_response3 = "not work on this world."; // L: 330
-								Login.Login_response0 = "Warning!"; // L: 331
-								Login.loginIndex = 1; // L: 332
-								if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 334
-									Login.currentLoginField = 1; // L: 335
-								} else {
-									Login.currentLoginField = 0; // L: 338
-								}
-							} else {
-								ClanChannelMember.Login_promptCredentials(false); // L: 343
-							}
-						}
-					} else {
-						short var8;
-						int var34;
-						if (Login.loginIndex == 1) { // L: 347
-							while (true) {
-								if (!ClanChannelMember.isKeyDown()) { // L: 348
-									var34 = UserComparator4.loginBoxCenter - 80; // L: 356
-									var8 = 321; // L: 357
-									if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 358
-										ClanChannelMember.Login_promptCredentials(false); // L: 359
-									}
-
-									var34 = UserComparator4.loginBoxCenter + 80; // L: 361
-									if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 362
-										Login.loginIndex = 0; // L: 363
-									}
-									break;
-								}
-
-								if (ItemComposition.field1859 == 84) { // L: 349
-									ClanChannelMember.Login_promptCredentials(false); // L: 350
-								} else if (ItemComposition.field1859 == 13) { // L: 352
-									Login.loginIndex = 0; // L: 353
-								}
-							}
-						} else {
-							int var11;
-							short var35;
-							boolean var38;
-							if (Login.loginIndex == 2) { // L: 366
-								var35 = 201; // L: 367
-								var34 = var35 + 52; // L: 368
-								if (var23 == 1 && var33 >= var34 - 12 && var33 < var34 + 2) { // L: 369
-									Login.currentLoginField = 0;
-								}
-
-								var34 += 15; // L: 370
-								if (var23 == 1 && var33 >= var34 - 12 && var33 < var34 + 2) { // L: 371
-									Login.currentLoginField = 1;
-								}
-
-								var34 += 15; // L: 372
-								var35 = 361; // L: 373
-								if (DynamicObject.field1107 != null) { // L: 374
-									var37 = DynamicObject.field1107.highX / 2; // L: 375
-									if (var23 == 1 && var32 >= DynamicObject.field1107.lowX - var37 && var32 <= var37 + DynamicObject.field1107.lowX && var33 >= var35 - 15 && var33 < var35) { // L: 376
-										switch(Login.field1039) { // L: 377
-										case 1:
-											class260.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 380
-											Login.loginIndex = 5; // L: 381
-											return; // L: 382
-										case 2:
-											Players.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 386
-										}
-									}
-								}
-
-								var37 = UserComparator4.loginBoxCenter - 80; // L: 392
-								var36 = 321; // L: 393
-								if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 394
-									Login.Login_username = Login.Login_username.trim(); // L: 395
-									if (Login.Login_username.length() == 0) { // L: 396
-										class260.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 397
-										return; // L: 398
-									}
-
-									if (Login.Login_password.length() == 0) { // L: 400
-										class260.setLoginResponseString("", "Please enter your password.", ""); // L: 401
-										return; // L: 402
-									}
-
-									class260.setLoginResponseString("", "Connecting to server...", ""); // L: 404
-									VarbitComposition.method2849(false); // L: 405
-									class12.updateGameState(20); // L: 406
-									return; // L: 407
-								}
-
-								var37 = Login.loginBoxX + 180 + 80; // L: 409
-								if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 410
-									Login.loginIndex = 0; // L: 411
-									Login.Login_username = ""; // L: 412
-									Login.Login_password = ""; // L: 413
-									class5.field53 = 0; // L: 414
-									Varps.otp = ""; // L: 415
-									Login.field1043 = true; // L: 416
-								}
-
-								var37 = UserComparator4.loginBoxCenter + -117; // L: 418
-								var36 = 277; // L: 419
-								Login.field1041 = var32 >= var37 && var32 < var37 + Skeleton.field2287 && var33 >= var36 && var33 < var36 + WorldMapIcon_1.field1937; // L: 420
-								if (var23 == 1 && Login.field1041) { // L: 421
-									Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 422
-									if (!Client.Login_isUsernameRemembered && ObjectComposition.clientPreferences.rememberedUsername != null) { // L: 423
-										ObjectComposition.clientPreferences.rememberedUsername = null; // L: 424
-										TileItem.savePreferences(); // L: 425
-									}
-								}
-
-								var37 = UserComparator4.loginBoxCenter + 24; // L: 428
-								var36 = 277; // L: 429
-								Login.field1047 = var32 >= var37 && var32 < var37 + Skeleton.field2287 && var33 >= var36 && var33 < var36 + WorldMapIcon_1.field1937; // L: 430
-								if (var23 == 1 && Login.field1047) { // L: 431
-									ObjectComposition.clientPreferences.hideUsername = !ObjectComposition.clientPreferences.hideUsername; // L: 432
-									if (!ObjectComposition.clientPreferences.hideUsername) { // L: 433
-										Login.Login_username = ""; // L: 434
-										ObjectComposition.clientPreferences.rememberedUsername = null; // L: 435
-										if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 437
-											Login.currentLoginField = 1; // L: 438
-										} else {
-											Login.currentLoginField = 0; // L: 441
-										}
-									}
-
-									TileItem.savePreferences(); // L: 445
-								}
-
-								while (true) {
-									int var12;
-									Transferable var25;
-									do {
-										while (true) {
-											label975:
-											do {
-												while (true) {
-													while (ClanChannelMember.isKeyDown()) { // L: 447
-														if (ItemComposition.field1859 != 13) { // L: 448
-															if (Login.currentLoginField != 0) { // L: 457
-																continue label975;
-															}
-
-															char var39 = class249.field3116; // L: 458
-
-															for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var39 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 460 461
-															}
-
-															if (ItemComposition.field1859 == 85 && Login.Login_username.length() > 0) { // L: 464
-																Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
-															}
-
-															if (ItemComposition.field1859 == 84 || ItemComposition.field1859 == 80) { // L: 465
-																Login.currentLoginField = 1;
-															}
-
-															if (DevicePcmPlayerProvider.method385(class249.field3116) && Login.Login_username.length() < 320) { // L: 466
-																Login.Login_username = Login.Login_username + class249.field3116;
-															}
-														} else {
-															Login.loginIndex = 0; // L: 449
-															Login.Login_username = ""; // L: 450
-															Login.Login_password = ""; // L: 451
-															class5.field53 = 0; // L: 452
-															Varps.otp = ""; // L: 453
-															Login.field1043 = true; // L: 454
-														}
-													}
-
-													return; // L: 755
-												}
-											} while(Login.currentLoginField != 1); // L: 468
-
-											if (ItemComposition.field1859 == 85 && Login.Login_password.length() > 0) { // L: 469
-												Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 470
-											} else if (ItemComposition.field1859 == 84 || ItemComposition.field1859 == 80) { // L: 472
-												Login.currentLoginField = 0; // L: 473
-												if (ItemComposition.field1859 == 84) { // L: 474
-													Login.Login_username = Login.Login_username.trim(); // L: 475
-													if (Login.Login_username.length() == 0) { // L: 476
-														class260.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 477
-														return; // L: 478
-													}
-
-													if (Login.Login_password.length() == 0) { // L: 480
-														class260.setLoginResponseString("", "Please enter your password.", ""); // L: 481
-														return; // L: 482
-													}
-
-													class260.setLoginResponseString("", "Connecting to server...", ""); // L: 484
-													VarbitComposition.method2849(false); // L: 485
-													class12.updateGameState(20); // L: 486
-													return; // L: 487
-												}
-											}
-
-											if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && ItemComposition.field1859 == 67) { // L: 490
-												Clipboard var24 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 491
-												var25 = var24.getContents(class23.client); // L: 492
-												var12 = 20 - Login.Login_password.length(); // L: 493
-												break;
-											}
-
-											char var40 = class249.field3116; // L: 535
-											if ((var40 < ' ' || var40 >= 127) && (var40 <= 127 || var40 >= 160) && (var40 <= 160 || var40 > 255)) { // L: 537
-												label1187: {
-													if (var40 != 0) { // L: 541
-														char[] var26 = class301.cp1252AsciiExtension; // L: 543
-
-														for (int var27 = 0; var27 < var26.length; ++var27) { // L: 544
-															char var14 = var26[var27]; // L: 545
-															if (var40 == var14) { // L: 547
-																var38 = true; // L: 548
-																break label1187; // L: 549
-															}
-														}
-													}
-
-													var38 = false; // L: 555
-												}
-											} else {
-												var38 = true; // L: 538
-											}
-
-											if (var38 && DevicePcmPlayerProvider.method385(class249.field3116) && Login.Login_password.length() < 20) { // L: 557
-												Login.Login_password = Login.Login_password + class249.field3116; // L: 558
-											}
-										}
-									} while(var12 <= 0); // L: 494
-
-									try {
-										String var13 = (String)var25.getTransferData(DataFlavor.stringFlavor); // L: 496
-										int var42 = Math.min(var12, var13.length()); // L: 497
-
-										for (int var15 = 0; var15 < var42; ++var15) { // L: 498
-											char var17 = var13.charAt(var15); // L: 500
-											boolean var16;
-											if ((var17 < ' ' || var17 >= 127) && (var17 <= 127 || var17 >= 160) && (var17 <= 160 || var17 > 255)) { // L: 502
-												label1190: {
-													if (var17 != 0) { // L: 506
-														char[] var18 = class301.cp1252AsciiExtension; // L: 508
-
-														for (int var19 = 0; var19 < var18.length; ++var19) { // L: 509
-															char var20 = var18[var19]; // L: 510
-															if (var20 == var17) { // L: 512
-																var16 = true; // L: 513
-																break label1190; // L: 514
-															}
-														}
-													}
-
-													var16 = false; // L: 520
-												}
-											} else {
-												var16 = true; // L: 503
-											}
-
-											if (!var16 || !DevicePcmPlayerProvider.method385(var13.charAt(var15))) { // L: 522
-												Login.loginIndex = 3; // L: 523
-												return; // L: 524
-											}
-										}
-
-										Login.Login_password = Login.Login_password + var13.substring(0, var42); // L: 527
-									} catch (UnsupportedFlavorException var29) { // L: 529
-									} catch (IOException var30) { // L: 530
-									}
-								}
-							} else if (Login.loginIndex == 3) { // L: 565
-								var34 = Login.loginBoxX + 180; // L: 566
-								var8 = 276; // L: 567
-								if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 568
-									ClanChannelMember.Login_promptCredentials(false); // L: 569
-								}
-
-								var34 = Login.loginBoxX + 180; // L: 571
-								var8 = 326; // L: 572
-								if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 573
-									class260.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 574
-									Login.loginIndex = 5; // L: 575
-									return; // L: 576
-								}
-							} else {
-								int var10;
-								if (Login.loginIndex == 4) { // L: 579
-									var34 = Login.loginBoxX + 180 - 80; // L: 580
-									var8 = 321; // L: 581
-									if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 582
-										Varps.otp.trim(); // L: 583
-										if (Varps.otp.length() != 6) { // L: 584
-											class260.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 585
-											return; // L: 586
-										}
-
-										class5.field53 = Integer.parseInt(Varps.otp); // L: 588
-										Varps.otp = ""; // L: 589
-										VarbitComposition.method2849(true); // L: 590
-										class260.setLoginResponseString("", "Connecting to server...", ""); // L: 591
-										class12.updateGameState(20); // L: 592
-										return; // L: 593
-									}
-
-									if (var23 == 1 && var32 >= Login.loginBoxX + 180 - 9 && var32 <= Login.loginBoxX + 180 + 130 && var33 >= 263 && var33 <= 296) { // L: 595
-										Login.field1043 = !Login.field1043; // L: 596
-									}
-
-									if (var23 == 1 && var32 >= Login.loginBoxX + 180 - 34 && var32 <= Login.loginBoxX + 34 + 180 && var33 >= 351 && var33 <= 363) { // L: 598
-										Players.openURL(KitDefinition.method2705("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 599
-									}
-
-									var34 = Login.loginBoxX + 180 + 80; // L: 601
-									if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 602
-										Login.loginIndex = 0; // L: 603
-										Login.Login_username = ""; // L: 604
-										Login.Login_password = ""; // L: 605
-										class5.field53 = 0; // L: 606
-										Varps.otp = ""; // L: 607
-									}
-
-									while (ClanChannelMember.isKeyDown()) { // L: 609
-										boolean var9 = false; // L: 610
-
-										for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 611
-											if (class249.field3116 == "1234567890".charAt(var10)) { // L: 612
-												var9 = true; // L: 613
-												break; // L: 614
-											}
-										}
-
-										if (ItemComposition.field1859 == 13) { // L: 617
-											Login.loginIndex = 0; // L: 618
-											Login.Login_username = ""; // L: 619
-											Login.Login_password = ""; // L: 620
-											class5.field53 = 0; // L: 621
-											Varps.otp = ""; // L: 622
-										} else {
-											if (ItemComposition.field1859 == 85 && Varps.otp.length() > 0) { // L: 625
-												Varps.otp = Varps.otp.substring(0, Varps.otp.length() - 1);
-											}
-
-											if (ItemComposition.field1859 == 84) { // L: 626
-												Varps.otp.trim(); // L: 627
-												if (Varps.otp.length() != 6) { // L: 628
-													class260.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 629
-													return; // L: 630
-												}
-
-												class5.field53 = Integer.parseInt(Varps.otp); // L: 632
-												Varps.otp = ""; // L: 633
-												VarbitComposition.method2849(true); // L: 634
-												class260.setLoginResponseString("", "Connecting to server...", ""); // L: 635
-												class12.updateGameState(20); // L: 636
-												return; // L: 637
-											}
-
-											if (var9 && Varps.otp.length() < 6) { // L: 639
-												Varps.otp = Varps.otp + class249.field3116;
-											}
-										}
-									}
-								} else if (Login.loginIndex == 5) { // L: 643
-									var34 = Login.loginBoxX + 180 - 80; // L: 644
-									var8 = 321; // L: 645
-									if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 646
-										ClanMate.method5712(); // L: 647
-										return; // L: 648
-									}
-
-									var34 = Login.loginBoxX + 180 + 80; // L: 650
-									if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 651
-										ClanChannelMember.Login_promptCredentials(true); // L: 652
-									}
-
-									var36 = 361; // L: 654
-									if (GrandExchangeOfferOwnWorldComparator.field631 != null) { // L: 655
-										var10 = GrandExchangeOfferOwnWorldComparator.field631.highX / 2; // L: 656
-										if (var23 == 1 && var32 >= GrandExchangeOfferOwnWorldComparator.field631.lowX - var10 && var32 <= var10 + GrandExchangeOfferOwnWorldComparator.field631.lowX && var33 >= var36 - 15 && var33 < var36) { // L: 657
-											Players.openURL(KitDefinition.method2705("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 658
-										}
-									}
-
-									while (ClanChannelMember.isKeyDown()) { // L: 661
-										var38 = false; // L: 662
-
-										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 663
-											if (class249.field3116 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 664
-												var38 = true; // L: 665
-												break; // L: 666
-											}
-										}
-
-										if (ItemComposition.field1859 == 13) { // L: 669
-											ClanChannelMember.Login_promptCredentials(true); // L: 670
-										} else {
-											if (ItemComposition.field1859 == 85 && Login.Login_username.length() > 0) { // L: 673
-												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
-											}
-
-											if (ItemComposition.field1859 == 84) { // L: 674
-												ClanMate.method5712(); // L: 675
-												return; // L: 676
-											}
-
-											if (var38 && Login.Login_username.length() < 320) { // L: 678
-												Login.Login_username = Login.Login_username + class249.field3116;
-											}
-										}
-									}
-								} else if (Login.loginIndex != 6) { // L: 682
-									if (Login.loginIndex == 7) { // L: 693
-										var34 = Login.loginBoxX + 180 - 80; // L: 694
-										var8 = 321; // L: 695
-										if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 696
-											Players.openURL(KitDefinition.method2705("secure", true) + "m=dob/set_dob.ws", true, false); // L: 697
-											class260.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 698
-											Login.loginIndex = 6; // L: 699
-											return; // L: 700
-										}
-
-										var34 = Login.loginBoxX + 180 + 80; // L: 702
-										if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 703
-											ClanChannelMember.Login_promptCredentials(true); // L: 704
-										}
-									} else if (Login.loginIndex == 8) { // L: 707
-										var34 = Login.loginBoxX + 180 - 80; // L: 708
-										var8 = 321; // L: 709
-										if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 710
-											Players.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 711
-											class260.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 712
-											Login.loginIndex = 6; // L: 713
-											return; // L: 714
-										}
-
-										var34 = Login.loginBoxX + 180 + 80; // L: 716
-										if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 717
-											ClanChannelMember.Login_promptCredentials(true); // L: 718
-										}
-									} else if (Login.loginIndex == 12) { // L: 721
-										String var28 = ""; // L: 722
-										switch(Login.field1032) { // L: 723
-										case 0:
-											var28 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 731
-											break;
-										case 1:
-											var28 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 725
-											break; // L: 726
-										default:
-											ClanChannelMember.Login_promptCredentials(false); // L: 728
-										}
-
-										var37 = Login.loginBoxX + 180; // L: 734
-										var36 = 276; // L: 735
-										if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 736
-											Players.openURL(var28, true, false); // L: 737
-											class260.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 738
-											Login.loginIndex = 6; // L: 739
-											return; // L: 740
-										}
-
-										var37 = Login.loginBoxX + 180; // L: 742
-										var36 = 326; // L: 743
-										if (var23 == 1 && var32 >= var37 - 75 && var32 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { // L: 744
-											ClanChannelMember.Login_promptCredentials(false); // L: 745
-										}
-									} else if (Login.loginIndex == 24) { // L: 748
-										var34 = Login.loginBoxX + 180; // L: 749
-										var8 = 301; // L: 750
-										if (var23 == 1 && var32 >= var34 - 75 && var32 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { // L: 751
-											ClanChannelMember.Login_promptCredentials(false); // L: 752
-										}
-									}
-								} else {
-									while (true) {
-										do {
-											if (!ClanChannelMember.isKeyDown()) { // L: 683
-												var35 = 321; // L: 688
-												if (var23 == 1 && var33 >= var35 - 20 && var33 <= var35 + 20) { // L: 689
-													ClanChannelMember.Login_promptCredentials(true); // L: 690
-												}
-
-												return;
-											}
-										} while(ItemComposition.field1859 != 84 && ItemComposition.field1859 != 13); // L: 684
-
-										ClanChannelMember.Login_promptCredentials(true); // L: 685
-									}
-								}
-							}
-						}
-					}
-
+			if (SoundCache.field446 == 96) { // L: 1419
+				if (Login.worldSelectPage > 0 && NetCache.worldSelectLeftSprite != null) { // L: 1420
+					--Login.worldSelectPage; // L: 1421
 				}
+			} else if (SoundCache.field446 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && class12.worldSelectRightSprite != null) { // L: 1424 1425
+				++Login.worldSelectPage; // L: 1426
 			}
 		}
-	} // L: 206
 
-	@ObfuscatedName("s")
+		if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1430
+			int var1 = Login.xPadding + 280; // L: 1431
+			if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1432
+				World.changeWorldSelectSorting(0, 0); // L: 1433
+				return; // L: 1434
+			}
+
+			if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1436
+				World.changeWorldSelectSorting(0, 1); // L: 1437
+				return; // L: 1438
+			}
+
+			int var2 = Login.xPadding + 390; // L: 1440
+			if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1441
+				World.changeWorldSelectSorting(1, 0); // L: 1442
+				return; // L: 1443
+			}
+
+			if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1445
+				World.changeWorldSelectSorting(1, 1); // L: 1446
+				return; // L: 1447
+			}
+
+			int var3 = Login.xPadding + 500; // L: 1449
+			if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1450
+				World.changeWorldSelectSorting(2, 0); // L: 1451
+				return; // L: 1452
+			}
+
+			if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1454
+				World.changeWorldSelectSorting(2, 1); // L: 1455
+				return; // L: 1456
+			}
+
+			int var4 = Login.xPadding + 610; // L: 1458
+			if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1459
+				World.changeWorldSelectSorting(3, 0); // L: 1460
+				return; // L: 1461
+			}
+
+			if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1463
+				World.changeWorldSelectSorting(3, 1); // L: 1464
+				return; // L: 1465
+			}
+
+			if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1467
+				Login.worldSelectOpen = false; // L: 1469
+				class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1470
+				class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1471
+				Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 1472
+				return; // L: 1474
+			}
+
+			if (Login.hoveredWorldIndex != -1) { // L: 1476
+				World var5 = World.World_worlds[Login.hoveredWorldIndex]; // L: 1477
+				GrandExchangeOfferAgeComparator.changeWorld(var5); // L: 1478
+				Login.worldSelectOpen = false; // L: 1480
+				class339.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1481
+				class377.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1482
+				Messages.logoSprite.drawAt(Login.xPadding + 382 - Messages.logoSprite.subWidth / 2, 18); // L: 1483
+				return; // L: 1485
+			}
+
+			if (Login.worldSelectPage > 0 && NetCache.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= NetCache.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class0.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class0.canvasHeight / 2 + 50) { // L: 1487
+				--Login.worldSelectPage; // L: 1488
+			}
+
+			if (Login.worldSelectPage < Login.worldSelectPagesCount && class12.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= AttackOption.canvasWidth - class12.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= AttackOption.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class0.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class0.canvasHeight / 2 + 50) { // L: 1490
+				++Login.worldSelectPage; // L: 1491
+			}
+		}
+
+	} // L: 1494
+
+	@ObfuscatedName("ff")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)V",
-		garbageValue = "-84"
+		descriptor = "(I)V",
+		garbageValue = "-306372299"
 	)
-	static final void method3490(String var0) {
-		StringBuilder var10000 = (new StringBuilder()).append(var0);
-		Object var10001 = null;
-		String var1 = var10000.append(" is already on your friend list").toString(); // L: 121
-		World.addGameMessage(30, "", var1); // L: 123
-	} // L: 125
-
-	@ObfuscatedName("jv")
-	@ObfuscatedSignature(
-		descriptor = "([Lio;IIIIIIII)V",
-		garbageValue = "1695957245"
-	)
-	@Export("updateInterface")
-	static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		for (int var8 = 0; var8 < var0.length; ++var8) { // L: 10186
-			Widget var9 = var0[var8]; // L: 10187
-			if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class21.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 10188 10189 10190
-				if (var9.isIf3) { // L: 10191
-					if (HitSplatDefinition.isComponentHidden(var9)) { // L: 10192
-						continue;
-					}
-				} else if (var9.type == 0 && var9 != World.mousedOverWidgetIf1 && HitSplatDefinition.isComponentHidden(var9)) { // L: 10195
-					continue;
-				}
-
-				int var10 = var9.x + var6; // L: 10197
-				int var11 = var7 + var9.y; // L: 10198
-				int var12;
-				int var13;
-				int var14;
-				int var15;
-				int var17;
-				int var18;
-				if (var9.type == 2) { // L: 10203
-					var12 = var2; // L: 10204
-					var13 = var3; // L: 10205
-					var14 = var4; // L: 10206
-					var15 = var5; // L: 10207
-				} else {
-					int var16;
-					if (var9.type == 9) { // L: 10209
-						var16 = var10; // L: 10210
-						var17 = var11; // L: 10211
-						var18 = var10 + var9.width; // L: 10212
-						int var19 = var11 + var9.height; // L: 10213
-						if (var18 < var10) { // L: 10214
-							var16 = var18; // L: 10216
-							var18 = var10; // L: 10217
-						}
-
-						if (var19 < var11) { // L: 10219
-							var17 = var19; // L: 10221
-							var19 = var11; // L: 10222
-						}
-
-						++var18; // L: 10224
-						++var19; // L: 10225
-						var12 = var16 > var2 ? var16 : var2; // L: 10226
-						var13 = var17 > var3 ? var17 : var3; // L: 10227
-						var14 = var18 < var4 ? var18 : var4; // L: 10228
-						var15 = var19 < var5 ? var19 : var5; // L: 10229
-					} else {
-						var16 = var10 + var9.width; // L: 10232
-						var17 = var11 + var9.height; // L: 10233
-						var12 = var10 > var2 ? var10 : var2; // L: 10234
-						var13 = var11 > var3 ? var11 : var3; // L: 10235
-						var14 = var16 < var4 ? var16 : var4; // L: 10236
-						var15 = var17 < var5 ? var17 : var5; // L: 10237
-					}
-				}
-
-				if (var9 == Client.clickedWidget) { // L: 10239
-					Client.field822 = true; // L: 10240
-					Client.field854 = var10; // L: 10241
-					Client.field804 = var11; // L: 10242
-				}
-
-				boolean var32 = false; // L: 10244
-				if (var9.field3032) { // L: 10245
-					switch(Client.field803) { // L: 10246
-					case 0:
-						var32 = true; // L: 10258
-					case 1:
-					default:
-						break;
-					case 2:
-						if (Client.field805 == var9.id >>> 16) { // L: 10248
-							var32 = true; // L: 10249
-						}
-						break;
-					case 3:
-						if (var9.id == Client.field805) { // L: 10253
-							var32 = true; // L: 10254
-						}
-					}
-				}
-
-				if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 10262
-					if (var9.isIf3) { // L: 10263
-						ScriptEvent var26;
-						if (var9.noClickThrough) { // L: 10264
-							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10265
-								for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10266
-									if (var26.isMouseInputEvent) { // L: 10267
-										var26.remove(); // L: 10268
-										var26.widget.containsMouse = false; // L: 10269
-									}
-								}
-
-								if (Actor.widgetDragDuration == 0) { // L: 10272
-									Client.clickedWidget = null; // L: 10273
-									Client.clickedWidgetParent = null; // L: 10274
-								}
-
-								if (!Client.isMenuOpen) { // L: 10276
-									NetSocket.addCancelMenuEntry(); // L: 10277
-								}
-							}
-						} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10281 10282
-							for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10283
-								if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 10284
-									var26.remove(); // L: 10285
-								}
-							}
-						}
-					}
-
-					var17 = MouseHandler.MouseHandler_x; // L: 10291
-					var18 = MouseHandler.MouseHandler_y; // L: 10292
-					if (MouseHandler.MouseHandler_lastButton != 0) { // L: 10293
-						var17 = MouseHandler.MouseHandler_lastPressedX; // L: 10294
-						var18 = MouseHandler.MouseHandler_lastPressedY; // L: 10295
-					}
-
-					boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 10297
-					if (var9.contentType == 1337) { // L: 10298
-						if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 10299
-							class2.addSceneMenuOptions(var17, var18, var12, var13);
-						}
-					} else if (var9.contentType == 1338) { // L: 10302
-						class69.checkIfMinimapClicked(var9, var10, var11); // L: 10303
-					} else {
-						if (var9.contentType == 1400) { // L: 10306
-							class243.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 10307
-						}
-
-						if (!Client.isMenuOpen && var33) { // L: 10309
-							if (var9.contentType == 1400) { // L: 10310
-								class243.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 10311
-							} else {
-								HealthBarUpdate.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 10314
-							}
-						}
-
-						boolean var21;
-						int var23;
-						if (var32) { // L: 10317
-							for (int var20 = 0; var20 < var9.field3033.length; ++var20) { // L: 10318
-								var21 = false; // L: 10319
-								boolean var27 = false; // L: 10320
-								if (!var21 && var9.field3033[var20] != null) { // L: 10321
-									for (var23 = 0; var23 < var9.field3033[var20].length; ++var23) { // L: 10322
-										boolean var24 = false; // L: 10323
-										if (var9.field3012 != null) { // L: 10324
-											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field3033[var20][var23]]; // L: 10325
-										}
-
-										if (NPC.method2258(var9.field3033[var20][var23]) || var24) { // L: 10327
-											var21 = true; // L: 10328
-											if (var9.field3012 != null && var9.field3012[var20] > Client.cycle) { // L: 10329
-												break;
-											}
-
-											byte var31 = var9.field3034[var20][var23]; // L: 10330
-											if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 10331 10332 10333 10334 10335
-												var27 = true; // L: 10337
-												break;
-											}
-										}
-									}
-								}
-
-								if (var27) { // L: 10343
-									if (var20 < 10) { // L: 10344
-										class376.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
-									} else if (var20 == 10) { // L: 10345
-										class5.Widget_runOnTargetLeave(); // L: 10346
-										LoginScreenAnimation.selectSpell(var9.id, var9.childIndex, AttackOption.Widget_unpackTargetMask(class21.getWidgetFlags(var9)), var9.itemId); // L: 10347
-										Client.selectedSpellActionName = BoundaryObject.Widget_getSpellActionName(var9); // L: 10348
-										if (Client.selectedSpellActionName == null) { // L: 10349
-											Client.selectedSpellActionName = "null";
-										}
-
-										Client.selectedSpellName = var9.dataText + class44.colorStartTag(16777215); // L: 10350
-									}
-
-									var23 = var9.field3035[var20]; // L: 10352
-									if (var9.field3012 == null) { // L: 10353
-										var9.field3012 = new int[var9.field3033.length];
-									}
-
-									if (var9.field3079 == null) { // L: 10354
-										var9.field3079 = new int[var9.field3033.length];
-									}
-
-									if (var23 != 0) { // L: 10355
-										if (var9.field3012[var20] == 0) { // L: 10356
-											var9.field3012[var20] = var23 + Client.cycle + var9.field3079[var20];
-										} else {
-											var9.field3012[var20] = var23 + Client.cycle; // L: 10357
-										}
-									} else {
-										var9.field3012[var20] = Integer.MAX_VALUE; // L: 10359
-									}
-								}
-
-								if (!var21 && var9.field3012 != null) { // L: 10361 10362
-									var9.field3012[var20] = 0;
-								}
-							}
-						}
-
-						if (var9.isIf3) { // L: 10366
-							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10367
-								var33 = true;
-							} else {
-								var33 = false; // L: 10368
-							}
-
-							boolean var34 = false; // L: 10369
-							if ((MouseHandler.MouseHandler_currentButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 10370
-								var34 = true;
-							}
-
-							var21 = false; // L: 10371
-							if ((MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 10372
-								var21 = true;
-							}
-
-							if (var21) { // L: 10373
-								VarcInt.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
-							}
-
-							if (var9.contentType == 1400) { // L: 10374
-								class243.worldMap.method6188(var17, var18, var33 & var34, var33 & var21); // L: 10375
-							}
-
-							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class170.method3552(class21.getWidgetFlags(var9))) { // L: 10377
-								Client.draggedOnWidget = var9;
-							}
-
-							if (var9 == Client.clickedWidgetParent) { // L: 10378
-								Client.field819 = true; // L: 10379
-								Client.field740 = var10; // L: 10380
-								Client.field821 = var11; // L: 10381
-							}
-
-							if (var9.hasListener) { // L: 10383
-								ScriptEvent var22;
-								if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 10384
-									var22 = new ScriptEvent(); // L: 10385
-									var22.isMouseInputEvent = true; // L: 10386
-									var22.widget = var9; // L: 10387
-									var22.mouseY = Client.mouseWheelRotation; // L: 10388
-									var22.args = var9.onScroll; // L: 10389
-									Client.scriptEvents.addFirst(var22); // L: 10390
-								}
-
-								if (Client.clickedWidget != null || Script.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10392
-									var21 = false; // L: 10393
-									var34 = false; // L: 10394
-									var33 = false; // L: 10395
-								}
-
-								if (!var9.isClicked && var21) { // L: 10397
-									var9.isClicked = true; // L: 10398
-									if (var9.onClick != null) { // L: 10399
-										var22 = new ScriptEvent(); // L: 10400
-										var22.isMouseInputEvent = true; // L: 10401
-										var22.widget = var9; // L: 10402
-										var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 10403
-										var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 10404
-										var22.args = var9.onClick; // L: 10405
-										Client.scriptEvents.addFirst(var22); // L: 10406
-									}
-								}
-
-								if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 10409 10410
-									var22 = new ScriptEvent(); // L: 10411
-									var22.isMouseInputEvent = true; // L: 10412
-									var22.widget = var9; // L: 10413
-									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10414
-									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10415
-									var22.args = var9.onClickRepeat; // L: 10416
-									Client.scriptEvents.addFirst(var22); // L: 10417
-								}
-
-								if (var9.isClicked && !var34) { // L: 10420
-									var9.isClicked = false; // L: 10421
-									if (var9.onRelease != null) { // L: 10422
-										var22 = new ScriptEvent(); // L: 10423
-										var22.isMouseInputEvent = true; // L: 10424
-										var22.widget = var9; // L: 10425
-										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10426
-										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10427
-										var22.args = var9.onRelease; // L: 10428
-										Client.field846.addFirst(var22); // L: 10429
-									}
-								}
-
-								if (var34 && var9.onHold != null) { // L: 10432 10433
-									var22 = new ScriptEvent(); // L: 10434
-									var22.isMouseInputEvent = true; // L: 10435
-									var22.widget = var9; // L: 10436
-									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10437
-									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10438
-									var22.args = var9.onHold; // L: 10439
-									Client.scriptEvents.addFirst(var22); // L: 10440
-								}
-
-								if (!var9.containsMouse && var33) { // L: 10443
-									var9.containsMouse = true; // L: 10444
-									if (var9.onMouseOver != null) { // L: 10445
-										var22 = new ScriptEvent(); // L: 10446
-										var22.isMouseInputEvent = true; // L: 10447
-										var22.widget = var9; // L: 10448
-										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10449
-										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10450
-										var22.args = var9.onMouseOver; // L: 10451
-										Client.scriptEvents.addFirst(var22); // L: 10452
-									}
-								}
-
-								if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 10455 10456
-									var22 = new ScriptEvent(); // L: 10457
-									var22.isMouseInputEvent = true; // L: 10458
-									var22.widget = var9; // L: 10459
-									var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10460
-									var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10461
-									var22.args = var9.onMouseRepeat; // L: 10462
-									Client.scriptEvents.addFirst(var22); // L: 10463
-								}
-
-								if (var9.containsMouse && !var33) { // L: 10466
-									var9.containsMouse = false; // L: 10467
-									if (var9.onMouseLeave != null) { // L: 10468
-										var22 = new ScriptEvent(); // L: 10469
-										var22.isMouseInputEvent = true; // L: 10470
-										var22.widget = var9; // L: 10471
-										var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 10472
-										var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 10473
-										var22.args = var9.onMouseLeave; // L: 10474
-										Client.field846.addFirst(var22); // L: 10475
-									}
-								}
-
-								if (var9.onTimer != null) { // L: 10478
-									var22 = new ScriptEvent(); // L: 10479
-									var22.widget = var9; // L: 10480
-									var22.args = var9.onTimer; // L: 10481
-									Client.field652.addFirst(var22); // L: 10482
-								}
-
-								ScriptEvent var25;
-								int var35;
-								int var36;
-								if (var9.onVarTransmit != null && Client.changedVarpCount > var9.field2990) { // L: 10484
-									if (var9.varTransmitTriggers != null && Client.changedVarpCount - var9.field2990 <= 32) { // L: 10485
-										label789:
-										for (var36 = var9.field2990; var36 < Client.changedVarpCount; ++var36) { // L: 10492
-											var23 = Client.changedVarps[var36 & 31]; // L: 10493
-
-											for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 10494
-												if (var23 == var9.varTransmitTriggers[var35]) { // L: 10495
-													var25 = new ScriptEvent(); // L: 10496
-													var25.widget = var9; // L: 10497
-													var25.args = var9.onVarTransmit; // L: 10498
-													Client.scriptEvents.addFirst(var25); // L: 10499
-													break label789; // L: 10500
-												}
-											}
-										}
-									} else {
-										var22 = new ScriptEvent(); // L: 10486
-										var22.widget = var9; // L: 10487
-										var22.args = var9.onVarTransmit; // L: 10488
-										Client.scriptEvents.addFirst(var22); // L: 10489
-									}
-
-									var9.field2990 = Client.changedVarpCount; // L: 10505
-								}
-
-								if (var9.onInvTransmit != null && Client.field830 > var9.field3095) { // L: 10507
-									if (var9.invTransmitTriggers != null && Client.field830 - var9.field3095 <= 32) { // L: 10508
-										label765:
-										for (var36 = var9.field3095; var36 < Client.field830; ++var36) { // L: 10515
-											var23 = Client.changedItemContainers[var36 & 31]; // L: 10516
-
-											for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 10517
-												if (var23 == var9.invTransmitTriggers[var35]) { // L: 10518
-													var25 = new ScriptEvent(); // L: 10519
-													var25.widget = var9; // L: 10520
-													var25.args = var9.onInvTransmit; // L: 10521
-													Client.scriptEvents.addFirst(var25); // L: 10522
-													break label765; // L: 10523
-												}
-											}
-										}
-									} else {
-										var22 = new ScriptEvent(); // L: 10509
-										var22.widget = var9; // L: 10510
-										var22.args = var9.onInvTransmit; // L: 10511
-										Client.scriptEvents.addFirst(var22); // L: 10512
-									}
-
-									var9.field3095 = Client.field830; // L: 10528
-								}
-
-								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field3096) { // L: 10530
-									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field3096 <= 32) { // L: 10531
-										label741:
-										for (var36 = var9.field3096; var36 < Client.changedSkillsCount; ++var36) { // L: 10538
-											var23 = Client.changedSkills[var36 & 31]; // L: 10539
-
-											for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10540
-												if (var23 == var9.statTransmitTriggers[var35]) { // L: 10541
-													var25 = new ScriptEvent(); // L: 10542
-													var25.widget = var9; // L: 10543
-													var25.args = var9.onStatTransmit; // L: 10544
-													Client.scriptEvents.addFirst(var25); // L: 10545
-													break label741; // L: 10546
-												}
-											}
-										}
-									} else {
-										var22 = new ScriptEvent(); // L: 10532
-										var22.widget = var9; // L: 10533
-										var22.args = var9.onStatTransmit; // L: 10534
-										Client.scriptEvents.addFirst(var22); // L: 10535
-									}
-
-									var9.field3096 = Client.changedSkillsCount; // L: 10551
-								}
-
-								if (Client.chatCycle > var9.field3104 && var9.onChatTransmit != null) { // L: 10553
-									var22 = new ScriptEvent(); // L: 10554
-									var22.widget = var9; // L: 10555
-									var22.args = var9.onChatTransmit; // L: 10556
-									Client.scriptEvents.addFirst(var22); // L: 10557
-								}
-
-								if (Client.field836 > var9.field3104 && var9.onFriendTransmit != null) { // L: 10559
-									var22 = new ScriptEvent(); // L: 10560
-									var22.widget = var9; // L: 10561
-									var22.args = var9.onFriendTransmit; // L: 10562
-									Client.scriptEvents.addFirst(var22); // L: 10563
-								}
-
-								if (Client.field844 > var9.field3104 && var9.onClanTransmit != null) { // L: 10565
-									var22 = new ScriptEvent(); // L: 10566
-									var22.widget = var9; // L: 10567
-									var22.args = var9.onClanTransmit; // L: 10568
-									Client.scriptEvents.addFirst(var22); // L: 10569
-								}
-
-								if (Client.field654 > var9.field3104 && var9.field3043 != null) { // L: 10571
-									var22 = new ScriptEvent(); // L: 10572
-									var22.widget = var9; // L: 10573
-									var22.args = var9.field3043; // L: 10574
-									Client.scriptEvents.addFirst(var22); // L: 10575
-								}
-
-								if (Client.field839 > var9.field3104 && var9.field3071 != null) { // L: 10577
-									var22 = new ScriptEvent(); // L: 10578
-									var22.widget = var9; // L: 10579
-									var22.args = var9.field3071; // L: 10580
-									Client.scriptEvents.addFirst(var22); // L: 10581
-								}
-
-								if (Client.field840 > var9.field3104 && var9.onStockTransmit != null) { // L: 10583
-									var22 = new ScriptEvent(); // L: 10584
-									var22.widget = var9; // L: 10585
-									var22.args = var9.onStockTransmit; // L: 10586
-									Client.scriptEvents.addFirst(var22); // L: 10587
-								}
-
-								if (Client.field748 > var9.field3104 && var9.field3077 != null) { // L: 10589
-									var22 = new ScriptEvent(); // L: 10590
-									var22.widget = var9; // L: 10591
-									var22.args = var9.field3077; // L: 10592
-									Client.scriptEvents.addFirst(var22); // L: 10593
-								}
-
-								if (Client.field659 > var9.field3104 && var9.onMiscTransmit != null) { // L: 10595
-									var22 = new ScriptEvent(); // L: 10596
-									var22.widget = var9; // L: 10597
-									var22.args = var9.onMiscTransmit; // L: 10598
-									Client.scriptEvents.addFirst(var22); // L: 10599
-								}
-
-								var9.field3104 = Client.cycleCntr; // L: 10601
-								if (var9.onKey != null) { // L: 10602
-									for (var36 = 0; var36 < Client.field806; ++var36) { // L: 10603
-										ScriptEvent var30 = new ScriptEvent(); // L: 10604
-										var30.widget = var9; // L: 10605
-										var30.keyTyped = Client.field868[var36]; // L: 10606
-										var30.keyPressed = Client.field867[var36]; // L: 10607
-										var30.args = var9.onKey; // L: 10608
-										Client.scriptEvents.addFirst(var30); // L: 10609
-									}
-								}
-							}
-						}
-
-						if (!var9.isIf3) { // L: 10614
-							if (Client.clickedWidget != null || Script.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10615
-								continue;
-							}
-
-							if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10616
-								if (var9.mouseOverRedirect >= 0) { // L: 10617
-									World.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
-								} else {
-									World.mousedOverWidgetIf1 = var9; // L: 10618
-								}
-							}
-
-							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10620
-								ReflectionCheck.field609 = var9; // L: 10621
-							}
-
-							if (var9.scrollHeight > var9.height) { // L: 10623
-								class313.method5617(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
-							}
-						}
-
-						if (var9.type == 0) { // L: 10625
-							updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10626
-							if (var9.children != null) { // L: 10627
-								updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
-							}
-
-							InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10628
-							if (var28 != null) { // L: 10629
-								if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10630
-									for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10631
-										if (var29.isMouseInputEvent) { // L: 10632
-											var29.remove(); // L: 10633
-											var29.widget.containsMouse = false; // L: 10634
-										}
-									}
-
-									if (Actor.widgetDragDuration == 0) { // L: 10637
-										Client.clickedWidget = null; // L: 10638
-										Client.clickedWidgetParent = null; // L: 10639
-									}
-
-									if (!Client.isMenuOpen) { // L: 10641
-										NetSocket.addCancelMenuEntry(); // L: 10642
-									}
-								}
-
-								class32.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10645
-							}
-						}
-					}
+	static final void method3557() {
+		int[] var0 = Players.Players_indices; // L: 3852
+
+		int var1;
+		for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3853
+			Player var4 = Client.players[var0[var1]]; // L: 3854
+			if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3855
+				--var4.overheadTextCyclesRemaining; // L: 3856
+				if (var4.overheadTextCyclesRemaining == 0) { // L: 3857
+					var4.overheadText = null;
 				}
 			}
 		}
 
-	} // L: 10649
+		for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3860
+			int var2 = Client.npcIndices[var1]; // L: 3861
+			NPC var3 = Client.npcs[var2]; // L: 3862
+			if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3863
+				--var3.overheadTextCyclesRemaining; // L: 3864
+				if (var3.overheadTextCyclesRemaining == 0) { // L: 3865
+					var3.overheadText = null;
+				}
+			}
+		}
+
+	} // L: 3868
 }
diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java
index cde93249bf..9e0a55fcd3 100644
--- a/runescape-client/src/main/java/WorldMapRectangle.java
+++ b/runescape-client/src/main/java/WorldMapRectangle.java
@@ -4,43 +4,113 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fu")
+@ObfuscatedName("fh")
 @Implements("WorldMapRectangle")
 public final class WorldMapRectangle {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1091176811
+		intValue = -1826737113
 	)
 	@Export("width")
 	int width;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 946840675
+		intValue = 813874845
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1906627729
+		intValue = 1282834747
 	)
 	@Export("x")
 	int x;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1404335247
+		intValue = 568186345
 	)
 	@Export("y")
 	int y;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lff;"
+		descriptor = "Lft;"
 	)
 	final WorldMapManager this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lff;)V"
+		descriptor = "(Lft;)V"
 	)
 	WorldMapRectangle(WorldMapManager var1) {
-		this.this$0 = var1; // L: 305
+		this.this$0 = var1; // L: 303
 	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lbk;Lbk;IZI)I",
+		garbageValue = "1719503771"
+	)
+	@Export("compareWorlds")
+	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
+		if (var2 == 1) { // L: 211
+			int var4 = var0.population; // L: 212
+			int var5 = var1.population; // L: 213
+			if (!var3) { // L: 214
+				if (var4 == -1) { // L: 215
+					var4 = 2001;
+				}
+
+				if (var5 == -1) { // L: 216
+					var5 = 2001;
+				}
+			}
+
+			return var4 - var5; // L: 218
+		} else if (var2 == 2) { // L: 220
+			return var0.location - var1.location;
+		} else if (var2 == 3) { // L: 221
+			if (var0.activity.equals("-")) { // L: 222
+				if (var1.activity.equals("-")) { // L: 223
+					return 0;
+				} else {
+					return var3 ? -1 : 1; // L: 224
+				}
+			} else if (var1.activity.equals("-")) { // L: 226
+				return var3 ? 1 : -1;
+			} else {
+				return var0.activity.compareTo(var1.activity); // L: 227
+			}
+		} else if (var2 == 4) { // L: 229
+			return var0.method1757() ? (var1.method1757() ? 0 : 1) : (var1.method1757() ? -1 : 0);
+		} else if (var2 == 5) { // L: 230
+			return var0.method1749() ? (var1.method1749() ? 0 : 1) : (var1.method1749() ? -1 : 0);
+		} else if (var2 == 6) { // L: 231
+			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
+		} else if (var2 == 7) { // L: 232
+			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
+		} else {
+			return var0.id - var1.id; // L: 233
+		}
+	}
+
+	@ObfuscatedName("lq")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;IB)V",
+		garbageValue = "-36"
+	)
+	static void method3709(Buffer var0, int var1) {
+		byte[] var2 = var0.array; // L: 11648
+		if (Client.randomDatData == null) { // L: 11650
+			Client.randomDatData = new byte[24];
+		}
+
+		class307.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 11651
+		if (JagexCache.JagexCache_randomDat != null) { // L: 11654
+			try {
+				JagexCache.JagexCache_randomDat.seek(0L); // L: 11656
+				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11657
+			} catch (Exception var4) { // L: 11659
+			}
+		}
+
+	} // L: 11662
 }
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index 8e54b5477a..637a39f183 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -9,176 +9,169 @@ 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("fq")
+@ObfuscatedName("fn")
 @Implements("WorldMapRegion")
 public class WorldMapRegion {
-	@ObfuscatedName("qf")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "Llt;"
-	)
-	@Export("friendsChat")
-	static FriendsChat friendsChat;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lhn;"
+		descriptor = "Lhh;"
 	)
 	@Export("WorldMapRegion_cachedSprites")
 	public static DemotingHashTable WorldMapRegion_cachedSprites;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1618950683
+		intValue = -91763405
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 2001174097
+		intValue = 1756122927
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "Lft;"
+		descriptor = "Lfo;"
 	)
 	@Export("worldMapData_0")
 	WorldMapData_0 worldMapData_0;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@Export("worldMapData1List")
 	LinkedList worldMapData1List;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -747005213
+		intValue = -314457837
 	)
 	@Export("backgroundColor")
 	int backgroundColor;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1359138405
+		intValue = 605397793
 	)
 	@Export("pixelsPerTile")
 	int pixelsPerTile;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@Export("icon0List")
 	List icon0List;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@Export("iconMap")
 	HashMap iconMap;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@Export("fonts")
 	final HashMap fonts;
 
 	static {
-		WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256);
+		WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26
 	}
 
 	WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
-		this.regionX = var1; // L: 47
-		this.regionY = var2; // L: 48
-		this.worldMapData1List = new LinkedList(); // L: 49
-		this.icon0List = new LinkedList(); // L: 50
-		this.iconMap = new HashMap(); // L: 51
-		this.backgroundColor = var3 | -16777216; // L: 52
-		this.fonts = var4; // L: 53
-	} // L: 54
+		this.regionX = var1; // L: 46
+		this.regionY = var2; // L: 47
+		this.worldMapData1List = new LinkedList(); // L: 48
+		this.icon0List = new LinkedList(); // L: 49
+		this.iconMap = new HashMap(); // L: 50
+		this.backgroundColor = var3 | -16777216; // L: 51
+		this.fonts = var4; // L: 52
+	} // L: 53
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)V",
-		garbageValue = "125158399"
+		garbageValue = "1948817139"
 	)
-	void method3328(int var1, int var2, int var3) {
-		int var5 = this.regionX; // L: 58
-		int var6 = this.regionY; // L: 59
-		int var7 = this.pixelsPerTile; // L: 60
-		DemotingHashTable var8 = WorldMapRegion_cachedSprites; // L: 62
-		long var9 = (long)(var7 << 16 | var5 << 8 | var6); // L: 65
-		SpritePixels var4 = (SpritePixels)var8.get(var9); // L: 67
-		if (var4 != null) {
-			if (var3 == this.pixelsPerTile * 64) { // L: 71
-				var4.drawAt(var1, var2); // L: 72
+	void method3407(int var1, int var2, int var3) {
+		int var5 = this.regionX; // L: 57
+		int var6 = this.regionY; // L: 58
+		int var7 = this.pixelsPerTile; // L: 59
+		SpritePixels var4 = (SpritePixels)WorldMapRegion_cachedSprites.get(GameEngine.method716(var5, var6, var7)); // L: 61
+		if (var4 != null) { // L: 64
+			if (var3 == this.pixelsPerTile * 64) { // L: 65
+				var4.drawAt(var1, var2); // L: 66
 			} else {
-				var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 75
+				var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 69
 			}
 
 		}
-	} // L: 70 77
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Lft;Ljava/util/List;I)V",
-		garbageValue = "-1081431828"
-	)
-	@Export("initWorldMapData0")
-	void initWorldMapData0(WorldMapData_0 var1, List var2) {
-		this.iconMap.clear(); // L: 80
-		this.worldMapData_0 = var1; // L: 81
-		this.addAllToIconList(var2); // L: 82
-	} // L: 83
+	} // L: 71
 
 	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Lfo;Ljava/util/List;I)V",
+		garbageValue = "-2121590512"
+	)
+	@Export("initWorldMapData0")
+	void initWorldMapData0(WorldMapData_0 var1, List var2) {
+		this.iconMap.clear(); // L: 74
+		this.worldMapData_0 = var1; // L: 75
+		this.addAllToIconList(var2); // L: 76
+	} // L: 77
+
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/HashSet;Ljava/util/List;I)V",
-		garbageValue = "-1864841845"
+		garbageValue = "2112928302"
 	)
 	@Export("initWorldMapData1")
 	void initWorldMapData1(HashSet var1, List var2) {
-		this.iconMap.clear(); // L: 86
-		Iterator var3 = var1.iterator(); // L: 87
+		this.iconMap.clear(); // L: 80
+		Iterator var3 = var1.iterator(); // L: 81
 
 		while (var3.hasNext()) {
-			WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 88
-			if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 90
-				this.worldMapData1List.add(var4); // L: 91
+			WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 82
+			if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 84
+				this.worldMapData1List.add(var4); // L: 85
 			}
 		}
 
-		this.addAllToIconList(var2); // L: 95
-	} // L: 96
+		this.addAllToIconList(var2); // L: 89
+	} // L: 90
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILfm;I)V",
-		garbageValue = "-1919437807"
+		descriptor = "(IIIILfy;I)V",
+		garbageValue = "831467254"
 	)
 	@Export("getIconsForTiles")
 	void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
-		for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 99
-			label76:
-			for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 100
-				for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 101
-					WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 102
-					if (var9 != null && var9.length != 0) { // L: 103
-						WorldMapDecoration[] var10 = var9; // L: 107
+		for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 93
+			label74:
+			for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 94
+				for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 95
+					WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 96
+					if (var9 != null && var9.length != 0) { // L: 97
+						WorldMapDecoration[] var10 = var9; // L: 101
 
-						for (int var11 = 0; var11 < var10.length; ++var11) { // L: 108
+						for (int var11 = 0; var11 < var10.length; ++var11) { // L: 102
 							ObjectComposition var13;
 							boolean var14;
-							label67: {
-								WorldMapDecoration var12 = var10[var11]; // L: 109
-								var13 = class23.getObjectDefinition(var12.objectDefinitionId); // L: 111
-								if (var13.transforms != null) { // L: 114
-									int[] var15 = var13.transforms; // L: 116
+							label65: {
+								WorldMapDecoration var12 = var10[var11]; // L: 103
+								var13 = Tiles.getObjectDefinition(var12.objectDefinitionId); // L: 105
+								if (var13.transforms != null) { // L: 108
+									int[] var15 = var13.transforms; // L: 110
 
-									for (int var16 = 0; var16 < var15.length; ++var16) { // L: 117
-										int var17 = var15[var16]; // L: 118
-										ObjectComposition var18 = class23.getObjectDefinition(var17); // L: 120
-										if (var18.mapIconId != -1) { // L: 121
-											var14 = true; // L: 122
-											break label67;
+									for (int var16 = 0; var16 < var15.length; ++var16) { // L: 111
+										int var17 = var15[var16]; // L: 112
+										ObjectComposition var18 = Tiles.getObjectDefinition(var17); // L: 114
+										if (var18.mapIconId != -1) { // L: 115
+											var14 = true; // L: 116
+											break label65;
 										}
 									}
-								} else if (var13.mapIconId != -1) { // L: 129
-									var14 = true; // L: 130
-									break label67; // L: 131
+								} else if (var13.mapIconId != -1) { // L: 123
+									var14 = true; // L: 124
+									break label65; // L: 125
 								}
 
-								var14 = false; // L: 133
+								var14 = false; // L: 127
 							}
 
-							if (var14) { // L: 135
-								this.getIcon(var13, var8, var6, var7, var5); // L: 138
-								continue label76; // L: 139
+							if (var14) { // L: 129
+								this.getIcon(var13, var8, var6, var7, var5); // L: 132
+								continue label74; // L: 133
 							}
 						}
 					}
@@ -186,504 +179,475 @@ public class WorldMapRegion {
 			}
 		}
 
-	} // L: 146
+	} // L: 140
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Leg;IIILfm;I)V",
-		garbageValue = "1079929853"
+		descriptor = "(Lez;IIILfy;B)V",
+		garbageValue = "111"
 	)
 	@Export("getIcon")
 	void getIcon(ObjectComposition var1, int var2, int var3, int var4, AbstractWorldMapData var5) {
-		Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 149
-		Coord var7 = null; // L: 150
-		if (this.worldMapData_0 != null) { // L: 151
-			var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 152
+		Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 143
+		Coord var7 = null; // L: 144
+		if (this.worldMapData_0 != null) { // L: 145
+			var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 146
 		} else {
-			WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 155
-			var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 156
+			WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 149
+			var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var4 + var8.regionYLow * 64 + var8.getChunkYLow() * 8); // L: 150
 		}
 
 		WorldMapElement var9;
 		Object var10;
-		if (var1.transforms != null) { // L: 159
-			var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 160
+		if (var1.transforms != null) { // L: 153
+			var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 154
 		} else {
-			var9 = class6.WorldMapElement_get(var1.mapIconId); // L: 163
-			var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 164
+			var9 = Archive.WorldMapElement_get(var1.mapIconId); // L: 157
+			var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 158
 		}
 
-		var9 = class6.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 166
-		if (var9.field1560) { // L: 167
-			this.iconMap.put(new Coord(0, var3, var4), var10); // L: 168
+		var9 = Archive.WorldMapElement_get(((AbstractWorldMapIcon)var10).getElement()); // L: 160
+		if (var9.field1569) { // L: 161
+			this.iconMap.put(new Coord(0, var3, var4), var10); // L: 162
 		}
 
-	} // L: 170
+	} // L: 164
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "16083"
+		descriptor = "(I)V",
+		garbageValue = "-95285337"
 	)
 	@Export("initWorldMapIcon1s")
 	void initWorldMapIcon1s() {
-		Iterator var1 = this.iconMap.values().iterator(); // L: 173
+		Iterator var1 = this.iconMap.values().iterator(); // L: 167
 
 		while (var1.hasNext()) {
-			AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 174
-			if (var2 instanceof WorldMapIcon_1) { // L: 176
-				((WorldMapIcon_1)var2).init(); // L: 177
+			AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 168
+			if (var2 instanceof WorldMapIcon_1) { // L: 170
+				((WorldMapIcon_1)var2).init(); // L: 171
 			}
 		}
 
-	} // L: 181
+	} // L: 175
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/List;I)V",
-		garbageValue = "1099621062"
+		garbageValue = "631658105"
 	)
 	@Export("addAllToIconList")
 	void addAllToIconList(List var1) {
-		Iterator var2 = var1.iterator(); // L: 184
+		Iterator var2 = var1.iterator(); // L: 178
 
-		while (var2.hasNext()) {
-			WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 185
-			if (class6.WorldMapElement_get(var3.element).field1560 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 187 190
-				WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3357(var3.element)); // L: 191
-				this.icon0List.add(var4); // L: 192
+		while (var2.hasNext()) { // L: 189
+			WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); // L: 179
+			if (Archive.WorldMapElement_get(var3.element).field1569 && var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { // L: 181 184
+				WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method3435(var3.element)); // L: 185
+				this.icon0List.add(var4); // L: 186
 			}
 		}
 
-	} // L: 196
+	} // L: 190
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1753897051"
+		garbageValue = "1612272147"
 	)
-	void method3388() {
-		if (this.worldMapData_0 != null) { // L: 199
-			this.worldMapData_0.reset(); // L: 200
+	void method3414() {
+		if (this.worldMapData_0 != null) { // L: 193
+			this.worldMapData_0.reset(); // L: 194
 		} else {
-			Iterator var1 = this.worldMapData1List.iterator(); // L: 203
+			Iterator var1 = this.worldMapData1List.iterator(); // L: 197
 
 			while (var1.hasNext()) {
-				WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 204
-				var2.reset(); // L: 206
+				WorldMapData_1 var2 = (WorldMapData_1)var1.next(); // L: 198
+				var2.reset(); // L: 200
 			}
 		}
 
-	} // L: 210
+	} // L: 204
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;S)Z",
-		garbageValue = "27128"
+		descriptor = "(Ljp;B)Z",
+		garbageValue = "37"
 	)
 	@Export("loadGeography")
 	boolean loadGeography(AbstractArchive var1) {
-		this.iconMap.clear(); // L: 213
-		if (this.worldMapData_0 != null) { // L: 214
-			this.worldMapData_0.loadGeography(var1); // L: 215
-			if (this.worldMapData_0.isFullyLoaded()) { // L: 216
-				this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 217
-				return true; // L: 218
+		this.iconMap.clear(); // L: 207
+		if (this.worldMapData_0 != null) { // L: 208
+			this.worldMapData_0.loadGeography(var1); // L: 209
+			if (this.worldMapData_0.isFullyLoaded()) { // L: 210
+				this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 211
+				return true; // L: 212
 			} else {
-				return false; // L: 220
+				return false; // L: 214
 			}
 		} else {
-			boolean var2 = true; // L: 223
+			boolean var2 = true; // L: 217
 
 			Iterator var3;
 			WorldMapData_1 var4;
-			for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 224 228
-				var4 = (WorldMapData_1)var3.next(); // L: 225
-				var4.loadGeography(var1); // L: 227
+			for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 218 222
+				var4 = (WorldMapData_1)var3.next(); // L: 219
+				var4.loadGeography(var1); // L: 221
 			}
 
-			if (var2) { // L: 231
-				var3 = this.worldMapData1List.iterator(); // L: 232
+			if (var2) { // L: 225
+				var3 = this.worldMapData1List.iterator(); // L: 226
 
 				while (var3.hasNext()) {
-					var4 = (WorldMapData_1)var3.next(); // L: 233
-					this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 235
+					var4 = (WorldMapData_1)var3.next(); // L: 227
+					this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 229
 				}
 			}
 
-			return var2; // L: 239
+			return var2; // L: 233
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILgb;[Lop;Ljv;Ljv;I)V",
-		garbageValue = "-1087727229"
+		descriptor = "(ILgs;[Lof;Ljp;Ljp;B)V",
+		garbageValue = "-40"
 	)
 	@Export("drawTile")
 	void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
-		this.pixelsPerTile = var1; // L: 244
-		if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 245
-			if (class7.method76(this.regionX, this.regionY, var1) == null) { // L: 248
-				boolean var6 = true; // L: 251
-				var6 &= this.loadGeography(var4); // L: 252
-				int var8;
+		this.pixelsPerTile = var1; // L: 238
+		if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 239
+			int var7 = this.regionX; // L: 243
+			int var8 = this.regionY; // L: 244
+			SpritePixels var6 = (SpritePixels)WorldMapRegion_cachedSprites.get(GameEngine.method716(var7, var8, var1)); // L: 246
+			if (var6 == null) { // L: 248
+				boolean var9 = true; // L: 251
+				var9 &= this.loadGeography(var4); // L: 252
+				int var11;
 				if (this.worldMapData_0 != null) { // L: 255
-					var8 = this.worldMapData_0.groupId; // L: 256
+					var11 = this.worldMapData_0.groupId; // L: 256
 				} else {
-					var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 259
+					var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 259
 				}
 
-				var6 &= var5.tryLoadGroup(var8); // L: 261
-				if (var6) { // L: 262
-					byte[] var7 = var5.takeFileFlat(var8); // L: 263
-					WorldMapSprite var9 = class82.method1909(var7); // L: 264
-					SpritePixels var10 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 265
-					var10.setRaster(); // L: 266
-					if (this.worldMapData_0 != null) { // L: 267
-						this.method3340(var2, var3, var9); // L: 268
+				var9 &= var5.tryLoadGroup(var11); // L: 261
+				if (var9) { // L: 262
+					byte[] var10 = var5.takeFileFlat(var11); // L: 263
+					WorldMapSprite var12;
+					if (var10 == null) { // L: 266
+						var12 = new WorldMapSprite(); // L: 267
 					} else {
-						this.method3455(var2, var3, var9); // L: 271
+						var12 = new WorldMapSprite(class125.convertJpgToSprite(var10).pixels); // L: 270
 					}
 
-					int var11 = this.regionX; // L: 273
-					int var12 = this.regionY; // L: 274
-					int var13 = this.pixelsPerTile; // L: 275
-					DemotingHashTable var14 = WorldMapRegion_cachedSprites; // L: 277
-					long var16 = (long)(var13 << 16 | var11 << 8 | var12); // L: 281
-					var14.put(var10, var16, var10.pixels.length * 4); // L: 283
-					this.method3388(); // L: 285
+					SpritePixels var14 = new SpritePixels(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 273
+					var14.setRaster(); // L: 274
+					if (this.worldMapData_0 != null) { // L: 275
+						this.method3419(var2, var3, var12); // L: 276
+					} else {
+						this.method3420(var2, var3, var12); // L: 279
+					}
+
+					int var15 = this.regionX; // L: 281
+					int var16 = this.regionY; // L: 282
+					int var17 = this.pixelsPerTile; // L: 283
+					WorldMapRegion_cachedSprites.put(var14, GameEngine.method716(var15, var16, var17), var14.pixels.length * 4); // L: 285
+					this.method3414(); // L: 287
 				}
 			}
 		}
-	} // L: 246 249 286
+	} // L: 240 249 288
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(IIILjava/util/HashSet;I)V",
-		garbageValue = "1432505674"
+		descriptor = "(IIILjava/util/HashSet;B)V",
+		garbageValue = "92"
 	)
-	void method3353(int var1, int var2, int var3, HashSet var4) {
-		if (var4 == null) { // L: 289
-			var4 = new HashSet(); // L: 290
+	void method3417(int var1, int var2, int var3, HashSet var4) {
+		if (var4 == null) { // L: 291
+			var4 = new HashSet(); // L: 292
 		}
 
-		this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 292
-		this.drawMapLinks(var1, var2, var4, var3); // L: 293
-	} // L: 294
+		this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 294
+		this.drawMapLinks(var1, var2, var4, var3); // L: 295
+	} // L: 296
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/HashSet;III)V",
-		garbageValue = "685193317"
+		garbageValue = "-1184159068"
 	)
 	@Export("flashElements")
 	void flashElements(HashSet var1, int var2, int var3) {
-		Iterator var4 = this.iconMap.values().iterator(); // L: 297
+		Iterator var4 = this.iconMap.values().iterator(); // L: 299
 
-		while (var4.hasNext()) { // L: 307
-			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 298
-			if (var5.hasValidElement()) { // L: 300
-				int var6 = var5.getElement(); // L: 301
-				if (var1.contains(var6)) { // L: 302
-					WorldMapElement var7 = class6.WorldMapElement_get(var6); // L: 303
-					this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 304
+		while (var4.hasNext()) {
+			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 300
+			if (var5.hasValidElement()) { // L: 302
+				int var6 = var5.getElement(); // L: 303
+				if (var1.contains(var6)) { // L: 304
+					WorldMapElement var7 = Archive.WorldMapElement_get(var6); // L: 305
+					this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 306
 				}
 			}
 		}
 
-		this.method3349(var1, var2, var3); // L: 308
-	} // L: 309
+		this.method3488(var1, var2, var3); // L: 310
+	} // L: 311
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(Lgb;[Lop;Lfd;I)V",
-		garbageValue = "1016970364"
+		descriptor = "(Lgs;[Lof;Lfk;B)V",
+		garbageValue = "0"
 	)
-	void method3340(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
+	void method3419(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
 		int var4;
 		int var5;
-		for (var4 = 0; var4 < 64; ++var4) { // L: 312
-			for (var5 = 0; var5 < 64; ++var5) { // L: 313
-				this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 314
-				this.method3344(var4, var5, this.worldMapData_0, var1); // L: 315
+		for (var4 = 0; var4 < 64; ++var4) { // L: 314
+			for (var5 = 0; var5 < 64; ++var5) { // L: 315
+				this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 316
+				this.method3423(var4, var5, this.worldMapData_0, var1); // L: 317
 			}
 		}
 
-		for (var4 = 0; var4 < 64; ++var4) { // L: 318
-			for (var5 = 0; var5 < 64; ++var5) { // L: 319
-				this.method3410(var4, var5, this.worldMapData_0, var1, var2); // L: 320
+		for (var4 = 0; var4 < 64; ++var4) { // L: 320
+			for (var5 = 0; var5 < 64; ++var5) { // L: 321
+				this.method3421(var4, var5, this.worldMapData_0, var1, var2); // L: 322
 			}
 		}
 
-	} // L: 323
+	} // L: 325
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "(Lgb;[Lop;Lfd;B)V",
-		garbageValue = "-39"
+		descriptor = "(Lgs;[Lof;Lfk;B)V",
+		garbageValue = "39"
 	)
-	void method3455(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
-		Iterator var4 = this.worldMapData1List.iterator(); // L: 326
+	void method3420(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) {
+		Iterator var4 = this.worldMapData1List.iterator(); // L: 328
 
 		WorldMapData_1 var5;
 		int var6;
 		int var7;
 		while (var4.hasNext()) {
-			var5 = (WorldMapData_1)var4.next(); // L: 327
+			var5 = (WorldMapData_1)var4.next(); // L: 329
 
-			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 329
-				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 330
-					this.drawTileGround(var6, var7, var5, var1, var3); // L: 331
-					this.method3344(var6, var7, var5, var1); // L: 332
+			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 331
+				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 332
+					this.drawTileGround(var6, var7, var5, var1, var3); // L: 333
+					this.method3423(var6, var7, var5, var1); // L: 334
 				}
 			}
 		}
 
-		var4 = this.worldMapData1List.iterator(); // L: 337
+		var4 = this.worldMapData1List.iterator(); // L: 339
 
 		while (var4.hasNext()) {
-			var5 = (WorldMapData_1)var4.next(); // L: 338
+			var5 = (WorldMapData_1)var4.next(); // L: 340
 
-			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 340
-				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 341
-					this.method3410(var6, var7, var5, var1, var2); // L: 342
+			for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 342
+				for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 343
+					this.method3421(var6, var7, var5, var1, var2); // L: 344
 				}
 			}
 		}
 
-	} // L: 347
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		descriptor = "(IILfm;Lgb;[Lop;B)V",
-		garbageValue = "27"
-	)
-	void method3410(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) {
-		this.method3347(var1, var2, var3); // L: 350
-		this.method3346(var1, var2, var3, var5); // L: 351
-	} // L: 352
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(IILfm;Lgb;Lfd;I)V",
-		garbageValue = "-1821301029"
-	)
-	@Export("drawTileGround")
-	void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) {
-		int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 355
-		int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 356
-		if (var6 == -1 && var7 == -1) { // L: 357
-			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 358
-		}
-
-		int var8 = 16711935; // L: 360
-		int var9;
-		if (var7 != -1) { // L: 361
-			int var10 = this.backgroundColor; // L: 363
-			FloorOverlayDefinition var11 = SoundSystem.method807(var7); // L: 365
-			if (var11 == null) { // L: 366
-				var9 = var10; // L: 367
-			} else if (var11.secondaryRgb >= 0) { // L: 370
-				var9 = var11.secondaryRgb | -16777216; // L: 371
-			} else if (var11.texture >= 0) { // L: 373
-				int var12 = WorldMapSection0.method3590(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 374
-				var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 375
-			} else if (var11.primaryRgb == 16711935) { // L: 377
-				var9 = var10; // L: 378
-			} else {
-				int var13 = var11.hue; // L: 382
-				int var14 = var11.saturation; // L: 383
-				int var15 = var11.lightness; // L: 384
-				if (var15 > 179) { // L: 386
-					var14 /= 2;
-				}
-
-				if (var15 > 192) { // L: 387
-					var14 /= 2;
-				}
-
-				if (var15 > 217) { // L: 388
-					var14 /= 2;
-				}
-
-				if (var15 > 243) { // L: 389
-					var14 /= 2;
-				}
-
-				int var16 = (var14 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 390
-				int var17 = WorldMapSection0.method3590(var16, 96); // L: 394
-				var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 395
-			}
-
-			var8 = var9; // L: 398
-		}
-
-		if (var7 > -1 && var3.field2067[0][var1][var2] == 0) { // L: 400
-			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 401
-		} else {
-			var9 = this.method3345(var1, var2, var3, var5); // L: 404
-			if (var7 == -1) { // L: 405
-				Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 406
-			} else {
-				var4.method3719(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2067[0][var1][var2], var3.field2065[0][var1][var2]); // L: 409
-			}
-		}
-	} // L: 402 407 410
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(IILfm;Lgb;B)V",
-		garbageValue = "16"
-	)
-	void method3344(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) {
-		for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 413
-			int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 414
-			if (var6 > -1) { // L: 415
-				int var8 = this.backgroundColor; // L: 417
-				FloorOverlayDefinition var9 = SoundSystem.method807(var6); // L: 419
-				int var7;
-				if (var9 == null) { // L: 420
-					var7 = var8; // L: 421
-				} else if (var9.secondaryRgb >= 0) { // L: 424
-					var7 = var9.secondaryRgb | -16777216; // L: 425
-				} else if (var9.texture >= 0) { // L: 427
-					int var10 = WorldMapSection0.method3590(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 428
-					var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 429
-				} else if (var9.primaryRgb == 16711935) { // L: 431
-					var7 = var8; // L: 432
-				} else {
-					int var11 = var9.hue; // L: 436
-					int var12 = var9.saturation; // L: 437
-					int var13 = var9.lightness; // L: 438
-					if (var13 > 179) { // L: 440
-						var12 /= 2;
-					}
-
-					if (var13 > 192) { // L: 441
-						var12 /= 2;
-					}
-
-					if (var13 > 217) { // L: 442
-						var12 /= 2;
-					}
-
-					if (var13 > 243) { // L: 443
-						var12 /= 2;
-					}
-
-					int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 444
-					int var15 = WorldMapSection0.method3590(var14, 96); // L: 448
-					var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 449
-				}
-
-				if (var3.field2067[var5][var1][var2] == 0) { // L: 453
-					Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 454
-				} else {
-					var4.method3719(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2067[var5][var1][var2], var3.field2065[var5][var1][var2]); // L: 457
-				}
-			}
-		}
-
-	} // L: 461
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(IILfm;Lfd;I)I",
-		garbageValue = "-404634884"
-	)
-	int method3345(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) {
-		return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 464 465 467
-	}
+	} // L: 349
 
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		descriptor = "(IILfm;[Lop;I)V",
-		garbageValue = "1218867013"
+		descriptor = "(IILfy;Lgs;[Lof;B)V",
+		garbageValue = "56"
 	)
-	void method3346(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) {
-		for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 471
-			WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 472
-			if (var6 != null && var6.length != 0) { // L: 473
-				WorldMapDecoration[] var7 = var6; // L: 477
+	void method3421(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) {
+		this.method3426(var1, var2, var3); // L: 352
+		this.method3425(var1, var2, var3, var5); // L: 353
+	} // L: 354
 
-				for (int var8 = 0; var8 < var7.length; ++var8) { // L: 478
-					WorldMapDecoration var9 = var7[var8]; // L: 479
-					if (!PacketBufferNode.method4367(var9.decoration)) { // L: 482
-						int var11 = var9.decoration; // L: 484
-						boolean var10 = var11 == WorldMapDecorationType.field3154.id; // L: 486
-						if (!var10) { // L: 488
-							continue;
-						}
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(IILfy;Lgs;Lfk;I)V",
+		garbageValue = "1645371529"
+	)
+	@Export("drawTileGround")
+	void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) {
+		int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 357
+		int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 358
+		if (var6 == -1 && var7 == -1) { // L: 359
+			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 360
+		}
+
+		int var8 = 16711935; // L: 362
+		int var9;
+		if (var7 != -1) { // L: 363
+			int var10 = this.backgroundColor; // L: 365
+			FloorOverlayDefinition var11 = WorldMapSectionType.method3677(var7); // L: 367
+			if (var11 == null) { // L: 368
+				var9 = var10; // L: 369
+			} else if (var11.secondaryRgb >= 0) { // L: 372
+				var9 = var11.secondaryRgb | -16777216; // L: 373
+			} else {
+				int var12;
+				if (var11.texture >= 0) { // L: 375
+					var12 = WorldMapID.method3718(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 376
+					var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 377
+				} else if (var11.primaryRgb == 16711935) { // L: 379
+					var9 = var10; // L: 380
+				} else {
+					var12 = ClientPreferences.method2330(var11.hue, var11.saturation, var11.lightness); // L: 383
+					int var13 = WorldMapID.method3718(var12, 96); // L: 384
+					var9 = Rasterizer3D.Rasterizer3D_colorPalette[var13] | -16777216; // L: 385
+				}
+			}
+
+			var8 = var9; // L: 388
+		}
+
+		if (var7 > -1 && var3.field2068[0][var1][var2] == 0) { // L: 390
+			Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 391
+		} else {
+			var9 = this.method3424(var1, var2, var3, var5); // L: 394
+			if (var7 == -1) { // L: 395
+				Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 396
+			} else {
+				var4.method3819(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field2068[0][var1][var2], var3.field2074[0][var1][var2]); // L: 399
+			}
+		}
+	} // L: 392 397 400
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(IILfy;Lgs;B)V",
+		garbageValue = "1"
+	)
+	void method3423(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) {
+		for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 403
+			int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 404
+			if (var6 > -1) { // L: 405
+				int var8 = this.backgroundColor; // L: 407
+				FloorOverlayDefinition var9 = WorldMapSectionType.method3677(var6); // L: 409
+				int var7;
+				if (var9 == null) { // L: 410
+					var7 = var8; // L: 411
+				} else if (var9.secondaryRgb >= 0) { // L: 414
+					var7 = var9.secondaryRgb | -16777216; // L: 415
+				} else {
+					int var10;
+					if (var9.texture >= 0) { // L: 417
+						var10 = WorldMapID.method3718(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 418
+						var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 419
+					} else if (var9.primaryRgb == 16711935) { // L: 421
+						var7 = var8; // L: 422
+					} else {
+						var10 = ClientPreferences.method2330(var9.hue, var9.saturation, var9.lightness); // L: 425
+						int var11 = WorldMapID.method3718(var10, 96); // L: 426
+						var7 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216; // L: 427
 					}
+				}
 
-					ObjectComposition var12 = class23.getObjectDefinition(var9.objectDefinitionId); // L: 490
-					if (var12.mapSceneId != -1) { // L: 491
-						if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 492
-							var4[var12.mapSceneId].method6958(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 496
-						} else {
-							var4[var12.mapSceneId].method6958(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 493
+				if (var3.field2068[var5][var1][var2] == 0) { // L: 431
+					Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 432
+				} else {
+					var4.method3819(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field2068[var5][var1][var2], var3.field2074[var5][var1][var2]); // L: 435
+				}
+			}
+		}
+
+	} // L: 439
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		descriptor = "(IILfy;Lfk;B)I",
+		garbageValue = "37"
+	)
+	int method3424(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) {
+		return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 442 443 445
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(IILfy;[Lof;I)V",
+		garbageValue = "-1994135211"
+	)
+	void method3425(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) {
+		for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 449
+			WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 450
+			if (var6 != null && var6.length != 0) { // L: 451
+				WorldMapDecoration[] var7 = var6; // L: 455
+
+				for (int var8 = 0; var8 < var7.length; ++var8) { // L: 456
+					WorldMapDecoration var9 = var7[var8]; // L: 457
+					int var11 = var9.decoration; // L: 460
+					boolean var10 = var11 >= WorldMapDecorationType.field3154.id && var11 <= WorldMapDecorationType.field3167.id; // L: 462
+					if (var10 || class32.method384(var9.decoration)) { // L: 464
+						ObjectComposition var12 = Tiles.getObjectDefinition(var9.objectDefinitionId); // L: 465
+						if (var12.mapSceneId != -1) { // L: 466
+							if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { // L: 467
+								var4[var12.mapSceneId].method6997(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 471
+							} else {
+								var4[var12.mapSceneId].method6997(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 468
+							}
 						}
 					}
 				}
 			}
 		}
 
-	} // L: 504
+	} // L: 479
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(IILfm;I)V",
-		garbageValue = "1479082417"
+		descriptor = "(IILfy;B)V",
+		garbageValue = "22"
 	)
-	void method3347(int var1, int var2, AbstractWorldMapData var3) {
-		for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 507
-			WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 508
-			if (var5 != null && var5.length != 0) { // L: 509
-				WorldMapDecoration[] var6 = var5; // L: 513
+	void method3426(int var1, int var2, AbstractWorldMapData var3) {
+		for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 482
+			WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 483
+			if (var5 != null && var5.length != 0) { // L: 484
+				WorldMapDecoration[] var6 = var5; // L: 488
 
-				for (int var7 = 0; var7 < var6.length; ++var7) { // L: 514
-					WorldMapDecoration var8 = var6[var7]; // L: 515
-					if (class254.method4823(var8.decoration)) { // L: 517
-						ObjectComposition var9 = class23.getObjectDefinition(var8.objectDefinitionId); // L: 518
-						int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 519
-						if (var8.decoration == WorldMapDecorationType.field3149.id) { // L: 520
-							this.method3361(var1, var2, var8.rotation, var10); // L: 521
+				for (int var7 = 0; var7 < var6.length; ++var7) { // L: 489
+					WorldMapDecoration var8 = var6[var7]; // L: 490
+					if (Login.method2058(var8.decoration)) { // L: 492
+						ObjectComposition var9 = Tiles.getObjectDefinition(var8.objectDefinitionId); // L: 493
+						int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 494
+						if (var8.decoration == WorldMapDecorationType.field3160.id) { // L: 495
+							this.method3439(var1, var2, var8.rotation, var10); // L: 496
 						}
 
-						if (var8.decoration == WorldMapDecorationType.field3167.id) { // L: 523
-							this.method3361(var1, var2, var8.rotation, -3355444); // L: 524
-							this.method3361(var1, var2, var8.rotation + 1, var10); // L: 525
+						if (var8.decoration == WorldMapDecorationType.field3148.id) { // L: 498
+							this.method3439(var1, var2, var8.rotation, -3355444); // L: 499
+							this.method3439(var1, var2, var8.rotation + 1, var10); // L: 500
 						}
 
-						if (var8.decoration == WorldMapDecorationType.field3145.id) { // L: 527
-							if (var8.rotation == 0) { // L: 528
+						if (var8.decoration == WorldMapDecorationType.field3170.id) { // L: 502
+							if (var8.rotation == 0) { // L: 503
 								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
 							}
 
 							if (var8.rotation == 1) {
-								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 529
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 504
 							}
 
-							if (var8.rotation == 2) { // L: 530
-								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
+							if (var8.rotation == 2) { // L: 505
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
 							}
 
-							if (var8.rotation == 3) { // L: 531
+							if (var8.rotation == 3) { // L: 506
 								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
 							}
 						}
 
-						if (var8.decoration == WorldMapDecorationType.field3146.id) { // L: 533
-							int var11 = var8.rotation % 2; // L: 534
+						if (var8.decoration == WorldMapDecorationType.field3150.id) { // L: 508
+							int var11 = var8.rotation % 2; // L: 509
 							int var12;
-							if (var11 == 0) { // L: 535
-								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 536
-									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 537
+							if (var11 == 0) { // L: 510
+								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 511
+									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 512
 								}
 							} else {
-								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 541
-									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 542
+								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 516
+									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 517
 								}
 							}
 						}
@@ -692,356 +656,351 @@ public class WorldMapRegion {
 			}
 		}
 
-	} // L: 551
+	} // L: 526
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/util/HashSet;II)V",
-		garbageValue = "-1949332191"
+		descriptor = "(IILjava/util/HashSet;IB)V",
+		garbageValue = "-34"
 	)
 	@Export("drawNonLinkMapIcons")
 	void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) {
-		float var5 = (float)var4 / 64.0F; // L: 554
-		float var6 = var5 / 2.0F; // L: 555
-		Iterator var7 = this.iconMap.entrySet().iterator(); // L: 556
+		float var5 = (float)var4 / 64.0F; // L: 529
+		float var6 = var5 / 2.0F; // L: 530
+		Iterator var7 = this.iconMap.entrySet().iterator(); // L: 531
 
 		while (var7.hasNext()) {
-			Entry var8 = (Entry)var7.next(); // L: 557
-			Coord var9 = (Coord)var8.getKey(); // L: 559
-			int var10 = (int)((float)var9.x * var5 + (float)var1 - var6); // L: 560
-			int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 561
-			AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 562
-			if (var12 != null && var12.hasValidElement()) { // L: 563
-				var12.screenX = var10; // L: 564
-				var12.screenY = var11; // L: 565
-				WorldMapElement var13 = class6.WorldMapElement_get(var12.getElement()); // L: 566
-				if (!var3.contains(var13.getObjectId())) { // L: 567
-					this.method3351(var12, var10, var11, var5); // L: 568
+			Entry var8 = (Entry)var7.next(); // L: 532
+			Coord var9 = (Coord)var8.getKey(); // L: 534
+			int var10 = (int)(var5 * (float)var9.x + (float)var1 - var6); // L: 535
+			int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); // L: 536
+			AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 537
+			if (var12 != null && var12.hasValidElement()) { // L: 538
+				var12.screenX = var10; // L: 539
+				var12.screenY = var11; // L: 540
+				WorldMapElement var13 = Archive.WorldMapElement_get(var12.getElement()); // L: 541
+				if (!var3.contains(var13.getObjectId())) { // L: 542
+					this.method3429(var12, var10, var11, var5); // L: 543
 				}
 			}
 		}
 
-	} // L: 573
+	} // L: 548
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/HashSet;III)V",
-		garbageValue = "-341047508"
+		garbageValue = "-466157918"
 	)
-	void method3349(HashSet var1, int var2, int var3) {
-		Iterator var4 = this.icon0List.iterator(); // L: 576
+	void method3488(HashSet var1, int var2, int var3) {
+		Iterator var4 = this.icon0List.iterator(); // L: 551
 
-		while (var4.hasNext()) { // L: 585
-			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 577
-			if (var5.hasValidElement()) { // L: 579
-				WorldMapElement var6 = class6.WorldMapElement_get(var5.getElement()); // L: 580
-				if (var6 != null && var1.contains(var6.getObjectId())) { // L: 581
-					this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 582
+		while (var4.hasNext()) {
+			AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 552
+			if (var5.hasValidElement()) { // L: 554
+				WorldMapElement var6 = Archive.WorldMapElement_get(var5.getElement()); // L: 555
+				if (var6 != null && var1.contains(var6.getObjectId())) { // L: 556
+					this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 557
 				}
 			}
 		}
 
-	} // L: 586
+	} // L: 561
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(Lew;IIIII)V",
-		garbageValue = "1184916583"
+		descriptor = "(Lek;IIIII)V",
+		garbageValue = "-380618886"
 	)
 	@Export("drawBackgroundCircle")
 	void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) {
-		SpritePixels var6 = var1.getSpriteBool(false); // L: 589
-		if (var6 != null) { // L: 590
-			var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 593
-			if (var4 % var5 < var5 / 2) { // L: 594
-				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 595
-				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 596
+		SpritePixels var6 = var1.getSpriteBool(false); // L: 564
+		if (var6 != null) { // L: 565
+			var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 568
+			if (var4 % var5 < var5 / 2) { // L: 569
+				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 570
+				Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 571
 			}
 
 		}
-	} // L: 591 598
+	} // L: 566 573
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		descriptor = "(Lgq;IIFI)V",
-		garbageValue = "-266654765"
+		descriptor = "(Lgh;IIFB)V",
+		garbageValue = "41"
 	)
-	void method3351(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
-		WorldMapElement var5 = class6.WorldMapElement_get(var1.getElement()); // L: 601
-		this.method3449(var5, var2, var3); // L: 602
-		this.method3342(var1, var5, var2, var3, var4); // L: 603
-	} // L: 604
+	void method3429(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
+		WorldMapElement var5 = Archive.WorldMapElement_get(var1.getElement()); // L: 576
+		this.method3477(var5, var2, var3); // L: 577
+		this.method3431(var1, var5, var2, var3, var4); // L: 578
+	} // L: 579
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		descriptor = "(Lew;III)V",
-		garbageValue = "-1515500646"
+		descriptor = "(Lek;III)V",
+		garbageValue = "2103112249"
 	)
-	void method3449(WorldMapElement var1, int var2, int var3) {
-		SpritePixels var4 = var1.getSpriteBool(false); // L: 607
-		if (var4 != null) { // L: 608
-			int var5 = this.method3391(var4, var1.horizontalAlignment); // L: 609
-			int var6 = this.method3356(var4, var1.verticalAlignment); // L: 610
-			var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 611
+	void method3477(WorldMapElement var1, int var2, int var3) {
+		SpritePixels var4 = var1.getSpriteBool(false); // L: 582
+		if (var4 != null) { // L: 583
+			int var5 = this.method3433(var4, var1.horizontalAlignment); // L: 584
+			int var6 = this.method3409(var4, var1.verticalAlignment); // L: 585
+			var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 586
 		}
 
-	} // L: 613
+	} // L: 588
 
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		descriptor = "(Lgq;Lew;IIFS)V",
-		garbageValue = "-4359"
+		descriptor = "(Lgh;Lek;IIFI)V",
+		garbageValue = "-796895701"
 	)
-	void method3342(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
-		WorldMapLabel var6 = var1.getLabel(); // L: 616
-		if (var6 != null) { // L: 617
-			if (var6.size.method3215(var5)) { // L: 620
-				Font var7 = (Font)this.fonts.get(var6.size); // L: 623
-				var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1557, 0, 1, 0, var7.ascent / 2); // L: 624
+	void method3431(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
+		WorldMapLabel var6 = var1.getLabel(); // L: 591
+		if (var6 != null) { // L: 592
+			if (var6.size.method3278(var5)) { // L: 595
+				Font var7 = (Font)this.fonts.get(var6.size); // L: 598
+				var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1563, 0, 1, 0, var7.ascent / 2); // L: 599
 			}
 		}
-	} // L: 618 621 625
-
-	@ObfuscatedName("ap")
-	@ObfuscatedSignature(
-		descriptor = "(IILjava/util/HashSet;II)V",
-		garbageValue = "-810530478"
-	)
-	@Export("drawMapLinks")
-	void drawMapLinks(int var1, int var2, HashSet var3, int var4) {
-		float var5 = (float)var4 / 64.0F; // L: 628
-		Iterator var6 = this.icon0List.iterator(); // L: 629
-
-		while (var6.hasNext()) {
-			AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 630
-			if (var7.hasValidElement()) { // L: 632
-				int var8 = var7.coord2.x % 64; // L: 633
-				int var9 = var7.coord2.y % 64; // L: 634
-				var7.screenX = (int)(var5 * (float)var8 + (float)var1); // L: 635
-				var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); // L: 636
-				if (!var3.contains(var7.getElement())) { // L: 637
-					this.method3351(var7, var7.screenX, var7.screenY, var5); // L: 640
-				}
-			}
-		}
-
-	} // L: 643
-
-	@ObfuscatedName("ab")
-	@ObfuscatedSignature(
-		descriptor = "(Loh;Len;I)I",
-		garbageValue = "491939852"
-	)
-	int method3391(SpritePixels var1, HorizontalAlignment var2) {
-		switch(var2.value) { // L: 646
-		case 0:
-			return -var1.subWidth / 2; // L: 649
-		case 1:
-			return 0; // L: 657
-		default:
-			return -var1.subWidth; // L: 653
-		}
-	}
-
-	@ObfuscatedName("al")
-	@ObfuscatedSignature(
-		descriptor = "(Loh;Lem;I)I",
-		garbageValue = "1319342568"
-	)
-	int method3356(SpritePixels var1, VerticalAlignment var2) {
-		switch(var2.value) { // L: 663
-		case 0:
-			return 0; // L: 674
-		case 1:
-			return -var1.subHeight / 2; // L: 670
-		default:
-			return -var1.subHeight; // L: 666
-		}
-	}
+	} // L: 593 596 600
 
 	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lfv;",
-		garbageValue = "1606957307"
+		descriptor = "(IILjava/util/HashSet;II)V",
+		garbageValue = "-281265080"
 	)
-	WorldMapLabel method3357(int var1) {
-		WorldMapElement var2 = class6.WorldMapElement_get(var1); // L: 680
-		return this.createMapLabel(var2); // L: 681
-	}
+	@Export("drawMapLinks")
+	void drawMapLinks(int var1, int var2, HashSet var3, int var4) {
+		float var5 = (float)var4 / 64.0F; // L: 603
+		Iterator var6 = this.icon0List.iterator(); // L: 604
 
-	@ObfuscatedName("ai")
-	@ObfuscatedSignature(
-		descriptor = "(Lew;I)Lfv;",
-		garbageValue = "-1759446365"
-	)
-	@Export("createMapLabel")
-	WorldMapLabel createMapLabel(WorldMapElement var1) {
-		if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 685
-			WorldMapLabelSize var2 = WorldMapLabelSize.method3208(var1.textSize); // L: 688
-			if (var2 == null) { // L: 689
-				return null; // L: 690
-			} else {
-				Font var3 = (Font)this.fonts.get(var2); // L: 692
-				if (var3 == null) { // L: 693
-					return null; // L: 694
-				} else {
-					int var4 = var3.lineCount(var1.name, 1000000); // L: 696
-					String[] var5 = new String[var4]; // L: 697
-					var3.breakLines(var1.name, (int[])null, var5); // L: 698
-					int var6 = var5.length * var3.ascent / 2; // L: 699
-					int var7 = 0; // L: 700
-					String[] var8 = var5; // L: 702
-
-					for (int var9 = 0; var9 < var8.length; ++var9) { // L: 703
-						String var10 = var8[var9]; // L: 704
-						int var11 = var3.stringWidth(var10); // L: 706
-						if (var11 > var7) { // L: 707
-							var7 = var11; // L: 708
-						}
-					}
-
-					return new WorldMapLabel(var1.name, var7, var6, var2); // L: 713
+		while (var6.hasNext()) {
+			AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 605
+			if (var7.hasValidElement()) { // L: 607
+				int var8 = var7.coord2.x % 64; // L: 608
+				int var9 = var7.coord2.y % 64; // L: 609
+				var7.screenX = (int)((float)var1 + (float)var8 * var5); // L: 610
+				var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); // L: 611
+				if (!var3.contains(var7.getElement())) { // L: 612
+					this.method3429(var7, var7.screenX, var7.screenY, var5); // L: 615
 				}
 			}
-		} else {
-			return null; // L: 686
+		}
+
+	} // L: 618
+
+	@ObfuscatedName("at")
+	@ObfuscatedSignature(
+		descriptor = "(Loa;Leq;I)I",
+		garbageValue = "2137509015"
+	)
+	int method3433(SpritePixels var1, HorizontalAlignment var2) {
+		switch(var2.value) { // L: 621
+		case 1:
+			return 0; // L: 632
+		case 2:
+			return -var1.subWidth / 2; // L: 628
+		default:
+			return -var1.subWidth; // L: 624
 		}
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIII)Ljava/util/List;",
-		garbageValue = "-183202693"
+		descriptor = "(Loa;Lee;I)I",
+		garbageValue = "-128811790"
 	)
-	List method3359(int var1, int var2, int var3, int var4, int var5) {
-		LinkedList var6 = new LinkedList(); // L: 717
-		if (var4 >= var1 && var5 >= var2) { // L: 718
-			if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 719
-				Iterator var7 = this.iconMap.values().iterator(); // L: 720
+	int method3409(SpritePixels var1, VerticalAlignment var2) {
+		switch(var2.value) { // L: 638
+		case 0:
+			return -var1.subHeight / 2; // L: 641
+		case 2:
+			return 0; // L: 649
+		default:
+			return -var1.subHeight; // L: 645
+		}
+	}
+
+	@ObfuscatedName("az")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lfd;",
+		garbageValue = "1"
+	)
+	WorldMapLabel method3435(int var1) {
+		WorldMapElement var2 = Archive.WorldMapElement_get(var1); // L: 655
+		return this.createMapLabel(var2); // L: 656
+	}
+
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		descriptor = "(Lek;I)Lfd;",
+		garbageValue = "282116482"
+	)
+	@Export("createMapLabel")
+	WorldMapLabel createMapLabel(WorldMapElement var1) {
+		if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 660
+			WorldMapLabelSize var2 = WorldMapLabelSize.method3281(var1.textSize); // L: 663
+			if (var2 == null) { // L: 664
+				return null; // L: 665
+			} else {
+				Font var3 = (Font)this.fonts.get(var2); // L: 667
+				if (var3 == null) { // L: 668
+					return null; // L: 669
+				} else {
+					int var4 = var3.lineCount(var1.name, 1000000); // L: 671
+					String[] var5 = new String[var4]; // L: 672
+					var3.breakLines(var1.name, (int[])null, var5); // L: 673
+					int var6 = var5.length * var3.ascent / 2; // L: 674
+					int var7 = 0; // L: 675
+					String[] var8 = var5; // L: 677
+
+					for (int var9 = 0; var9 < var8.length; ++var9) { // L: 678
+						String var10 = var8[var9]; // L: 679
+						int var11 = var3.stringWidth(var10); // L: 681
+						if (var11 > var7) { // L: 682
+							var7 = var11; // L: 683
+						}
+					}
+
+					return new WorldMapLabel(var1.name, var7, var6, var2); // L: 688
+				}
+			}
+		} else {
+			return null; // L: 661
+		}
+	}
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIB)Ljava/util/List;",
+		garbageValue = "0"
+	)
+	List method3437(int var1, int var2, int var3, int var4, int var5) {
+		LinkedList var6 = new LinkedList(); // L: 692
+		if (var4 >= var1 && var5 >= var2) { // L: 693
+			if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 694
+				Iterator var7 = this.iconMap.values().iterator(); // L: 695
 
 				AbstractWorldMapIcon var8;
 				while (var7.hasNext()) {
-					var8 = (AbstractWorldMapIcon)var7.next(); // L: 721
-					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 723
-						var6.add(var8); // L: 724
+					var8 = (AbstractWorldMapIcon)var7.next(); // L: 696
+					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 698
+						var6.add(var8); // L: 699
 					}
 				}
 
-				var7 = this.icon0List.iterator(); // L: 728
+				var7 = this.icon0List.iterator(); // L: 703
 
 				while (var7.hasNext()) {
-					var8 = (AbstractWorldMapIcon)var7.next(); // L: 729
-					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 731
-						var6.add(var8); // L: 732
+					var8 = (AbstractWorldMapIcon)var7.next(); // L: 704
+					if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 706
+						var6.add(var8); // L: 707
 					}
 				}
 
-				return var6; // L: 736
+				return var6; // L: 711
 			} else {
-				return var6; // L: 727
+				return var6; // L: 702
 			}
 		} else {
 			return var6;
 		}
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/util/List;",
-		garbageValue = "-983336809"
+		garbageValue = "-1092434212"
 	)
 	@Export("icons")
 	List icons() {
-		LinkedList var1 = new LinkedList(); // L: 740
-		var1.addAll(this.icon0List); // L: 741
-		var1.addAll(this.iconMap.values()); // L: 742
-		return var1; // L: 743
+		LinkedList var1 = new LinkedList(); // L: 715
+		var1.addAll(this.icon0List); // L: 716
+		var1.addAll(this.iconMap.values()); // L: 717
+		return var1; // L: 718
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		descriptor = "(IIIII)V",
-		garbageValue = "575857346"
+		garbageValue = "-767493128"
 	)
-	void method3361(int var1, int var2, int var3, int var4) {
-		var3 %= 4; // L: 747
-		if (var3 == 0) { // L: 748
+	void method3439(int var1, int var2, int var3, int var4) {
+		var3 %= 4; // L: 722
+		if (var3 == 0) { // L: 723
 			Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
-		if (var3 == 1) { // L: 749
+		if (var3 == 1) { // L: 724
 			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
-		if (var3 == 2) { // L: 750
+		if (var3 == 2) { // L: 725
 			Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
 		if (var3 == 3) {
-			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 751
+			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 726
 		}
 
-	} // L: 752
+	} // L: 727
 
-	@ObfuscatedName("v")
-	public static final int method3437(double var0, double var2, double var4) {
-		double var6 = var4; // L: 9
-		double var8 = var4; // L: 10
-		double var10 = var4; // L: 11
-		if (0.0D != var2) { // L: 12
-			double var12;
-			if (var4 < 0.5D) { // L: 14
-				var12 = var4 * (1.0D + var2);
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-1078417152"
+	)
+	static int method3472(int var0, Script var1, boolean var2) {
+		Widget var3 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1202
+		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1203
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ModelData0.Widget_unpackTargetMask(class22.getWidgetFlags(var3)); // L: 1204
+			return 1; // L: 1205
+		} else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1207
+			if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1214
+				if (var3.dataText == null) { // L: 1215
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = "";
+				} else {
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1216
+				}
+
+				return 1; // L: 1217
 			} else {
-				var12 = var4 + var2 - var2 * var4; // L: 15
+				return 2; // L: 1219
 			}
-
-			double var14 = 2.0D * var4 - var12; // L: 16
-			double var16 = var0 + 0.3333333333333333D; // L: 17
-			if (var16 > 1.0D) { // L: 18
-				--var16;
-			}
-
-			double var20 = var0 - 0.3333333333333333D; // L: 20
-			if (var20 < 0.0D) { // L: 21
-				++var20;
-			}
-
-			if (var16 * 6.0D < 1.0D) { // L: 22
-				var6 = (var12 - var14) * 6.0D * var16 + var14;
-			} else if (var16 * 2.0D < 1.0D) { // L: 23
-				var6 = var12;
-			} else if (var16 * 3.0D < 2.0D) { // L: 24
-				var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14;
+		} else {
+			int var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1208
+			--var4; // L: 1209
+			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1210
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1211
 			} else {
-				var6 = var14; // L: 25
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = "";
 			}
 
-			if (6.0D * var0 < 1.0D) { // L: 26
-				var8 = 6.0D * (var12 - var14) * var0 + var14;
-			} else if (2.0D * var0 < 1.0D) { // L: 27
-				var8 = var12;
-			} else if (3.0D * var0 < 2.0D) { // L: 28
-				var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D;
-			} else {
-				var8 = var14; // L: 29
-			}
-
-			if (var20 * 6.0D < 1.0D) { // L: 30
-				var10 = var14 + (var12 - var14) * 6.0D * var20;
-			} else if (2.0D * var20 < 1.0D) { // L: 31
-				var10 = var12;
-			} else if (3.0D * var20 < 2.0D) { // L: 32
-				var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14;
-			} else {
-				var10 = var14; // L: 33
-			}
+			return 1; // L: 1212
 		}
-
-		int var22 = (int)(256.0D * var6); // L: 35
-		int var13 = (int)(var8 * 256.0D); // L: 36
-		int var23 = (int)(256.0D * var10); // L: 37
-		int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38
-		return var15; // L: 39
 	}
+
+	@ObfuscatedName("li")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "1896402361"
+	)
+	static final void method3519(int var0, int var1) {
+		if (Client.currentClanChannels[var0] != null) { // L: 11510
+			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method49()) { // L: 11511
+				ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11512
+				if (var2.rank == -1) { // L: 11513
+					PacketWriter var3 = Client.packetWriter; // L: 11514
+					PacketBufferNode var4 = InterfaceParent.getPacketBufferNode(ClientPacket.field2584, var3.isaacCipher); // L: 11515
+					var4.packetBuffer.writeByte(3 + class44.stringCp1252NullTerminatedByteSize(var2.name)); // L: 11516
+					var4.packetBuffer.writeByte(var0); // L: 11517
+					var4.packetBuffer.writeShort(var1); // L: 11518
+					var4.packetBuffer.writeStringCp1252NullTerminated(var2.name); // L: 11519
+					var3.addNode(var4); // L: 11520
+				}
+			}
+		}
+	} // L: 11521
 }
diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java
index 6c04e0fe20..7dfe858407 100644
--- a/runescape-client/src/main/java/WorldMapScaleHandler.java
+++ b/runescape-client/src/main/java/WorldMapScaleHandler.java
@@ -4,16 +4,19 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gb")
+@ObfuscatedName("gs")
 @Implements("WorldMapScaleHandler")
 public class WorldMapScaleHandler {
-	@ObfuscatedName("v")
+	@ObfuscatedName("r")
+	@Export("ByteArrayPool_altSizeArrayCounts")
+	public static int[] ByteArrayPool_altSizeArrayCounts;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -455192265
+		intValue = 1461867137
 	)
 	@Export("pixelsPerTile")
 	int pixelsPerTile;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("tileTemplates")
 	byte[][][] tileTemplates;
 
@@ -21,25 +24,25 @@ public class WorldMapScaleHandler {
 		this.pixelsPerTile = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIIB)V",
-		garbageValue = "45"
+		descriptor = "(IIIIIIIII)V",
+		garbageValue = "1201297815"
 	)
-	void method3719(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+	void method3819(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { // L: 14
-			var8 = this.method3731(var8, var7); // L: 15
-			var7 = this.method3721(var7); // L: 16
+			var8 = this.method3820(var8, var7); // L: 15
+			var7 = this.method3847(var7); // L: 16
 			Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17
 		}
 	} // L: 18
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "-2107942869"
+		garbageValue = "-638925559"
 	)
-	int method3731(int var1, int var2) {
+	int method3820(int var1, int var2) {
 		if (var2 == 9) { // L: 21
 			var1 = var1 + 1 & 3;
 		}
@@ -48,19 +51,19 @@ public class WorldMapScaleHandler {
 			var1 = var1 + 3 & 3;
 		}
 
-		if (var2 == 11) { // L: 23
-			var1 = var1 + 3 & 3;
+		if (var2 == 11) {
+			var1 = var1 + 3 & 3; // L: 23
 		}
 
 		return var1; // L: 24
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "2"
+		descriptor = "(II)I",
+		garbageValue = "-1205509523"
 	)
-	int method3721(int var1) {
+	int method3847(int var1) {
 		if (var1 != 9 && var1 != 10) { // L: 28
 			return var1 == 11 ? 8 : var1; // L: 29
 		} else {
@@ -70,28 +73,28 @@ public class WorldMapScaleHandler {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "123"
+		descriptor = "(I)V",
+		garbageValue = "1145415965"
 	)
 	@Export("init")
 	void init() {
 		if (this.tileTemplates == null) { // L: 34
-			this.tileTemplates = new byte[8][4][]; // L: 37
-			this.init0(); // L: 38
-			this.init1(); // L: 39
-			this.init2(); // L: 40
-			this.init3(); // L: 41
-			this.init4(); // L: 42
+			this.tileTemplates = new byte[8][4][];
+			this.init0();
+			this.init1();
+			this.init2();
+			this.init3();
+			this.init4();
 			this.init5(); // L: 43
 			this.init6(); // L: 44
 			this.init7(); // L: 45
 		}
-	} // L: 35 46
+	} // L: 46
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1080825248"
+		descriptor = "(S)V",
+		garbageValue = "1144"
 	)
 	@Export("init0")
 	void init0() {
@@ -116,8 +119,8 @@ public class WorldMapScaleHandler {
 
 		for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60
 			for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61
-				if (var4 <= var3) {
-					var1[var2] = -1; // L: 62
+				if (var4 <= var3) { // L: 62
+					var1[var2] = -1;
 				}
 
 				++var2; // L: 63
@@ -155,10 +158,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[0][3] = var1; // L: 84
 	} // L: 85
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "801681003"
+		garbageValue = "-1022109285"
 	)
 	@Export("init1")
 	void init1() {
@@ -226,10 +229,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[1][3] = var1; // L: 127
 	} // L: 128
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1431897073"
+		garbageValue = "-1467975580"
 	)
 	@Export("init2")
 	void init2() {
@@ -293,10 +296,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[2][3] = var1; // L: 166
 	} // L: 167
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1131330964"
+		garbageValue = "-1661716942"
 	)
 	@Export("init3")
 	void init3() {
@@ -360,10 +363,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[3][3] = var1; // L: 205
 	} // L: 206
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "517266785"
+		garbageValue = "22640304"
 	)
 	@Export("init4")
 	void init4() {
@@ -427,10 +430,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[4][3] = var1; // L: 244
 	} // L: 245
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1671132761"
+		descriptor = "(B)V",
+		garbageValue = "-31"
 	)
 	@Export("init5")
 	void init5() {
@@ -496,10 +499,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[5][3] = var1; // L: 285
 	} // L: 286
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "732319141"
+		descriptor = "(B)V",
+		garbageValue = "68"
 	)
 	@Export("init6")
 	void init6() {
@@ -565,10 +568,10 @@ public class WorldMapScaleHandler {
 		this.tileTemplates[6][3] = var1; // L: 326
 	} // L: 327
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "83"
+		descriptor = "(I)V",
+		garbageValue = "-1742038975"
 	)
 	@Export("init7")
 	void init7() {
@@ -633,4 +636,101 @@ public class WorldMapScaleHandler {
 
 		this.tileTemplates[7][3] = var1; // L: 367
 	} // L: 368
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lfm;",
+		garbageValue = "-43701379"
+	)
+	@Export("SequenceDefinition_get")
+	public static SequenceDefinition SequenceDefinition_get(int var0) {
+		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35
+		if (var1 != null) { // L: 36
+			return var1;
+		} else {
+			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37
+			var1 = new SequenceDefinition(); // L: 38
+			if (var2 != null) { // L: 39
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 40
+			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); // L: 41
+			return var1; // L: 42
+		}
+	}
+
+	@ObfuscatedName("aa")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZS)I",
+		garbageValue = "-3249"
+	)
+	static int method3857(int var0, Script var1, boolean var2) {
+		if (var0 == 7100) { // L: 4318
+			++ChatChannel.Interpreter_intStackSize; // L: 4319
+			return 1; // L: 4320
+		} else if (var0 == 7101) { // L: 4322
+			UserComparator9.Interpreter_stringStackSize += 2; // L: 4323
+			return 1; // L: 4324
+		} else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4326
+			if (var0 == 7106) { // L: 4330
+				++ChatChannel.Interpreter_intStackSize; // L: 4331
+				return 1; // L: 4332
+			} else if (var0 == 7107) { // L: 4334
+				++ChatChannel.Interpreter_intStackSize; // L: 4335
+				return 1; // L: 4336
+			} else if (var0 == 7108) { // L: 4338
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = GameEngine.method717() ? 1 : 0; // L: 4339
+				return 1; // L: 4340
+			} else if (var0 == 7110) { // L: 4342
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4343
+				return 1; // L: 4344
+			} else if (var0 == 7120) { // L: 4346
+				--ChatChannel.Interpreter_intStackSize; // L: 4347
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4348
+				return 1; // L: 4349
+			} else if (var0 == 7121) { // L: 4351
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 4352
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4353
+				return 1; // L: 4354
+			} else if (var0 == 7122) { // L: 4356
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 4357
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4358
+				return 1; // L: 4359
+			} else {
+				return 2; // L: 4361
+			}
+		} else {
+			++ChatChannel.Interpreter_intStackSize; // L: 4327
+			return 1; // L: 4328
+		}
+	}
+
+	@ObfuscatedName("ic")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-579182952"
+	)
+	static void method3856() {
+		for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 8972
+			if (class160.method3253(Client.menuOpcodes[var0])) { // L: 8973
+				if (var0 < Client.menuOptionsCount - 1) { // L: 8974
+					for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8975
+						Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8976
+						Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8977
+						Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8978
+						Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8979
+						Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8980
+						Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8981
+						Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8982
+					}
+				}
+
+				--var0; // L: 8985
+				--Client.menuOptionsCount; // L: 8986
+			}
+		}
+
+		Language.method5270(); // L: 8989
+	} // L: 8990
 }
diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java
index ab1d5de4f8..2b41e97319 100644
--- a/runescape-client/src/main/java/WorldMapSection.java
+++ b/runescape-client/src/main/java/WorldMapSection.java
@@ -3,29 +3,29 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gi")
+@ObfuscatedName("ge")
 @Implements("WorldMapSection")
 public interface WorldMapSection {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "1120913212"
+		descriptor = "(Lfa;B)V",
+		garbageValue = "120"
 	)
 	@Export("expandBounds")
 	void expandBounds(WorldMapArea var1);
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)Z",
-		garbageValue = "264048682"
+		garbageValue = "-2105423832"
 	)
 	@Export("containsCoord")
 	boolean containsCoord(int var1, int var2, int var3);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "-11"
+		descriptor = "(III)Z",
+		garbageValue = "-173753307"
 	)
 	@Export("containsPosition")
 	boolean containsPosition(int var1, int var2);
@@ -33,23 +33,23 @@ public interface WorldMapSection {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)[I",
-		garbageValue = "1943891890"
+		garbageValue = "2086451205"
 	)
 	@Export("getBorderTileLengths")
 	int[] getBorderTileLengths(int var1, int var2, int var3);
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lii;",
-		garbageValue = "691158162"
+		descriptor = "(IIB)Liw;",
+		garbageValue = "-36"
 	)
 	@Export("coord")
 	Coord coord(int var1, int var2);
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1138667895"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1313413902"
 	)
 	@Export("read")
 	void read(Buffer var1);
diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java
index 049773df0d..d25ce9e152 100644
--- a/runescape-client/src/main/java/WorldMapSection0.java
+++ b/runescape-client/src/main/java/WorldMapSection0.java
@@ -4,96 +4,100 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fy")
+@ObfuscatedName("fr")
 @Implements("WorldMapSection0")
 public class WorldMapSection0 implements WorldMapSection {
-	@ObfuscatedName("bv")
-	@ObfuscatedSignature(
-		descriptor = "Lnc;"
-	)
-	@Export("loginType")
-	static LoginType loginType;
-	@ObfuscatedName("v")
+	@ObfuscatedName("ee")
 	@ObfuscatedGetter(
-		intValue = -1266673559
+		intValue = -1160309187
+	)
+	static int field2038;
+	@ObfuscatedName("gi")
+	@ObfuscatedGetter(
+		intValue = 389090953
+	)
+	static int field2047;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -55376569
 	)
 	@Export("oldZ")
 	int oldZ;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 36841939
+		intValue = 1457760887
 	)
 	@Export("newZ")
 	int newZ;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1295466191
+		intValue = -288902471
 	)
 	@Export("oldX")
 	int oldX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -468293811
+		intValue = 20509859
 	)
 	@Export("oldY")
 	int oldY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -336136429
+		intValue = 96413413
 	)
 	@Export("newX")
 	int newX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -792173003
+		intValue = -515923129
 	)
 	@Export("newY")
 	int newY;
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 241806671
+		intValue = -1499525307
 	)
 	@Export("oldChunkXLow")
 	int oldChunkXLow;
-	@ObfuscatedName("b")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1800377871
+		intValue = 697420279
 	)
 	@Export("oldChunkYLow")
 	int oldChunkYLow;
-	@ObfuscatedName("d")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 2078535785
+		intValue = -1525307811
 	)
 	@Export("oldChunkXHigh")
 	int oldChunkXHigh;
-	@ObfuscatedName("s")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1891382951
+		intValue = 93550631
 	)
 	@Export("oldChunkYHigh")
 	int oldChunkYHigh;
-	@ObfuscatedName("u")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -833437573
+		intValue = -301719127
 	)
 	@Export("newChunkXLow")
 	int newChunkXLow;
-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -2027622395
+		intValue = -1292488093
 	)
 	@Export("newChunkYLow")
 	int newChunkYLow;
-	@ObfuscatedName("o")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1314551747
+		intValue = 1252351887
 	)
 	@Export("newChunkXHigh")
 	int newChunkXHigh;
-	@ObfuscatedName("c")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2008874357
+		intValue = 1541153839
 	)
 	@Export("newChunkYHigh")
 	int newChunkYHigh;
@@ -101,10 +105,10 @@ public class WorldMapSection0 implements WorldMapSection {
 	WorldMapSection0() {
 	} // L: 22
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "1120913212"
+		descriptor = "(Lfa;B)V",
+		garbageValue = "120"
 	)
 	@Export("expandBounds")
 	public void expandBounds(WorldMapArea var1) {
@@ -113,37 +117,37 @@ public class WorldMapSection0 implements WorldMapSection {
 		}
 
 		if (var1.regionHighX < this.newX) {
-			var1.regionHighX = this.newX;
+			var1.regionHighX = this.newX; // L: 26
 		}
 
-		if (var1.regionLowY > this.newY) {
+		if (var1.regionLowY > this.newY) { // L: 27
 			var1.regionLowY = this.newY;
 		}
 
-		if (var1.regionHighY < this.newY) {
+		if (var1.regionHighY < this.newY) { // L: 28
 			var1.regionHighY = this.newY;
 		}
 
-	}
+	} // L: 29
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)Z",
-		garbageValue = "264048682"
+		garbageValue = "-2105423832"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 32
+		if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 32
 			return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35
 		} else {
 			return false; // L: 33
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "-11"
+		descriptor = "(III)Z",
+		garbageValue = "-173753307"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
@@ -153,38 +157,38 @@ public class WorldMapSection0 implements WorldMapSection {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)[I",
-		garbageValue = "1943891890"
+		garbageValue = "2086451205"
 	)
 	@Export("getBorderTileLengths")
 	public int[] getBorderTileLengths(int var1, int var2, int var3) {
 		if (!this.containsCoord(var1, var2, var3)) { // L: 43
-			return null;
+			return null; // L: 44
 		} else {
-			int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)};
-			return var4;
-		}
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lii;",
-		garbageValue = "691158162"
-	)
-	@Export("coord")
-	public Coord coord(int var1, int var2) {
-		if (!this.containsPosition(var1, var2)) { // L: 53
-			return null;
-		} else {
-			int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56
-			int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8);
-			return new Coord(this.oldZ, var3, var4);
+			int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48
+			return var4; // L: 49
 		}
 	}
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1138667895"
+		descriptor = "(IIB)Liw;",
+		garbageValue = "-36"
+	)
+	@Export("coord")
+	public Coord coord(int var1, int var2) {
+		if (!this.containsPosition(var1, var2)) { // L: 53
+			return null; // L: 54
+		} else {
+			int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56
+			int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57
+			return new Coord(this.oldZ, var3, var4); // L: 58
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1313413902"
 	)
 	@Export("read")
 	public void read(Buffer var1) {
@@ -205,78 +209,12 @@ public class WorldMapSection0 implements WorldMapSection {
 		this.postRead(); // L: 76
 	} // L: 77
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1517456697"
+		garbageValue = "518606194"
 	)
 	@Export("postRead")
 	void postRead() {
 	} // L: 79
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(IIS)I",
-		garbageValue = "12620"
-	)
-	static int method3590(int var0, int var1) {
-		if (var0 == -2) { // L: 15
-			return 12345678;
-		} else if (var0 == -1) { // L: 16
-			if (var1 < 0) { // L: 17
-				var1 = 0; // L: 18
-			} else if (var1 > 127) { // L: 20
-				var1 = 127; // L: 21
-			}
-
-			var1 = 127 - var1; // L: 23
-			return var1; // L: 24
-		} else {
-			var1 = (var0 & 127) * var1 / 128; // L: 26
-			if (var1 < 2) { // L: 27
-				var1 = 2;
-			} else if (var1 > 126) { // L: 28
-				var1 = 126;
-			}
-
-			return (var0 & 65408) + var1; // L: 29
-		}
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "-2020954619"
-	)
-	public static String method3589(CharSequence var0) {
-		long var3 = 0L; // L: 44
-		int var5 = var0.length(); // L: 45
-
-		for (int var6 = 0; var6 < var5; ++var6) { // L: 46
-			var3 *= 37L; // L: 47
-			char var7 = var0.charAt(var6); // L: 48
-			if (var7 >= 'A' && var7 <= 'Z') { // L: 49
-				var3 += (long)(var7 + 1 - 65);
-			} else if (var7 >= 'a' && var7 <= 'z') { // L: 50
-				var3 += (long)(var7 + 1 - 97);
-			} else if (var7 >= '0' && var7 <= '9') {
-				var3 += (long)(var7 + 27 - 48); // L: 51
-			}
-
-			if (var3 >= 177917621779460413L) { // L: 52
-				break;
-			}
-		}
-
-		while (var3 % 37L == 0L && var3 != 0L) { // L: 54
-			var3 /= 37L;
-		}
-
-		String var8 = class258.base37DecodeLong(var3); // L: 57
-		if (var8 == null) { // L: 58
-			var8 = "";
-		}
-
-		return var8; // L: 59
-	}
 }
diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java
index e745588c32..a3f44ed9d7 100644
--- a/runescape-client/src/main/java/WorldMapSection1.java
+++ b/runescape-client/src/main/java/WorldMapSection1.java
@@ -4,45 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gg")
+@ObfuscatedName("gk")
 @Implements("WorldMapSection1")
 public class WorldMapSection1 implements WorldMapSection {
-	@ObfuscatedName("aw")
-	@Export("hasFocus")
-	protected static boolean hasFocus;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1722297591
+		intValue = -2120559769
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1533702617
+		intValue = 20308873
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 51994539
+		intValue = -1110742467
 	)
 	@Export("regionStartX")
 	int regionStartX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1997271109
+		intValue = -109322199
 	)
 	@Export("regionStartY")
 	int regionStartY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1700415935
+		intValue = -705603633
 	)
 	@Export("regionEndX")
 	int regionEndX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -61887781
+		intValue = -2092573819
 	)
 	@Export("regionEndY")
 	int regionEndY;
@@ -50,10 +47,10 @@ public class WorldMapSection1 implements WorldMapSection {
 	WorldMapSection1() {
 	} // L: 14
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "1120913212"
+		descriptor = "(Lfa;B)V",
+		garbageValue = "120"
 	)
 	@Export("expandBounds")
 	public void expandBounds(WorldMapArea var1) {
@@ -75,24 +72,24 @@ public class WorldMapSection1 implements WorldMapSection {
 
 	} // L: 21
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)Z",
-		garbageValue = "264048682"
+		garbageValue = "-2105423832"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 24
+		if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 24
 			return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; // L: 27
 		} else {
 			return false; // L: 25
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "-11"
+		descriptor = "(III)Z",
+		garbageValue = "-173753307"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
@@ -102,7 +99,7 @@ public class WorldMapSection1 implements WorldMapSection {
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)[I",
-		garbageValue = "1943891890"
+		garbageValue = "2086451205"
 	)
 	@Export("getBorderTileLengths")
 	public int[] getBorderTileLengths(int var1, int var2, int var3) {
@@ -114,10 +111,10 @@ public class WorldMapSection1 implements WorldMapSection {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lii;",
-		garbageValue = "691158162"
+		descriptor = "(IIB)Liw;",
+		garbageValue = "-36"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
@@ -130,10 +127,10 @@ public class WorldMapSection1 implements WorldMapSection {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1138667895"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1313413902"
 	)
 	@Export("read")
 	public void read(Buffer var1) {
@@ -146,12 +143,22 @@ public class WorldMapSection1 implements WorldMapSection {
 		this.postRead(); // L: 60
 	} // L: 61
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1321456868"
+		garbageValue = "-533258975"
 	)
 	@Export("postRead")
 	void postRead() {
 	} // L: 63
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lcs;I)V",
+		garbageValue = "-360609536"
+	)
+	@Export("runScriptEvent")
+	public static void runScriptEvent(ScriptEvent var0) {
+		Varcs.runScript(var0, 500000, 475000); // L: 109
+	} // L: 110
 }
diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java
index c3741f058e..c5deb4d2fc 100644
--- a/runescape-client/src/main/java/WorldMapSection2.java
+++ b/runescape-client/src/main/java/WorldMapSection2.java
@@ -3,155 +3,154 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("fb")
+@ObfuscatedName("fs")
 @Implements("WorldMapSection2")
 public class WorldMapSection2 implements WorldMapSection {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1405879659
+		intValue = -1901155751
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1291885051
+		intValue = 585064293
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1139978387
+		intValue = -1431737197
 	)
 	@Export("regionStartX")
 	int regionStartX;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1146438231
+		intValue = 1644208397
 	)
 	@Export("regionStartY")
 	int regionStartY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -144912345
+		intValue = 1498564843
 	)
 	@Export("regionEndX")
 	int regionEndX;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -720689063
+		intValue = -207611195
 	)
 	@Export("regionEndY")
 	int regionEndY;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -37128885
+	)
+	int field1962;
 	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -18859023
+		intValue = 311901217
 	)
-	int field1952;
-	@ObfuscatedName("b")
+	int field1963;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -1614238823
+		intValue = -1141655241
 	)
-	int field1947;
+	int field1964;
 	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -120763515
+		intValue = 206814275
 	)
-	int field1946;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 1556024609
-	)
-	int field1955;
+	int field1965;
 
 	WorldMapSection2() {
 	} // L: 18
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "1120913212"
+		descriptor = "(Lfa;B)V",
+		garbageValue = "120"
 	)
 	@Export("expandBounds")
 	public void expandBounds(WorldMapArea var1) {
-		if (var1.regionLowX > this.field1952) { // L: 21
-			var1.regionLowX = this.field1952;
+		if (var1.regionLowX > this.field1962) { // L: 21
+			var1.regionLowX = this.field1962;
 		}
 
-		if (var1.regionHighX < this.field1946) {
-			var1.regionHighX = this.field1946; // L: 22
+		if (var1.regionHighX < this.field1964) {
+			var1.regionHighX = this.field1964; // L: 22
 		}
 
-		if (var1.regionLowY > this.field1947) { // L: 23
-			var1.regionLowY = this.field1947;
+		if (var1.regionLowY > this.field1963) { // L: 23
+			var1.regionLowY = this.field1963;
 		}
 
-		if (var1.regionHighY < this.field1955) { // L: 24
-			var1.regionHighY = this.field1955;
+		if (var1.regionHighY < this.field1965) { // L: 24
+			var1.regionHighY = this.field1965;
 		}
 
 	} // L: 25
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)Z",
-		garbageValue = "264048682"
+		garbageValue = "-2105423832"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 28
-			return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31
+		if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) {
+			return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY;
 		} else {
-			return false; // L: 29
+			return false;
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "-11"
+		descriptor = "(III)Z",
+		garbageValue = "-173753307"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		return var1 >> 6 >= this.field1952 && var1 >> 6 <= this.field1946 && var2 >> 6 >= this.field1947 && var2 >> 6 <= this.field1955; // L: 35
+		return var1 >> 6 >= this.field1962 && var1 >> 6 <= this.field1964 && var2 >> 6 >= this.field1963 && var2 >> 6 <= this.field1965; // L: 35
 	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)[I",
-		garbageValue = "1943891890"
+		garbageValue = "2086451205"
 	)
 	@Export("getBorderTileLengths")
 	public int[] getBorderTileLengths(int var1, int var2, int var3) {
 		if (!this.containsCoord(var1, var2, var3)) { // L: 39
 			return null; // L: 40
 		} else {
-			int[] var4 = new int[]{var2 + (this.field1952 * 64 - this.regionStartX * 64), var3 + (this.field1947 * 64 - this.regionStartY * 64)}; // L: 42 43 44
+			int[] var4 = new int[]{var2 + (this.field1962 * 64 - this.regionStartX * 64), var3 + (this.field1963 * 64 - this.regionStartY * 64)}; // L: 42 43 44
 			return var4; // L: 45
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lii;",
-		garbageValue = "691158162"
+		descriptor = "(IIB)Liw;",
+		garbageValue = "-36"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
 		if (!this.containsPosition(var1, var2)) { // L: 49
 			return null; // L: 50
 		} else {
-			int var3 = this.regionStartX * 64 - this.field1952 * 64 + var1; // L: 52
-			int var4 = var2 + (this.regionStartY * 64 - this.field1947 * 64); // L: 53
+			int var3 = this.regionStartX * 64 - this.field1962 * 64 + var1; // L: 52
+			int var4 = var2 + (this.regionStartY * 64 - this.field1963 * 64); // L: 53
 			return new Coord(this.minPlane, var3, var4); // L: 54
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1138667895"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1313413902"
 	)
 	@Export("read")
 	public void read(Buffer var1) {
@@ -161,161 +160,49 @@ public class WorldMapSection2 implements WorldMapSection {
 		this.regionStartY = var1.readUnsignedShort(); // L: 61
 		this.regionEndX = var1.readUnsignedShort(); // L: 62
 		this.regionEndY = var1.readUnsignedShort(); // L: 63
-		this.field1952 = var1.readUnsignedShort(); // L: 64
-		this.field1947 = var1.readUnsignedShort(); // L: 65
-		this.field1946 = var1.readUnsignedShort(); // L: 66
-		this.field1955 = var1.readUnsignedShort(); // L: 67
+		this.field1962 = var1.readUnsignedShort(); // L: 64
+		this.field1963 = var1.readUnsignedShort(); // L: 65
+		this.field1964 = var1.readUnsignedShort(); // L: 66
+		this.field1965 = var1.readUnsignedShort(); // L: 67
 		this.postRead(); // L: 68
 	} // L: 69
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1294582509"
+		garbageValue = "767493014"
 	)
 	@Export("postRead")
 	void postRead() {
 	} // L: 71
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-2037016852"
+		descriptor = "(II)Lew;",
+		garbageValue = "1413321363"
 	)
-	static int method3257(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1855
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.cycle; // L: 1856
-			return 1; // L: 1857
+	public static VarbitComposition method3329(int var0) {
+		VarbitComposition var1 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0); // L: 28
+		if (var1 != null) { // L: 29
+			return var1;
 		} else {
-			int var3;
-			int var4;
-			if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1859
-				class44.Interpreter_intStackSize -= 2; // L: 1860
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1861
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1862
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GameEngine.method538(var3, var4); // L: 1863
-				return 1; // L: 1864
-			} else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1866
-				class44.Interpreter_intStackSize -= 2; // L: 1867
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1868
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1869
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class20.ItemContainer_getCount(var3, var4); // L: 1870
-				return 1; // L: 1871
-			} else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1873
-				class44.Interpreter_intStackSize -= 2; // L: 1874
-				var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1875
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1876
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = LoginScreenAnimation.method2235(var3, var4); // L: 1877
-				return 1; // L: 1878
-			} else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1880
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1881
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.getInvDefinition(var3).size; // L: 1882
-				return 1; // L: 1883
-			} else if (var0 == ScriptOpcodes.STAT) { // L: 1885
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1886
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1887
-				return 1; // L: 1888
-			} else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1890
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1891
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1892
-				return 1; // L: 1893
-			} else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1895
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1896
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1897
-				return 1; // L: 1898
-			} else {
-				int var5;
-				if (var0 == ScriptOpcodes.COORD) { // L: 1900
-					var3 = class22.Client_plane; // L: 1901
-					var4 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 1902
-					var5 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 1903
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1904
-					return 1; // L: 1905
-				} else if (var0 == ScriptOpcodes.COORDX) { // L: 1907
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1908
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1909
-					return 1; // L: 1910
-				} else if (var0 == ScriptOpcodes.COORDZ) { // L: 1912
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1913
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1914
-					return 1; // L: 1915
-				} else if (var0 == ScriptOpcodes.COORDY) { // L: 1917
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1918
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1919
-					return 1; // L: 1920
-				} else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1922
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1923
-					return 1; // L: 1924
-				} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1926
-					class44.Interpreter_intStackSize -= 2; // L: 1927
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] + 32768; // L: 1928
-					var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1929
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = GameEngine.method538(var3, var4); // L: 1930
-					return 1; // L: 1931
-				} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1933
-					class44.Interpreter_intStackSize -= 2; // L: 1934
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] + 32768; // L: 1935
-					var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1936
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class20.ItemContainer_getCount(var3, var4); // L: 1937
-					return 1; // L: 1938
-				} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1940
-					class44.Interpreter_intStackSize -= 2; // L: 1941
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] + 32768; // L: 1942
-					var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1943
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = LoginScreenAnimation.method2235(var3, var4); // L: 1944
-					return 1; // L: 1945
-				} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1947
-					if (Client.staffModLevel >= 2) { // L: 1948
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.staffModLevel;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1949
-					}
-
-					return 1; // L: 1950
-				} else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1952
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1953
-					return 1; // L: 1954
-				} else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1956
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.worldId; // L: 1957
-					return 1; // L: 1958
-				} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1960
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1961
-					return 1; // L: 1962
-				} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1964
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.weight; // L: 1965
-					return 1; // L: 1966
-				} else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1968
-					if (Client.playerMod) { // L: 1969
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1970
-					}
-
-					return 1; // L: 1971
-				} else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1973
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1974
-					return 1; // L: 1975
-				} else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1977
-					class44.Interpreter_intStackSize -= 4; // L: 1978
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1979
-					var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1980
-					var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 1981
-					int var6 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 1982
-					var3 += var4 << 14; // L: 1983
-					var3 += var5 << 28; // L: 1984
-					var3 += var6; // L: 1985
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3; // L: 1986
-					return 1; // L: 1987
-				} else if (var0 == 3326) { // L: 1989
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.field651; // L: 1990
-					return 1; // L: 1991
-				} else if (var0 == 3327) { // L: 1993
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.field812; // L: 1994
-					return 1; // L: 1995
-				} else {
-					return 2; // L: 1997
-				}
+			byte[] var2 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0); // L: 30
+			var1 = new VarbitComposition(); // L: 31
+			if (var2 != null) { // L: 32
+				var1.decode(new Buffer(var2));
 			}
+
+			VarbitComposition.VarbitDefinition_cached.put(var1, (long)var0); // L: 33
+			return var1; // L: 34
 		}
 	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "844511026"
+	)
+	static final int method3333() {
+		return ViewportMouse.ViewportMouse_y; // L: 90
+	}
 }
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index 30dca2ac15..229ae1351a 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -3,261 +3,159 @@ 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("fx")
+@ObfuscatedName("fj")
 @Implements("WorldMapSectionType")
-public enum WorldMapSectionType implements Enumerated {
-	@ObfuscatedName("v")
+public enum WorldMapSectionType implements Enumerated
+{
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lfx;"
+		descriptor = "Lfj;"
 	)
 	@Export("WORLDMAPSECTIONTYPE0")
 	WORLDMAPSECTIONTYPE0(0, (byte)0),
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lfx;"
+		descriptor = "Lfj;"
 	)
 	@Export("WORLDMAPSECTIONTYPE1")
-	WORLDMAPSECTIONTYPE1(2, (byte)1),
-	@ObfuscatedName("f")
+	WORLDMAPSECTIONTYPE1(1, (byte)1),
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lfx;"
+		descriptor = "Lfj;"
 	)
 	@Export("WORLDMAPSECTIONTYPE2")
-	WORLDMAPSECTIONTYPE2(1, (byte)2),
+	WORLDMAPSECTIONTYPE2(2, (byte)2),
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lfx;"
+		descriptor = "Lfj;"
 	)
 	@Export("WORLDMAPSECTIONTYPE3")
 	WORLDMAPSECTIONTYPE3(3, (byte)3);
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
+	@Export("Tiles_hueMultiplier")
+	static int[] Tiles_hueMultiplier;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -694186145
+		intValue = -1205433047
 	)
 	@Export("type")
 	final int type;
-	@ObfuscatedName("j")
+	@ObfuscatedName("o")
 	@Export("id")
 	final byte id;
 
 	WorldMapSectionType(int var3, byte var4) {
-		this.type = var3;
-		this.id = var4;
-	}
+		this.type = var3; // L: 21
+		this.id = var4; // L: 22
+	} // L: 23
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.id;
+		return this.id; // L: 26
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Lkk;II)Lhq;",
-		garbageValue = "2062718345"
+		descriptor = "(II)Lfq;",
+		garbageValue = "1715010895"
 	)
-	public static PacketBufferNode method3596(int var0, String var1, Language var2, int var3) {
-		PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2660, Client.packetWriter.isaacCipher); // L: 17
-		var4.packetBuffer.writeByte(0); // L: 18
-		int var5 = var4.packetBuffer.offset; // L: 19
-		var4.packetBuffer.writeByte(var0); // L: 20
-		String var6 = var1.toLowerCase();
-		byte var7 = 0;
-		if (var6.startsWith("yellow:")) {
-			var7 = 0;
-			var1 = var1.substring("yellow:".length());
-		} else if (var6.startsWith("red:")) {
-			var7 = 1; // L: 28
-			var1 = var1.substring("red:".length()); // L: 29
-		} else if (var6.startsWith("green:")) { // L: 31
-			var7 = 2; // L: 32
-			var1 = var1.substring("green:".length()); // L: 33
-		} else if (var6.startsWith("cyan:")) { // L: 35
-			var7 = 3; // L: 36
-			var1 = var1.substring("cyan:".length()); // L: 37
-		} else if (var6.startsWith("purple:")) { // L: 39
-			var7 = 4; // L: 40
-			var1 = var1.substring("purple:".length()); // L: 41
-		} else if (var6.startsWith("white:")) { // L: 43
-			var7 = 5; // L: 44
-			var1 = var1.substring("white:".length()); // L: 45
-		} else if (var6.startsWith("flash1:")) { // L: 47
-			var7 = 6; // L: 48
-			var1 = var1.substring("flash1:".length()); // L: 49
-		} else if (var6.startsWith("flash2:")) { // L: 51
-			var7 = 7; // L: 52
-			var1 = var1.substring("flash2:".length()); // L: 53
-		} else if (var6.startsWith("flash3:")) { // L: 55
-			var7 = 8; // L: 56
-			var1 = var1.substring("flash3:".length()); // L: 57
-		} else if (var6.startsWith("glow1:")) { // L: 59
-			var7 = 9; // L: 60
-			var1 = var1.substring("glow1:".length()); // L: 61
-		} else if (var6.startsWith("glow2:")) { // L: 63
-			var7 = 10; // L: 64
-			var1 = var1.substring("glow2:".length()); // L: 65
-		} else if (var6.startsWith("glow3:")) { // L: 67
-			var7 = 11; // L: 68
-			var1 = var1.substring("glow3:".length()); // L: 69
-		} else if (var2 != Language.Language_EN) { // L: 71
-			if (var6.startsWith("yellow:")) { // L: 72
-				var7 = 0; // L: 73
-				var1 = var1.substring("yellow:".length()); // L: 74
-			} else if (var6.startsWith("red:")) { // L: 76
-				var7 = 1; // L: 77
-				var1 = var1.substring("red:".length()); // L: 78
-			} else if (var6.startsWith("green:")) { // L: 80
-				var7 = 2; // L: 81
-				var1 = var1.substring("green:".length()); // L: 82
-			} else if (var6.startsWith("cyan:")) { // L: 84
-				var7 = 3; // L: 85
-				var1 = var1.substring("cyan:".length()); // L: 86
-			} else if (var6.startsWith("purple:")) { // L: 88
-				var7 = 4; // L: 89
-				var1 = var1.substring("purple:".length()); // L: 90
-			} else if (var6.startsWith("white:")) { // L: 92
-				var7 = 5; // L: 93
-				var1 = var1.substring("white:".length()); // L: 94
-			} else if (var6.startsWith("flash1:")) { // L: 96
-				var7 = 6; // L: 97
-				var1 = var1.substring("flash1:".length()); // L: 98
-			} else if (var6.startsWith("flash2:")) { // L: 100
-				var7 = 7; // L: 101
-				var1 = var1.substring("flash2:".length()); // L: 102
-			} else if (var6.startsWith("flash3:")) { // L: 104
-				var7 = 8; // L: 105
-				var1 = var1.substring("flash3:".length()); // L: 106
-			} else if (var6.startsWith("glow1:")) { // L: 108
-				var7 = 9; // L: 109
-				var1 = var1.substring("glow1:".length()); // L: 110
-			} else if (var6.startsWith("glow2:")) { // L: 112
-				var7 = 10; // L: 113
-				var1 = var1.substring("glow2:".length()); // L: 114
-			} else if (var6.startsWith("glow3:")) { // L: 116
-				var7 = 11; // L: 117
-				var1 = var1.substring("glow3:".length()); // L: 118
-			}
-		}
-
-		var6 = var1.toLowerCase(); // L: 121
-		byte var8 = 0; // L: 122
-		if (var6.startsWith("wave:")) { // L: 123
-			var8 = 1; // L: 124
-			var1 = var1.substring("wave:".length()); // L: 125
-		} else if (var6.startsWith("wave2:")) { // L: 127
-			var8 = 2; // L: 128
-			var1 = var1.substring("wave2:".length()); // L: 129
-		} else if (var6.startsWith("shake:")) { // L: 131
-			var8 = 3; // L: 132
-			var1 = var1.substring("shake:".length()); // L: 133
-		} else if (var6.startsWith("scroll:")) { // L: 135
-			var8 = 4; // L: 136
-			var1 = var1.substring("scroll:".length()); // L: 137
-		} else if (var6.startsWith("slide:")) { // L: 139
-			var8 = 5; // L: 140
-			var1 = var1.substring("slide:".length()); // L: 141
-		} else if (var2 != Language.Language_EN) { // L: 143
-			if (var6.startsWith("wave:")) { // L: 144
-				var8 = 1; // L: 145
-				var1 = var1.substring("wave:".length()); // L: 146
-			} else if (var6.startsWith("wave2:")) { // L: 148
-				var8 = 2; // L: 149
-				var1 = var1.substring("wave2:".length()); // L: 150
-			} else if (var6.startsWith("shake:")) { // L: 152
-				var8 = 3; // L: 153
-				var1 = var1.substring("shake:".length()); // L: 154
-			} else if (var6.startsWith("scroll:")) { // L: 156
-				var8 = 4; // L: 157
-				var1 = var1.substring("scroll:".length()); // L: 158
-			} else if (var6.startsWith("slide:")) { // L: 160
-				var8 = 5; // L: 161
-				var1 = var1.substring("slide:".length()); // L: 162
-			}
-		}
-
-		var4.packetBuffer.writeByte(var7); // L: 165
-		var4.packetBuffer.writeByte(var8); // L: 166
-		ParamComposition.method2878(var4.packetBuffer, var1); // L: 167
-		if (var0 == class254.field3136.rsOrdinal()) { // L: 168
-			var4.packetBuffer.writeByte(var3); // L: 169
-		}
-
-		var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171
-		return var4; // L: 172
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Lej;",
-		garbageValue = "-24"
-	)
-	public static VarcInt method3591(int var0) {
-		VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 21
-		if (var1 != null) { // L: 22
+	public static FloorOverlayDefinition method3677(int var0) {
+		FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 30
+		if (var1 != null) { // L: 31
 			return var1;
 		} else {
-			byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); // L: 23
-			var1 = new VarcInt(); // L: 24
-			if (var2 != null) { // L: 25
-				var1.method2656(new Buffer(var2));
+			byte[] var2 = GrandExchangeOfferUnitPriceComparator.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 32
+			var1 = new FloorOverlayDefinition(); // L: 33
+			if (var2 != null) { // L: 34
+				var1.decode(new Buffer(var2), var0);
 			}
 
-			VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 26
-			return var1; // L: 27
+			var1.postDecode(); // L: 35
+			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 36
+			return var1; // L: 37
 		}
 	}
 
-	@ObfuscatedName("fb")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-944693216"
+		descriptor = "(IZIZI)V",
+		garbageValue = "-216851091"
 	)
-	static void method3594() {
-		Client.packetWriter.clearBuffer(); // L: 2507
-		Client.packetWriter.packetBuffer.offset = 0; // L: 2508
-		Client.packetWriter.serverPacket = null; // L: 2509
-		Client.packetWriter.field1411 = null; // L: 2510
-		Client.packetWriter.field1412 = null; // L: 2511
-		Client.packetWriter.field1400 = null; // L: 2512
-		Client.packetWriter.serverPacketLength = 0; // L: 2513
-		Client.packetWriter.field1409 = 0; // L: 2514
-		Client.rebootTimer = 0; // L: 2515
-		class1.method11(); // L: 2516
-		Client.minimapState = 0; // L: 2517
-		Client.destinationX = 0; // L: 2518
-
-		int var0;
-		for (var0 = 0; var0 < 2048; ++var0) { // L: 2519
-			Client.players[var0] = null;
+	@Export("sortWorldList")
+	static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
+		if (World.World_worlds != null) { // L: 171
+			class35.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
 		}
 
-		class93.localPlayer = null; // L: 2520
+	} // L: 174
 
-		for (var0 = 0; var0 < Client.npcs.length; ++var0) { // L: 2521
-			NPC var1 = Client.npcs[var0]; // L: 2522
-			if (var1 != null) { // L: 2523
-				var1.targetIndex = -1; // L: 2524
-				var1.false0 = false; // L: 2525
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lfj;",
+		garbageValue = "1780988355"
+	)
+	static WorldMapSectionType[] method3676() {
+		return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE3}; // L: 17
+	}
+
+	@ObfuscatedName("ab")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "-73"
+	)
+	static int method3668(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3469
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class302.getWindowedMode(); // L: 3470
+			return 1; // L: 3471
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3473
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3474
+				if (var3 == 1 || var3 == 2) { // L: 3475
+					WorldMapDecorationType.setWindowedMode(var3);
+				}
+
+				return 1; // L: 3476
+			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3478
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.windowMode; // L: 3479
+				return 1; // L: 3480
+			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3482
+				if (var0 == 5310) { // L: 3490
+					--ChatChannel.Interpreter_intStackSize; // L: 3491
+					return 1; // L: 3492
+				} else if (var0 == 5311) { // L: 3494
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 3495
+					return 1; // L: 3496
+				} else if (var0 == 5312) { // L: 3498
+					--ChatChannel.Interpreter_intStackSize; // L: 3499
+					return 1; // L: 3500
+				} else if (var0 == 5350) { // L: 3502
+					UserComparator9.Interpreter_stringStackSize -= 2; // L: 3503
+					--ChatChannel.Interpreter_intStackSize; // L: 3504
+					return 1; // L: 3505
+				} else if (var0 == 5351) { // L: 3507
+					--UserComparator9.Interpreter_stringStackSize; // L: 3508
+					return 1; // L: 3509
+				} else {
+					return 2; // L: 3511
+				}
+			} else {
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3483
+				if (var3 == 1 || var3 == 2) { // L: 3484
+					class4.clientPreferences.windowMode = var3; // L: 3485
+					Actor.savePreferences(); // L: 3486
+				}
+
+				return 1; // L: 3488
 			}
 		}
-
-		Skeleton.method3921(); // L: 2528
-		class12.updateGameState(30); // L: 2529
-
-		for (var0 = 0; var0 < 100; ++var0) { // L: 2530
-			Client.field719[var0] = true;
-		}
-
-		PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2662, Client.packetWriter.isaacCipher); // L: 2533
-		var2.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode()); // L: 2534
-		var2.packetBuffer.writeShort(class32.canvasWidth); // L: 2535
-		var2.packetBuffer.writeShort(ReflectionCheck.canvasHeight); // L: 2536
-		Client.packetWriter.addNode(var2); // L: 2537
-	} // L: 2539
+	}
 }
diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java
index ca047c14d8..8538245459 100644
--- a/runescape-client/src/main/java/WorldMapSprite.java
+++ b/runescape-client/src/main/java/WorldMapSprite.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("fd")
+@ObfuscatedName("fk")
 @Implements("WorldMapSprite")
 public final class WorldMapSprite {
-	@ObfuscatedName("n")
+	@ObfuscatedName("gk")
+	@ObfuscatedGetter(
+		intValue = 1244253529
+	)
+	@Export("baseY")
+	static int baseY;
+	@ObfuscatedName("e")
 	@Export("tileColors")
 	final int[] tileColors;
 
@@ -18,34 +25,13 @@ public final class WorldMapSprite {
 		this.tileColors = var1; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "-26460885"
+		garbageValue = "1831503038"
 	)
 	@Export("getTileColor")
 	final int getTileColor(int var1, int var2) {
-		return this.tileColors[var2 * 64 + var1]; // L: 24
+		return this.tileColors[var2 * 64 + var1]; // L: 19
 	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "581142439"
-	)
-	static void method3631() {
-		for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30
-			if (var0.stream1 != null) { // L: 31
-				class308.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32
-				var0.stream1 = null; // L: 33
-			}
-
-			if (var0.stream2 != null) { // L: 35
-				class308.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36
-				var0.stream2 = null; // L: 37
-			}
-		}
-
-		ObjectSound.objectSounds.clear(); // L: 40
-	} // L: 41
 }
diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java
index 4af0ef671c..090d4af14e 100644
--- a/runescape-client/src/main/java/Wrapper.java
+++ b/runescape-client/src/main/java/Wrapper.java
@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("he")
+@ObfuscatedName("ha")
 @Implements("Wrapper")
 public abstract class Wrapper extends DualNode {
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("size")
 	final int size;
 
@@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode {
 		this.size = var1; // L: 9
 	} // L: 10
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@Export("get")
 	abstract Object get();
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@Export("isSoft")
 	abstract boolean isSoft();
 }
diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java
index 364510c90e..3558600358 100644
--- a/runescape-client/src/main/java/class0.java
+++ b/runescape-client/src/main/java/class0.java
@@ -3,71 +3,194 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("v")
+@ObfuscatedName("f")
 public class class0 extends class14 {
-	@ObfuscatedName("v")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1588156263
+		intValue = 566766495
+	)
+	@Export("canvasHeight")
+	public static int canvasHeight;
+	@ObfuscatedName("af")
+	@ObfuscatedGetter(
+		intValue = -1559337791
+	)
+	static int field2;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 469754669
 	)
 	int field3;
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = -2287605941349640037L
+		longValue = -494167787820068405L
 	)
 	long field0;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class0(class2 var1) {
 		this.this$0 = var1; // L: 307
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
+	void vmethod363(Buffer var1) {
 		this.field3 = var1.readInt(); // L: 310
 		this.field0 = var1.readLong(); // L: 311
 	} // L: 312
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method122(this.field3, this.field0); // L: 315
+	void vmethod354(ClanSettings var1) {
+		var1.method137(this.field3, this.field0); // L: 315
 	} // L: 316
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("gw")
 	@ObfuscatedSignature(
-		descriptor = "(Lbg;I)V",
-		garbageValue = "1784663758"
+		descriptor = "(Lcl;B)V",
+		garbageValue = "-91"
 	)
-	@Export("changeWorld")
-	static void changeWorld(World var0) {
-		if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1619
-			Client.isMembersWorld = var0.isMembersOnly(); // L: 1620
-			WorldMapDecorationType.method4834(var0.isMembersOnly()); // L: 1621
+	static final void method11(Actor var0) {
+		var0.isWalking = false; // L: 4293
+		SequenceDefinition var1;
+		if (var0.movementSequence != -1) { // L: 4294
+			var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.movementSequence); // L: 4295
+			if (var1 != null && var1.frameIds != null) { // L: 4296
+				++var0.movementFrameCycle; // L: 4297
+				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4298
+					var0.movementFrameCycle = 1; // L: 4299
+					++var0.movementFrame; // L: 4300
+					Buddy.method5896(var1, var0.movementFrame, var0.x, var0.y); // L: 4301
+				}
+
+				if (var0.movementFrame >= var1.frameIds.length) { // L: 4303
+					var0.movementFrameCycle = 0; // L: 4304
+					var0.movementFrame = 0; // L: 4305
+					Buddy.method5896(var1, var0.movementFrame, var0.x, var0.y); // L: 4306
+				}
+			} else {
+				var0.movementSequence = -1; // L: 4309
+			}
 		}
 
-		if (var0.properties != Client.worldProperties) { // L: 1623
-			GrandExchangeOfferAgeComparator.method5068(GrandExchangeOfferAgeComparator.archive8, var0.properties); // L: 1624
+		if (var0.spotAnimation != -1 && Client.cycle >= var0.field1262) { // L: 4311
+			if (var0.spotAnimationFrame < 0) { // L: 4312
+				var0.spotAnimationFrame = 0;
+			}
+
+			int var3 = Tiles.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4313
+			if (var3 != -1) { // L: 4314
+				SequenceDefinition var2 = WorldMapScaleHandler.SequenceDefinition_get(var3); // L: 4315
+				if (var2 != null && var2.frameIds != null) { // L: 4316
+					++var0.spotAnimationFrameCycle; // L: 4317
+					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4318
+						var0.spotAnimationFrameCycle = 1; // L: 4319
+						++var0.spotAnimationFrame; // L: 4320
+						Buddy.method5896(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 4321
+					}
+
+					if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 4323 4324
+						var0.spotAnimation = -1;
+					}
+				} else {
+					var0.spotAnimation = -1; // L: 4327
+				}
+			} else {
+				var0.spotAnimation = -1; // L: 4329
+			}
 		}
 
-		class80.worldHost = var0.host; // L: 1626
-		Client.worldId = var0.id; // L: 1627
-		Client.worldProperties = var0.properties; // L: 1628
-		WorldMapLabelSize.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1629
-		GrandExchangeOfferTotalQuantityComparator.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1630
-		DesktopPlatformInfoProvider.currentPort = WorldMapLabelSize.worldPort; // L: 1631
-	} // L: 1632
+		if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4331
+			var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.sequence); // L: 4332
+			if (var1.field1895 == 1 && var0.field1281 > 0 && var0.field1276 <= Client.cycle && var0.field1269 < Client.cycle) { // L: 4333 4334
+				var0.sequenceDelay = 1; // L: 4335
+				return; // L: 4336
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4340
+			var1 = WorldMapScaleHandler.SequenceDefinition_get(var0.sequence); // L: 4341
+			if (var1 != null && var1.frameIds != null) { // L: 4342
+				++var0.sequenceFrameCycle; // L: 4343
+				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4344
+					var0.sequenceFrameCycle = 1; // L: 4345
+					++var0.sequenceFrame; // L: 4346
+					Buddy.method5896(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4347
+				}
+
+				if (var0.sequenceFrame >= var1.frameIds.length) { // L: 4349
+					var0.sequenceFrame -= var1.frameCount; // L: 4350
+					++var0.field1258; // L: 4351
+					if (var0.field1258 >= var1.field1896) { // L: 4352
+						var0.sequence = -1;
+					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 4353
+						Buddy.method5896(var1, var0.sequenceFrame, var0.x, var0.y); // L: 4354
+					} else {
+						var0.sequence = -1;
+					}
+				}
+
+				var0.isWalking = var1.field1888; // L: 4356
+			} else {
+				var0.sequence = -1; // L: 4358
+			}
+		}
+
+		if (var0.sequenceDelay > 0) { // L: 4360
+			--var0.sequenceDelay;
+		}
+
+	} // L: 4361
+
+	@ObfuscatedName("if")
+	@ObfuscatedSignature(
+		descriptor = "(II)Ljava/lang/String;",
+		garbageValue = "1925251884"
+	)
+	static String method1(int var0) {
+		if (var0 < 0) { // L: 8997
+			return "";
+		} else {
+			return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 8998 8999
+		}
+	}
+
+	@ObfuscatedName("ka")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "935953368"
+	)
+	static final void method0(int var0) {
+		var0 = Math.min(Math.max(var0, 0), 255); // L: 11112
+		if (var0 != class4.clientPreferences.musicVolume) { // L: 11113
+			if (class4.clientPreferences.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 11114
+				class105.method2357(DynamicObject.archive6, Client.currentTrackGroupId, 0, var0, false); // L: 11115
+				Client.field862 = false; // L: 11116
+			} else if (var0 == 0) { // L: 11118
+				Decimator.method1169(); // L: 11119
+				Client.field862 = false; // L: 11120
+			} else if (class233.musicPlayerStatus != 0) { // L: 11123
+				class233.musicTrackVolume = var0;
+			} else {
+				class233.midiPcmStream.setPcmStreamVolume(var0); // L: 11124
+			}
+
+			class4.clientPreferences.musicVolume = var0; // L: 11126
+			Actor.savePreferences(); // L: 11127
+		}
+
+	} // L: 11129
 }
diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java
index 964e858e69..5f6105ecf4 100644
--- a/runescape-client/src/main/java/class1.java
+++ b/runescape-client/src/main/java/class1.java
@@ -1,102 +1,104 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("n")
+@ObfuscatedName("e")
 public class class1 extends class14 {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 920679423
+	@ObfuscatedName("ar")
+	@Export("client")
+	@ObfuscatedSignature(
+		descriptor = "Lclient;"
 	)
-	int field5;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -2074698601
-	)
-	int field6;
+	static Client client;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1666414987
+		intValue = -790224169
+	)
+	int field6;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -1595809253
+	)
+	int field7;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -864477031
 	)
 	int field8;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1361309885
+		intValue = 1618165123
 	)
 	int field9;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class1(class2 var1) {
 		this.this$0 = var1; // L: 289
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field5 = var1.readInt(); // L: 292
+	void vmethod363(Buffer var1) {
+		this.field6 = var1.readInt(); // L: 292
 		this.field9 = var1.readInt(); // L: 293
-		this.field6 = var1.readUnsignedByte(); // L: 294
+		this.field7 = var1.readUnsignedByte(); // L: 294
 		this.field8 = var1.readUnsignedByte(); // L: 295
 	} // L: 296
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method113(this.field5, this.field9, this.field6, this.field8); // L: 299
+	void vmethod354(ClanSettings var1) {
+		var1.method136(this.field6, this.field9, this.field7, this.field8); // L: 299
 	} // L: 300
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;B)V",
-		garbageValue = "10"
+		descriptor = "(II)Leb;",
+		garbageValue = "2027222445"
 	)
-	public static void method13(AbstractArchive var0, AbstractArchive var1) {
-		SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; // L: 32
-		SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var1; // L: 33
-	} // L: 34
-
-	@ObfuscatedName("hq")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "22"
-	)
-	static void method11() {
-		Client.menuOptionsCount = 0; // L: 7585
-		Client.isMenuOpen = false; // L: 7586
-	} // L: 7587
-
-	@ObfuscatedName("kf")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-375078554"
-	)
-	static final void method7(int var0, int var1) {
-		ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : ApproximateRouteStrategy.guestClanChannel; // L: 11314
-		if (var2 != null && var1 >= 0 && var1 < var2.method27()) { // L: 11315
-			ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11316
-			if (var3.rank == -1) { // L: 11317
-				String var4 = var3.name; // L: 11318
-				PacketWriter var5 = Client.packetWriter; // L: 11319
-				PacketBufferNode var6 = class21.getPacketBufferNode(ClientPacket.field2651, var5.isaacCipher); // L: 11320
-				var6.packetBuffer.writeByte(3 + Tiles.stringCp1252NullTerminatedByteSize(var4)); // L: 11321
-				var6.packetBuffer.writeByte(var0); // L: 11322
-				var6.packetBuffer.writeShort(var1); // L: 11323
-				var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11324
-				var5.addNode(var6); // L: 11325
+	@Export("VarpDefinition_get")
+	public static VarpDefinition VarpDefinition_get(int var0) {
+		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23
+		if (var1 != null) { // L: 24
+			return var1;
+		} else {
+			byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25
+			var1 = new VarpDefinition(); // L: 26
+			if (var2 != null) { // L: 27
+				var1.decode(new Buffer(var2));
 			}
+
+			VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28
+			return var1; // L: 29
 		}
-	} // L: 11326
+	}
+
+	@ObfuscatedName("kv")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;B)V",
+		garbageValue = "-72"
+	)
+	@Export("clanKickUser")
+	static final void clanKickUser(String var0) {
+		if (class289.friendsChat != null) { // L: 11471
+			PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2606, Client.packetWriter.isaacCipher); // L: 11472
+			var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 11473
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11474
+			Client.packetWriter.addNode(var1); // L: 11475
+		}
+	} // L: 11476
 }
diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java
index f3a7c5f8eb..f2ec29812c 100644
--- a/runescape-client/src/main/java/class10.java
+++ b/runescape-client/src/main/java/class10.java
@@ -3,54 +3,82 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("u")
+@ObfuscatedName("z")
 public class class10 extends class14 {
-	@ObfuscatedName("sl")
+	@ObfuscatedName("bs")
 	@ObfuscatedSignature(
-		descriptor = "Lmy;"
+		descriptor = "[Lof;"
 	)
-	@Export("platformInfo")
-	static PlatformInfo platformInfo;
-	@ObfuscatedName("gc")
+	@Export("worldSelectArrows")
+	static IndexedSprite[] worldSelectArrows;
+	@ObfuscatedName("en")
 	@ObfuscatedSignature(
-		descriptor = "[Lop;"
+		descriptor = "Ljf;"
 	)
-	@Export("mapSceneSprites")
-	static IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("v")
+	@Export("archive17")
+	static Archive archive17;
+	@ObfuscatedName("ot")
+	@ObfuscatedSignature(
+		descriptor = "Lmv;"
+	)
+	static class340 field74;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -91373789
+		intValue = -1622036421
 	)
-	int field85;
+	int field73;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class10(class2 var1) {
 		this.this$0 = var1;
-		this.field85 = -1; // L: 213
+		this.field73 = -1; // L: 213
 	} // L: 215
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field85 = var1.readUnsignedShort(); // L: 218
+	void vmethod363(Buffer var1) {
+		this.field73 = var1.readUnsignedShort(); // L: 218
 	} // L: 219
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method139(this.field85); // L: 222
+	void vmethod354(ClanSettings var1) {
+		var1.method124(this.field73); // L: 222
 	} // L: 223
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljp;I)V",
+		garbageValue = "1676920158"
+	)
+	public static void method109(AbstractArchive var0) {
+		EnumComposition.EnumDefinition_archive = var0; // L: 25
+	} // L: 26
+
+	@ObfuscatedName("lo")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1908881441"
+	)
+	static void method113(int var0) {
+		for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { // L: 11538
+			if ((var1.key >> 48 & 65535L) == (long)var0) { // L: 11539
+				var1.remove(); // L: 11540
+			}
+		}
+
+	} // L: 11543
 }
diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java
index 12a6c54a09..1b7b28c694 100644
--- a/runescape-client/src/main/java/class105.java
+++ b/runescape-client/src/main/java/class105.java
@@ -1,54 +1,57 @@
+import java.io.IOException;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dz")
+@ObfuscatedName("db")
 public class class105 {
-	@ObfuscatedName("ha")
-	@ObfuscatedGetter(
-		intValue = -2115685501
-	)
-	@Export("cameraZ")
-	static int cameraZ;
-
-	@ObfuscatedName("hw")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "-1492762721"
+		descriptor = "(ZI)V",
+		garbageValue = "-1657910779"
 	)
-	@Export("getTileHeight")
-	static final int getTileHeight(int var0, int var1, int var2) {
-		int var3 = var0 >> 7; // L: 5027
-		int var4 = var1 >> 7; // L: 5028
-		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 5029
-			int var5 = var2; // L: 5030
-			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 5031
-				var5 = var2 + 1;
+	public static void method2358(boolean var0) {
+		if (NetCache.NetCache_socket != null) { // L: 42
+			try {
+				Buffer var1 = new Buffer(4); // L: 44
+				var1.writeByte(var0 ? 2 : 3); // L: 45
+				var1.writeMedium(0); // L: 46
+				NetCache.NetCache_socket.write(var1.array, 0, 4); // L: 47
+			} catch (IOException var4) {
+				try {
+					NetCache.NetCache_socket.close(); // L: 51
+				} catch (Exception var3) { // L: 53
+				}
+
+				++NetCache.NetCache_ioExceptions; // L: 54
+				NetCache.NetCache_socket = null; // L: 55
 			}
 
-			int var6 = var0 & 127; // L: 5032
-			int var7 = var1 & 127; // L: 5033
-			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 5034
-			int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; // L: 5035
-			return var9 * var7 + var8 * (128 - var7) >> 7; // L: 5036
-		} else {
-			return 0;
 		}
-	}
+	} // L: 57
 
-	@ObfuscatedName("ku")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1444494320"
+		descriptor = "(Ljp;IIIZI)V",
+		garbageValue = "1271786262"
 	)
-	@Export("clanKickUser")
-	static final void clanKickUser(String var0) {
-		if (WorldMapRegion.friendsChat != null) { // L: 11290
-			PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); // L: 11291
-			var1.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var0)); // L: 11292
-			var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 11293
-			Client.packetWriter.addNode(var1); // L: 11294
-		}
-	} // L: 11295
+	public static void method2357(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
+		class233.musicPlayerStatus = 1; // L: 34
+		InvDefinition.musicTrackArchive = var0; // L: 35
+		class233.musicTrackGroupId = var1; // L: 36
+		class233.musicTrackFileId = var2; // L: 37
+		class233.musicTrackVolume = var3; // L: 38
+		GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var4; // L: 39
+		FaceNormal.pcmSampleLength = 10000; // L: 40
+	} // L: 41
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(CI)Z",
+		garbageValue = "1162856506"
+	)
+	@Export("isDigit")
+	public static boolean isDigit(char var0) {
+		return var0 >= '0' && var0 <= '9'; // L: 162
+	}
 }
diff --git a/runescape-client/src/main/java/class106.java b/runescape-client/src/main/java/class106.java
new file mode 100644
index 0000000000..bb56216826
--- /dev/null
+++ b/runescape-client/src/main/java/class106.java
@@ -0,0 +1,137 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("dm")
+public class class106 {
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 2138418587
+	)
+	int field1338;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -967225705
+	)
+	int field1339;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1767393285
+	)
+	int field1340;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = -818178637
+	)
+	int field1337;
+
+	class106(int var1, int var2, int var3, int var4) {
+		this.field1338 = var1; // L: 10
+		this.field1339 = var2; // L: 11
+		this.field1340 = var3; // L: 12
+		this.field1337 = var4; // L: 13
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "2088462326"
+	)
+	int method2375() {
+		return this.field1338; // L: 17
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1716458247"
+	)
+	int method2360() {
+		return this.field1339; // L: 21
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1297519754"
+	)
+	int method2367() {
+		return this.field1340; // L: 25
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1743321878"
+	)
+	int method2363() {
+		return this.field1337; // L: 29
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lja;",
+		garbageValue = "-2024232904"
+	)
+	@Export("PlayerType_values")
+	public static PlayerType[] PlayerType_values() {
+		return new PlayerType[]{PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.field3544, PlayerType.PlayerType_ultimateIronman}; // L: 20
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Lee;",
+		garbageValue = "895185577"
+	)
+	static VerticalAlignment[] method2373() {
+		return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field1676, VerticalAlignment.field1679}; // L: 14
+	}
+
+	@ObfuscatedName("by")
+	@ObfuscatedSignature(
+		descriptor = "([BI)[B",
+		garbageValue = "-194944054"
+	)
+	@Export("decompressBytes")
+	static final byte[] decompressBytes(byte[] var0) {
+		Buffer var1 = new Buffer(var0); // L: 406
+		int var2 = var1.readUnsignedByte(); // L: 407
+		int var3 = var1.readInt(); // L: 408
+		if (var3 < 0 || AbstractArchive.field3599 != 0 && var3 > AbstractArchive.field3599) { // L: 409
+			throw new RuntimeException(); // L: 410
+		} else if (var2 == 0) { // L: 412
+			byte[] var6 = new byte[var3]; // L: 413
+			var1.readBytes(var6, 0, var3); // L: 414
+			return var6; // L: 415
+		} else {
+			int var4 = var1.readInt(); // L: 418
+			if (var4 >= 0 && (AbstractArchive.field3599 == 0 || var4 <= AbstractArchive.field3599)) { // L: 419
+				byte[] var5 = new byte[var4]; // L: 422
+				if (var2 == 1) { // L: 423
+					BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9);
+				} else {
+					AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 424
+				}
+
+				return var5; // L: 425
+			} else {
+				throw new RuntimeException(); // L: 420
+			}
+		}
+	}
+
+	@ObfuscatedName("gx")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-47"
+	)
+	static final int method2372() {
+		if (class4.clientPreferences.roofsHidden) { // L: 4849
+			return SoundSystem.Client_plane;
+		} else {
+			int var0 = ItemContainer.getTileHeight(ObjectSound.cameraX, Canvas.cameraZ, SoundSystem.Client_plane); // L: 4850
+			return var0 - class160.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.Client_plane][ObjectSound.cameraX >> 7][Canvas.cameraZ >> 7] & 4) != 0 ? SoundSystem.Client_plane : 3; // L: 4851 4852
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java
index 70623cdb4a..fe001f0d8e 100644
--- a/runescape-client/src/main/java/class12.java
+++ b/runescape-client/src/main/java/class12.java
@@ -1,220 +1,98 @@
-import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("o")
+@ObfuscatedName("i")
 public class class12 extends class16 {
-	@ObfuscatedName("p")
-	@Export("cacheDir")
-	public static File cacheDir;
-	@ObfuscatedName("v")
-	String field125;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -2090329987
+	@ObfuscatedName("bt")
+	@ObfuscatedSignature(
+		descriptor = "Lof;"
 	)
-	int field117;
+	@Export("worldSelectRightSprite")
+	static IndexedSprite worldSelectRightSprite;
+	@ObfuscatedName("gh")
+	@ObfuscatedGetter(
+		intValue = -1417181599
+	)
+	static int field111;
 	@ObfuscatedName("f")
-	byte field118;
+	String field112;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 667023111
+	)
+	int field109;
+	@ObfuscatedName("v")
+	byte field110;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Ls;"
 	)
 	final class19 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lx;)V"
+		descriptor = "(Ls;)V"
 	)
 	class12(class19 var1) {
 		this.this$0 = var1;
-		this.field125 = null; // L: 54
+		this.field112 = null; // L: 54
 	} // L: 58
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "68071115"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "851460888"
 	)
-	void vmethod266(Buffer var1) {
+	void vmethod331(Buffer var1) {
 		if (var1.readUnsignedByte() != 255) { // L: 61
 			--var1.offset; // L: 62
 			var1.readLong(); // L: 63
 		}
 
-		this.field125 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65
-		this.field117 = var1.readUnsignedShort(); // L: 66
-		this.field118 = var1.readByte(); // L: 67
+		this.field112 = var1.readStringCp1252NullTerminatedOrNull(); // L: 65
+		this.field109 = var1.readUnsignedShort(); // L: 66
+		this.field110 = var1.readByte(); // L: 67
 		var1.readLong(); // L: 68
 	} // L: 69
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ly;I)V",
-		garbageValue = "-1846892157"
+		garbageValue = "-1362614343"
 	)
-	void vmethod264(ClanChannel var1) {
+	void vmethod332(ClanChannel var1) {
 		ClanChannelMember var2 = new ClanChannelMember(); // L: 72
-		var2.name = this.field125; // L: 73
-		var2.world = this.field117; // L: 74
-		var2.rank = this.field118; // L: 75
+		var2.name = this.field112; // L: 73
+		var2.world = this.field109; // L: 74
+		var2.rank = this.field110; // L: 75
 		var1.addMember(var2); // L: 76
 	} // L: 77
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("fg")
 	@ObfuscatedSignature(
-		descriptor = "(Lbg;Lbg;IZI)I",
-		garbageValue = "-333331035"
+		descriptor = "(III)V",
+		garbageValue = "655976642"
 	)
-	@Export("compareWorlds")
-	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
-		if (var2 == 1) { // L: 221
-			int var4 = var0.population; // L: 222
-			int var5 = var1.population; // L: 223
-			if (!var3) { // L: 224
-				if (var4 == -1) { // L: 225
-					var4 = 2001;
-				}
+	static void method209(int var0, int var1) {
+		int[] var2 = new int[9]; // L: 1727
 
-				if (var5 == -1) { // L: 226
-					var5 = 2001;
-				}
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1728
+			int var4 = var3 * 32 + 15 + 128; // L: 1729
+			int var5 = NetSocket.method2676(var4); // L: 1730
+			int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1731
+			int var8 = var1 - 334; // L: 1734
+			if (var8 < 0) { // L: 1735
+				var8 = 0;
+			} else if (var8 > 100) { // L: 1736
+				var8 = 100;
 			}
 
-			return var4 - var5; // L: 228
-		} else if (var2 == 2) { // L: 230
-			return var0.location - var1.location;
-		} else if (var2 == 3) { // L: 231
-			if (var0.activity.equals("-")) { // L: 232
-				if (var1.activity.equals("-")) { // L: 233
-					return 0;
-				} else {
-					return var3 ? -1 : 1; // L: 234
-				}
-			} else if (var1.activity.equals("-")) { // L: 236
-				return var3 ? 1 : -1;
-			} else {
-				return var0.activity.compareTo(var1.activity); // L: 237
-			}
-		} else if (var2 == 4) { // L: 239
-			return var0.method1640() ? (var1.method1640() ? 0 : 1) : (var1.method1640() ? -1 : 0);
-		} else if (var2 == 5) { // L: 240
-			return var0.method1638() ? (var1.method1638() ? 0 : 1) : (var1.method1638() ? -1 : 0);
-		} else if (var2 == 6) { // L: 241
-			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
-		} else if (var2 == 7) { // L: 242
-			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
-		} else {
-			return var0.id - var1.id; // L: 243
+			int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; // L: 1737
+			int var7 = var9 * var5 / 256; // L: 1738
+			var2[var3] = var7 * var6 >> 16; // L: 1741
 		}
-	}
 
-	@ObfuscatedName("ax")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "101"
-	)
-	static int method173(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3463
-			class44.Interpreter_intStackSize -= 2; // L: 3464
-			var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3465
-			int var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3466
-			if (!Client.isCameraLocked) { // L: 3467
-				Client.camAngleX = var3; // L: 3468
-				Client.camAngleY = var4; // L: 3469
-			}
-
-			return 1; // L: 3471
-		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3473
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3474
-			return 1; // L: 3475
-		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3477
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3478
-			return 1; // L: 3479
-		} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3481
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3482
-			if (var3 < 0) { // L: 3483
-				var3 = 0;
-			}
-
-			Client.camFollowHeight = var3; // L: 3484
-			return 1; // L: 3485
-		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3487
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3488
-			return 1; // L: 3489
-		} else {
-			return 2; // L: 3491
-		}
-	}
-
-	@ObfuscatedName("eh")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "0"
-	)
-	@Export("updateGameState")
-	static void updateGameState(int var0) {
-		if (var0 != Client.gameState) { // L: 1117
-			if (Client.gameState == 0) { // L: 1118
-				class23.client.method501();
-			}
-
-			if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1119
-				Client.loginState = 0; // L: 1120
-				Client.field673 = 0; // L: 1121
-				Client.field845 = 0; // L: 1122
-				Client.timer.method5591(var0); // L: 1123
-				if (var0 != 20) { // L: 1124
-					VarbitComposition.method2849(false);
-				}
-			}
-
-			if (var0 != 20 && var0 != 40 && Client.field688 != null) { // L: 1126 1127
-				Client.field688.close(); // L: 1128
-				Client.field688 = null; // L: 1129
-			}
-
-			if (Client.gameState == 25) { // L: 1132
-				Client.field698 = 0; // L: 1133
-				Client.field694 = 0; // L: 1134
-				Client.field695 = 1; // L: 1135
-				Client.field696 = 0; // L: 1136
-				Client.field697 = 1; // L: 1137
-			}
-
-			if (var0 != 5 && var0 != 10) { // L: 1139
-				if (var0 == 20) { // L: 1142
-					class179.method3634(SoundCache.archive10, GrandExchangeOfferAgeComparator.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1143
-				} else if (var0 == 11) { // L: 1145
-					class179.method3634(SoundCache.archive10, GrandExchangeOfferAgeComparator.archive8, false, 4); // L: 1146
-				} else if (Login.clearLoginScreen) { // L: 1149
-					class260.titleboxSprite = null; // L: 1150
-					Login.titlebuttonSprite = null; // L: 1151
-					Login.runesSprite = null; // L: 1152
-					Login.leftTitleSprite = null; // L: 1153
-					class20.rightTitleSprite = null; // L: 1154
-					Fonts.logoSprite = null; // L: 1155
-					Decimator.title_muteSprite = null; // L: 1156
-					FriendSystem.options_buttons_0Sprite = null; // L: 1157
-					GrandExchangeOffer.options_buttons_2Sprite = null; // L: 1158
-					class337.worldSelectBackSprites = null; // L: 1159
-					class25.worldSelectFlagSprites = null; // L: 1160
-					HitSplatDefinition.worldSelectArrows = null; // L: 1161
-					class18.worldSelectStars = null; // L: 1162
-					class69.field597 = null; // L: 1163
-					class24.loginScreenRunesAnimation.method2202(); // L: 1164
-					class159.method3192(2); // L: 1165
-					StudioGame.method4847(true); // L: 1166
-					Login.clearLoginScreen = false; // L: 1167
-				}
-			} else {
-				class179.method3634(SoundCache.archive10, GrandExchangeOfferAgeComparator.archive8, true, 0); // L: 1140
-			}
-
-			Client.gameState = var0; // L: 1169
-		}
-	} // L: 1170
+		Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1743
+	} // L: 1744
 }
diff --git a/runescape-client/src/main/java/class123.java b/runescape-client/src/main/java/class123.java
deleted file mode 100644
index 88728b029a..0000000000
--- a/runescape-client/src/main/java/class123.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("dh")
-public interface class123 {
-}
diff --git a/runescape-client/src/main/java/class124.java b/runescape-client/src/main/java/class124.java
index b51e739fc2..50098f365d 100644
--- a/runescape-client/src/main/java/class124.java
+++ b/runescape-client/src/main/java/class124.java
@@ -1,56 +1,5 @@
-import java.lang.management.GarbageCollectorMXBean;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dl")
-public class class124 implements class123 {
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lhp;"
-	)
-	@Export("midiPcmStream")
-	public static MidiPcmStream midiPcmStream;
-	@ObfuscatedName("af")
-	@Export("garbageCollector")
-	static GarbageCollectorMXBean garbageCollector;
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Llm;",
-		garbageValue = "-333681005"
-	)
-	public static PrivateChatMode method2498(int var0) {
-		PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3888, PrivateChatMode.field3887, PrivateChatMode.field3889}; // L: 18
-		PrivateChatMode[] var2 = var1; // L: 20
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21
-			PrivateChatMode var4 = var2[var3]; // L: 22
-			if (var0 == var4.field3890) { // L: 24
-				return var4;
-			}
-		}
-
-		return null; // L: 28
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lbi;",
-		garbageValue = "1712316428"
-	)
-	@Export("Messages_getMessage")
-	static Message Messages_getMessage(int var0) {
-		return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40
-	}
-
-	@ObfuscatedName("kw")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "90"
-	)
-	static final void method2496() {
-		Client.field654 = Client.cycleCntr; // L: 11285
-		class21.field190 = true; // L: 11286
-	} // L: 11287
+@ObfuscatedName("dx")
+public interface class124 {
 }
diff --git a/runescape-client/src/main/java/class125.java b/runescape-client/src/main/java/class125.java
index 3b1dfa8328..daa23fc3e6 100644
--- a/runescape-client/src/main/java/class125.java
+++ b/runescape-client/src/main/java/class125.java
@@ -1,121 +1,166 @@
+import java.awt.image.BufferedImage;
+import java.awt.image.PixelGrabber;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dq")
-public enum class125 implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ldq;"
-	)
-	field1470(2, 0),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ldq;"
-	)
-	field1469(1, 1),
+@ObfuscatedName("dw")
+public class class125 implements class124 {
 	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Ldq;"
-	)
-	field1468(0, 2),
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Ldq;"
-	)
-	field1471(3, 3);
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "Lnd;"
-	)
-	@Export("NetCache_reference")
-	public static Buffer NetCache_reference;
-	@ObfuscatedName("ec")
 	@ObfuscatedSignature(
 		descriptor = "Ljp;"
 	)
-	@Export("archive14")
-	static Archive archive14;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 850248893
-	)
-	public final int field1472;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -1949743275
-	)
-	@Export("id")
-	final int id;
+	@Export("KitDefinition_archive")
+	public static AbstractArchive KitDefinition_archive;
 
-	class125(int var3, int var4) {
-		this.field1472 = var3; // L: 16
-		this.id = var4; // L: 17
-	} // L: 18
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		descriptor = "(CI)B",
+		garbageValue = "-29327102"
 	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.id; // L: 21
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "-60"
-	)
-	static int method2502(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1); // L: 114
-		return BuddyRankComparator.NetCache_currentResponse != null && var2 == BuddyRankComparator.NetCache_currentResponse.key ? SoundSystem.NetCache_responseArchiveBuffer.offset * 99 / (SoundSystem.NetCache_responseArchiveBuffer.array.length - BuddyRankComparator.NetCache_currentResponse.padding) + 1 : 0; // L: 115 116
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "2118107095"
-	)
-	static final int method2504() {
-		return ViewportMouse.ViewportMouse_x; // L: 112
-	}
-
-	@ObfuscatedName("ja")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;Leq;IIZI)V",
-		garbageValue = "1630446885"
-	)
-	@Export("addWidgetItemMenuItem")
-	static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
-		String[] var5 = var1.inventoryActions; // L: 9970
-		byte var6 = -1; // L: 9971
-		String var7 = null; // L: 9972
-		if (var5 != null && var5[var3] != null) { // L: 9973
-			if (var3 == 0) { // L: 9974
-				var6 = 33;
-			} else if (var3 == 1) { // L: 9975
-				var6 = 34;
-			} else if (var3 == 2) {
-				var6 = 35; // L: 9976
-			} else if (var3 == 3) { // L: 9977
-				var6 = 36;
-			} else {
-				var6 = 37; // L: 9978
-			}
-
-			var7 = var5[var3]; // L: 9979
-		} else if (var3 == 4) { // L: 9982
-			var6 = 37; // L: 9983
-			var7 = "Drop"; // L: 9984
+	@Export("charToByteCp1252")
+	public static byte charToByteCp1252(char var0) {
+		byte var1;
+		if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12
+			var1 = (byte)var0;
+		} else if (var0 == 8364) { // L: 13
+			var1 = -128;
+		} else if (var0 == 8218) { // L: 14
+			var1 = -126;
+		} else if (var0 == 402) { // L: 15
+			var1 = -125;
+		} else if (var0 == 8222) { // L: 16
+			var1 = -124;
+		} else if (var0 == 8230) { // L: 17
+			var1 = -123;
+		} else if (var0 == 8224) {
+			var1 = -122;
+		} else if (var0 == 8225) {
+			var1 = -121;
+		} else if (var0 == 710) {
+			var1 = -120;
+		} else if (var0 == 8240) { // L: 21
+			var1 = -119;
+		} else if (var0 == 352) {
+			var1 = -118;
+		} else if (var0 == 8249) {
+			var1 = -117;
+		} else if (var0 == 338) {
+			var1 = -116;
+		} else if (var0 == 381) {
+			var1 = -114;
+		} else if (var0 == 8216) {
+			var1 = -111;
+		} else if (var0 == 8217) {
+			var1 = -110;
+		} else if (var0 == 8220) {
+			var1 = -109;
+		} else if (var0 == 8221) { // L: 29
+			var1 = -108;
+		} else if (var0 == 8226) {
+			var1 = -107;
+		} else if (var0 == 8211) {
+			var1 = -106;
+		} else if (var0 == 8212) {
+			var1 = -105;
+		} else if (var0 == 732) { // L: 33
+			var1 = -104;
+		} else if (var0 == 8482) { // L: 34
+			var1 = -103;
+		} else if (var0 == 353) { // L: 35
+			var1 = -102;
+		} else if (var0 == 8250) { // L: 36
+			var1 = -101;
+		} else if (var0 == 339) { // L: 37
+			var1 = -100;
+		} else if (var0 == 382) { // L: 38
+			var1 = -98;
+		} else if (var0 == 376) { // L: 39
+			var1 = -97;
+		} else {
+			var1 = 63; // L: 40
 		}
 
-		if (var6 != -1 && var7 != null) { // L: 9987
-			BoundaryObject.insertMenuItem(var7, class44.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 9988
+		return var1; // L: 41
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "([BI)Loa;",
+		garbageValue = "-996987451"
+	)
+	@Export("convertJpgToSprite")
+	public static final SpritePixels convertJpgToSprite(byte[] var0) {
+		BufferedImage var1 = null;
+
+		try {
+			var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22
+			int var2 = var1.getWidth(); // L: 23
+			int var3 = var1.getHeight(); // L: 24
+			int[] var4 = new int[var3 * var2]; // L: 25
+			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26
+			var5.grabPixels(); // L: 27
+			return new SpritePixels(var4, var2, var3); // L: 28
+		} catch (IOException var7) { // L: 30
+		} catch (InterruptedException var8) { // L: 31
 		}
 
-	} // L: 9990
+		return new SpritePixels(0, 0); // L: 32
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljp;I)V",
+		garbageValue = "-494495560"
+	)
+	public static void method2587(AbstractArchive var0) {
+		VarpDefinition.VarpDefinition_archive = var0; // L: 18
+		SoundSystem.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19
+	} // L: 20
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;B)I",
+		garbageValue = "127"
+	)
+	public static int method2586(CharSequence var0) {
+		int var1 = var0.length(); // L: 151
+		int var2 = 0; // L: 152
+
+		for (int var3 = 0; var3 < var1; ++var3) { // L: 153
+			var2 = (var2 << 5) - var2 + var0.charAt(var3);
+		}
+
+		return var2; // L: 154
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-1592870252"
+	)
+	@Export("hslToRgb")
+	static final int hslToRgb(int var0, int var1, int var2) {
+		if (var2 > 179) { // L: 865
+			var1 /= 2;
+		}
+
+		if (var2 > 192) { // L: 866
+			var1 /= 2;
+		}
+
+		if (var2 > 217) { // L: 867
+			var1 /= 2;
+		}
+
+		if (var2 > 243) { // L: 868
+			var1 /= 2;
+		}
+
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 869
+		return var3; // L: 870
+	}
 }
diff --git a/runescape-client/src/main/java/class126.java b/runescape-client/src/main/java/class126.java
new file mode 100644
index 0000000000..452985cefb
--- /dev/null
+++ b/runescape-client/src/main/java/class126.java
@@ -0,0 +1,306 @@
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.Reflection;
+
+@ObfuscatedName("dv")
+public enum class126 implements Enumerated
+{
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Ldv;"
+	)
+	field1478(3, 0),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ldv;"
+	)
+	field1472(1, 1),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Ldv;"
+	)
+	field1475(0, 2),
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Ldv;"
+	)
+	field1471(2, 3);
+
+	@ObfuscatedName("h")
+	@Export("SpriteBuffer_pixels")
+	public static byte[][] SpriteBuffer_pixels;
+	@ObfuscatedName("ai")
+	@ObfuscatedGetter(
+		intValue = -137966849
+	)
+	static int field1477;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 1230952189
+	)
+	public final int field1476;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1895212337
+	)
+	@Export("id")
+	final int id;
+
+	class126(int var3, int var4) {
+		this.field1476 = var3; // L: 16
+		this.id = var4; // L: 17
+	} // L: 18
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1154679040"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.id;
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(IILfv;Lfl;I)Z",
+		garbageValue = "773199709"
+	)
+	public static final boolean method2595(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+		int var4 = var0; // L: 19
+		int var5 = var1; // L: 20
+		byte var6 = 64; // L: 21
+		byte var7 = 64; // L: 22
+		int var8 = var0 - var6; // L: 23
+		int var9 = var1 - var7; // L: 24
+		class160.directions[var6][var7] = 99; // L: 25
+		class160.distances[var6][var7] = 0; // L: 26
+		byte var10 = 0; // L: 27
+		int var11 = 0; // L: 28
+		class160.bufferX[var10] = var0; // L: 29
+		byte var10001 = var10;
+		int var18 = var10 + 1;
+		class160.bufferY[var10001] = var1; // L: 30
+		int[][] var12 = var3.flags; // L: 31
+
+		while (var11 != var18) { // L: 34
+			var4 = class160.bufferX[var11]; // L: 35
+			var5 = class160.bufferY[var11]; // L: 36
+			var11 = var11 + 1 & 4095; // L: 37
+			int var16 = var4 - var8; // L: 38
+			int var17 = var5 - var9; // L: 39
+			int var13 = var4 - var3.xInset; // L: 40
+			int var14 = var5 - var3.yInset; // L: 41
+			if (var2.hasArrived(1, var4, var5, var3)) { // L: 42
+				Login.field1033 = var4; // L: 43
+				GrandExchangeOfferOwnWorldComparator.field608 = var5; // L: 44
+				return true; // L: 45
+			}
+
+			int var15 = class160.distances[var16][var17] + 1; // L: 47
+			if (var16 > 0 && class160.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 48
+				class160.bufferX[var18] = var4 - 1; // L: 49
+				class160.bufferY[var18] = var5; // L: 50
+				var18 = var18 + 1 & 4095; // L: 51
+				class160.directions[var16 - 1][var17] = 2; // L: 52
+				class160.distances[var16 - 1][var17] = var15; // L: 53
+			}
+
+			if (var16 < 127 && class160.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 55
+				class160.bufferX[var18] = var4 + 1; // L: 56
+				class160.bufferY[var18] = var5; // L: 57
+				var18 = var18 + 1 & 4095; // L: 58
+				class160.directions[var16 + 1][var17] = 8; // L: 59
+				class160.distances[var16 + 1][var17] = var15; // L: 60
+			}
+
+			if (var17 > 0 && class160.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 62
+				class160.bufferX[var18] = var4;
+				class160.bufferY[var18] = var5 - 1;
+				var18 = var18 + 1 & 4095;
+				class160.directions[var16][var17 - 1] = 1;
+				class160.distances[var16][var17 - 1] = var15;
+			}
+
+			if (var17 < 127 && class160.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) {
+				class160.bufferX[var18] = var4; // L: 70
+				class160.bufferY[var18] = var5 + 1; // L: 71
+				var18 = var18 + 1 & 4095; // L: 72
+				class160.directions[var16][var17 + 1] = 4; // L: 73
+				class160.distances[var16][var17 + 1] = var15; // L: 74
+			}
+
+			if (var16 > 0 && var17 > 0 && class160.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 76
+				class160.bufferX[var18] = var4 - 1; // L: 77
+				class160.bufferY[var18] = var5 - 1; // L: 78
+				var18 = var18 + 1 & 4095; // L: 79
+				class160.directions[var16 - 1][var17 - 1] = 3; // L: 80
+				class160.distances[var16 - 1][var17 - 1] = var15; // L: 81
+			}
+
+			if (var16 < 127 && var17 > 0 && class160.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 83
+				class160.bufferX[var18] = var4 + 1; // L: 84
+				class160.bufferY[var18] = var5 - 1; // L: 85
+				var18 = var18 + 1 & 4095; // L: 86
+				class160.directions[var16 + 1][var17 - 1] = 9; // L: 87
+				class160.distances[var16 + 1][var17 - 1] = var15; // L: 88
+			}
+
+			if (var16 > 0 && var17 < 127 && class160.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 90
+				class160.bufferX[var18] = var4 - 1; // L: 91
+				class160.bufferY[var18] = var5 + 1; // L: 92
+				var18 = var18 + 1 & 4095; // L: 93
+				class160.directions[var16 - 1][var17 + 1] = 6; // L: 94
+				class160.distances[var16 - 1][var17 + 1] = var15; // L: 95
+			}
+
+			if (var16 < 127 && var17 < 127 && class160.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 97
+				class160.bufferX[var18] = var4 + 1; // L: 98
+				class160.bufferY[var18] = var5 + 1; // L: 99
+				var18 = var18 + 1 & 4095; // L: 100
+				class160.directions[var16 + 1][var17 + 1] = 12; // L: 101
+				class160.distances[var16 + 1][var17 + 1] = var15; // L: 102
+			}
+		}
+
+		Login.field1033 = var4; // L: 105
+		GrandExchangeOfferOwnWorldComparator.field608 = var5; // L: 106
+		return false; // L: 107
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;II)V",
+		garbageValue = "985430780"
+	)
+	@Export("readReflectionCheck")
+	public static void readReflectionCheck(Buffer var0, int var1) {
+		ReflectionCheck var2 = new ReflectionCheck(); // L: 133
+		var2.size = var0.readUnsignedByte(); // L: 134
+		var2.id = var0.readInt(); // L: 135
+		var2.operations = new int[var2.size]; // L: 136
+		var2.creationErrors = new int[var2.size]; // L: 137
+		var2.fields = new Field[var2.size]; // L: 138
+		var2.intReplaceValues = new int[var2.size]; // L: 139
+		var2.methods = new Method[var2.size]; // L: 140
+		var2.arguments = new byte[var2.size][][]; // L: 141
+
+		for (int var3 = 0; var3 < var2.size; ++var3) { // L: 142
+			try {
+				int var4 = var0.readUnsignedByte(); // L: 144
+				String var5;
+				String var6;
+				int var7;
+				if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 145
+					if (var4 == 3 || var4 == 4) { // L: 155
+						var5 = var0.readStringCp1252NullTerminated(); // L: 156
+						var6 = var0.readStringCp1252NullTerminated(); // L: 157
+						var7 = var0.readUnsignedByte(); // L: 158
+						String[] var8 = new String[var7]; // L: 159
+
+						for (int var9 = 0; var9 < var7; ++var9) { // L: 160
+							var8[var9] = var0.readStringCp1252NullTerminated();
+						}
+
+						String var20 = var0.readStringCp1252NullTerminated(); // L: 161
+						byte[][] var10 = new byte[var7][]; // L: 162
+						int var12;
+						if (var4 == 3) { // L: 163
+							for (int var11 = 0; var11 < var7; ++var11) { // L: 164
+								var12 = var0.readInt(); // L: 165
+								var10[var11] = new byte[var12]; // L: 166
+								var0.readBytes(var10[var11], 0, var12); // L: 167
+							}
+						}
+
+						var2.operations[var3] = var4; // L: 170
+						Class[] var21 = new Class[var7]; // L: 171
+
+						for (var12 = 0; var12 < var7; ++var12) { // L: 172
+							var21[var12] = FontName.loadClassFromDescriptor(var8[var12]);
+						}
+
+						Class var22 = FontName.loadClassFromDescriptor(var20); // L: 173
+						if (FontName.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 174
+							throw new SecurityException();
+						}
+
+						Method[] var13 = FontName.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 175
+						Method[] var14 = var13; // L: 177
+
+						for (int var15 = 0; var15 < var14.length; ++var15) { // L: 178
+							Method var16 = var14[var15]; // L: 179
+							if (Reflection.getMethodName(var16).equals(var6)) { // L: 181
+								Class[] var17 = Reflection.getParameterTypes(var16); // L: 182
+								if (var21.length == var17.length) { // L: 183
+									boolean var18 = true; // L: 184
+
+									for (int var19 = 0; var19 < var21.length; ++var19) { // L: 185
+										if (var17[var19] != var21[var19]) { // L: 186
+											var18 = false; // L: 187
+											break; // L: 188
+										}
+									}
+
+									if (var18 && var22 == var16.getReturnType()) { // L: 191
+										var2.methods[var3] = var16; // L: 192
+									}
+								}
+							}
+						}
+
+						var2.arguments[var3] = var10; // L: 199
+					}
+				} else {
+					var5 = var0.readStringCp1252NullTerminated(); // L: 146
+					var6 = var0.readStringCp1252NullTerminated(); // L: 147
+					var7 = 0; // L: 148
+					if (var4 == 1) { // L: 149
+						var7 = var0.readInt();
+					}
+
+					var2.operations[var3] = var4; // L: 150
+					var2.intReplaceValues[var3] = var7; // L: 151
+					if (FontName.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 152
+						throw new SecurityException();
+					}
+
+					var2.fields[var3] = Reflection.findField(FontName.loadClassFromDescriptor(var5), var6); // L: 153
+				}
+			} catch (ClassNotFoundException var24) { // L: 202
+				var2.creationErrors[var3] = -1; // L: 203
+			} catch (SecurityException var25) { // L: 205
+				var2.creationErrors[var3] = -2; // L: 206
+			} catch (NullPointerException var26) { // L: 208
+				var2.creationErrors[var3] = -3; // L: 209
+			} catch (Exception var27) { // L: 211
+				var2.creationErrors[var3] = -4; // L: 212
+			} catch (Throwable var28) { // L: 214
+				var2.creationErrors[var3] = -5; // L: 215
+			}
+		}
+
+		class69.reflectionChecks.addFirst(var2); // L: 218
+	} // L: 219
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "-47"
+	)
+	@Export("clearItemContainer")
+	static void clearItemContainer(int var0) {
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63
+		if (var1 != null) { // L: 64
+			for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65
+				var1.ids[var2] = -1; // L: 66
+				var1.quantities[var2] = 0; // L: 67
+			}
+
+		}
+	} // L: 69
+}
diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java
index 5135b68aac..d8d44cbb0e 100644
--- a/runescape-client/src/main/java/class13.java
+++ b/runescape-client/src/main/java/class13.java
@@ -3,99 +3,53 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("c")
+@ObfuscatedName("k")
 public class class13 extends class14 {
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("scriptDotWidget")
-	static Widget scriptDotWidget;
-	@ObfuscatedName("v")
+	@ObfuscatedName("at")
+	@Export("fontHelvetica13")
+	static java.awt.Font fontHelvetica13;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = 2060700822682065955L
+		longValue = 2406216224100242295L
 	)
-	long field129;
-	@ObfuscatedName("n")
-	String field128;
+	long field117;
+	@ObfuscatedName("e")
+	String field121;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class13(class2 var1) {
 		this.this$0 = var1;
-		this.field129 = -1L; // L: 194
-		this.field128 = null; // L: 195
+		this.field117 = -1L; // L: 194
+		this.field121 = null; // L: 195
 	} // L: 197
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
+	void vmethod363(Buffer var1) {
 		if (var1.readUnsignedByte() != 255) { // L: 200
 			--var1.offset; // L: 201
-			this.field129 = var1.readLong(); // L: 202
+			this.field117 = var1.readLong(); // L: 202
 		}
 
-		this.field128 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204
+		this.field121 = var1.readStringCp1252NullTerminatedOrNull(); // L: 204
 	} // L: 205
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method106(this.field129, this.field128); // L: 208
+	void vmethod354(ClanSettings var1) {
+		var1.method129(this.field117, this.field121); // L: 208
 	} // L: 209
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;B)V",
-		garbageValue = "-4"
-	)
-	public static void method180(AbstractArchive var0) {
-		StructComposition.StructDefinition_archive = var0; // L: 19
-	} // L: 20
-
-	@ObfuscatedName("n")
-	public static double method182(double var0, double var2, double var4) {
-		return MouseHandler.method620((var0 - var2) / var4) / var4; // L: 13
-	}
-
-	@ObfuscatedName("fz")
-	@ObfuscatedSignature(
-		descriptor = "(Ljp;Ljava/lang/String;I)V",
-		garbageValue = "-1436949198"
-	)
-	static void method175(Archive var0, String var1) {
-		ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1492
-		Client.archiveLoaders.add(var2); // L: 1493
-		Client.field916 += var2.groupCount; // L: 1494
-	} // L: 1495
-
-	@ObfuscatedName("km")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;IIII)V",
-		garbageValue = "425709195"
-	)
-	@Export("drawCompass")
-	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
-		SpriteMask var4 = var0.getSpriteMask(false); // L: 11206
-		if (var4 != null) { // L: 11207
-			if (Client.minimapState < 3) { // L: 11208
-				NPCComposition.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
-			} else {
-				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 11209
-			}
-
-		}
-	} // L: 11210
 }
diff --git a/runescape-client/src/main/java/class135.java b/runescape-client/src/main/java/class135.java
deleted file mode 100644
index 98a08c923c..0000000000
--- a/runescape-client/src/main/java/class135.java
+++ /dev/null
@@ -1,162 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("ed")
-public class class135 {
-	@ObfuscatedName("f")
-	public short[] field1537;
-	@ObfuscatedName("y")
-	public short[] field1538;
-
-	public class135(int var1) {
-		ItemComposition var2 = class260.ItemDefinition_get(var1); // L: 12
-		if (var2.method3024()) { // L: 13
-			this.field1537 = new short[var2.recolorTo.length]; // L: 14
-			System.arraycopy(var2.recolorTo, 0, this.field1537, 0, this.field1537.length); // L: 15
-		}
-
-		if (var2.method3025()) { // L: 17
-			this.field1538 = new short[var2.retextureTo.length]; // L: 18
-			System.arraycopy(var2.retextureTo, 0, this.field1538, 0, this.field1538.length); // L: 19
-		}
-
-	} // L: 21
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "660073374"
-	)
-	public static void method2601() {
-		KitDefinition.KitDefinition_cached.clear(); // L: 136
-	} // L: 137
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "-54"
-	)
-	public static final void method2599(int var0, int var1) {
-		ViewportMouse.ViewportMouse_x = var0; // L: 95
-		ViewportMouse.ViewportMouse_y = var1; // L: 96
-		ViewportMouse.ViewportMouse_isInViewport = true; // L: 97
-		ViewportMouse.ViewportMouse_entityCount = 0; // L: 98
-		ViewportMouse.ViewportMouse_false0 = false; // L: 99
-	} // L: 100
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1611533259"
-	)
-	static int method2600(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) { // L: 1007
-			var0 -= 1000; // L: 1008
-			var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1009
-		} else {
-			var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1011
-		}
-
-		String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 1012
-		int[] var5 = null; // L: 1013
-		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 1014
-			int var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1015
-			if (var6 > 0) { // L: 1016
-				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]) { // L: 1017 1018
-				}
-			}
-
-			var4 = var4.substring(0, var4.length() - 1); // L: 1020
-		}
-
-		Object[] var8 = new Object[var4.length() + 1]; // L: 1022
-
-		int var7;
-		for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 1023
-			if (var4.charAt(var7 - 1) == 's') { // L: 1024
-				var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-			} else {
-				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1025
-			}
-		}
-
-		var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1027
-		if (var7 != -1) { // L: 1028
-			var8[0] = new Integer(var7);
-		} else {
-			var8 = null; // L: 1029
-		}
-
-		if (var0 == ScriptOpcodes.CC_SETONCLICK) {
-			var3.onClick = var8; // L: 1030
-		} else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 1031
-			var3.onHold = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 1032
-			var3.onRelease = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 1033
-			var3.onMouseOver = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 1034
-			var3.onMouseLeave = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 1035
-			var3.onDrag = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 1036
-			var3.onTargetLeave = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 1037
-			var3.onVarTransmit = var8; // L: 1038
-			var3.varTransmitTriggers = var5; // L: 1039
-		} else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 1041
-			var3.onTimer = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 1042
-			var3.onOp = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 1043
-			var3.onDragComplete = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 1044
-			var3.onClickRepeat = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 1045
-			var3.onMouseRepeat = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 1046
-			var3.onInvTransmit = var8; // L: 1047
-			var3.invTransmitTriggers = var5; // L: 1048
-		} else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 1050
-			var3.onStatTransmit = var8; // L: 1051
-			var3.statTransmitTriggers = var5; // L: 1052
-		} else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { // L: 1054
-			var3.onTargetEnter = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 1055
-			var3.onScroll = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 1056
-			var3.onChatTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 1057
-			var3.onKey = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 1058
-			var3.onFriendTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 1059
-			var3.onClanTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 1060
-			var3.onMiscTransmit = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 1061
-			var3.onDialogAbort = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1062
-			var3.onSubChange = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1063
-			var3.onStockTransmit = var8;
-		} else if (var0 == 1426) { // L: 1064
-			var3.field3077 = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { // L: 1065
-			var3.onResize = var8;
-		} else if (var0 == 1428) { // L: 1066
-			var3.field3043 = var8;
-		} else {
-			if (var0 != 1429) { // L: 1067
-				return 2; // L: 1068
-			}
-
-			var3.field3071 = var8;
-		}
-
-		var3.hasListener = true; // L: 1069
-		return 1; // L: 1070
-	}
-}
diff --git a/runescape-client/src/main/java/class136.java b/runescape-client/src/main/java/class136.java
new file mode 100644
index 0000000000..84bf620d09
--- /dev/null
+++ b/runescape-client/src/main/java/class136.java
@@ -0,0 +1,33 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("et")
+public class class136 {
+	@ObfuscatedName("v")
+	public short[] field1542;
+	@ObfuscatedName("y")
+	public short[] field1541;
+
+	class136(int var1) {
+		ItemComposition var2 = class250.ItemDefinition_get(var1); // L: 12
+		if (var2.method3086()) { // L: 13
+			this.field1542 = new short[var2.recolorTo.length]; // L: 14
+			System.arraycopy(var2.recolorTo, 0, this.field1542, 0, this.field1542.length); // L: 15
+		}
+
+		if (var2.method3139()) { // L: 17
+			this.field1541 = new short[var2.retextureTo.length]; // L: 18
+			System.arraycopy(var2.retextureTo, 0, this.field1541, 0, this.field1541.length); // L: 19
+		}
+
+	} // L: 21
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(III)Z",
+		garbageValue = "-1546323198"
+	)
+	public static boolean method2696(int var0, int var1) {
+		return (var0 >> var1 + 1 & 1) != 0; // L: 9
+	}
+}
diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java
index 0f80180afd..968c7f3d00 100644
--- a/runescape-client/src/main/java/class14.java
+++ b/runescape-client/src/main/java/class14.java
@@ -1,66 +1,82 @@
+import java.lang.management.GarbageCollectorMXBean;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("e")
+@ObfuscatedName("g")
 public abstract class class14 extends Node {
-	@ObfuscatedName("lc")
+	@ObfuscatedName("aa")
+	@Export("garbageCollector")
+	static GarbageCollectorMXBean garbageCollector;
+	@ObfuscatedName("io")
 	@ObfuscatedGetter(
-		intValue = 1812999285
+		intValue = 570617391
 	)
-	@Export("menuX")
-	static int menuX;
+	static int field124;
 
 	class14() {
 	} // L: 68
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	abstract void vmethod276(Buffer var1);
+	abstract void vmethod363(Buffer var1);
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	abstract void vmethod281(ClanSettings var1);
+	abstract void vmethod354(ClanSettings var1);
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(CB)Z",
-		garbageValue = "-24"
+		descriptor = "(Ljava/lang/String;II)V",
+		garbageValue = "1354695002"
 	)
-	public static final boolean method188(char var0) {
-		if (Character.isISOControl(var0)) { // L: 16
-			return false;
-		} else if (Login.isAlphaNumeric(var0)) { // L: 17
-			return true;
-		} else {
-			char[] var1 = class365.field4096; // L: 19
+	static final void method229(String var0, int var1) {
+		PacketBufferNode var2 = InterfaceParent.getPacketBufferNode(ClientPacket.field2653, Client.packetWriter.isaacCipher); // L: 252
+		var2.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 253
+		var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 254
+		var2.packetBuffer.method6640(var1); // L: 255
+		Client.packetWriter.addNode(var2); // L: 256
+	} // L: 257
 
-			int var2;
-			char var3;
-			for (var2 = 0; var2 < var1.length; ++var2) { // L: 20
-				var3 = var1[var2]; // L: 21
-				if (var0 == var3) { // L: 22
-					return true;
-				}
+	@ObfuscatedName("jq")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;Lef;IIZI)V",
+		garbageValue = "-3145938"
+	)
+	@Export("addWidgetItemMenuItem")
+	static final void addWidgetItemMenuItem(Widget var0, ItemComposition var1, int var2, int var3, boolean var4) {
+		String[] var5 = var1.inventoryActions; // L: 10150
+		byte var6 = -1; // L: 10151
+		String var7 = null; // L: 10152
+		if (var5 != null && var5[var3] != null) { // L: 10153
+			if (var3 == 0) { // L: 10154
+				var6 = 33;
+			} else if (var3 == 1) { // L: 10155
+				var6 = 34;
+			} else if (var3 == 2) { // L: 10156
+				var6 = 35;
+			} else if (var3 == 3) { // L: 10157
+				var6 = 36;
+			} else {
+				var6 = 37; // L: 10158
 			}
 
-			var1 = class365.field4097; // L: 26
-
-			for (var2 = 0; var2 < var1.length; ++var2) { // L: 27
-				var3 = var1[var2]; // L: 28
-				if (var0 == var3) {
-					return true; // L: 29
-				}
-			}
-
-			return false; // L: 32
+			var7 = var5[var3]; // L: 10159
+		} else if (var3 == 4) { // L: 10162
+			var6 = 37; // L: 10163
+			var7 = "Drop"; // L: 10164
 		}
-	}
+
+		if (var6 != -1 && var7 != null) { // L: 10167
+			PacketWriter.insertMenuItem(var7, SecureRandomFuture.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 10168
+		}
+
+	} // L: 10170
 }
diff --git a/runescape-client/src/main/java/class142.java b/runescape-client/src/main/java/class142.java
deleted file mode 100644
index 2f89c89a39..0000000000
--- a/runescape-client/src/main/java/class142.java
+++ /dev/null
@@ -1,42 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("eb")
-public class class142 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("FloorOverlayDefinition_archive")
-	public static AbstractArchive FloorOverlayDefinition_archive;
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(B)[Loh;",
-		garbageValue = "61"
-	)
-	static SpritePixels[] method2739() {
-		SpritePixels[] var0 = new SpritePixels[class396.SpriteBuffer_spriteCount]; // L: 163
-
-		for (int var1 = 0; var1 < class396.SpriteBuffer_spriteCount; ++var1) { // L: 164
-			SpritePixels var2 = var0[var1] = new SpritePixels(); // L: 165
-			var2.width = class396.SpriteBuffer_spriteWidth; // L: 166
-			var2.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 167
-			var2.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[var1]; // L: 168
-			var2.yOffset = Calendar.SpriteBuffer_yOffsets[var1]; // L: 169
-			var2.subWidth = class396.SpriteBuffer_spriteWidths[var1]; // L: 170
-			var2.subHeight = class302.SpriteBuffer_spriteHeights[var1]; // L: 171
-			int var3 = var2.subWidth * var2.subHeight; // L: 172
-			byte[] var4 = class396.SpriteBuffer_pixels[var1]; // L: 173
-			var2.pixels = new int[var3]; // L: 174
-
-			for (int var5 = 0; var5 < var3; ++var5) { // L: 175
-				var2.pixels[var5] = MilliClock.SpriteBuffer_spritePalette[var4[var5] & 255];
-			}
-		}
-
-		MilliClock.method2587(); // L: 177
-		return var0; // L: 178
-	}
-}
diff --git a/runescape-client/src/main/java/class143.java b/runescape-client/src/main/java/class143.java
new file mode 100644
index 0000000000..b096618d31
--- /dev/null
+++ b/runescape-client/src/main/java/class143.java
@@ -0,0 +1,265 @@
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Random;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("eg")
+public class class143 {
+	@ObfuscatedName("lz")
+	@ObfuscatedGetter(
+		intValue = 592275981
+	)
+	@Export("menuY")
+	static int menuY;
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-349868767"
+	)
+	public static int method2815(int var0, int var1, int var2) {
+		var2 &= 3; // L: 9
+		if (var2 == 0) { // L: 10
+			return var0;
+		} else if (var2 == 1) { // L: 11
+			return var1;
+		} else {
+			return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13
+		}
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "1661040540"
+	)
+	@Export("ItemContainer_getCount")
+	static int ItemContainer_getCount(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21
+		if (var2 == null) { // L: 22
+			return 0;
+		} else {
+			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24
+		}
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "1187310793"
+	)
+	static void method2810() {
+		Login.Login_username = Login.Login_username.trim(); // L: 710
+		if (Login.Login_username.length() == 0) { // L: 711
+			CollisionMap.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 712
+		} else {
+			long var1 = WorldMapElement.method2721(); // L: 716
+			byte var0;
+			if (var1 == 0L) { // L: 717
+				var0 = 5;
+			} else {
+				String var4 = Login.Login_username; // L: 720
+				Random var5 = new Random(); // L: 722
+				Buffer var6 = new Buffer(128); // L: 723
+				Buffer var7 = new Buffer(128); // L: 724
+				int[] var8 = new int[]{var5.nextInt(), var5.nextInt(), (int)(var1 >> 32), (int)var1}; // L: 725 726 727 728 729
+				var6.writeByte(10); // L: 730
+
+				int var9;
+				for (var9 = 0; var9 < 4; ++var9) { // L: 731
+					var6.writeInt(var5.nextInt()); // L: 732
+				}
+
+				var6.writeInt(var8[0]); // L: 734
+				var6.writeInt(var8[1]); // L: 735
+				var6.writeLong(var1); // L: 736
+				var6.writeLong(0L); // L: 737
+
+				for (var9 = 0; var9 < 4; ++var9) { // L: 738
+					var6.writeInt(var5.nextInt()); // L: 739
+				}
+
+				var6.encryptRsa(class80.field983, class80.field984); // L: 741
+				var7.writeByte(10); // L: 742
+
+				for (var9 = 0; var9 < 3; ++var9) { // L: 743
+					var7.writeInt(var5.nextInt()); // L: 744
+				}
+
+				var7.writeLong(var5.nextLong()); // L: 746
+				var7.writeLongMedium(var5.nextLong()); // L: 747
+				if (Client.randomDatData != null) { // L: 749
+					var7.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 750
+				} else {
+					byte[] var21 = PlatformInfo.method6115(); // L: 753
+					var7.writeBytes(var21, 0, var21.length); // L: 754
+				}
+
+				var7.writeLong(var5.nextLong()); // L: 756
+				var7.encryptRsa(class80.field983, class80.field984); // L: 757
+				var9 = class44.stringCp1252NullTerminatedByteSize(var4); // L: 758
+				if (var9 % 8 != 0) { // L: 759
+					var9 += 8 - var9 % 8;
+				}
+
+				Buffer var10 = new Buffer(var9); // L: 760
+				var10.writeStringCp1252NullTerminated(var4); // L: 761
+				var10.offset = var9; // L: 762
+				var10.xteaEncryptAll(var8); // L: 763
+				Buffer var11 = new Buffer(var7.offset + var6.offset + var10.offset + 5); // L: 764
+				var11.writeByte(2); // L: 765
+				var11.writeByte(var6.offset); // L: 766
+				var11.writeBytes(var6.array, 0, var6.offset); // L: 767
+				var11.writeByte(var7.offset); // L: 768
+				var11.writeBytes(var7.array, 0, var7.offset); // L: 769
+				var11.writeShort(var10.offset); // L: 770
+				var11.writeBytes(var10.array, 0, var10.offset); // L: 771
+				byte[] var13 = var11.array; // L: 773
+				int var15 = var13.length; // L: 776
+				StringBuilder var16 = new StringBuilder(); // L: 778
+
+				int var19;
+				for (int var17 = 0; var17 < var15 + 0; var17 += 3) { // L: 779
+					int var18 = var13[var17] & 255; // L: 780
+					var16.append(class303.field3747[var18 >>> 2]); // L: 781
+					if (var17 < var15 - 1) { // L: 782
+						var19 = var13[var17 + 1] & 255; // L: 783
+						var16.append(class303.field3747[(var18 & 3) << 4 | var19 >>> 4]); // L: 784
+						if (var17 < var15 - 2) { // L: 785
+							int var20 = var13[var17 + 2] & 255; // L: 786
+							var16.append(class303.field3747[(var19 & 15) << 2 | var20 >>> 6]).append(class303.field3747[var20 & 63]); // L: 787
+						} else {
+							var16.append(class303.field3747[(var19 & 15) << 2]).append("="); // L: 789
+						}
+					} else {
+						var16.append(class303.field3747[(var18 & 3) << 4]).append("=="); // L: 791
+					}
+				}
+
+				String var14 = var16.toString(); // L: 793
+				var14 = var14; // L: 797
+
+				byte var3;
+				try {
+					URL var22 = new URL(class19.method283("services", false) + "m=accountappeal/login.ws"); // L: 799
+					URLConnection var27 = var22.openConnection(); // L: 800
+					var27.setDoInput(true); // L: 801
+					var27.setDoOutput(true); // L: 802
+					var27.setConnectTimeout(5000); // L: 803
+					OutputStreamWriter var23 = new OutputStreamWriter(var27.getOutputStream()); // L: 804
+					var23.write("data2=" + Renderable.method4251(var14) + "&dest=" + Renderable.method4251("passwordchoice.ws")); // L: 805
+					var23.flush(); // L: 806
+					InputStream var24 = var27.getInputStream(); // L: 807
+					var11 = new Buffer(new byte[1000]); // L: 808
+
+					while (true) {
+						var19 = var24.read(var11.array, var11.offset, 1000 - var11.offset); // L: 810
+						if (var19 == -1) { // L: 811
+							var23.close(); // L: 818
+							var24.close(); // L: 819
+							String var25 = new String(var11.array); // L: 820
+							if (var25.startsWith("OFFLINE")) { // L: 821
+								var3 = 4; // L: 822
+							} else if (var25.startsWith("WRONG")) { // L: 825
+								var3 = 7; // L: 826
+							} else if (var25.startsWith("RELOAD")) { // L: 829
+								var3 = 3; // L: 830
+							} else if (var25.startsWith("Not permitted for social network accounts.")) { // L: 833
+								var3 = 6; // L: 834
+							} else {
+								var11.xteaDecryptAll(var8); // L: 837
+
+								while (var11.offset > 0 && var11.array[var11.offset - 1] == 0) { // L: 838
+									--var11.offset; // L: 839
+								}
+
+								var25 = new String(var11.array, 0, var11.offset); // L: 841
+								if (EnumComposition.method2831(var25)) { // L: 842
+									AttackOption.openURL(var25, true, false); // L: 843
+									var3 = 2; // L: 844
+								} else {
+									var3 = 5; // L: 846
+								}
+							}
+							break;
+						}
+
+						var11.offset += var19; // L: 812
+						if (var11.offset >= 1000) { // L: 813
+							var3 = 5; // L: 814
+							break;
+						}
+					}
+				} catch (Throwable var26) { // L: 848
+					var26.printStackTrace(); // L: 849
+					var3 = 5; // L: 850
+				}
+
+				var0 = var3; // L: 853
+			}
+
+			switch(var0) { // L: 855
+			case 2:
+				CollisionMap.setLoginResponseString(Strings.field3499, Strings.field3500, Strings.field3286); // L: 872
+				Login.loginIndex = 6; // L: 873
+				break;
+			case 3:
+				CollisionMap.setLoginResponseString("", "Error connecting to server.", ""); // L: 863
+				break; // L: 864
+			case 4:
+				CollisionMap.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 857
+				break; // L: 858
+			case 5:
+				CollisionMap.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 860
+				break; // L: 861
+			case 6:
+				CollisionMap.setLoginResponseString("", "Error connecting to server.", ""); // L: 869
+				break; // L: 870
+			case 7:
+				CollisionMap.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 866
+			}
+
+		}
+	} // L: 713 876
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-2116352910"
+	)
+	public static void method2811() {
+		NPCComposition.NpcDefinition_cached.clear(); // L: 269
+		NPCComposition.NpcDefinition_cachedModels.clear(); // L: 270
+	} // L: 271
+
+	@ObfuscatedName("gp")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;ZI)V",
+		garbageValue = "-578637844"
+	)
+	@Export("drawLoadingMessage")
+	static final void drawLoadingMessage(String var0, boolean var1) {
+		if (Client.showLoadingMessages) { // L: 4505
+			byte var2 = 4; // L: 4506
+			int var3 = var2 + 6; // L: 4507
+			int var4 = var2 + 6; // L: 4508
+			int var5 = AbstractSocket.fontPlain12.lineWidth(var0, 250); // L: 4509
+			int var6 = AbstractSocket.fontPlain12.lineCount(var0, 250) * 13; // L: 4510
+			Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 0); // L: 4511
+			Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 16777215); // L: 4512
+			AbstractSocket.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 4513
+			AccessFile.method6437(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2); // L: 4514
+			if (var1) { // L: 4515
+				AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 4516
+			} else {
+				ReflectionCheck.method1229(var3, var4, var5, var6); // L: 4519
+			}
+
+		}
+	} // L: 4521
+}
diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java
index 73118cab20..97787cb6a0 100644
--- a/runescape-client/src/main/java/class15.java
+++ b/runescape-client/src/main/java/class15.java
@@ -3,92 +3,134 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("g")
+@ObfuscatedName("t")
 public class class15 extends class14 {
-	@ObfuscatedName("s")
-	public static short[][] field137;
-	@ObfuscatedName("l")
+	@ObfuscatedName("gl")
 	@ObfuscatedGetter(
-		intValue = -49357127
+		intValue = 1795345059
 	)
-	static int field140;
-	@ObfuscatedName("v")
-	String field136;
+	@Export("baseX")
+	static int baseX;
+	@ObfuscatedName("gc")
+	@ObfuscatedGetter(
+		intValue = -809778825
+	)
+	static int field128;
+	@ObfuscatedName("mq")
+	@ObfuscatedGetter(
+		intValue = 2042655841
+	)
+	@Export("selectedSpellWidget")
+	static int selectedSpellWidget;
+	@ObfuscatedName("f")
+	String field125;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class15(class2 var1) {
 		this.this$0 = var1; // L: 229
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field136 = var1.readStringCp1252NullTerminated(); // L: 232
+	void vmethod363(Buffer var1) {
+		this.field125 = var1.readStringCp1252NullTerminated(); // L: 232
 		var1.readInt(); // L: 233
 	} // L: 234
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.name = this.field136; // L: 237
+	void vmethod354(ClanSettings var1) {
+		var1.name = this.field125; // L: 237
 	} // L: 238
 
-	@ObfuscatedName("ff")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1672827396"
+		descriptor = "(Ljp;Ljp;IZI)Lgi;",
+		garbageValue = "-91677995"
 	)
-	@Export("forceDisconnect")
-	static final void forceDisconnect(int var0) {
-		class7.logOut(); // L: 2671
-		switch(var0) { // L: 2672
-		case 1:
-			WorldMapLabelSize.method3218(); // L: 2675
-			break;
-		case 2:
-			class170.method3551(); // L: 2680
-		}
+	public static Frames method240(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
+		boolean var4 = true; // L: 11
+		int[] var5 = var0.getGroupFileIds(var2); // L: 12
 
-	} // L: 2684
+		for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13
+			byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14
+			if (var7 == null) { // L: 15
+				var4 = false; // L: 16
+			} else {
+				int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19
+				byte[] var9;
+				if (var3) { // L: 21
+					var9 = var1.getFile(0, var8);
+				} else {
+					var9 = var1.getFile(var8, 0); // L: 22
+				}
 
-	@ObfuscatedName("ir")
-	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-5074"
-	)
-	static void method196() {
-		ReflectionCheck.method1126(class29.menuWidth / 2 + class14.menuX, class243.menuY); // L: 7740
-	} // L: 7741
-
-	@ObfuscatedName("ly")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "16"
-	)
-	static String method189(String var0) {
-		PlayerType[] var1 = class372.PlayerType_values(); // L: 11524
-
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 11525
-			PlayerType var3 = var1[var2]; // L: 11526
-			if (var3.modIcon != -1 && var0.startsWith(SecureRandomFuture.method1982(var3.modIcon))) { // L: 11528 11529
-				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 11530
-				break;
+				if (var9 == null) { // L: 23
+					var4 = false;
+				}
 			}
 		}
 
-		return var0; // L: 11537
+		if (!var4) { // L: 25
+			return null;
+		} else {
+			try {
+				return new Frames(var0, var1, var2, var3); // L: 27
+			} catch (Exception var11) { // L: 29
+				return null; // L: 30
+			}
+		}
 	}
+
+	@ObfuscatedName("gi")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "201138696"
+	)
+	static void method238() {
+		if (Client.renderSelf) { // L: 4766
+			class160.addPlayerToScene(class262.localPlayer, false); // L: 4767
+		}
+
+	} // L: 4769
+
+	@ObfuscatedName("ho")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "959129058"
+	)
+	static final void method241(int var0, int var1) {
+		if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { // L: 7744
+			if (Client.showMouseOverText) { // L: 7745
+				int var2 = HealthBarUpdate.method2283(); // L: 7746
+				String var3;
+				if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { // L: 7748
+					var3 = "Use" + " " + Client.selectedItemName + " " + "->";
+				} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { // L: 7749
+					var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+				} else {
+					var3 = class0.method1(var2); // L: 7750
+				}
+
+				if (Client.menuOptionsCount > 2) { // L: 7751
+					var3 = var3 + SecureRandomFuture.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+				}
+
+				class309.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); // L: 7752
+			}
+		}
+	} // L: 7753
 }
diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java
deleted file mode 100644
index 72b5e29f06..0000000000
--- a/runescape-client/src/main/java/class159.java
+++ /dev/null
@@ -1,47 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fa")
-public class class159 {
-	@ObfuscatedName("f")
-	@Export("directions")
-	static int[][] directions;
-	@ObfuscatedName("y")
-	@Export("distances")
-	static int[][] distances;
-	@ObfuscatedName("b")
-	@Export("bufferX")
-	static int[] bufferX;
-	@ObfuscatedName("d")
-	@Export("bufferY")
-	static int[] bufferY;
-	@ObfuscatedName("ds")
-	@ObfuscatedSignature(
-		descriptor = "Leu;"
-	)
-	@Export("js5SocketTask")
-	static Task js5SocketTask;
-
-	static {
-		directions = new int[128][128]; // L: 6
-		distances = new int[128][128]; // L: 7
-		bufferX = new int[4096]; // L: 11
-		bufferY = new int[4096]; // L: 12
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-1685265527"
-	)
-	public static void method3192(int var0) {
-		class232.musicPlayerStatus = 1; // L: 60
-		ModelData0.musicTrackArchive = null; // L: 61
-		class32.musicTrackGroupId = -1; // L: 62
-		class18.musicTrackFileId = -1; // L: 63
-		class232.musicTrackVolume = 0; // L: 64
-		class232.musicTrackBoolean = false; // L: 65
-		class232.pcmSampleLength = var0; // L: 66
-	} // L: 67
-}
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index ddebcc1661..12f603f23a 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -2,26 +2,304 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("a")
+@ObfuscatedName("x")
 public abstract class class16 extends Node {
-	@ObfuscatedName("gf")
-	@Export("regionMapArchiveIds")
-	static int[] regionMapArchiveIds;
+	@ObfuscatedName("m")
+	static byte[][][] field132;
+	@ObfuscatedName("dw")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive9")
+	static Archive archive9;
 
 	class16() {
 	} // L: 48
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "68071115"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "851460888"
 	)
-	abstract void vmethod266(Buffer var1);
+	abstract void vmethod331(Buffer var1);
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ly;I)V",
-		garbageValue = "-1846892157"
+		garbageValue = "-1362614343"
 	)
-	abstract void vmethod264(ClanChannel var1);
+	abstract void vmethod332(ClanChannel var1);
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "2069823141"
+	)
+	public static int method245(int var0, int var1) {
+		int var2;
+		for (var2 = 0; var1 > 0; --var1) { // L: 99 100 103
+			var2 = var2 << 1 | var0 & 1; // L: 101
+			var0 >>>= 1; // L: 102
+		}
+
+		return var2; // L: 105
+	}
+
+	@ObfuscatedName("hs")
+	@ObfuscatedSignature(
+		descriptor = "(ZLns;B)V",
+		garbageValue = "58"
+	)
+	@Export("updateNpcs")
+	static final void updateNpcs(boolean var0, PacketBuffer var1) {
+		Client.field783 = 0; // L: 7480
+		Client.field636 = 0; // L: 7481
+		class171.method3610(); // L: 7482
+
+		int var2;
+		NPC var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		int var10;
+		while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 7485
+			var2 = var1.readBits(15); // L: 7486
+			if (var2 == 32767) { // L: 7487
+				break;
+			}
+
+			boolean var3 = false; // L: 7488
+			if (Client.npcs[var2] == null) { // L: 7489
+				Client.npcs[var2] = new NPC(); // L: 7490
+				var3 = true; // L: 7491
+			}
+
+			var4 = Client.npcs[var2]; // L: 7493
+			Client.npcIndices[++Client.npcCount - 1] = var2; // L: 7494
+			var4.npcCycle = Client.cycle; // L: 7495
+			var4.definition = class248.getNpcDefinition(var1.readBits(14)); // L: 7499
+			if (var0) { // L: 7500
+				var6 = var1.readBits(8); // L: 7501
+				if (var6 > 127) { // L: 7502
+					var6 -= 256;
+				}
+			} else {
+				var6 = var1.readBits(5); // L: 7505
+				if (var6 > 15) { // L: 7506
+					var6 -= 32;
+				}
+			}
+
+			if (var0) { // L: 7508
+				var7 = var1.readBits(8); // L: 7509
+				if (var7 > 127) { // L: 7510
+					var7 -= 256;
+				}
+			} else {
+				var7 = var1.readBits(5); // L: 7513
+				if (var7 > 15) { // L: 7514
+					var7 -= 32;
+				}
+			}
+
+			var8 = var1.readBits(1); // L: 7516
+			if (var8 == 1) { // L: 7517
+				Client.field763[++Client.field636 - 1] = var2;
+			}
+
+			var5 = var1.readBits(1); // L: 7518
+			boolean var9 = var1.readBits(1) == 1; // L: 7519
+			if (var9) { // L: 7520
+				var1.readBits(32); // L: 7521
+			}
+
+			var10 = Client.defaultRotations[var1.readBits(3)]; // L: 7523
+			if (var3) { // L: 7524
+				var4.orientation = var4.rotation = var10;
+			}
+
+			var4.field1225 = var4.definition.size; // L: 7525
+			var4.field1275 = var4.definition.rotation; // L: 7526
+			if (var4.field1275 == 0) { // L: 7527
+				var4.rotation = 0;
+			}
+
+			var4.walkSequence = var4.definition.walkSequence; // L: 7528
+			var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7529
+			var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7530
+			var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7531
+			var4.idleSequence = var4.definition.idleSequence; // L: 7532
+			var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7533
+			var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7534
+			var4.method2347(class262.localPlayer.pathX[0] + var6, class262.localPlayer.pathY[0] + var7, var5 == 1); // L: 7535
+		}
+
+		var1.exportIndex(); // L: 7537
+
+		int var14;
+		for (var2 = 0; var2 < Client.field636; ++var2) { // L: 7540
+			var14 = Client.field763[var2]; // L: 7541
+			var4 = Client.npcs[var14]; // L: 7542
+			var5 = var1.readUnsignedByte(); // L: 7543
+			int var15;
+			if ((var5 & 128) != 0) { // L: 7544
+				var6 = var1.readUnsignedShort(); // L: 7545
+				var7 = var1.readUnsignedShort(); // L: 7546
+				var8 = var4.x - (var6 - class15.baseX - class15.baseX) * 64; // L: 7547
+				var15 = var4.y - (var7 - WorldMapSprite.baseY - WorldMapSprite.baseY) * 64; // L: 7548
+				if (var8 != 0 || var15 != 0) { // L: 7549
+					var4.field1280 = (int)(Math.atan2((double)var8, (double)var15) * 325.949D) & 2047;
+				}
+			}
+
+			if ((var5 & 64) != 0) { // L: 7551
+				var4.definition = class248.getNpcDefinition(var1.method6652()); // L: 7552
+				var4.field1225 = var4.definition.size; // L: 7553
+				var4.field1275 = var4.definition.rotation; // L: 7554
+				var4.walkSequence = var4.definition.walkSequence; // L: 7555
+				var4.walkBackSequence = var4.definition.walkBackSequence; // L: 7556
+				var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 7557
+				var4.walkRightSequence = var4.definition.walkRightSequence; // L: 7558
+				var4.idleSequence = var4.definition.idleSequence; // L: 7559
+				var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 7560
+				var4.turnRightSequence = var4.definition.turnRightSequence; // L: 7561
+			}
+
+			if ((var5 & 16) != 0) { // L: 7563
+				var6 = var1.readUnsignedShort(); // L: 7564
+				if (var6 == 65535) { // L: 7565
+					var6 = -1;
+				}
+
+				var7 = var1.method6642(); // L: 7566
+				if (var6 == var4.sequence && var6 != -1) { // L: 7567
+					var8 = WorldMapScaleHandler.SequenceDefinition_get(var6).field1894; // L: 7568
+					if (var8 == 1) { // L: 7569
+						var4.sequenceFrame = 0; // L: 7570
+						var4.sequenceFrameCycle = 0; // L: 7571
+						var4.sequenceDelay = var7; // L: 7572
+						var4.field1258 = 0; // L: 7573
+					}
+
+					if (var8 == 2) { // L: 7575
+						var4.field1258 = 0; // L: 7576
+					}
+				} else if (var6 == -1 || var4.sequence == -1 || WorldMapScaleHandler.SequenceDefinition_get(var6).field1892 >= WorldMapScaleHandler.SequenceDefinition_get(var4.sequence).field1892) { // L: 7579
+					var4.sequence = var6; // L: 7580
+					var4.sequenceFrame = 0; // L: 7581
+					var4.sequenceFrameCycle = 0; // L: 7582
+					var4.sequenceDelay = var7; // L: 7583
+					var4.field1258 = 0; // L: 7584
+					var4.field1281 = var4.pathLength; // L: 7585
+				}
+			}
+
+			if ((var5 & 2) != 0) { // L: 7589
+				var4.overheadText = var1.readStringCp1252NullTerminated(); // L: 7590
+				var4.overheadTextCyclesRemaining = 100; // L: 7591
+			}
+
+			if ((var5 & 1) != 0) { // L: 7593
+				var6 = var1.readUnsignedByte(); // L: 7594
+				int var11;
+				int var12;
+				if (var6 > 0) { // L: 7595
+					for (var7 = 0; var7 < var6; ++var7) { // L: 7596
+						var15 = -1; // L: 7598
+						var10 = -1; // L: 7599
+						var11 = -1; // L: 7600
+						var8 = var1.readUShortSmart(); // L: 7601
+						if (var8 == 32767) { // L: 7602
+							var8 = var1.readUShortSmart(); // L: 7603
+							var10 = var1.readUShortSmart(); // L: 7604
+							var15 = var1.readUShortSmart(); // L: 7605
+							var11 = var1.readUShortSmart(); // L: 7606
+						} else if (var8 != 32766) { // L: 7608
+							var10 = var1.readUShortSmart(); // L: 7609
+						} else {
+							var8 = -1; // L: 7611
+						}
+
+						var12 = var1.readUShortSmart(); // L: 7612
+						var4.addHitSplat(var8, var10, var15, var11, Client.cycle, var12); // L: 7613
+					}
+				}
+
+				var7 = var1.method6643(); // L: 7616
+				if (var7 > 0) { // L: 7617
+					for (var8 = 0; var8 < var7; ++var8) { // L: 7618
+						var15 = var1.readUShortSmart(); // L: 7619
+						var10 = var1.readUShortSmart(); // L: 7620
+						if (var10 != 32767) { // L: 7621
+							var11 = var1.readUShortSmart(); // L: 7622
+							var12 = var1.method6643(); // L: 7623
+							int var13 = var10 > 0 ? var1.method6642() : var12; // L: 7624
+							var4.addHealthBar(var15, Client.cycle, var10, var11, var12, var13); // L: 7625
+						} else {
+							var4.removeHealthBar(var15); // L: 7627
+						}
+					}
+				}
+			}
+
+			if ((var5 & 32) != 0) { // L: 7631
+				var4.field1264 = var1.method6619(); // L: 7632
+				var4.field1268 = var1.readByte(); // L: 7633
+				var4.field1265 = var1.readByte(); // L: 7634
+				var4.field1267 = var1.method6682(); // L: 7635
+				var4.field1276 = var1.method6651() + Client.cycle; // L: 7636
+				var4.field1269 = var1.method6652() + Client.cycle; // L: 7637
+				var4.field1270 = var1.method6651(); // L: 7638
+				var4.pathLength = 1; // L: 7639
+				var4.field1281 = 0; // L: 7640
+				var4.field1264 += var4.pathX[0]; // L: 7641
+				var4.field1268 += var4.pathY[0]; // L: 7642
+				var4.field1265 += var4.pathX[0]; // L: 7643
+				var4.field1267 += var4.pathY[0]; // L: 7644
+			}
+
+			if ((var5 & 4) != 0) { // L: 7646
+				var4.targetIndex = var1.method6653(); // L: 7647
+				if (var4.targetIndex == 65535) { // L: 7648
+					var4.targetIndex = -1;
+				}
+			}
+
+			if ((var5 & 8) != 0) { // L: 7650
+				var4.spotAnimation = var1.method6651(); // L: 7651
+				var6 = var1.method6725(); // L: 7652
+				var4.field1263 = var6 >> 16; // L: 7653
+				var4.field1262 = (var6 & 65535) + Client.cycle; // L: 7654
+				var4.spotAnimationFrame = 0; // L: 7655
+				var4.spotAnimationFrameCycle = 0; // L: 7656
+				if (var4.field1262 > Client.cycle) { // L: 7657
+					var4.spotAnimationFrame = -1;
+				}
+
+				if (var4.spotAnimation == 65535) { // L: 7658
+					var4.spotAnimation = -1;
+				}
+			}
+		}
+
+		for (var2 = 0; var2 < Client.field783; ++var2) { // L: 7662
+			var14 = Client.field859[var2]; // L: 7663
+			if (Client.npcs[var14].npcCycle != Client.cycle) { // L: 7664
+				Client.npcs[var14].definition = null; // L: 7665
+				Client.npcs[var14] = null; // L: 7666
+			}
+		}
+
+		if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 7669
+			throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+		} else {
+			for (var2 = 0; var2 < Client.npcCount; ++var2) { // L: 7670
+				if (Client.npcs[Client.npcIndices[var2]] == null) { // L: 7671
+					throw new RuntimeException(var2 + "," + Client.npcCount); // L: 7672
+				}
+			}
+
+		}
+	} // L: 7675
 }
diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java
new file mode 100644
index 0000000000..ee70f2b30d
--- /dev/null
+++ b/runescape-client/src/main/java/class160.java
@@ -0,0 +1,99 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("fx")
+public class class160 {
+	@ObfuscatedName("v")
+	@Export("directions")
+	public static int[][] directions;
+	@ObfuscatedName("y")
+	@Export("distances")
+	public static int[][] distances;
+	@ObfuscatedName("r")
+	@Export("bufferX")
+	public static int[] bufferX;
+	@ObfuscatedName("h")
+	@Export("bufferY")
+	public static int[] bufferY;
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "Len;"
+	)
+	@Export("clock")
+	static Clock clock;
+	@ObfuscatedName("dy")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive11")
+	static Archive archive11;
+	@ObfuscatedName("fa")
+	@ObfuscatedGetter(
+		longValue = 3427195158311582499L
+	)
+	static long field1929;
+	@ObfuscatedName("hz")
+	@ObfuscatedGetter(
+		intValue = 1662594795
+	)
+	@Export("cameraY")
+	static int cameraY;
+
+	static {
+		directions = new int[128][128]; // L: 6
+		distances = new int[128][128]; // L: 7
+		bufferX = new int[4096]; // L: 11
+		bufferY = new int[4096]; // L: 12
+	}
+
+	@ObfuscatedName("gj")
+	@ObfuscatedSignature(
+		descriptor = "(Lcj;ZI)V",
+		garbageValue = "-868096923"
+	)
+	@Export("addPlayerToScene")
+	static void addPlayerToScene(Player var0, boolean var1) {
+		if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4778
+			var0.isUnanimated = false; // L: 4779
+			if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4780 4781
+				var0.isUnanimated = true;
+			}
+
+			int var2 = var0.x >> 7; // L: 4783
+			int var3 = var0.y >> 7; // L: 4784
+			if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4785
+				long var4 = UserComparator3.calculateTag(0, 0, 0, false, var0.index); // L: 4786
+				if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4787
+					var0.isUnanimated = false; // L: 4788
+					var0.tileHeight = ItemContainer.getTileHeight(var0.x, var0.y, SoundSystem.Client_plane); // L: 4789
+					var0.playerCycle = Client.cycle; // L: 4790
+					DevicePcmPlayerProvider.scene.addNullableObject(SoundSystem.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.minX, var0.minY, var0.maxX, var0.maxY); // L: 4791
+				} else {
+					if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4794
+						if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4795
+							return;
+						}
+
+						Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4796
+					}
+
+					var0.tileHeight = ItemContainer.getTileHeight(var0.x, var0.y, SoundSystem.Client_plane); // L: 4798
+					var0.playerCycle = Client.cycle; // L: 4799
+					DevicePcmPlayerProvider.scene.drawEntity(SoundSystem.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4800
+				}
+			}
+		}
+
+	} // L: 4804
+
+	@ObfuscatedName("iu")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-18748902"
+	)
+	static boolean method3253(int var0) {
+		return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 8993
+	}
+}
diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java
deleted file mode 100644
index bd9e021a27..0000000000
--- a/runescape-client/src/main/java/class161.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("fs")
-public class class161 {
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1034667621
-	)
-	static int field1920;
-}
diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java
new file mode 100644
index 0000000000..0e1ef2a1e2
--- /dev/null
+++ b/runescape-client/src/main/java/class162.java
@@ -0,0 +1,7 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("fc")
+public class class162 {
+	@ObfuscatedName("bs")
+	static String field1936;
+}
diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java
deleted file mode 100644
index 70c17b5e61..0000000000
--- a/runescape-client/src/main/java/class169.java
+++ /dev/null
@@ -1,247 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fj")
-public class class169 implements WorldMapSection {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 398172859
-	)
-	int field2018;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -829119157
-	)
-	int field2011;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 2102107219
-	)
-	int field2012;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -620257867
-	)
-	int field2016;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1859823215
-	)
-	int field2014;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -466083281
-	)
-	int field2015;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -558728135
-	)
-	int field2010;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -77605471
-	)
-	int field2017;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 832342515
-	)
-	int field2013;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -701591619
-	)
-	int field2019;
-
-	class169() {
-	} // L: 18
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lfo;I)V",
-		garbageValue = "1120913212"
-	)
-	@Export("expandBounds")
-	public void expandBounds(WorldMapArea var1) {
-		if (var1.regionLowX > this.field2014) { // L: 21
-			var1.regionLowX = this.field2014;
-		}
-
-		if (var1.regionHighX < this.field2014) {
-			var1.regionHighX = this.field2014; // L: 22
-		}
-
-		if (var1.regionLowY > this.field2015) { // L: 23
-			var1.regionLowY = this.field2015;
-		}
-
-		if (var1.regionHighY < this.field2015) { // L: 24
-			var1.regionHighY = this.field2015;
-		}
-
-	} // L: 25
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "264048682"
-	)
-	@Export("containsCoord")
-	public boolean containsCoord(int var1, int var2, int var3) {
-		if (var1 >= this.field2018 && var1 < this.field2018 + this.field2011) { // L: 28
-			return var2 >= (this.field2012 << 6) + (this.field2010 << 3) && var2 <= (this.field2012 << 6) + (this.field2010 << 3) + 7 && var3 >= (this.field2016 << 6) + (this.field2017 << 3) && var3 <= (this.field2016 << 6) + (this.field2017 << 3) + 7; // L: 31
-		} else {
-			return false; // L: 29
-		}
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)Z",
-		garbageValue = "-11"
-	)
-	@Export("containsPosition")
-	public boolean containsPosition(int var1, int var2) {
-		return var1 >= (this.field2014 << 6) + (this.field2013 << 3) && var1 <= (this.field2014 << 6) + (this.field2013 << 3) + 7 && var2 >= (this.field2015 << 6) + (this.field2019 << 3) && var2 <= (this.field2015 << 6) + (this.field2019 << 3) + 7; // L: 35
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)[I",
-		garbageValue = "1943891890"
-	)
-	@Export("getBorderTileLengths")
-	public int[] getBorderTileLengths(int var1, int var2, int var3) {
-		if (!this.containsCoord(var1, var2, var3)) { // L: 39
-			return null; // L: 40
-		} else {
-			int[] var4 = new int[]{var2 + (this.field2014 * 64 - this.field2012 * 64) + (this.field2013 * 8 - this.field2010 * 8), var3 + (this.field2015 * 64 - this.field2016 * 64) + (this.field2019 * 8 - this.field2017 * 8)}; // L: 42 43 44
-			return var4; // L: 45
-		}
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(III)Lii;",
-		garbageValue = "691158162"
-	)
-	@Export("coord")
-	public Coord coord(int var1, int var2) {
-		if (!this.containsPosition(var1, var2)) { // L: 49
-			return null; // L: 50
-		} else {
-			int var3 = this.field2012 * 64 - this.field2014 * 64 + (this.field2010 * 8 - this.field2013 * 8) + var1; // L: 52
-			int var4 = var2 + (this.field2016 * 64 - this.field2015 * 64) + (this.field2017 * 8 - this.field2019 * 8); // L: 53
-			return new Coord(this.field2018, var3, var4); // L: 54
-		}
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1138667895"
-	)
-	@Export("read")
-	public void read(Buffer var1) {
-		this.field2018 = var1.readUnsignedByte(); // L: 58
-		this.field2011 = var1.readUnsignedByte(); // L: 59
-		this.field2012 = var1.readUnsignedShort(); // L: 60
-		this.field2010 = var1.readUnsignedByte(); // L: 61
-		this.field2016 = var1.readUnsignedShort(); // L: 62
-		this.field2017 = var1.readUnsignedByte(); // L: 63
-		this.field2014 = var1.readUnsignedShort(); // L: 64
-		this.field2013 = var1.readUnsignedByte(); // L: 65
-		this.field2015 = var1.readUnsignedShort(); // L: 66
-		this.field2019 = var1.readUnsignedByte(); // L: 67
-		this.method3529(); // L: 68
-	} // L: 69
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-186236256"
-	)
-	void method3529() {
-	} // L: 71
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-309944500"
-	)
-	static void method3549(int var0, int var1, int var2, int var3) {
-		for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 99
-			if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 100
-				int var5 = 0; // L: 101
-				if (var1 > var4.field956) { // L: 102
-					var5 += var1 - var4.field956;
-				} else if (var1 < var4.x) { // L: 103
-					var5 += var4.x - var1;
-				}
-
-				if (var2 > var4.field957) { // L: 104
-					var5 += var2 - var4.field957;
-				} else if (var2 < var4.y) { // L: 105
-					var5 += var4.y - var2;
-				}
-
-				if (var5 - 64 <= var4.field958 && ObjectComposition.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 106
-					var5 -= 64; // L: 117
-					if (var5 < 0) { // L: 118
-						var5 = 0;
-					}
-
-					int var6 = (var4.field958 - var5) * ObjectComposition.clientPreferences.areaSoundEffectsVolume / var4.field958; // L: 119
-					if (var4.stream1 == null) { // L: 120
-						if (var4.soundEffectId >= 0) { // L: 121
-							SoundEffect var7 = SoundEffect.readSoundEffect(class32.archive4, var4.soundEffectId, 0); // L: 122
-							if (var7 != null) { // L: 123
-								RawSound var8 = var7.toRawSound().resample(TileItem.decimator); // L: 124
-								RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 125
-								var9.setNumLoops(-1); // L: 126
-								class308.pcmStreamMixer.addSubStream(var9); // L: 127
-								var4.stream1 = var9; // L: 128
-							}
-						}
-					} else {
-						var4.stream1.method845(var6); // L: 132
-					}
-
-					if (var4.stream2 == null) { // L: 133
-						if (var4.soundEffectIds != null && (var4.field954 -= var3) <= 0) { // L: 134
-							int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 135
-							SoundEffect var12 = SoundEffect.readSoundEffect(class32.archive4, var4.soundEffectIds[var11], 0); // L: 136
-							if (var12 != null) { // L: 137
-								RawSound var13 = var12.toRawSound().resample(TileItem.decimator); // L: 138
-								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 139
-								var10.setNumLoops(0); // L: 140
-								class308.pcmStreamMixer.addSubStream(var10); // L: 141
-								var4.stream2 = var10; // L: 142
-								var4.field954 = var4.field961 + (int)(Math.random() * (double)(var4.field964 - var4.field961)); // L: 143
-							}
-						}
-					} else {
-						var4.stream2.method845(var6); // L: 148
-						if (!var4.stream2.hasNext()) { // L: 149
-							var4.stream2 = null; // L: 150
-						}
-					}
-				} else {
-					if (var4.stream1 != null) { // L: 107
-						class308.pcmStreamMixer.removeSubStream(var4.stream1); // L: 108
-						var4.stream1 = null; // L: 109
-					}
-
-					if (var4.stream2 != null) { // L: 111
-						class308.pcmStreamMixer.removeSubStream(var4.stream2); // L: 112
-						var4.stream2 = null; // L: 113
-					}
-				}
-			}
-		}
-
-	} // L: 154
-}
diff --git a/runescape-client/src/main/java/class17.java b/runescape-client/src/main/java/class17.java
index bbf48244a1..fe3b19c918 100644
--- a/runescape-client/src/main/java/class17.java
+++ b/runescape-client/src/main/java/class17.java
@@ -1,607 +1,161 @@
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("k")
+@ObfuscatedName("u")
 public class class17 extends class14 {
-	@ObfuscatedName("ie")
-	@ObfuscatedGetter(
-		intValue = 769722653
-	)
-	static int field148;
-	@ObfuscatedName("v")
-	boolean field146;
-	@ObfuscatedName("n")
-	byte field143;
 	@ObfuscatedName("f")
-	byte field144;
+	boolean field140;
+	@ObfuscatedName("e")
+	byte field136;
+	@ObfuscatedName("v")
+	byte field137;
 	@ObfuscatedName("y")
-	byte field145;
-	@ObfuscatedName("p")
-	byte field147;
+	byte field135;
+	@ObfuscatedName("j")
+	byte field139;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class17(class2 var1) {
 		this.this$0 = var1; // L: 248
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field146 = var1.readUnsignedByte() == 1; // L: 251
-		this.field143 = var1.readByte(); // L: 252
-		this.field144 = var1.readByte(); // L: 253
-		this.field145 = var1.readByte(); // L: 254
-		this.field147 = var1.readByte(); // L: 255
+	void vmethod363(Buffer var1) {
+		this.field140 = var1.readUnsignedByte() == 1; // L: 251
+		this.field136 = var1.readByte(); // L: 252
+		this.field137 = var1.readByte(); // L: 253
+		this.field135 = var1.readByte(); // L: 254
+		this.field139 = var1.readByte(); // L: 255
 	} // L: 256
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.allowGuests = this.field146; // L: 259
-		var1.field103 = this.field143; // L: 260
-		var1.field113 = this.field144; // L: 261
-		var1.field98 = this.field145; // L: 262
-		var1.field96 = this.field147; // L: 263
+	void vmethod354(ClanSettings var1) {
+		var1.allowGuests = this.field140; // L: 259
+		var1.field87 = this.field136; // L: 260
+		var1.field88 = this.field137; // L: 261
+		var1.field93 = this.field135; // L: 262
+		var1.field90 = this.field139; // L: 263
 	} // L: 264
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Ley;",
-		garbageValue = "113"
+		descriptor = "(B)Ljava/lang/String;",
+		garbageValue = "-50"
 	)
-	public static FloorUnderlayDefinition method204(int var0) {
-		FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); // L: 25
-		if (var1 != null) { // L: 26
-			return var1;
-		} else {
-			byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); // L: 27
-			var1 = new FloorUnderlayDefinition(); // L: 28
-			if (var2 != null) { // L: 29
-				var1.decode(new Buffer(var2), var0);
-			}
+	static String method255() {
+		return class4.clientPreferences.hideUsername ? class22.method315(Login.Login_username) : Login.Login_username; // L: 179
+	}
 
-			var1.postDecode(); // L: 30
-			FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); // L: 31
-			return var1; // L: 32
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(III)Liv;",
+		garbageValue = "-571050051"
+	)
+	@Export("getWidgetChild")
+	public static Widget getWidgetChild(int var0, int var1) {
+		Widget var2 = WorldMapData_1.getWidget(var0); // L: 209
+		if (var1 == -1) { // L: 210
+			return var2;
+		} else {
+			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 211 212
 		}
 	}
 
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(Lgt;[Lfz;I)V",
-		garbageValue = "-1580902995"
-	)
-	static final void method210(Scene var0, CollisionMap[] var1) {
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		for (var2 = 0; var2 < 4; ++var2) { // L: 494
-			for (var3 = 0; var3 < 104; ++var3) { // L: 495
-				for (var4 = 0; var4 < 104; ++var4) { // L: 496
-					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 497
-						var5 = var2; // L: 498
-						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 499
-							var5 = var2 - 1;
-						}
-
-						if (var5 >= 0) { // L: 500
-							var1[var5].setBlockedByFloor(var3, var4);
-						}
-					}
-				}
-			}
-		}
-
-		Tiles.field1130 += (int)(Math.random() * 5.0D) - 2; // L: 505
-		if (Tiles.field1130 < -8) { // L: 506
-			Tiles.field1130 = -8;
-		}
-
-		if (Tiles.field1130 > 8) { // L: 507
-			Tiles.field1130 = 8;
-		}
-
-		Tiles.field1131 += (int)(Math.random() * 5.0D) - 2; // L: 508
-		if (Tiles.field1131 < -16) { // L: 509
-			Tiles.field1131 = -16;
-		}
-
-		if (Tiles.field1131 > 16) { // L: 510
-			Tiles.field1131 = 16;
-		}
-
-		int var9;
-		int var10;
-		int var11;
-		int var12;
-		int var13;
-		int var14;
-		int var15;
-		int var16;
-		int[] var10000;
-		int var17;
-		int var18;
-		for (var2 = 0; var2 < 4; ++var2) { // L: 511
-			byte[][] var42 = class372.field4123[var2]; // L: 512
-			var9 = (int)Math.sqrt(5100.0D); // L: 518
-			var10 = var9 * 768 >> 8; // L: 519
-
-			int var19;
-			int var20;
-			for (var11 = 1; var11 < 103; ++var11) { // L: 520
-				for (var12 = 1; var12 < 103; ++var12) { // L: 521
-					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 522
-					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 523
-					var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 524
-					var16 = (var13 << 8) / var15; // L: 525
-					var17 = 65536 / var15; // L: 526
-					var18 = (var14 << 8) / var15; // L: 527
-					var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 528
-					var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); // L: 529
-					class229.field2813[var12][var11] = var19 - var20; // L: 530
-				}
-			}
-
-			for (var11 = 0; var11 < 104; ++var11) { // L: 533
-				ChatChannel.Tiles_hue[var11] = 0; // L: 534
-				class23.Tiles_saturation[var11] = 0; // L: 535
-				Tiles.Tiles_lightness[var11] = 0; // L: 536
-				ParamComposition.Tiles_hueMultiplier[var11] = 0; // L: 537
-				DefaultsGroup.field3894[var11] = 0; // L: 538
-			}
-
-			for (var11 = -5; var11 < 109; ++var11) { // L: 540
-				for (var12 = 0; var12 < 104; ++var12) { // L: 541
-					var13 = var11 + 5; // L: 542
-					int var10002;
-					if (var13 >= 0 && var13 < 104) { // L: 543
-						var14 = Tiles.field1120[var2][var13][var12] & 255; // L: 544
-						if (var14 > 0) { // L: 545
-							FloorUnderlayDefinition var44 = method204(var14 - 1); // L: 546
-							var10000 = ChatChannel.Tiles_hue; // L: 547
-							var10000[var12] += var44.hue;
-							var10000 = class23.Tiles_saturation; // L: 548
-							var10000[var12] += var44.saturation;
-							var10000 = Tiles.Tiles_lightness; // L: 549
-							var10000[var12] += var44.lightness;
-							var10000 = ParamComposition.Tiles_hueMultiplier; // L: 550
-							var10000[var12] += var44.hueMultiplier;
-							var10002 = DefaultsGroup.field3894[var12]++; // L: 551
-						}
-					}
-
-					var14 = var11 - 5; // L: 554
-					if (var14 >= 0 && var14 < 104) { // L: 555
-						var15 = Tiles.field1120[var2][var14][var12] & 255; // L: 556
-						if (var15 > 0) { // L: 557
-							FloorUnderlayDefinition var45 = method204(var15 - 1); // L: 558
-							var10000 = ChatChannel.Tiles_hue; // L: 559
-							var10000[var12] -= var45.hue;
-							var10000 = class23.Tiles_saturation; // L: 560
-							var10000[var12] -= var45.saturation;
-							var10000 = Tiles.Tiles_lightness; // L: 561
-							var10000[var12] -= var45.lightness;
-							var10000 = ParamComposition.Tiles_hueMultiplier; // L: 562
-							var10000[var12] -= var45.hueMultiplier;
-							var10002 = DefaultsGroup.field3894[var12]--; // L: 563
-						}
-					}
-				}
-
-				if (var11 >= 1 && var11 < 103) { // L: 567
-					var12 = 0; // L: 568
-					var13 = 0; // L: 569
-					var14 = 0; // L: 570
-					var15 = 0; // L: 571
-					var16 = 0; // L: 572
-
-					for (var17 = -5; var17 < 109; ++var17) { // L: 573
-						var18 = var17 + 5; // L: 574
-						if (var18 >= 0 && var18 < 104) { // L: 575
-							var12 += ChatChannel.Tiles_hue[var18]; // L: 576
-							var13 += class23.Tiles_saturation[var18]; // L: 577
-							var14 += Tiles.Tiles_lightness[var18]; // L: 578
-							var15 += ParamComposition.Tiles_hueMultiplier[var18]; // L: 579
-							var16 += DefaultsGroup.field3894[var18]; // L: 580
-						}
-
-						var19 = var17 - 5; // L: 582
-						if (var19 >= 0 && var19 < 104) { // L: 583
-							var12 -= ChatChannel.Tiles_hue[var19]; // L: 584
-							var13 -= class23.Tiles_saturation[var19]; // L: 585
-							var14 -= Tiles.Tiles_lightness[var19]; // L: 586
-							var15 -= ParamComposition.Tiles_hueMultiplier[var19]; // L: 587
-							var16 -= DefaultsGroup.field3894[var19]; // L: 588
-						}
-
-						if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 590 591 592 593
-							if (var2 < Tiles.Tiles_minPlane) { // L: 596
-								Tiles.Tiles_minPlane = var2;
-							}
-
-							var20 = Tiles.field1120[var2][var11][var17] & 255; // L: 597
-							int var21 = class253.field3130[var2][var11][var17] & 255; // L: 598
-							if (var20 > 0 || var21 > 0) { // L: 599
-								int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 600
-								int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 601
-								int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 602
-								int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 603
-								int var26 = class229.field2813[var11][var17]; // L: 604
-								int var27 = class229.field2813[var11 + 1][var17]; // L: 605
-								int var28 = class229.field2813[var11 + 1][var17 + 1]; // L: 606
-								int var29 = class229.field2813[var11][var17 + 1]; // L: 607
-								int var30 = -1; // L: 608
-								int var31 = -1; // L: 609
-								int var32;
-								int var33;
-								if (var20 > 0) { // L: 610
-									var32 = var12 * 256 / var15; // L: 611
-									var33 = var13 / var16; // L: 612
-									int var34 = var14 / var16; // L: 613
-									var30 = WorldMapElement.hslToRgb(var32, var33, var34); // L: 614
-									var32 = var32 + Tiles.field1130 & 255; // L: 615
-									var34 += Tiles.field1131; // L: 616
-									if (var34 < 0) { // L: 617
-										var34 = 0;
-									} else if (var34 > 255) { // L: 618
-										var34 = 255;
-									}
-
-									var31 = WorldMapElement.hslToRgb(var32, var33, var34); // L: 619
-								}
-
-								if (var2 > 0) { // L: 621
-									boolean var47 = true; // L: 622
-									if (var20 == 0 && class20.field182[var2][var11][var17] != 0) { // L: 623
-										var47 = false;
-									}
-
-									if (var21 > 0 && !SoundSystem.method807(var21 - 1).hideUnderlay) { // L: 624
-										var47 = false;
-									}
-
-									if (var47 && var22 == var23 && var24 == var22 && var25 == var22) { // L: 625 626
-										var10000 = UrlRequester.field1419[var2][var11];
-										var10000[var17] |= 2340;
-									}
-								}
-
-								var32 = 0; // L: 629
-								if (var31 != -1) { // L: 630
-									var32 = Rasterizer3D.Rasterizer3D_colorPalette[HealthBarDefinition.method2728(var31, 96)];
-								}
-
-								if (var21 == 0) { // L: 631
-									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, HealthBarDefinition.method2728(var30, var26), HealthBarDefinition.method2728(var30, var27), HealthBarDefinition.method2728(var30, var28), HealthBarDefinition.method2728(var30, var29), 0, 0, 0, 0, var32, 0); // L: 632
-								} else {
-									var33 = class20.field182[var2][var11][var17] + 1; // L: 635
-									byte var48 = DirectByteArrayCopier.field3128[var2][var11][var17]; // L: 636
-									FloorOverlayDefinition var35 = SoundSystem.method807(var21 - 1); // L: 637
-									int var36 = var35.texture; // L: 638
-									int var37;
-									int var38;
-									int var39;
-									int var40;
-									if (var36 >= 0) { // L: 641
-										var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 642
-										var37 = -1; // L: 643
-									} else if (var35.primaryRgb == 16711935) { // L: 646
-										var37 = -2; // L: 647
-										var36 = -1; // L: 648
-										var38 = -2; // L: 649
-									} else {
-										var37 = WorldMapElement.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 652
-										var39 = var35.hue + Tiles.field1130 & 255; // L: 653
-										var40 = var35.lightness + Tiles.field1131; // L: 654
-										if (var40 < 0) { // L: 655
-											var40 = 0;
-										} else if (var40 > 255) { // L: 656
-											var40 = 255;
-										}
-
-										var38 = WorldMapElement.hslToRgb(var39, var35.saturation, var40); // L: 657
-									}
-
-									var39 = 0; // L: 660
-									if (var38 != -2) { // L: 661
-										var39 = Rasterizer3D.Rasterizer3D_colorPalette[class26.method272(var38, 96)];
-									}
-
-									if (var35.secondaryRgb != -1) { // L: 662
-										var40 = var35.secondaryHue + Tiles.field1130 & 255; // L: 663
-										int var41 = var35.secondaryLightness + Tiles.field1131; // L: 664
-										if (var41 < 0) { // L: 665
-											var41 = 0;
-										} else if (var41 > 255) { // L: 666
-											var41 = 255;
-										}
-
-										var38 = WorldMapElement.hslToRgb(var40, var35.secondarySaturation, var41); // L: 667
-										var39 = Rasterizer3D.Rasterizer3D_colorPalette[class26.method272(var38, 96)]; // L: 668
-									}
-
-									var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, HealthBarDefinition.method2728(var30, var26), HealthBarDefinition.method2728(var30, var27), HealthBarDefinition.method2728(var30, var28), HealthBarDefinition.method2728(var30, var29), class26.method272(var37, var26), class26.method272(var37, var27), class26.method272(var37, var28), class26.method272(var37, var29), var32, var39); // L: 670
-								}
-							}
-						}
-					}
-				}
-			}
-
-			for (var11 = 1; var11 < 103; ++var11) { // L: 677
-				for (var12 = 1; var12 < 103; ++var12) { // L: 678
-					if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 685
-						var17 = 0; // L: 686
-					} else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 689
-						var17 = var2 - 1; // L: 690
-					} else {
-						var17 = var2; // L: 693
-					}
-
-					var0.setTileMinPlane(var2, var12, var11, var17); // L: 695
-				}
-			}
-
-			Tiles.field1120[var2] = null; // L: 698
-			class253.field3130[var2] = null; // L: 699
-			class20.field182[var2] = null; // L: 700
-			DirectByteArrayCopier.field3128[var2] = null; // L: 701
-			class372.field4123[var2] = null; // L: 702
-		}
-
-		var0.method3955(-50, -10, -50); // L: 704
-
-		for (var2 = 0; var2 < 104; ++var2) { // L: 705
-			for (var3 = 0; var3 < 104; ++var3) { // L: 706
-				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 707
-					var0.setLinkBelow(var2, var3);
-				}
-			}
-		}
-
-		var2 = 1; // L: 710
-		var3 = 2; // L: 711
-		var4 = 4; // L: 712
-
-		for (var5 = 0; var5 < 4; ++var5) { // L: 713
-			if (var5 > 0) { // L: 714
-				var2 <<= 3; // L: 715
-				var3 <<= 3; // L: 716
-				var4 <<= 3; // L: 717
-			}
-
-			for (int var6 = 0; var6 <= var5; ++var6) { // L: 719
-				for (int var7 = 0; var7 <= 104; ++var7) { // L: 720
-					for (int var8 = 0; var8 <= 104; ++var8) { // L: 721
-						short var46;
-						if ((UrlRequester.field1419[var6][var8][var7] & var2) != 0) { // L: 722
-							var9 = var7; // L: 723
-							var10 = var7; // L: 724
-							var11 = var6; // L: 725
-
-							for (var12 = var6; var9 > 0 && (UrlRequester.field1419[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 726 727
-							}
-
-							while (var10 < 104 && (UrlRequester.field1419[var6][var8][var10 + 1] & var2) != 0) { // L: 728
-								++var10;
-							}
-
-							label438:
-							while (var11 > 0) { // L: 729
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 730
-									if ((UrlRequester.field1419[var11 - 1][var8][var13] & var2) == 0) {
-										break label438;
-									}
-								}
-
-								--var11; // L: 731
-							}
-
-							label427:
-							while (var12 < var5) { // L: 733
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 734
-									if ((UrlRequester.field1419[var12 + 1][var8][var13] & var2) == 0) {
-										break label427;
-									}
-								}
-
-								++var12; // L: 735
-							}
-
-							var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 737
-							if (var13 >= 8) { // L: 738
-								var46 = 240; // L: 739
-								var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; // L: 740
-								var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 741
-								Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 742
-
-								for (var17 = var11; var17 <= var12; ++var17) { // L: 743
-									for (var18 = var9; var18 <= var10; ++var18) { // L: 744
-										var10000 = UrlRequester.field1419[var17][var8];
-										var10000[var18] &= ~var2;
-									}
-								}
-							}
-						}
-
-						if ((UrlRequester.field1419[var6][var8][var7] & var3) != 0) { // L: 748
-							var9 = var8; // L: 749
-							var10 = var8; // L: 750
-							var11 = var6; // L: 751
-
-							for (var12 = var6; var9 > 0 && (UrlRequester.field1419[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 752 753
-							}
-
-							while (var10 < 104 && (UrlRequester.field1419[var6][var10 + 1][var7] & var3) != 0) { // L: 754
-								++var10;
-							}
-
-							label491:
-							while (var11 > 0) { // L: 755
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 756
-									if ((UrlRequester.field1419[var11 - 1][var13][var7] & var3) == 0) {
-										break label491;
-									}
-								}
-
-								--var11; // L: 757
-							}
-
-							label480:
-							while (var12 < var5) { // L: 759
-								for (var13 = var9; var13 <= var10; ++var13) { // L: 760
-									if ((UrlRequester.field1419[var12 + 1][var13][var7] & var3) == 0) {
-										break label480;
-									}
-								}
-
-								++var12; // L: 761
-							}
-
-							var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 763
-							if (var13 >= 8) { // L: 764
-								var46 = 240; // L: 765
-								var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; // L: 766
-								var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 767
-								Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 768
-
-								for (var17 = var11; var17 <= var12; ++var17) { // L: 769
-									for (var18 = var9; var18 <= var10; ++var18) { // L: 770
-										var10000 = UrlRequester.field1419[var17][var18];
-										var10000[var7] &= ~var3;
-									}
-								}
-							}
-						}
-
-						if ((UrlRequester.field1419[var6][var8][var7] & var4) != 0) { // L: 774
-							var9 = var8; // L: 775
-							var10 = var8; // L: 776
-							var11 = var7; // L: 777
-
-							for (var12 = var7; var11 > 0 && (UrlRequester.field1419[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 778 779
-							}
-
-							while (var12 < 104 && (UrlRequester.field1419[var6][var8][var12 + 1] & var4) != 0) { // L: 780
-								++var12;
-							}
-
-							label544:
-							while (var9 > 0) { // L: 781
-								for (var13 = var11; var13 <= var12; ++var13) { // L: 782
-									if ((UrlRequester.field1419[var6][var9 - 1][var13] & var4) == 0) {
-										break label544;
-									}
-								}
-
-								--var9; // L: 783
-							}
-
-							label533:
-							while (var10 < 104) { // L: 785
-								for (var13 = var11; var13 <= var12; ++var13) { // L: 786
-									if ((UrlRequester.field1419[var6][var10 + 1][var13] & var4) == 0) {
-										break label533;
-									}
-								}
-
-								++var10; // L: 787
-							}
-
-							if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 789
-								var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 790
-								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 791
-
-								for (var14 = var9; var14 <= var10; ++var14) { // L: 792
-									for (var15 = var11; var15 <= var12; ++var15) { // L: 793
-										var10000 = UrlRequester.field1419[var6][var14];
-										var10000[var15] &= ~var4;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-	} // L: 801
-
-	@ObfuscatedName("d")
+	@ObfuscatedName("an")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-1692198232"
+		garbageValue = "-148102361"
 	)
-	@Export("Messages_getLastChatID")
-	static int Messages_getLastChatID(int var0) {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 73
-		if (var1 == null) { // L: 74
-			return -1;
-		} else {
-			return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 75 76
-		}
+	static int method258(int var0) {
+		return (int)((Math.log((double)var0) / Interpreter.field959 - 7.0D) * 256.0D); // L: 3567
 	}
 
-	@ObfuscatedName("ft")
+	@ObfuscatedName("hw")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "12"
+		descriptor = "(I)V",
+		garbageValue = "614337343"
 	)
-	static void method209(int var0, int var1) {
-		int[] var2 = new int[9]; // L: 1511
+	static final void method261() {
+		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7351 7352 7395
+			if (var0.hitpoints > 0) { // L: 7353
+				--var0.hitpoints;
+			}
 
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 1512
-			int var4 = var3 * 32 + 15 + 128; // L: 1513
-			int var5 = SecureRandomFuture.method1980(var4); // L: 1514
-			int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 1515
-			var5 = WorldMapDecoration.method3627(var5, var1); // L: 1516
-			var2[var3] = var6 * var5 >> 16; // L: 1517
+			boolean var1;
+			int var2;
+			int var3;
+			ObjectComposition var4;
+			if (var0.hitpoints == 0) { // L: 7354
+				if (var0.objectId >= 0) { // L: 7356
+					var2 = var0.objectId; // L: 7358
+					var3 = var0.field1210; // L: 7359
+					var4 = Tiles.getObjectDefinition(var2); // L: 7361
+					if (var3 == 11) { // L: 7362
+						var3 = 10;
+					}
+
+					if (var3 >= 5 && var3 <= 8) { // L: 7363
+						var3 = 4;
+					}
+
+					var1 = var4.method3019(var3); // L: 7364
+					if (!var1) { // L: 7366
+						continue;
+					}
+				}
+
+				WorldMapEvent.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field1209, var0.field1210); // L: 7368
+				var0.remove(); // L: 7369
+			} else {
+				if (var0.delay > 0) { // L: 7373
+					--var0.delay;
+				}
+
+				if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102) { // L: 7374
+					if (var0.id >= 0) { // L: 7376
+						var2 = var0.id; // L: 7378
+						var3 = var0.field1213; // L: 7379
+						var4 = Tiles.getObjectDefinition(var2); // L: 7381
+						if (var3 == 11) { // L: 7382
+							var3 = 10;
+						}
+
+						if (var3 >= 5 && var3 <= 8) { // L: 7383
+							var3 = 4;
+						}
+
+						var1 = var4.method3019(var3); // L: 7384
+						if (!var1) { // L: 7386
+							continue;
+						}
+					}
+
+					WorldMapEvent.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field1213); // L: 7388
+					var0.delay = -1; // L: 7389
+					if (var0.id == var0.objectId && var0.objectId == -1) { // L: 7390
+						var0.remove();
+					} else if (var0.id == var0.objectId && var0.field1209 == var0.orientation && var0.field1210 == var0.field1213) { // L: 7391
+						var0.remove();
+					}
+				}
+			}
 		}
 
-		Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); // L: 1519
-	} // L: 1520
-
-	@ObfuscatedName("ka")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Lcu;",
-		garbageValue = "1899538302"
-	)
-	static final InterfaceParent method208(int var0, int var1, int var2) {
-		InterfaceParent var3 = new InterfaceParent(); // L: 11042
-		var3.group = var1; // L: 11043
-		var3.type = var2; // L: 11044
-		Client.interfaceParents.put(var3, (long)var0); // L: 11045
-		class21.Widget_resetModelFrames(var1); // L: 11046
-		Widget var4 = Frames.getWidget(var0); // L: 11047
-		WorldMapCacheName.invalidateWidget(var4); // L: 11048
-		if (Client.meslayerContinueWidget != null) { // L: 11049
-			WorldMapCacheName.invalidateWidget(Client.meslayerContinueWidget); // L: 11050
-			Client.meslayerContinueWidget = null; // L: 11051
-		}
-
-		class7.method68(); // L: 11053
-		class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 11054
-		FloorDecoration.runWidgetOnLoadListener(var1); // L: 11055
-		if (Client.rootInterface != -1) { // L: 11056
-			Login.runIntfCloseListeners(Client.rootInterface, 1);
-		}
-
-		return var3; // L: 11057
-	}
+	} // L: 7397
 }
diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java
index dc31f96ecb..248836e0b9 100644
--- a/runescape-client/src/main/java/class170.java
+++ b/runescape-client/src/main/java/class170.java
@@ -1,64 +1,171 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fg")
-public class class170 {
-	@ObfuscatedName("hj")
-	@ObfuscatedSignature(
-		descriptor = "[Loh;"
+@ObfuscatedName("fb")
+public class class170 implements WorldMapSection {
+	@ObfuscatedName("qo")
+	static boolean field2016;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -1070894697
 	)
-	@Export("mapDotSprites")
-	static SpritePixels[] mapDotSprites;
+	int field2015;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -2078857995
+	)
+	int field2013;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -492732977
+	)
+	int field2014;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 748081581
+	)
+	int field2012;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -522763659
+	)
+	int field2023;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = -1748963509
+	)
+	int field2017;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1793396217
+	)
+	int field2018;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 589577767
+	)
+	int field2019;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -724496135
+	)
+	int field2020;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 1652929447
+	)
+	int field2021;
+
+	class170() {
+	} // L: 18
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lfa;B)V",
+		garbageValue = "120"
+	)
+	@Export("expandBounds")
+	public void expandBounds(WorldMapArea var1) {
+		if (var1.regionLowX > this.field2023) { // L: 21
+			var1.regionLowX = this.field2023;
+		}
+
+		if (var1.regionHighX < this.field2023) {
+			var1.regionHighX = this.field2023; // L: 22
+		}
+
+		if (var1.regionLowY > this.field2017) { // L: 23
+			var1.regionLowY = this.field2017;
+		}
+
+		if (var1.regionHighY < this.field2017) { // L: 24
+			var1.regionHighY = this.field2017;
+		}
+
+	} // L: 25
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)Z",
+		garbageValue = "-2105423832"
+	)
+	@Export("containsCoord")
+	public boolean containsCoord(int var1, int var2, int var3) {
+		if (var1 >= this.field2015 && var1 < this.field2013 + this.field2015) { // L: 28
+			return var2 >= (this.field2014 << 6) + (this.field2018 << 3) && var2 <= (this.field2014 << 6) + (this.field2018 << 3) + 7 && var3 >= (this.field2012 << 6) + (this.field2019 << 3) && var3 <= (this.field2012 << 6) + (this.field2019 << 3) + 7; // L: 31
+		} else {
+			return false; // L: 29
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(III)Z",
+		garbageValue = "-173753307"
+	)
+	@Export("containsPosition")
+	public boolean containsPosition(int var1, int var2) {
+		return var1 >= (this.field2023 << 6) + (this.field2020 << 3) && var1 <= (this.field2023 << 6) + (this.field2020 << 3) + 7 && var2 >= (this.field2017 << 6) + (this.field2021 << 3) && var2 <= (this.field2017 << 6) + (this.field2021 << 3) + 7; // L: 35
+	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(II)Z",
-		garbageValue = "1604021821"
+		descriptor = "(IIII)[I",
+		garbageValue = "2086451205"
 	)
-	public static boolean method3552(int var0) {
-		return (var0 >> 20 & 1) != 0; // L: 21
+	@Export("getBorderTileLengths")
+	public int[] getBorderTileLengths(int var1, int var2, int var3) {
+		if (!this.containsCoord(var1, var2, var3)) { // L: 39
+			return null; // L: 40
+		} else {
+			int[] var4 = new int[]{var2 + (this.field2023 * 64 - this.field2014 * 64) + (this.field2020 * 8 - this.field2018 * 8), var3 + (this.field2017 * 64 - this.field2012 * 64) + (this.field2021 * 8 - this.field2019 * 8)}; // L: 42 43 44
+			return var4; // L: 45
+		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
+		descriptor = "(IIB)Liw;",
+		garbageValue = "-36"
 	)
-	static void method3551() {
-		Login.loginIndex = 24; // L: 1648
-		class260.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1649
-	} // L: 1650
+	@Export("coord")
+	public Coord coord(int var1, int var2) {
+		if (!this.containsPosition(var1, var2)) { // L: 49
+			return null; // L: 50
+		} else {
+			int var3 = this.field2014 * 64 - this.field2023 * 64 + (this.field2018 * 8 - this.field2020 * 8) + var1; // L: 52
+			int var4 = var2 + (this.field2012 * 64 - this.field2017 * 64) + (this.field2019 * 8 - this.field2021 * 8); // L: 53
+			return new Coord(this.field2015, var3, var4); // L: 54
+		}
+	}
 
-	@ObfuscatedName("jj")
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "1313413902"
+	)
+	@Export("read")
+	public void read(Buffer var1) {
+		this.field2015 = var1.readUnsignedByte(); // L: 58
+		this.field2013 = var1.readUnsignedByte(); // L: 59
+		this.field2014 = var1.readUnsignedShort(); // L: 60
+		this.field2018 = var1.readUnsignedByte(); // L: 61
+		this.field2012 = var1.readUnsignedShort(); // L: 62
+		this.field2019 = var1.readUnsignedByte(); // L: 63
+		this.field2023 = var1.readUnsignedShort(); // L: 64
+		this.field2020 = var1.readUnsignedByte(); // L: 65
+		this.field2017 = var1.readUnsignedShort(); // L: 66
+		this.field2021 = var1.readUnsignedByte(); // L: 67
+		this.method3591(); // L: 68
+	} // L: 69
+
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "1716136591"
+		garbageValue = "-1129174695"
 	)
-	static void method3554() {
-		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 10798
-			int var1 = var0.group; // L: 10799
-			if (Clock.loadInterface(var1)) { // L: 10800
-				boolean var2 = true; // L: 10801
-				Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 10802
-
-				int var4;
-				for (var4 = 0; var4 < var3.length; ++var4) { // L: 10803
-					if (var3[var4] != null) { // L: 10804
-						var2 = var3[var4].isIf3; // L: 10805
-						break;
-					}
-				}
-
-				if (!var2) { // L: 10809
-					var4 = (int)var0.key; // L: 10810
-					Widget var5 = Frames.getWidget(var4); // L: 10811
-					if (var5 != null) { // L: 10812
-						WorldMapCacheName.invalidateWidget(var5);
-					}
-				}
-			}
-		}
-
-	} // L: 10816
+	void method3591() {
+	} // L: 71
 }
diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java
new file mode 100644
index 0000000000..a8fe37ca56
--- /dev/null
+++ b/runescape-client/src/main/java/class171.java
@@ -0,0 +1,185 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("fp")
+public class class171 {
+	@ObfuscatedName("hd")
+	@ObfuscatedSignature(
+		descriptor = "[Loa;"
+	)
+	@Export("mapDotSprites")
+	static SpritePixels[] mapDotSprites;
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IIII)I",
+		garbageValue = "-592340813"
+	)
+	public static int method3614(int var0, int var1, int var2) {
+		var2 &= 3;
+		if (var2 == 0) {
+			return var1;
+		} else if (var2 == 1) {
+			return 7 - var0;
+		} else {
+			return var2 == 2 ? 7 - var1 : var0;
+		}
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(DDII)[D",
+		garbageValue = "-1088637460"
+	)
+	public static double[] method3616(double var0, double var2, int var4) {
+		int var5 = var4 * 2 + 1; // L: 17
+		double[] var6 = new double[var5]; // L: 18
+		int var7 = -var4;
+
+		for (int var8 = 0; var7 <= var4; ++var8) {
+			var6[var8] = CollisionMap.method3213((double)var7, var0, var2); // L: 20
+			++var7; // L: 19
+		}
+
+		return var6; // L: 22
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(IIILez;II)V",
+		garbageValue = "671627265"
+	)
+	static void method3612(int var0, int var1, int var2, ObjectComposition var3, int var4) {
+		ObjectSound var5 = new ObjectSound(); // L: 59
+		var5.plane = var0; // L: 60
+		var5.x = var1 * 128; // L: 61
+		var5.y = var2 * 128; // L: 62
+		int var6 = var3.sizeX; // L: 63
+		int var7 = var3.sizeY; // L: 64
+		if (var4 == 1 || var4 == 3) { // L: 65
+			var6 = var3.sizeY; // L: 66
+			var7 = var3.sizeX; // L: 67
+		}
+
+		var5.field937 = (var6 + var1) * 128; // L: 69
+		var5.field944 = (var7 + var2) * 128; // L: 70
+		var5.soundEffectId = var3.ambientSoundId; // L: 71
+		var5.field939 = var3.field1801 * 128; // L: 72
+		var5.field941 = var3.int5; // L: 73
+		var5.field943 = var3.int6; // L: 74
+		var5.soundEffectIds = var3.soundEffectIds; // L: 75
+		if (var3.transforms != null) { // L: 76
+			var5.obj = var3; // L: 77
+			var5.set(); // L: 78
+		}
+
+		ObjectSound.objectSounds.addFirst(var5); // L: 80
+		if (var5.soundEffectIds != null) { // L: 81
+			var5.field945 = var5.field941 + (int)(Math.random() * (double)(var5.field943 - var5.field941));
+		}
+
+	} // L: 82
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(I)[I",
+		garbageValue = "1022341437"
+	)
+	public static int[] method3615() {
+		int[] var0 = new int[KeyHandler.field271]; // L: 249
+
+		for (int var1 = 0; var1 < KeyHandler.field271; ++var1) { // L: 250
+			var0[var1] = KeyHandler.field257[var1]; // L: 251
+		}
+
+		return var0; // L: 253
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1497317992"
+	)
+	public static void method3613() {
+		HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 177
+		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 178
+		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 179
+	} // L: 180
+
+	@ObfuscatedName("gv")
+	@ObfuscatedSignature(
+		descriptor = "(B)Z",
+		garbageValue = "81"
+	)
+	static boolean method3611() {
+		return (Client.drawPlayerNames & 4) != 0; // L: 4856
+	}
+
+	@ObfuscatedName("hl")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-68"
+	)
+	static final void method3610() {
+		PacketBuffer var0 = Client.packetWriter.packetBuffer; // L: 7678
+		var0.importIndex(); // L: 7679
+		int var1 = var0.readBits(8); // L: 7680
+		int var2;
+		if (var1 < Client.npcCount) { // L: 7681
+			for (var2 = var1; var2 < Client.npcCount; ++var2) { // L: 7682
+				Client.field859[++Client.field783 - 1] = Client.npcIndices[var2];
+			}
+		}
+
+		if (var1 > Client.npcCount) { // L: 7684
+			throw new RuntimeException("");
+		} else {
+			Client.npcCount = 0; // L: 7685
+
+			for (var2 = 0; var2 < var1; ++var2) { // L: 7686
+				int var3 = Client.npcIndices[var2]; // L: 7687
+				NPC var4 = Client.npcs[var3]; // L: 7688
+				int var5 = var0.readBits(1); // L: 7689
+				if (var5 == 0) { // L: 7690
+					Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7691
+					var4.npcCycle = Client.cycle; // L: 7692
+				} else {
+					int var6 = var0.readBits(2); // L: 7695
+					if (var6 == 0) { // L: 7696
+						Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7697
+						var4.npcCycle = Client.cycle; // L: 7698
+						Client.field763[++Client.field636 - 1] = var3; // L: 7699
+					} else {
+						int var7;
+						int var8;
+						if (var6 == 1) { // L: 7702
+							Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7703
+							var4.npcCycle = Client.cycle; // L: 7704
+							var7 = var0.readBits(3); // L: 7705
+							var4.method2343(var7, (byte)1); // L: 7706
+							var8 = var0.readBits(1); // L: 7707
+							if (var8 == 1) { // L: 7708
+								Client.field763[++Client.field636 - 1] = var3;
+							}
+						} else if (var6 == 2) { // L: 7711
+							Client.npcIndices[++Client.npcCount - 1] = var3; // L: 7712
+							var4.npcCycle = Client.cycle; // L: 7713
+							var7 = var0.readBits(3); // L: 7714
+							var4.method2343(var7, (byte)2); // L: 7715
+							var8 = var0.readBits(3); // L: 7716
+							var4.method2343(var8, (byte)2); // L: 7717
+							int var9 = var0.readBits(1); // L: 7718
+							if (var9 == 1) {
+								Client.field763[++Client.field636 - 1] = var3; // L: 7719
+							}
+						} else if (var6 == 3) { // L: 7722
+							Client.field859[++Client.field783 - 1] = var3; // L: 7723
+						}
+					}
+				}
+			}
+
+		}
+	} // L: 7727
+}
diff --git a/runescape-client/src/main/java/class179.java b/runescape-client/src/main/java/class179.java
deleted file mode 100644
index dd0a073de8..0000000000
--- a/runescape-client/src/main/java/class179.java
+++ /dev/null
@@ -1,139 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("fn")
-public class class179 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lfn;"
-	)
-	static final class179 field2100;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lfn;"
-	)
-	static final class179 field2099;
-	@ObfuscatedName("ek")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive19")
-	static Archive archive19;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 1748165695
-	)
-	@Export("value")
-	final int value;
-
-	static {
-		field2100 = new class179(0); // L: 4
-		field2099 = new class179(1); // L: 5
-	}
-
-	class179(int var1) {
-		this.value = var1; // L: 9
-	} // L: 10
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljp;II)V",
-		garbageValue = "-2058248289"
-	)
-	static void method3633(Archive var0, int var1) {
-		if (class125.NetCache_reference != null) { // L: 60
-			class125.NetCache_reference.offset = var1 * 8 + 5; // L: 61
-			int var2 = class125.NetCache_reference.readInt(); // L: 62
-			int var3 = class125.NetCache_reference.readInt(); // L: 63
-			var0.loadIndex(var2, var3); // L: 64
-		} else {
-			DirectByteArrayCopier.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 67
-			NetCache.NetCache_archives[var1] = var0; // L: 68
-		}
-	} // L: 65 69
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljv;ZII)V",
-		garbageValue = "-905944907"
-	)
-	static void method3634(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-		if (Login.clearLoginScreen) { // L: 128
-			if (var3 == 4) { // L: 129
-				Login.loginIndex = 4; // L: 130
-			}
-
-		} else {
-			Login.loginIndex = var3; // L: 134
-			Rasterizer2D.Rasterizer2D_clear(); // L: 135
-			byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 136
-			Login.leftTitleSprite = ParamComposition.convertJpgToSprite(var4); // L: 137
-			class20.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); // L: 138
-			GrandExchangeOfferAgeComparator.method5068(var1, Client.worldProperties); // L: 139
-			class260.titleboxSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 140
-			Login.titlebuttonSprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 141
-			int var6 = var1.getGroupId("runes"); // L: 144
-			int var7 = var1.getFileId(var6, ""); // L: 145
-			IndexedSprite[] var5 = VerticalAlignment.method2799(var1, var6, var7); // L: 146
-			Login.runesSprite = var5; // L: 148
-			var7 = var1.getGroupId("title_mute"); // L: 151
-			int var8 = var1.getFileId(var7, ""); // L: 152
-			IndexedSprite[] var9 = VerticalAlignment.method2799(var1, var7, var8); // L: 153
-			Decimator.title_muteSprite = var9; // L: 155
-			FriendSystem.options_buttons_0Sprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 156
-			Decimator.field553 = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 157
-			GrandExchangeOffer.options_buttons_2Sprite = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 158
-			ClanChannel.field33 = EnumComposition.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 159
-			Skeleton.field2287 = FriendSystem.options_buttons_0Sprite.subWidth; // L: 160
-			WorldMapIcon_1.field1937 = FriendSystem.options_buttons_0Sprite.subHeight; // L: 161
-			class24.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); // L: 162
-			if (var2) { // L: 163
-				Login.Login_username = ""; // L: 164
-				Login.Login_password = ""; // L: 165
-			}
-
-			class5.field53 = 0; // L: 167
-			Varps.otp = ""; // L: 168
-			Login.field1043 = true; // L: 169
-			Login.worldSelectOpen = false; // L: 170
-			if (!ObjectComposition.clientPreferences.titleMusicDisabled) { // L: 171
-				class6.method60(2, UrlRequest.archive6, "scape main", "", 255, false);
-			} else {
-				class159.method3192(2); // L: 172
-			}
-
-			StudioGame.method4847(false); // L: 173
-			Login.clearLoginScreen = true; // L: 174
-			Login.xPadding = (class32.canvasWidth - 765) / 2; // L: 175
-			Login.loginBoxX = Login.xPadding + 202; // L: 176
-			UserComparator4.loginBoxCenter = Login.loginBoxX + 180; // L: 177
-			Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 178
-			class20.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 179
-			Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 180
-		}
-	} // L: 132 181
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIS)I",
-		garbageValue = "4030"
-	)
-	public static int method3635(int var0, int var1, int var2, int var3, int var4, int var5) {
-		if ((var5 & 1) == 1) { // L: 17
-			int var6 = var3; // L: 18
-			var3 = var4; // L: 19
-			var4 = var6; // L: 20
-		}
-
-		var2 &= 3; // L: 22
-		if (var2 == 0) { // L: 23
-			return var1;
-		} else if (var2 == 1) { // L: 24
-			return 7 - var0 - (var3 - 1);
-		} else {
-			return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 25
-		}
-	}
-}
diff --git a/runescape-client/src/main/java/class18.java b/runescape-client/src/main/java/class18.java
index e646c4556d..d05efccdb8 100644
--- a/runescape-client/src/main/java/class18.java
+++ b/runescape-client/src/main/java/class18.java
@@ -1,113 +1,226 @@
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("m")
+@ObfuscatedName("q")
 public class class18 extends class14 {
-	@ObfuscatedName("rf")
-	@ObfuscatedGetter(
-		intValue = -1469899117
+	@ObfuscatedName("de")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
 	)
-	static int field153;
-	@ObfuscatedName("re")
-	@ObfuscatedGetter(
-		intValue = 1439588607
-	)
-	static int field156;
+	@Export("archive3")
+	static Archive archive3;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = -6310115608975141981L
+		intValue = 1954969381
 	)
-	public static long field159;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = 393303047
-	)
-	@Export("musicTrackFileId")
-	public static int musicTrackFileId;
-	@ObfuscatedName("br")
-	@ObfuscatedSignature(
-		descriptor = "[Lop;"
-	)
-	@Export("worldSelectStars")
-	static IndexedSprite[] worldSelectStars;
-	@ObfuscatedName("gj")
-	@Export("regionLandArchives")
-	static byte[][] regionLandArchives;
-	@ObfuscatedName("jm")
-	@ObfuscatedSignature(
-		descriptor = "Lio;"
-	)
-	@Export("hoveredItemContainer")
-	static Widget hoveredItemContainer;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -918629571
-	)
-	int field157;
-	@ObfuscatedName("n")
-	boolean field150;
+	int field144;
+	@ObfuscatedName("e")
+	boolean field145;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class18(class2 var1) {
 		this.this$0 = var1;
-		this.field157 = -1; // L: 178
+		this.field144 = -1; // L: 178
 	} // L: 181
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
-	)
-	void vmethod276(Buffer var1) {
-		this.field157 = var1.readUnsignedShort(); // L: 184
-		this.field150 = var1.readUnsignedByte() == 1; // L: 185
-	} // L: 186
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
-	)
-	void vmethod281(ClanSettings var1) {
-		var1.method110(this.field157, this.field150); // L: 189
-	} // L: 190
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "-52"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	public static int method213(int var0) {
-		return var0 >> 17 & 7; // L: 17
+	void vmethod363(Buffer var1) {
+		this.field144 = var1.readUnsignedShort(); // L: 184
+		this.field145 = var1.readUnsignedByte() == 1; // L: 185
+	} // L: 186
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
+	)
+	void vmethod354(ClanSettings var1) {
+		var1.method133(this.field144, this.field145); // L: 189
+	} // L: 190
+
+	@ObfuscatedName("f")
+	public static final void method272(long var0) {
+		if (var0 > 0L) { // L: 9
+			if (var0 % 10L == 0L) { // L: 10
+				long var2 = var0 - 1L; // L: 11
+
+				try {
+					Thread.sleep(var2); // L: 14
+				} catch (InterruptedException var8) { // L: 16
+				}
+
+				try {
+					Thread.sleep(1L); // L: 20
+				} catch (InterruptedException var7) { // L: 22
+				}
+			} else {
+				try {
+					Thread.sleep(var0); // L: 27
+				} catch (InterruptedException var6) { // L: 29
+				}
+			}
+
+		}
+	} // L: 31
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/awt/Component;I)V",
+		garbageValue = "-118293038"
+	)
+	static void method275(Component var0) {
+		var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 161
+		var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 162
+		KeyHandler.field268 = -1; // L: 163
+	} // L: 164
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Z",
+		garbageValue = "4"
+	)
+	public static boolean method271(int var0) {
+		return var0 >= 0 && var0 < 112 ? KeyHandler.KeyHandler_pressedKeys[var0] : false; // L: 239 240
 	}
 
-	@ObfuscatedName("kn")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(IIZB)V",
-		garbageValue = "-41"
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1866300199"
 	)
-	static final void method216(int var0, int var1, boolean var2) {
-		if (Client.currentClanChannels[var0] != null) { // L: 11343
-			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method27()) { // L: 11344
-				ClanChannelMember var3 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11345
-				PacketWriter var4 = Client.packetWriter; // L: 11346
-				PacketBufferNode var5 = class21.getPacketBufferNode(ClientPacket.field2607, var4.isaacCipher); // L: 11347
-				var5.packetBuffer.writeByte(4 + Tiles.stringCp1252NullTerminatedByteSize(var3.name)); // L: 11348
-				var5.packetBuffer.writeByte(var0); // L: 11349
-				var5.packetBuffer.writeShort(var1); // L: 11350
-				var5.packetBuffer.writeBoolean(var2); // L: 11351
-				var5.packetBuffer.writeStringCp1252NullTerminated(var3.name); // L: 11352
-				var4.addNode(var5); // L: 11353
+	static int method262(int var0, Script var1, boolean var2) {
+		int var3;
+		int var6;
+		int var9;
+		if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 2015
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 2016
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2017
+			var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2018
+			EnumComposition var10 = TextureProvider.getEnum(var3); // L: 2019
+			if (var10.outputType != 's') { // L: 2020
+			}
+
+			for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 2021
+				if (var9 == var10.keys[var6]) { // L: 2022
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 2023
+					var10 = null; // L: 2024
+					break;
+				}
+			}
+
+			if (var10 != null) { // L: 2028
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var10.defaultStr;
+			}
+
+			return 1; // L: 2029
+		} else if (var0 != ScriptOpcodes.ENUM) { // L: 2031
+			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 2057
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2058
+				EnumComposition var4 = TextureProvider.getEnum(var3); // L: 2059
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.size(); // L: 2060
+				return 1; // L: 2061
+			} else {
+				return 2; // L: 2063
+			}
+		} else {
+			ChatChannel.Interpreter_intStackSize -= 4; // L: 2032
+			var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2033
+			var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2034
+			int var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2035
+			var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 2036
+			EnumComposition var7 = TextureProvider.getEnum(var5); // L: 2037
+			if (var3 == var7.inputType && var9 == var7.outputType) { // L: 2038
+				for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 2043
+					if (var6 == var7.keys[var8]) { // L: 2044
+						if (var9 == 115) { // L: 2045
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.strVals[var8];
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 2046
+						}
+
+						var7 = null; // L: 2047
+						break;
+					}
+				}
+
+				if (var7 != null) { // L: 2051
+					if (var9 == 115) {
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.defaultStr; // L: 2052
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 2053
+					}
+				}
+
+				return 1; // L: 2055
+			} else {
+				if (var9 == 115) { // L: 2039
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = "null";
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2040
+				}
+
+				return 1; // L: 2041
 			}
 		}
-	} // L: 11354
+	}
+
+	@ObfuscatedName("ja")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;IIIIIII)V",
+		garbageValue = "1257309508"
+	)
+	static final void method273(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+		if (Client.field689) { // L: 10001
+			Client.alternativeScrollbarWidth = 32;
+		} else {
+			Client.alternativeScrollbarWidth = 0; // L: 10002
+		}
+
+		Client.field689 = false; // L: 10003
+		int var7;
+		if (MouseHandler.MouseHandler_currentButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 10004
+			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 10005
+				var0.scrollY -= 4; // L: 10006
+				Script.invalidateWidget(var0); // L: 10007
+			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 10009
+				var0.scrollY += 4; // L: 10010
+				Script.invalidateWidget(var0); // L: 10011
+			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 10013
+				var7 = var3 * (var3 - 32) / var4; // L: 10014
+				if (var7 < 8) { // L: 10015
+					var7 = 8;
+				}
+
+				int var8 = var6 - var2 - 16 - var7 / 2; // L: 10016
+				int var9 = var3 - 32 - var7; // L: 10017
+				var0.scrollY = var8 * (var4 - var3) / var9; // L: 10018
+				Script.invalidateWidget(var0); // L: 10019
+				Client.field689 = true; // L: 10020
+			}
+		}
+
+		if (Client.mouseWheelRotation != 0) { // L: 10023
+			var7 = var0.width; // L: 10024
+			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 10025
+				var0.scrollY += Client.mouseWheelRotation * 45; // L: 10026
+				Script.invalidateWidget(var0); // L: 10027
+			}
+		}
+
+	} // L: 10030
 }
diff --git a/runescape-client/src/main/java/class180.java b/runescape-client/src/main/java/class180.java
new file mode 100644
index 0000000000..a9975c5c1a
--- /dev/null
+++ b/runescape-client/src/main/java/class180.java
@@ -0,0 +1,33 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("fz")
+public class class180 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lfz;"
+	)
+	static final class180 field2102;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lfz;"
+	)
+	static final class180 field2103;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1733060335
+	)
+	@Export("value")
+	final int value;
+
+	static {
+		field2102 = new class180(0); // L: 4
+		field2103 = new class180(1); // L: 5
+	}
+
+	class180(int var1) {
+		this.value = var1; // L: 9
+	} // L: 10
+}
diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java
new file mode 100644
index 0000000000..105c39e1c0
--- /dev/null
+++ b/runescape-client/src/main/java/class182.java
@@ -0,0 +1,17 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("gl")
+public class class182 {
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		longValue = -4548001499872116191L
+	)
+	static long field2113;
+	@ObfuscatedName("bb")
+	@ObfuscatedSignature(
+		descriptor = "Ljl;"
+	)
+	static StudioGame field2114;
+}
diff --git a/runescape-client/src/main/java/class19.java b/runescape-client/src/main/java/class19.java
index 388602ea50..105974bdcf 100644
--- a/runescape-client/src/main/java/class19.java
+++ b/runescape-client/src/main/java/class19.java
@@ -2,56 +2,51 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("x")
+@ObfuscatedName("s")
 public class class19 {
-	@ObfuscatedName("ba")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	@Export("worldSelectLeftSprite")
-	static IndexedSprite worldSelectLeftSprite;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		longValue = -7800373263393014969L
-	)
-	long field162;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		longValue = 2996578654687834529L
-	)
-	long field160;
 	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lki;"
+	@ObfuscatedGetter(
+		longValue = 2755229533790487225L
 	)
-	IterableNodeDeque field163;
+	long field155;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		longValue = -2197636962351973129L
+	)
+	long field152;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
+	)
+	IterableNodeDeque field153;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	public class19(Buffer var1) {
-		this.field160 = -1L; // L: 9
-		this.field163 = new IterableNodeDeque(); // L: 10
-		this.method221(var1); // L: 18
-	} // L: 19
+		this.field152 = -1L; // L: 9
+		this.field153 = new IterableNodeDeque(); // L: 10
+		this.method277(var1);
+	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1275623765"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-1965655263"
 	)
-	void method221(Buffer var1) {
-		this.field162 = var1.readLong(); // L: 22
-		this.field160 = var1.readLong(); // L: 23
+	void method277(Buffer var1) {
+		this.field155 = var1.readLong();
+		this.field152 = var1.readLong();
 
-		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 24 25 35
+		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 24 35
 			Object var3;
-			if (var2 == 1) { // L: 27
+			if (var2 == 1) {
 				var3 = new class12(this);
-			} else if (var2 == 4) { // L: 28
-				var3 = new class7(this);
-			} else if (var2 == 3) { // L: 29
+			} else if (var2 == 4) {
+				var3 = new class7(this); // L: 28
+			} else if (var2 == 3) {
 				var3 = new class5(this);
 			} else if (var2 == 2) { // L: 30
 				var3 = new class20(this);
@@ -63,35 +58,206 @@ public class class19 {
 				var3 = new class25(this);
 			}
 
-			((class16)var3).vmethod266(var1); // L: 33
-			this.field163.addFirst((Node)var3); // L: 34
+			((class16)var3).vmethod331(var1); // L: 33
+			this.field153.addFirst((Node)var3); // L: 34
 		}
 
 	} // L: 37
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ly;I)V",
-		garbageValue = "205429833"
+		garbageValue = "-11264917"
 	)
-	public void method218(ClanChannel var1) {
-		if (var1.key == this.field162 && var1.field29 == this.field160) { // L: 40
-			for (class16 var2 = (class16)this.field163.last(); var2 != null; var2 = (class16)this.field163.previous()) { // L: 41
-				var2.vmethod264(var1); // L: 42
+	public void method278(ClanChannel var1) {
+		if (var1.key == this.field155 && var1.field25 == this.field152) { // L: 40
+			for (class16 var2 = (class16)this.field153.last(); var2 != null; var2 = (class16)this.field153.previous()) { // L: 41
+				var2.vmethod332(var1); // L: 42
 			}
 
-			++var1.field29; // L: 44
+			++var1.field25; // L: 44
 		} else {
 			throw new RuntimeException("");
 		}
+	} // L: 45
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;Lmo;I)Lmo;",
+		garbageValue = "1921289241"
+	)
+	@Export("readStringIntParameters")
+	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
+		int var2 = var0.readUnsignedByte(); // L: 16
+		int var3;
+		if (var1 == null) { // L: 17
+			var3 = UrlRequester.method2504(var2); // L: 18
+			var1 = new IterableNodeHashTable(var3); // L: 19
+		}
+
+		for (var3 = 0; var3 < var2; ++var3) { // L: 21
+			boolean var4 = var0.readUnsignedByte() == 1; // L: 22
+			int var5 = var0.readMedium(); // L: 23
+			Object var6;
+			if (var4) {
+				var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25
+			} else {
+				var6 = new IntegerNode(var0.readInt()); // L: 26
+			}
+
+			var1.put((Node)var6, (long)var5); // L: 27
+		}
+
+		return var1; // L: 29
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("al")
 	@ObfuscatedSignature(
-		descriptor = "(Lbh;I)V",
-		garbageValue = "229174712"
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "6"
 	)
-	public static final void method225(PlayerProvider var0) {
-		class26.pcmPlayerProvider = var0; // L: 45
-	} // L: 46
+	static int method276(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3571
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 3572
+			Client.field876 = (short)ScriptFrame.method1233(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]); // L: 3573
+			if (Client.field876 <= 0) { // L: 3574
+				Client.field876 = 256;
+			}
+
+			Client.field877 = (short)ScriptFrame.method1233(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 3575
+			if (Client.field877 <= 0) { // L: 3576
+				Client.field877 = 256;
+			}
+
+			return 1; // L: 3577
+		} else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3579
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 3580
+			Client.zoomHeight = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3581
+			if (Client.zoomHeight <= 0) { // L: 3582
+				Client.zoomHeight = 256;
+			}
+
+			Client.zoomWidth = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3583
+			if (Client.zoomWidth <= 0) { // L: 3584
+				Client.zoomWidth = 320;
+			}
+
+			return 1; // L: 3585
+		} else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3587
+			ChatChannel.Interpreter_intStackSize -= 4; // L: 3588
+			Client.field880 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3589
+			if (Client.field880 <= 0) { // L: 3590
+				Client.field880 = 1;
+			}
+
+			Client.field864 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3591
+			if (Client.field864 <= 0) { // L: 3592
+				Client.field864 = 32767;
+			} else if (Client.field864 < Client.field880) { // L: 3593
+				Client.field864 = Client.field880;
+			}
+
+			Client.field881 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 3594
+			if (Client.field881 <= 0) { // L: 3595
+				Client.field881 = 1;
+			}
+
+			Client.field690 = (short)Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 3596
+			if (Client.field690 <= 0) { // L: 3597
+				Client.field690 = 32767;
+			} else if (Client.field690 < Client.field881) { // L: 3598
+				Client.field690 = Client.field881;
+			}
+
+			return 1; // L: 3599
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3601
+			if (Client.viewportWidget != null) { // L: 3602
+				Interpreter.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3603
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3604
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3605
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3608
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3609
+			}
+
+			return 1; // L: 3611
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3613
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3614
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3615
+			return 1; // L: 3616
+		} else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3618
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class17.method258(Client.field876); // L: 3619
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class17.method258(Client.field877); // L: 3620
+			return 1; // L: 3621
+		} else if (var0 == 6220) { // L: 3623
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3624
+			return 1; // L: 3625
+		} else if (var0 == 6221) { // L: 3627
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3628
+			return 1; // L: 3629
+		} else if (var0 == 6222) { // L: 3631
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AttackOption.canvasWidth; // L: 3632
+			return 1; // L: 3633
+		} else if (var0 == 6223) { // L: 3635
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class0.canvasHeight; // L: 3636
+			return 1; // L: 3637
+		} else {
+			return 2; // L: 3639
+		}
+	}
+
+	@ObfuscatedName("fi")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "1156700824"
+	)
+	static final void method281(boolean var0) {
+		if (var0) { // L: 3181
+			Client.field656 = Login.field1022 ? class126.field1472 : class126.field1471; // L: 3182
+		} else {
+			Client.field656 = class4.clientPreferences.parameters.containsKey(class125.method2586(Login.Login_username)) ? class126.field1478 : class126.field1475; // L: 3185
+		}
+
+	} // L: 3187
+
+	@ObfuscatedName("ga")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "2012334489"
+	)
+	static void method282() {
+		if (class80.worldMap != null) { // L: 4364
+			class80.worldMap.method6287(SoundSystem.Client_plane, (class262.localPlayer.x >> 7) + class15.baseX, (class262.localPlayer.y >> 7) + WorldMapSprite.baseY, false); // L: 4365
+			class80.worldMap.loadCache(); // L: 4366
+		}
+
+	} // L: 4368
+
+	@ObfuscatedName("lf")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;",
+		garbageValue = "-1620053364"
+	)
+	static String method283(String var0, boolean var1) {
+		String var2 = var1 ? "https://" : "http://"; // L: 11574
+		if (Client.gameBuild == 1) { // L: 11575
+			var0 = var0 + "-wtrc";
+		} else if (Client.gameBuild == 2) { // L: 11576
+			var0 = var0 + "-wtqa";
+		} else if (Client.gameBuild == 3) { // L: 11577
+			var0 = var0 + "-wtwip";
+		} else if (Client.gameBuild == 5) { // L: 11578
+			var0 = var0 + "-wti";
+		} else if (Client.gameBuild == 4) { // L: 11579
+			var0 = "local";
+		}
+
+		String var3 = ""; // L: 11580
+		if (Messages.field1397 != null) { // L: 11581
+			var3 = "/p=" + Messages.field1397;
+		}
+
+		String var4 = "runescape.com"; // L: 11582
+		return var2 + var0 + "." + var4 + "/l=" + AbstractArchive.clientLanguage + "/a=" + class82.field999 + var3 + "/"; // L: 11583
+	}
 }
diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java
index 9f7a1ee51c..2e807c6c38 100644
--- a/runescape-client/src/main/java/class2.java
+++ b/runescape-client/src/main/java/class2.java
@@ -3,46 +3,45 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("f")
+@ObfuscatedName("v")
 public class class2 {
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "Lie;"
-	)
-	@Export("musicTrack")
-	public static MusicTrack musicTrack;
-	@ObfuscatedName("v")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = 4932681583424374285L
+		intValue = 1819318139
 	)
-	long field21;
-	@ObfuscatedName("n")
+	static int field20;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -2049607965
+		longValue = -5109163209193777569L
+	)
+	long field18;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 1849981899
 	)
 	int field13;
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lki;"
+		descriptor = "Lkz;"
 	)
 	IterableNodeDeque field14;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	public class2(Buffer var1) {
 		this.field13 = -1; // L: 9
 		this.field14 = new IterableNodeDeque(); // L: 10
-		this.method19(var1); // L: 28
+		this.method23(var1); // L: 28
 	} // L: 29
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "1835710687"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "834353065"
 	)
-	void method19(Buffer var1) {
-		this.field21 = var1.readLong(); // L: 32
+	void method23(Buffer var1) {
+		this.field18 = var1.readLong(); // L: 32
 		this.field13 = var1.readInt(); // L: 33
 
 		for (int var2 = var1.readUnsignedByte(); var2 != 0; var2 = var1.readUnsignedByte()) { // L: 34 35 55
@@ -83,248 +82,45 @@ public class class2 {
 				var3 = new class27(this);
 			}
 
-			((class14)var3).vmethod276(var1); // L: 53
+			((class14)var3).vmethod363(var1); // L: 53
 			this.field14.addFirst((Node)var3); // L: 54
 		}
 
 	} // L: 57
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;I)V",
-		garbageValue = "-184881258"
+		descriptor = "(Lb;B)V",
+		garbageValue = "-59"
 	)
-	public void method16(ClanSettings var1) {
-		if (var1.field109 == this.field21 && this.field13 == var1.field94) { // L: 60
+	public void method24(ClanSettings var1) {
+		if (var1.field82 == this.field18 && this.field13 == var1.field83) { // L: 60
 			for (class14 var2 = (class14)this.field14.last(); var2 != null; var2 = (class14)this.field14.previous()) { // L: 61
-				var2.vmethod281(var1); // L: 62
+				var2.vmethod354(var1); // L: 62
 			}
 
-			++var1.field94; // L: 64
+			++var1.field83; // L: 64
 		} else {
 			throw new RuntimeException("");
 		}
 	} // L: 65
 
-	@ObfuscatedName("gg")
+	@ObfuscatedName("fb")
 	@ObfuscatedSignature(
-		descriptor = "(Lcy;B)V",
-		garbageValue = "0"
+		descriptor = "(IB)V",
+		garbageValue = "8"
 	)
-	static final void method21(Actor var0) {
-		if (var0.field1283 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > LoginScreenAnimation.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3647
-			int var1 = var0.field1283 - var0.field1265; // L: 3648
-			int var2 = Client.cycle - var0.field1265; // L: 3649
-			int var3 = var0.field1239 * 64 + var0.field1278 * 128; // L: 3650
-			int var4 = var0.field1239 * 64 + var0.field1280 * 128; // L: 3651
-			int var5 = var0.field1239 * 64 + var0.field1269 * 128; // L: 3652
-			int var6 = var0.field1239 * 64 + var0.field1238 * 128; // L: 3653
-			var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1; // L: 3654
-			var0.y = (var2 * var6 + var4 * (var1 - var2)) / var1; // L: 3655
+	@Export("forceDisconnect")
+	static final void forceDisconnect(int var0) {
+		PcmPlayer.logOut(); // L: 3151
+		switch(var0) { // L: 3152
+		case 1:
+			Login.loginIndex = 24; // L: 3156
+			CollisionMap.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 3157
+			break;
+		case 2:
+			GameObject.method4432(); // L: 3163
 		}
 
-		var0.field1294 = 0; // L: 3657
-		var0.orientation = var0.field1284; // L: 3658
-		var0.rotation = var0.orientation; // L: 3659
-	} // L: 3660
-
-	@ObfuscatedName("im")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-1987725219"
-	)
-	@Export("addSceneMenuOptions")
-	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
-		if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 8855
-			Occluder.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 8856
-		}
-
-		long var4 = -1L; // L: 8859
-		long var6 = -1L; // L: 8860
-
-		int var8;
-		for (var8 = 0; var8 < ItemComposition.method3084(); ++var8) { // L: 8861
-			long var22 = HealthBarDefinition.method2720(var8); // L: 8862
-			if (var22 != var6) { // L: 8863
-				var6 = var22; // L: 8864
-				int var11 = class5.method58(var8); // L: 8865
-				int var12 = GrandExchangeOfferOwnWorldComparator.method1166(var8); // L: 8866
-				int var13 = class261.method4842(var8); // L: 8867
-				int var14 = class93.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 8870
-				int var15 = var14; // L: 8872
-				if (var13 == 2 && AbstractSocket.scene.getObjectFlags(class22.Client_plane, var11, var12, var22) >= 0) { // L: 8873 8874
-					ObjectComposition var16 = class23.getObjectDefinition(var14); // L: 8875
-					if (var16.transforms != null) { // L: 8876
-						var16 = var16.transform();
-					}
-
-					if (var16 == null) { // L: 8877
-						continue;
-					}
-
-					if (Client.isItemSelected == 1) { // L: 8878
-						Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(65535) + var16.name, 1, var14, var11, var12); // L: 8879
-					} else if (Client.isSpellSelected) { // L: 8882
-						if ((class4.selectedSpellFlags & 4) == 4) { // L: 8883
-							Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(65535) + var16.name, 2, var14, var11, var12); // L: 8884
-						}
-					} else {
-						String[] var17 = var16.actions; // L: 8889
-						if (var17 != null) { // L: 8890
-							for (int var18 = 4; var18 >= 0; --var18) { // L: 8891
-								if (var17[var18] != null) { // L: 8892
-									short var19 = 0; // L: 8893
-									if (var18 == 0) { // L: 8894
-										var19 = 3;
-									}
-
-									if (var18 == 1) { // L: 8895
-										var19 = 4;
-									}
-
-									if (var18 == 2) { // L: 8896
-										var19 = 5;
-									}
-
-									if (var18 == 3) { // L: 8897
-										var19 = 6;
-									}
-
-									if (var18 == 4) { // L: 8898
-										var19 = 1001;
-									}
-
-									Occluder.insertMenuItemNoShift(var17[var18], class44.colorStartTag(65535) + var16.name, var19, var15, var11, var12); // L: 8899
-								}
-							}
-						}
-
-						Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(65535) + var16.name, 1002, var16.id, var11, var12); // L: 8904
-					}
-				}
-
-				Player var20;
-				int var24;
-				NPC var25;
-				int var32;
-				int[] var33;
-				if (var13 == 1) { // L: 8909
-					NPC var28 = Client.npcs[var15]; // L: 8910
-					if (var28 == null) { // L: 8911
-						continue;
-					}
-
-					if (var28.definition.size == 1 && (var28.x & 127) == 64 && (var28.y & 127) == 64) { // L: 8912
-						for (var24 = 0; var24 < Client.npcCount; ++var24) { // L: 8913
-							var25 = Client.npcs[Client.npcIndices[var24]]; // L: 8914
-							if (var25 != null && var28 != var25 && var25.definition.size == 1 && var25.x == var28.x && var25.y == var28.y) { // L: 8915
-								class35.addNpcToMenu(var25.definition, Client.npcIndices[var24], var11, var12);
-							}
-						}
-
-						var24 = Players.Players_count; // L: 8917
-						var33 = Players.Players_indices; // L: 8918
-
-						for (var32 = 0; var32 < var24; ++var32) { // L: 8919
-							var20 = Client.players[var33[var32]]; // L: 8920
-							if (var20 != null && var20.x == var28.x && var28.y == var20.y) { // L: 8921
-								HitSplatDefinition.addPlayerToMenu(var20, var33[var32], var11, var12);
-							}
-						}
-					}
-
-					class35.addNpcToMenu(var28.definition, var15, var11, var12); // L: 8924
-				}
-
-				if (var13 == 0) { // L: 8926
-					Player var29 = Client.players[var15]; // L: 8927
-					if (var29 == null) { // L: 8928
-						continue;
-					}
-
-					if ((var29.x & 127) == 64 && (var29.y & 127) == 64) { // L: 8929
-						for (var24 = 0; var24 < Client.npcCount; ++var24) { // L: 8930
-							var25 = Client.npcs[Client.npcIndices[var24]]; // L: 8931
-							if (var25 != null && var25.definition.size == 1 && var29.x == var25.x && var25.y == var29.y) { // L: 8932
-								class35.addNpcToMenu(var25.definition, Client.npcIndices[var24], var11, var12);
-							}
-						}
-
-						var24 = Players.Players_count; // L: 8934
-						var33 = Players.Players_indices; // L: 8935
-
-						for (var32 = 0; var32 < var24; ++var32) { // L: 8936
-							var20 = Client.players[var33[var32]]; // L: 8937
-							if (var20 != null && var20 != var29 && var29.x == var20.x && var29.y == var20.y) { // L: 8938
-								HitSplatDefinition.addPlayerToMenu(var20, var33[var32], var11, var12);
-							}
-						}
-					}
-
-					if (var15 != Client.combatTargetPlayerIndex) { // L: 8941
-						HitSplatDefinition.addPlayerToMenu(var29, var15, var11, var12);
-					} else {
-						var4 = var22; // L: 8942
-					}
-				}
-
-				if (var13 == 3) { // L: 8944
-					NodeDeque var31 = Client.groundItems[class22.Client_plane][var11][var12]; // L: 8945
-					if (var31 != null) { // L: 8946
-						for (TileItem var30 = (TileItem)var31.first(); var30 != null; var30 = (TileItem)var31.next()) { // L: 8947 8948 8981
-							ItemComposition var34 = class260.ItemDefinition_get(var30.id); // L: 8949
-							if (Client.isItemSelected == 1) { // L: 8950
-								Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16748608) + var34.name, 16, var30.id, var11, var12); // L: 8951
-							} else if (Client.isSpellSelected) { // L: 8954
-								if ((class4.selectedSpellFlags & 1) == 1) { // L: 8955
-									Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16748608) + var34.name, 17, var30.id, var11, var12); // L: 8956
-								}
-							} else {
-								String[] var26 = var34.groundActions; // L: 8961
-
-								for (int var27 = 4; var27 >= 0; --var27) { // L: 8962
-									if (var26 != null && var26[var27] != null) { // L: 8963
-										byte var21 = 0; // L: 8964
-										if (var27 == 0) { // L: 8965
-											var21 = 18;
-										}
-
-										if (var27 == 1) { // L: 8966
-											var21 = 19;
-										}
-
-										if (var27 == 2) { // L: 8967
-											var21 = 20;
-										}
-
-										if (var27 == 3) { // L: 8968
-											var21 = 21;
-										}
-
-										if (var27 == 4) { // L: 8969
-											var21 = 22;
-										}
-
-										Occluder.insertMenuItemNoShift(var26[var27], class44.colorStartTag(16748608) + var34.name, var21, var30.id, var11, var12); // L: 8970
-									} else if (var27 == 2) { // L: 8973
-										Occluder.insertMenuItemNoShift("Take", class44.colorStartTag(16748608) + var34.name, 20, var30.id, var11, var12); // L: 8974
-									}
-								}
-
-								Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16748608) + var34.name, 1004, var30.id, var11, var12); // L: 8978
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (var4 != -1L) { // L: 8986
-			var8 = VarpDefinition.method2630(var4); // L: 8987
-			int var9 = class229.method4374(var4); // L: 8988
-			Player var10 = Client.players[Client.combatTargetPlayerIndex]; // L: 8989
-			HitSplatDefinition.addPlayerToMenu(var10, Client.combatTargetPlayerIndex, var8, var9); // L: 8990
-		}
-
-	} // L: 8992
+	} // L: 3167
 }
diff --git a/runescape-client/src/main/java/class20.java b/runescape-client/src/main/java/class20.java
index 610663fc10..867facfd36 100644
--- a/runescape-client/src/main/java/class20.java
+++ b/runescape-client/src/main/java/class20.java
@@ -3,207 +3,161 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("z")
+@ObfuscatedName("p")
 public class class20 extends class16 {
-	@ObfuscatedName("j")
-	static byte[][][] field182;
-	@ObfuscatedName("b")
+	@ObfuscatedName("ru")
+	@ObfuscatedGetter(
+		intValue = -114026065
+	)
+	static int field166;
+	@ObfuscatedName("hp")
 	@ObfuscatedSignature(
-		descriptor = "Loh;"
+		descriptor = "[Loa;"
 	)
-	@Export("rightTitleSprite")
-	static SpritePixels rightTitleSprite;
-	@ObfuscatedName("d")
-	@Export("ByteArrayPool_arrays")
-	static byte[][][] ByteArrayPool_arrays;
-	@ObfuscatedName("es")
-	@ObfuscatedGetter(
-		intValue = -318023015
+	@Export("headIconPrayerSprites")
+	static SpritePixels[] headIconPrayerSprites;
+	@ObfuscatedName("ox")
+	@ObfuscatedSignature(
+		descriptor = "Ldf;"
 	)
-	static int field184;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 1112467139
-	)
-	int field178;
-	@ObfuscatedName("n")
-	byte field172;
+	@Export("varcs")
+	static Varcs varcs;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 500629175
+		intValue = 468630141
 	)
-	int field173;
+	int field162;
+	@ObfuscatedName("e")
+	byte field163;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 658289705
+	)
+	int field161;
 	@ObfuscatedName("y")
-	String field174;
+	String field164;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Ls;"
 	)
 	final class19 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lx;)V"
+		descriptor = "(Ls;)V"
 	)
 	class20(class19 var1) {
 		this.this$0 = var1;
-		this.field178 = -1; // L: 100
+		this.field162 = -1; // L: 100
 	} // L: 105
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "68071115"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "851460888"
 	)
-	void vmethod266(Buffer var1) {
-		this.field178 = var1.readUnsignedShort(); // L: 108
-		this.field172 = var1.readByte(); // L: 109
-		this.field173 = var1.readUnsignedShort(); // L: 110
+	void vmethod331(Buffer var1) {
+		this.field162 = var1.readUnsignedShort(); // L: 108
+		this.field163 = var1.readByte(); // L: 109
+		this.field161 = var1.readUnsignedShort(); // L: 110
 		var1.readLong(); // L: 111
-		this.field174 = var1.readStringCp1252NullTerminated(); // L: 112
+		this.field164 = var1.readStringCp1252NullTerminated(); // L: 112
 	} // L: 113
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ly;I)V",
-		garbageValue = "-1846892157"
+		garbageValue = "-1362614343"
 	)
-	void vmethod264(ClanChannel var1) {
-		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field178); // L: 116
-		var2.rank = this.field172; // L: 117
-		var2.world = this.field173; // L: 118
-		var2.name = this.field174; // L: 119
+	void vmethod332(ClanChannel var1) {
+		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field162); // L: 116
+		var2.rank = this.field163; // L: 117
+		var2.world = this.field161; // L: 118
+		var2.name = this.field164; // L: 119
 	} // L: 120
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-912438388"
+		descriptor = "(IS)Z",
+		garbageValue = "-8931"
 	)
-	public static boolean method231() {
-		ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28
-		return var0 != null; // L: 29
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Z",
-		garbageValue = "-253899282"
-	)
-	@Export("isNumber")
-	public static boolean isNumber(CharSequence var0) {
-		return MusicPatchNode.method4638(var0, 10, true); // L: 34
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-192400471"
-	)
-	@Export("ItemContainer_getCount")
-	static int ItemContainer_getCount(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21
-		if (var2 == null) { // L: 22
-			return 0;
+	@Export("loadInterface")
+	public static boolean loadInterface(int var0) {
+		if (Widget.Widget_loadedInterfaces[var0]) { // L: 216
+			return true;
+		} else if (!AttackOption.Widget_archive.tryLoadGroup(var0)) { // L: 217
+			return false;
 		} else {
-			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24
+			int var1 = AttackOption.Widget_archive.getGroupFileCount(var0); // L: 218
+			if (var1 == 0) { // L: 219
+				Widget.Widget_loadedInterfaces[var0] = true; // L: 220
+				return true; // L: 221
+			} else {
+				if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] == null) { // L: 223
+					GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] = new Widget[var1];
+				}
+
+				for (int var2 = 0; var2 < var1; ++var2) { // L: 224
+					if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] == null) { // L: 225
+						byte[] var3 = AttackOption.Widget_archive.takeFile(var0, var2); // L: 226
+						if (var3 != null) { // L: 227
+							GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 228
+							GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 229
+							if (var3[0] == -1) { // L: 230
+								GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3));
+							} else {
+								GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 231
+							}
+						}
+					}
+				}
+
+				Widget.Widget_loadedInterfaces[var0] = true; // L: 235
+				return true; // L: 236
+			}
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("ih")
 	@ObfuscatedSignature(
-		descriptor = "(Laf;B)V",
-		garbageValue = "-93"
+		descriptor = "(B)V",
+		garbageValue = "-11"
 	)
-	static void method230(GameEngine var0) {
-		while (ClanChannelMember.isKeyDown()) { // L: 1531
-			if (ItemComposition.field1859 == 13) { // L: 1532
-				Login.worldSelectOpen = false; // L: 1534
-				Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1535
-				rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1536
-				Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1537
-				return; // L: 1539
+	@Export("Widget_runOnTargetLeave")
+	static void Widget_runOnTargetLeave() {
+		if (Client.isSpellSelected) { // L: 8796
+			Widget var0 = class17.getWidgetChild(class15.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8797
+			if (var0 != null && var0.onTargetLeave != null) { // L: 8798
+				ScriptEvent var1 = new ScriptEvent(); // L: 8799
+				var1.widget = var0; // L: 8800
+				var1.args = var0.onTargetLeave; // L: 8801
+				WorldMapSection1.runScriptEvent(var1); // L: 8802
 			}
 
-			if (ItemComposition.field1859 == 96) { // L: 1541
-				if (Login.worldSelectPage > 0 && class19.worldSelectLeftSprite != null) { // L: 1542
-					--Login.worldSelectPage; // L: 1543
-				}
-			} else if (ItemComposition.field1859 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapID.worldSelectRightSprite != null) { // L: 1546 1547
-				++Login.worldSelectPage; // L: 1548
+			Client.field634 = -1; // L: 8804
+			Client.isSpellSelected = false; // L: 8805
+			Script.invalidateWidget(var0); // L: 8806
+		}
+	} // L: 8807
+
+	@ObfuscatedName("kd")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1886471303"
+	)
+	static final void method288() {
+		PacketBufferNode var0 = InterfaceParent.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); // L: 11242
+		Client.packetWriter.addNode(var0); // L: 11243
+
+		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11244
+			if (var1.type == 0 || var1.type == 3) { // L: 11245
+				InvDefinition.closeInterface(var1, true);
 			}
 		}
 
-		if (MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1552
-			int var1 = Login.xPadding + 280; // L: 1553
-			if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1554
-				class44.changeWorldSelectSorting(0, 0); // L: 1555
-				return; // L: 1556
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1558
-				class44.changeWorldSelectSorting(0, 1); // L: 1559
-				return; // L: 1560
-			}
-
-			int var2 = Login.xPadding + 390; // L: 1562
-			if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1563
-				class44.changeWorldSelectSorting(1, 0); // L: 1564
-				return; // L: 1565
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1567
-				class44.changeWorldSelectSorting(1, 1); // L: 1568
-				return; // L: 1569
-			}
-
-			int var3 = Login.xPadding + 500; // L: 1571
-			if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1572
-				class44.changeWorldSelectSorting(2, 0); // L: 1573
-				return; // L: 1574
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1576
-				class44.changeWorldSelectSorting(2, 1); // L: 1577
-				return; // L: 1578
-			}
-
-			int var4 = Login.xPadding + 610; // L: 1580
-			if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1581
-				class44.changeWorldSelectSorting(3, 0); // L: 1582
-				return; // L: 1583
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1585
-				class44.changeWorldSelectSorting(3, 1); // L: 1586
-				return; // L: 1587
-			}
-
-			if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1589
-				Login.worldSelectOpen = false; // L: 1591
-				Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1592
-				rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1593
-				Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1594
-				return; // L: 1596
-			}
-
-			if (Login.hoveredWorldIndex != -1) { // L: 1598
-				World var5 = Tiles.World_worlds[Login.hoveredWorldIndex]; // L: 1599
-				class0.changeWorld(var5); // L: 1600
-				Login.worldSelectOpen = false; // L: 1602
-				Login.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1603
-				rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1604
-				Fonts.logoSprite.drawAt(Login.xPadding + 382 - Fonts.logoSprite.subWidth / 2, 18); // L: 1605
-				return; // L: 1607
-			}
-
-			if (Login.worldSelectPage > 0 && class19.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class19.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= ReflectionCheck.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ReflectionCheck.canvasHeight / 2 + 50) { // L: 1609
-				--Login.worldSelectPage; // L: 1610
-			}
-
-			if (Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapID.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= class32.canvasWidth - WorldMapID.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= class32.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= ReflectionCheck.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= ReflectionCheck.canvasHeight / 2 + 50) { // L: 1612
-				++Login.worldSelectPage; // L: 1613
-			}
+		if (Client.meslayerContinueWidget != null) { // L: 11247
+			Script.invalidateWidget(Client.meslayerContinueWidget); // L: 11248
+			Client.meslayerContinueWidget = null; // L: 11249
 		}
 
-	} // L: 1616
+	} // L: 11251
 }
diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java
index cee0b994db..ee8f6e7e64 100644
--- a/runescape-client/src/main/java/class21.java
+++ b/runescape-client/src/main/java/class21.java
@@ -1,130 +1,658 @@
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("w")
+@ObfuscatedName("c")
 public class class21 extends class14 {
-	@ObfuscatedName("qi")
-	static boolean field190;
-	@ObfuscatedName("v")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1525573159
+		intValue = 688651321
 	)
-	int field192;
-	@ObfuscatedName("n")
+	static int field180;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1941525271
+		intValue = 619101743
 	)
-	int field185;
+	static int field171;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -948599653
+		intValue = -293151227
 	)
-	int field186;
+	int field179;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 64877513
+	)
+	int field174;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 20782795
+	)
+	int field173;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -461559247
+		intValue = -462967025
 	)
-	int field187;
+	int field172;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class21(class2 var1) {
 		this.this$0 = var1;
-		this.field192 = -1; // L: 158
+		this.field179 = -1; // L: 158
 	} // L: 163
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field192 = var1.readUnsignedShort(); // L: 166
-		this.field185 = var1.readInt(); // L: 167
-		this.field186 = var1.readUnsignedByte(); // L: 168
-		this.field187 = var1.readUnsignedByte(); // L: 169
+	void vmethod363(Buffer var1) {
+		this.field179 = var1.readUnsignedShort(); // L: 166
+		this.field174 = var1.readInt(); // L: 167
+		this.field173 = var1.readUnsignedByte(); // L: 168
+		this.field172 = var1.readUnsignedByte(); // L: 169
 	} // L: 170
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method126(this.field192, this.field185, this.field186, this.field187); // L: 173
+	void vmethod354(ClanSettings var1) {
+		var1.method128(this.field179, this.field174, this.field173, this.field172); // L: 173
 	} // L: 174
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(Lhs;Loy;B)Lhq;",
-		garbageValue = "8"
+		descriptor = "(Laa;I)V",
+		garbageValue = "-863685229"
 	)
-	@Export("getPacketBufferNode")
-	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
-		PacketBufferNode var2;
-		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 24
-			var2 = new PacketBufferNode(); // L: 25
+	@Export("doCycleTitle")
+	static void doCycleTitle(GameEngine var0) {
+		if (Login.worldSelectOpen) { // L: 204
+			WorldMapManager.method3538(var0); // L: 205
 		} else {
-			var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 28
-		}
-
-		var2.clientPacket = var0; // L: 31
-		var2.clientPacketLength = var0.length; // L: 32
-		if (var2.clientPacketLength == -1) {
-			var2.packetBuffer = new PacketBuffer(260); // L: 33
-		} else if (var2.clientPacketLength == -2) { // L: 34
-			var2.packetBuffer = new PacketBuffer(10000);
-		} else if (var2.clientPacketLength <= 18) { // L: 35
-			var2.packetBuffer = new PacketBuffer(20);
-		} else if (var2.clientPacketLength <= 98) { // L: 36
-			var2.packetBuffer = new PacketBuffer(100);
-		} else {
-			var2.packetBuffer = new PacketBuffer(260); // L: 37
-		}
-
-		var2.packetBuffer.setIsaacCipher(var1); // L: 38
-		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 39
-		var2.index = 0; // L: 40
-		return var2; // L: 41
-	}
-
-	@ObfuscatedName("ju")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "993410393"
-	)
-	@Export("Widget_resetModelFrames")
-	static final void Widget_resetModelFrames(int var0) {
-		if (Clock.loadInterface(var0)) { // L: 10825
-			Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 10826
-
-			for (int var2 = 0; var2 < var1.length; ++var2) { // L: 10827
-				Widget var3 = var1[var2]; // L: 10828
-				if (var3 != null) { // L: 10829
-					var3.modelFrame = 0; // L: 10830
-					var3.modelFrameCycle = 0; // L: 10831
+			if ((MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 208
+				class4.clientPreferences.titleMusicDisabled = !class4.clientPreferences.titleMusicDisabled; // L: 209
+				Actor.savePreferences(); // L: 210
+				if (!class4.clientPreferences.titleMusicDisabled) { // L: 211
+					Archive var1 = DynamicObject.archive6; // L: 212
+					int var2 = var1.getGroupId("scape main"); // L: 214
+					int var3 = var1.getFileId(var2, ""); // L: 215
+					class105.method2357(var1, var2, var3, 255, false); // L: 216
+				} else {
+					Decimator.method1169(); // L: 219
 				}
 			}
 
-		}
-	} // L: 10833
+			if (Client.gameState != 5) { // L: 221
+				if (-1L == Login.field1019) { // L: 222
+					Login.field1019 = ClientPacket.currentTimeMillis() + 1000L; // L: 223
+				}
 
-	@ObfuscatedName("ks")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I)I",
-		garbageValue = "2132424043"
-	)
-	@Export("getWidgetFlags")
-	static int getWidgetFlags(Widget var0) {
-		IntegerNode var1 = (IntegerNode)Client.widgetFlags.get((long)var0.childIndex + ((long)var0.id << 32)); // L: 11357
-		return var1 != null ? var1.integer : var0.flags; // L: 11358 11359
-	}
+				long var16 = ClientPacket.currentTimeMillis(); // L: 225
+				boolean var24;
+				if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 228
+					while (true) {
+						if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { // L: 232
+							var24 = true; // L: 240
+							break;
+						}
+
+						ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 233
+						if (!var4.isLoaded()) { // L: 234
+							var24 = false; // L: 235
+							break; // L: 236
+						}
+
+						++Client.archiveLoadersDone; // L: 238
+					}
+				} else {
+					var24 = true; // L: 229
+				}
+
+				if (var24 && -1L == Login.field1031) { // L: 242 243
+					Login.field1031 = var16; // L: 244
+					if (Login.field1031 > Login.field1019) { // L: 245
+						Login.field1019 = Login.field1031; // L: 246
+					}
+				}
+
+				if (Client.gameState == 10 || Client.gameState == 11) { // L: 250
+					int var18;
+					if (AbstractArchive.clientLanguage == Language.Language_EN) { // L: 251
+						if (MouseHandler.MouseHandler_lastButton == 1 || !UserComparator3.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 252
+							var18 = Login.xPadding + 5; // L: 253
+							short var5 = 463; // L: 254
+							byte var6 = 100; // L: 255
+							byte var7 = 35; // L: 256
+							if (MouseHandler.MouseHandler_lastPressedX >= var18 && MouseHandler.MouseHandler_lastPressedX <= var6 + var18 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var7 + var5) { // L: 257
+								if (FaceNormal.loadWorlds()) { // L: 259
+									Login.worldSelectOpen = true; // L: 260
+									Login.worldSelectPage = 0; // L: 261
+									Login.worldSelectPagesCount = 0; // L: 262
+								}
+
+								return; // L: 265
+							}
+						}
+
+						if (World.World_request != null) { // L: 268
+							ScriptFrame.method1231();
+						}
+					}
+
+					var18 = MouseHandler.MouseHandler_lastButton; // L: 270
+					int var25 = MouseHandler.MouseHandler_lastPressedX; // L: 271
+					int var26 = MouseHandler.MouseHandler_lastPressedY; // L: 272
+					if (var18 == 0) { // L: 273
+						var25 = MouseHandler.MouseHandler_x; // L: 274
+						var26 = MouseHandler.MouseHandler_y; // L: 275
+					}
+
+					if (!UserComparator3.mouseCam && var18 == 4) { // L: 277
+						var18 = 1;
+					}
+
+					short var29;
+					int var30;
+					if (Login.loginIndex == 0) { // L: 278
+						boolean var35 = false; // L: 279
+
+						while (SecureRandomCallable.isKeyDown()) { // L: 280
+							if (SoundCache.field446 == 84) { // L: 281
+								var35 = true; // L: 282
+							}
+						}
+
+						var30 = class25.loginBoxCenter - 80; // L: 285
+						var29 = 291; // L: 286
+						if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 287
+							AttackOption.openURL(class19.method283("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 288
+						}
+
+						var30 = class25.loginBoxCenter + 80; // L: 290
+						if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20 || var35) { // L: 291
+							if ((Client.worldProperties & 33554432) != 0) { // L: 292
+								Login.Login_response0 = ""; // L: 293
+								Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world."; // L: 294
+								Login.Login_response2 = "Your normal account will not be affected."; // L: 295
+								Login.Login_response3 = ""; // L: 296
+								Login.loginIndex = 1; // L: 297
+								GameObject.method4433(); // L: 298
+							} else if ((Client.worldProperties & 4) != 0) { // L: 300
+								if ((Client.worldProperties & 1024) != 0) { // L: 301
+									Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world."; // L: 302
+									Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 303
+									Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 304
+								} else {
+									Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world."; // L: 307
+									Login.Login_response2 = "Players can attack each other"; // L: 308
+									Login.Login_response3 = "almost everywhere."; // L: 309
+								}
+
+								Login.Login_response0 = "Warning!"; // L: 311
+								Login.loginIndex = 1; // L: 312
+								GameObject.method4433(); // L: 313
+							} else if ((Client.worldProperties & 1024) != 0) { // L: 315
+								Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world."; // L: 316
+								Login.Login_response2 = "The Protect Item prayer will"; // L: 317
+								Login.Login_response3 = "not work on this world."; // L: 318
+								Login.Login_response0 = "Warning!"; // L: 319
+								Login.loginIndex = 1; // L: 320
+								GameObject.method4433(); // L: 321
+							} else {
+								class69.Login_promptCredentials(false); // L: 324
+							}
+						}
+					} else {
+						short var8;
+						int var27;
+						if (Login.loginIndex == 1) { // L: 328
+							while (true) {
+								if (!SecureRandomCallable.isKeyDown()) { // L: 329
+									var27 = class25.loginBoxCenter - 80; // L: 337
+									var8 = 321; // L: 338
+									if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 339
+										class69.Login_promptCredentials(false); // L: 340
+									}
+
+									var27 = class25.loginBoxCenter + 80; // L: 342
+									if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 343
+										Login.loginIndex = 0; // L: 344
+									}
+									break;
+								}
+
+								if (SoundCache.field446 == 84) { // L: 330
+									class69.Login_promptCredentials(false); // L: 331
+								} else if (SoundCache.field446 == 13) { // L: 333
+									Login.loginIndex = 0; // L: 334
+								}
+							}
+						} else {
+							int var11;
+							short var28;
+							if (Login.loginIndex == 2) { // L: 347
+								var28 = 201; // L: 348
+								var27 = var28 + 52; // L: 349
+								if (var18 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 350
+									Login.currentLoginField = 0;
+								}
+
+								var27 += 15; // L: 351
+								if (var18 == 1 && var26 >= var27 - 12 && var26 < var27 + 2) { // L: 352
+									Login.currentLoginField = 1;
+								}
+
+								var27 += 15; // L: 353
+								var28 = 361; // L: 354
+								if (Client.field903 != null) { // L: 355
+									var30 = Client.field903.highX / 2; // L: 356
+									if (var18 == 1 && var25 >= Client.field903.lowX - var30 && var25 <= var30 + Client.field903.lowX && var26 >= var28 - 15 && var26 < var28) { // L: 357
+										switch(Login.field1012) { // L: 358
+										case 1:
+											CollisionMap.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 361
+											Login.loginIndex = 5; // L: 362
+											return; // L: 363
+										case 2:
+											AttackOption.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 367
+										}
+									}
+								}
+
+								var30 = class25.loginBoxCenter - 80; // L: 373
+								var29 = 321; // L: 374
+								if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 375
+									Login.Login_username = Login.Login_username.trim(); // L: 376
+									if (Login.Login_username.length() == 0) { // L: 377
+										CollisionMap.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 378
+										return; // L: 379
+									}
+
+									if (Login.Login_password.length() == 0) { // L: 381
+										CollisionMap.setLoginResponseString("", "Please enter your password.", ""); // L: 382
+										return; // L: 383
+									}
+
+									CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 385
+									class19.method281(false); // L: 386
+									Projectile.updateGameState(20); // L: 387
+									return; // L: 388
+								}
+
+								var30 = Login.loginBoxX + 180 + 80; // L: 390
+								if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 391
+									Login.loginIndex = 0; // L: 392
+									Login.Login_username = ""; // L: 393
+									Login.Login_password = ""; // L: 394
+									class0.field2 = 0; // L: 395
+									ItemLayer.otp = ""; // L: 396
+									Login.field1022 = true; // L: 397
+								}
+
+								var30 = class25.loginBoxCenter + -117; // L: 399
+								var29 = 277; // L: 400
+								Login.field1006 = var25 >= var30 && var25 < var30 + class126.field1477 && var26 >= var29 && var26 < var29 + PcmPlayer.field416; // L: 401
+								if (var18 == 1 && Login.field1006) { // L: 402
+									Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 403
+									if (!Client.Login_isUsernameRemembered && class4.clientPreferences.rememberedUsername != null) { // L: 404
+										class4.clientPreferences.rememberedUsername = null; // L: 405
+										Actor.savePreferences(); // L: 406
+									}
+								}
+
+								var30 = class25.loginBoxCenter + 24; // L: 409
+								var29 = 277; // L: 410
+								Login.field1021 = var25 >= var30 && var25 < var30 + class126.field1477 && var26 >= var29 && var26 < var29 + PcmPlayer.field416; // L: 411
+								if (var18 == 1 && Login.field1021) { // L: 412
+									class4.clientPreferences.hideUsername = !class4.clientPreferences.hideUsername; // L: 413
+									if (!class4.clientPreferences.hideUsername) { // L: 414
+										Login.Login_username = ""; // L: 415
+										class4.clientPreferences.rememberedUsername = null; // L: 416
+										GameObject.method4433(); // L: 417
+									}
+
+									Actor.savePreferences(); // L: 419
+								}
+
+								while (true) {
+									Transferable var20;
+									int var33;
+									do {
+										while (true) {
+											label903:
+											do {
+												while (true) {
+													while (SecureRandomCallable.isKeyDown()) { // L: 421
+														if (SoundCache.field446 != 13) { // L: 422
+															if (Login.currentLoginField != 0) { // L: 431
+																continue label903;
+															}
+
+															char var32 = Timer.field3780; // L: 432
+
+															for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var32 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { // L: 434 435
+															}
+
+															if (SoundCache.field446 == 85 && Login.Login_username.length() > 0) { // L: 438
+																Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+															}
+
+															if (SoundCache.field446 == 84 || SoundCache.field446 == 80) { // L: 439
+																Login.currentLoginField = 1;
+															}
+
+															char var12 = Timer.field3780; // L: 441
+															boolean var34 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var12) != -1; // L: 443
+															if (var34 && Login.Login_username.length() < 320) { // L: 445
+																Login.Login_username = Login.Login_username + Timer.field3780;
+															}
+														} else {
+															Login.loginIndex = 0; // L: 423
+															Login.Login_username = ""; // L: 424
+															Login.Login_password = ""; // L: 425
+															class0.field2 = 0; // L: 426
+															ItemLayer.otp = ""; // L: 427
+															Login.field1022 = true; // L: 428
+														}
+													}
+
+													return; // L: 686
+												}
+											} while(Login.currentLoginField != 1); // L: 447
+
+											if (SoundCache.field446 == 85 && Login.Login_password.length() > 0) { // L: 448
+												Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 449
+											} else if (SoundCache.field446 == 84 || SoundCache.field446 == 80) { // L: 451
+												Login.currentLoginField = 0; // L: 452
+												if (SoundCache.field446 == 84) { // L: 453
+													Login.Login_username = Login.Login_username.trim(); // L: 454
+													if (Login.Login_username.length() == 0) { // L: 455
+														CollisionMap.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 456
+														return; // L: 457
+													}
+
+													if (Login.Login_password.length() == 0) { // L: 459
+														CollisionMap.setLoginResponseString("", "Please enter your password.", ""); // L: 460
+														return; // L: 461
+													}
+
+													CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 463
+													class19.method281(false); // L: 464
+													Projectile.updateGameState(20); // L: 465
+													return; // L: 466
+												}
+											}
+
+											if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && SoundCache.field446 == 67) { // L: 469
+												Clipboard var19 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 470
+												var20 = var19.getContents(class1.client); // L: 471
+												var33 = 20 - Login.Login_password.length(); // L: 472
+												break;
+											}
+
+											if (ItemContainer.method2181(Timer.field3780) && PacketWriter.method2496(Timer.field3780) && Login.Login_password.length() < 20) { // L: 489
+												Login.Login_password = Login.Login_password + Timer.field3780; // L: 490
+											}
+										}
+									} while(var33 <= 0); // L: 473
+
+									try {
+										String var13 = (String)var20.getTransferData(DataFlavor.stringFlavor); // L: 475
+										int var14 = Math.min(var33, var13.length()); // L: 476
+
+										for (int var15 = 0; var15 < var14; ++var15) { // L: 477
+											if (!ItemContainer.method2181(var13.charAt(var15)) || !PacketWriter.method2496(var13.charAt(var15))) { // L: 478
+												Login.loginIndex = 3; // L: 479
+												return; // L: 480
+											}
+										}
+
+										Login.Login_password = Login.Login_password + var13.substring(0, var14); // L: 483
+									} catch (UnsupportedFlavorException var22) { // L: 485
+									} catch (IOException var23) { // L: 486
+									}
+								}
+							} else if (Login.loginIndex == 3) { // L: 496
+								var27 = Login.loginBoxX + 180; // L: 497
+								var8 = 276; // L: 498
+								if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 499
+									class69.Login_promptCredentials(false); // L: 500
+								}
+
+								var27 = Login.loginBoxX + 180; // L: 502
+								var8 = 326; // L: 503
+								if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 504
+									CollisionMap.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 505
+									Login.loginIndex = 5; // L: 506
+									return; // L: 507
+								}
+							} else {
+								int var10;
+								if (Login.loginIndex == 4) { // L: 510
+									var27 = Login.loginBoxX + 180 - 80; // L: 511
+									var8 = 321; // L: 512
+									if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 513
+										ItemLayer.otp.trim(); // L: 514
+										if (ItemLayer.otp.length() != 6) { // L: 515
+											CollisionMap.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 516
+											return; // L: 517
+										}
+
+										class0.field2 = Integer.parseInt(ItemLayer.otp); // L: 519
+										ItemLayer.otp = ""; // L: 520
+										class19.method281(true); // L: 521
+										CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 522
+										Projectile.updateGameState(20); // L: 523
+										return; // L: 524
+									}
+
+									if (var18 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var26 >= 263 && var26 <= 296) { // L: 526
+										Login.field1022 = !Login.field1022; // L: 527
+									}
+
+									if (var18 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var26 >= 351 && var26 <= 363) { // L: 529
+										AttackOption.openURL(class19.method283("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 530
+									}
+
+									var27 = Login.loginBoxX + 180 + 80; // L: 532
+									if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 533
+										Login.loginIndex = 0; // L: 534
+										Login.Login_username = ""; // L: 535
+										Login.Login_password = ""; // L: 536
+										class0.field2 = 0; // L: 537
+										ItemLayer.otp = ""; // L: 538
+									}
+
+									while (SecureRandomCallable.isKeyDown()) { // L: 540
+										boolean var9 = false; // L: 541
+
+										for (var10 = 0; var10 < "1234567890".length(); ++var10) { // L: 542
+											if (Timer.field3780 == "1234567890".charAt(var10)) { // L: 543
+												var9 = true; // L: 544
+												break; // L: 545
+											}
+										}
+
+										if (SoundCache.field446 == 13) { // L: 548
+											Login.loginIndex = 0; // L: 549
+											Login.Login_username = ""; // L: 550
+											Login.Login_password = ""; // L: 551
+											class0.field2 = 0; // L: 552
+											ItemLayer.otp = ""; // L: 553
+										} else {
+											if (SoundCache.field446 == 85 && ItemLayer.otp.length() > 0) { // L: 556
+												ItemLayer.otp = ItemLayer.otp.substring(0, ItemLayer.otp.length() - 1);
+											}
+
+											if (SoundCache.field446 == 84) { // L: 557
+												ItemLayer.otp.trim(); // L: 558
+												if (ItemLayer.otp.length() != 6) { // L: 559
+													CollisionMap.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 560
+													return; // L: 561
+												}
+
+												class0.field2 = Integer.parseInt(ItemLayer.otp); // L: 563
+												ItemLayer.otp = ""; // L: 564
+												class19.method281(true); // L: 565
+												CollisionMap.setLoginResponseString("", "Connecting to server...", ""); // L: 566
+												Projectile.updateGameState(20); // L: 567
+												return; // L: 568
+											}
+
+											if (var9 && ItemLayer.otp.length() < 6) { // L: 570
+												ItemLayer.otp = ItemLayer.otp + Timer.field3780;
+											}
+										}
+									}
+								} else if (Login.loginIndex == 5) { // L: 574
+									var27 = Login.loginBoxX + 180 - 80; // L: 575
+									var8 = 321; // L: 576
+									if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 577
+										class143.method2810(); // L: 578
+										return; // L: 579
+									}
+
+									var27 = Login.loginBoxX + 180 + 80; // L: 581
+									if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 582
+										class69.Login_promptCredentials(true); // L: 583
+									}
+
+									var29 = 361; // L: 585
+									if (DefaultsGroup.field3891 != null) { // L: 586
+										var10 = DefaultsGroup.field3891.highX / 2; // L: 587
+										if (var18 == 1 && var25 >= DefaultsGroup.field3891.lowX - var10 && var25 <= var10 + DefaultsGroup.field3891.lowX && var26 >= var29 - 15 && var26 < var29) { // L: 588
+											AttackOption.openURL(class19.method283("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 589
+										}
+									}
+
+									while (SecureRandomCallable.isKeyDown()) { // L: 592
+										boolean var31 = false; // L: 593
+
+										for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { // L: 594
+											if (Timer.field3780 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { // L: 595
+												var31 = true; // L: 596
+												break; // L: 597
+											}
+										}
+
+										if (SoundCache.field446 == 13) { // L: 600
+											class69.Login_promptCredentials(true); // L: 601
+										} else {
+											if (SoundCache.field446 == 85 && Login.Login_username.length() > 0) { // L: 604
+												Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
+											}
+
+											if (SoundCache.field446 == 84) { // L: 605
+												class143.method2810(); // L: 606
+												return; // L: 607
+											}
+
+											if (var31 && Login.Login_username.length() < 320) { // L: 609
+												Login.Login_username = Login.Login_username + Timer.field3780;
+											}
+										}
+									}
+								} else if (Login.loginIndex != 6) { // L: 613
+									if (Login.loginIndex == 7) { // L: 624
+										var27 = Login.loginBoxX + 180 - 80; // L: 625
+										var8 = 321; // L: 626
+										if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 627
+											AttackOption.openURL(class19.method283("secure", true) + "m=dob/set_dob.ws", true, false); // L: 628
+											CollisionMap.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 629
+											Login.loginIndex = 6; // L: 630
+											return; // L: 631
+										}
+
+										var27 = Login.loginBoxX + 180 + 80; // L: 633
+										if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 634
+											class69.Login_promptCredentials(true); // L: 635
+										}
+									} else if (Login.loginIndex == 8) { // L: 638
+										var27 = Login.loginBoxX + 180 - 80; // L: 639
+										var8 = 321; // L: 640
+										if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 641
+											AttackOption.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 642
+											CollisionMap.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 643
+											Login.loginIndex = 6; // L: 644
+											return; // L: 645
+										}
+
+										var27 = Login.loginBoxX + 180 + 80; // L: 647
+										if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 648
+											class69.Login_promptCredentials(true); // L: 649
+										}
+									} else if (Login.loginIndex == 12) { // L: 652
+										String var21 = ""; // L: 653
+										switch(Login.field1011) { // L: 654
+										case 0:
+											var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 659
+											break; // L: 660
+										case 1:
+											var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 656
+											break; // L: 657
+										default:
+											class69.Login_promptCredentials(false); // L: 662
+										}
+
+										var30 = Login.loginBoxX + 180; // L: 665
+										var29 = 276; // L: 666
+										if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 667
+											AttackOption.openURL(var21, true, false); // L: 668
+											CollisionMap.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 669
+											Login.loginIndex = 6; // L: 670
+											return; // L: 671
+										}
+
+										var30 = Login.loginBoxX + 180; // L: 673
+										var29 = 326; // L: 674
+										if (var18 == 1 && var25 >= var30 - 75 && var25 <= var30 + 75 && var26 >= var29 - 20 && var26 <= var29 + 20) { // L: 675
+											class69.Login_promptCredentials(false); // L: 676
+										}
+									} else if (Login.loginIndex == 24) { // L: 679
+										var27 = Login.loginBoxX + 180; // L: 680
+										var8 = 301; // L: 681
+										if (var18 == 1 && var25 >= var27 - 75 && var25 <= var27 + 75 && var26 >= var8 - 20 && var26 <= var8 + 20) { // L: 682
+											class69.Login_promptCredentials(false); // L: 683
+										}
+									}
+								} else {
+									while (true) {
+										do {
+											if (!SecureRandomCallable.isKeyDown()) { // L: 614
+												var28 = 321; // L: 619
+												if (var18 == 1 && var26 >= var28 - 20 && var26 <= var28 + 20) { // L: 620
+													class69.Login_promptCredentials(true); // L: 621
+												}
+
+												return;
+											}
+										} while(SoundCache.field446 != 84 && SoundCache.field446 != 13); // L: 615
+
+										class69.Login_promptCredentials(true); // L: 616
+									}
+								}
+							}
+						}
+					}
+
+				}
+			}
+		}
+	} // L: 206
 }
diff --git a/runescape-client/src/main/java/class213.java b/runescape-client/src/main/java/class213.java
deleted file mode 100644
index 2bdf3cc68d..0000000000
--- a/runescape-client/src/main/java/class213.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("hg")
-public interface class213 extends class215 {
-}
diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java
index 3ffc0daa08..2af8983a88 100644
--- a/runescape-client/src/main/java/class214.java
+++ b/runescape-client/src/main/java/class214.java
@@ -1,44 +1,5 @@
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hf")
-public abstract class class214 implements class216 {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1948210145
-	)
-	protected int field2558;
-
-	@ObfuscatedSignature(
-		descriptor = "(Ljd;Lkk;I)V"
-	)
-	protected class214(StudioGame var1, Language var2, int var3) {
-		this.field2558 = var3; // L: 10
-	} // L: 11
-
-	@ObfuscatedName("ah")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "-592432279"
-	)
-	static int method4280(int var0, Script var1, boolean var2) {
-		if (var0 == 6800) { // L: 4185
-			++Interpreter.Interpreter_stringStackSize; // L: 4186
-			return 1; // L: 4187
-		} else if (var0 != 6801 && var0 != 6802) { // L: 4189
-			if (var0 == 6850) { // L: 4193
-				++Interpreter.Interpreter_stringStackSize; // L: 4194
-				return 1; // L: 4195
-			} else if (var0 != 6851 && var0 != 6852) { // L: 4197
-				return 2; // L: 4201
-			} else {
-				++class44.Interpreter_intStackSize; // L: 4198
-				return 1; // L: 4199
-			}
-		} else {
-			++class44.Interpreter_intStackSize; // L: 4190
-			return 1; // L: 4191
-		}
-	}
+@ObfuscatedName("hi")
+public interface class214 extends class216 {
 }
diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java
index c882b98a60..f7e0b9ab33 100644
--- a/runescape-client/src/main/java/class215.java
+++ b/runescape-client/src/main/java/class215.java
@@ -1,5 +1,65 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ht")
-public interface class215 {
+@ObfuscatedName("hk")
+public abstract class class215 implements class217 {
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "Lbz;"
+	)
+	@Export("soundCache")
+	static SoundCache soundCache;
+	@ObfuscatedName("ag")
+	static String field2557;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 1817479427
+	)
+	protected int field2559;
+
+	@ObfuscatedSignature(
+		descriptor = "(Ljl;Lkn;I)V"
+	)
+	protected class215(StudioGame var1, Language var2, int var3) {
+		this.field2559 = var3; // L: 10
+	} // L: 11
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "([Ljava/lang/String;[IIIB)V",
+		garbageValue = "-125"
+	)
+	public static void method4434(String[] var0, int[] var1, int var2, int var3) {
+		if (var2 < var3) { // L: 39
+			int var4 = (var3 + var2) / 2; // L: 40
+			int var5 = var2; // L: 41
+			String var6 = var0[var4]; // L: 42
+			var0[var4] = var0[var3]; // L: 43
+			var0[var3] = var6; // L: 44
+			int var7 = var1[var4]; // L: 45
+			var1[var4] = var1[var3]; // L: 46
+			var1[var3] = var7; // L: 47
+
+			for (int var8 = var2; var8 < var3; ++var8) { // L: 48
+				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 49
+					String var9 = var0[var8]; // L: 50
+					var0[var8] = var0[var5]; // L: 51
+					var0[var5] = var9; // L: 52
+					int var10 = var1[var8]; // L: 53
+					var1[var8] = var1[var5]; // L: 54
+					var1[var5++] = var10; // L: 55
+				}
+			}
+
+			var0[var3] = var0[var5]; // L: 59
+			var0[var5] = var6; // L: 60
+			var1[var3] = var1[var5]; // L: 61
+			var1[var5] = var7; // L: 62
+			method4434(var0, var1, var2, var5 - 1); // L: 63
+			method4434(var0, var1, var5 + 1, var3); // L: 64
+		}
+
+	} // L: 66
 }
diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java
index 8224f262be..cd3180e59a 100644
--- a/runescape-client/src/main/java/class216.java
+++ b/runescape-client/src/main/java/class216.java
@@ -1,5 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("hm")
-public interface class216 extends Iterable {
+@ObfuscatedName("hx")
+public interface class216 {
 }
diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java
index 6ae7c12e5c..d41b42da6c 100644
--- a/runescape-client/src/main/java/class217.java
+++ b/runescape-client/src/main/java/class217.java
@@ -1,7 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("hh")
-public interface class217 {
-	@ObfuscatedName("v")
-	void method4282(Object var1);
+@ObfuscatedName("hc")
+public interface class217 extends Iterable {
 }
diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java
new file mode 100644
index 0000000000..3fe83ca896
--- /dev/null
+++ b/runescape-client/src/main/java/class218.java
@@ -0,0 +1,7 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("hm")
+public interface class218 {
+	@ObfuscatedName("f")
+	void method4438(Object var1);
+}
diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java
index 4d701e42f7..65368d3706 100644
--- a/runescape-client/src/main/java/class22.java
+++ b/runescape-client/src/main/java/class22.java
@@ -3,83 +3,117 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("t")
+@ObfuscatedName("n")
 public class class22 extends class14 {
-	@ObfuscatedName("t")
-	@Export("userHomeDirectory")
-	public static String userHomeDirectory;
-	@ObfuscatedName("kh")
-	@ObfuscatedGetter(
-		intValue = 1115122599
+	@ObfuscatedName("o")
+	static byte[][][] field186;
+	@ObfuscatedName("gd")
+	@ObfuscatedSignature(
+		descriptor = "Loa;"
 	)
-	@Export("Client_plane")
-	static int Client_plane;
-	@ObfuscatedName("v")
+	@Export("redHintArrowSprite")
+	static SpritePixels redHintArrowSprite;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 242899457
+		intValue = 1693043909
 	)
-	int field194;
+	int field182;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class22(class2 var1) {
 		this.this$0 = var1;
-		this.field194 = -1; // L: 114
+		this.field182 = -1; // L: 114
 	} // L: 116
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field194 = var1.readUnsignedShort(); // L: 119
+	void vmethod363(Buffer var1) {
+		this.field182 = var1.readUnsignedShort(); // L: 119
 	} // L: 120
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method121(this.field194); // L: 123
+	void vmethod354(ClanSettings var1) {
+		var1.method127(this.field182); // L: 123
 	} // L: 124
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lhq;",
-		garbageValue = "-115271413"
+		descriptor = "(II)I",
+		garbageValue = "616364541"
 	)
-	public static PacketBufferNode method247() {
-		PacketBufferNode var0;
-		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 47
-			var0 = new PacketBufferNode(); // L: 48
+	static int method306(int var0) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75
+		if (var1 == null) { // L: 76
+			return -1;
 		} else {
-			var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 51
+			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 77 78
 		}
-
-		var0.clientPacket = null; // L: 54
-		var0.clientPacketLength = 0; // L: 55
-		var0.packetBuffer = new PacketBuffer(5000); // L: 56
-		return var0; // L: 57
 	}
 
-	@ObfuscatedName("ii")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "188298202"
+		descriptor = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
+		garbageValue = "-39"
 	)
-	@Export("resumePauseWidget")
-	static void resumePauseWidget(int var0, int var1) {
-		PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 8662
-		var2.packetBuffer.method6619(var1); // L: 8663
-		var2.packetBuffer.writeIntME(var0); // L: 8664
-		Client.packetWriter.addNode(var2); // L: 8665
-	} // L: 8666
+	public static String method315(CharSequence var0) {
+		int var2 = var0.length(); // L: 190
+		char[] var3 = new char[var2]; // L: 192
+
+		for (int var4 = 0; var4 < var2; ++var4) { // L: 193
+			var3[var4] = '*';
+		}
+
+		String var1 = new String(var3); // L: 194
+		return var1; // L: 196
+	}
+
+	@ObfuscatedName("ix")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V",
+		garbageValue = "-17"
+	)
+	@Export("insertMenuItemNoShift")
+	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
+		PacketWriter.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8950
+	} // L: 8951
+
+	@ObfuscatedName("jy")
+	@ObfuscatedSignature(
+		descriptor = "(II)Z",
+		garbageValue = "-608958445"
+	)
+	static boolean method314(int var0) {
+		for (int var1 = 0; var1 < Client.field847; ++var1) { // L: 10857
+			if (Client.field786[var1] == var0) { // L: 10858
+				return true;
+			}
+		}
+
+		return false; // L: 10860
+	}
+
+	@ObfuscatedName("lj")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I)I",
+		garbageValue = "1053231968"
+	)
+	@Export("getWidgetFlags")
+	static int getWidgetFlags(Widget var0) {
+		IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 11546
+		return var1 != null ? var1.integer : var0.flags; // L: 11547 11548
+	}
 }
diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java
deleted file mode 100644
index 9f12400da7..0000000000
--- a/runescape-client/src/main/java/class223.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("hr")
-public interface class223 {
-}
diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java
new file mode 100644
index 0000000000..823bcc1315
--- /dev/null
+++ b/runescape-client/src/main/java/class224.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("hz")
+public interface class224 {
+}
diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java
deleted file mode 100644
index 9673e0377c..0000000000
--- a/runescape-client/src/main/java/class225.java
+++ /dev/null
@@ -1,104 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ha")
-public class class225 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2686;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2680;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2682;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2683;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2681;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2685;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2687;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2684;
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2688;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Lha;"
-	)
-	public static final class225 field2689;
-
-	static {
-		field2686 = new class225(15); // L: 5
-		field2680 = new class225(7); // L: 6
-		field2682 = new class225(2); // L: 7
-		field2683 = new class225(5); // L: 8
-		field2681 = new class225(14); // L: 9
-		field2685 = new class225(3); // L: 10
-		field2687 = new class225(5); // L: 11
-		field2684 = new class225(4); // L: 12
-		field2688 = new class225(4); // L: 13
-		field2689 = new class225(6); // L: 14
-	}
-
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "15"
-	)
-	class225(int var1) {
-	} // L: 20
-
-	@ObfuscatedName("ia")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIIB)V",
-		garbageValue = "-40"
-	)
-	@Export("drawWidgets")
-	static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-		if (Clock.loadInterface(var0)) { // L: 9193
-			class4.field49 = null; // L: 9200
-			class303.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 9201
-			if (class4.field49 != null) { // L: 9202
-				class303.drawInterface(class4.field49, -1412584499, var1, var2, var3, var4, ClanChannel.field38, class82.field1020, var7); // L: 9203
-				class4.field49 = null; // L: 9204
-			}
-
-		} else {
-			if (var7 != -1) { // L: 9194
-				Client.field719[var7] = true;
-			} else {
-				for (int var8 = 0; var8 < 100; ++var8) { // L: 9196
-					Client.field719[var8] = true;
-				}
-			}
-
-		}
-	} // L: 9198 9206
-}
diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java
new file mode 100644
index 0000000000..6628f3f874
--- /dev/null
+++ b/runescape-client/src/main/java/class226.java
@@ -0,0 +1,211 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hj")
+public class class226 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2688;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2683;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2684;
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2692;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2693;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2687;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2686;
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2689;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2690;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "Lhj;"
+	)
+	public static final class226 field2691;
+
+	static {
+		field2688 = new class226(5); // L: 5
+		field2683 = new class226(4); // L: 6
+		field2684 = new class226(3); // L: 7
+		field2692 = new class226(6); // L: 8
+		field2693 = new class226(7); // L: 9
+		field2687 = new class226(5); // L: 10
+		field2686 = new class226(4);
+		field2689 = new class226(15);
+		field2690 = new class226(2);
+		field2691 = new class226(14);
+	}
+
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "5"
+	)
+	class226(int var1) {
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lkn;I)I",
+		garbageValue = "456849187"
+	)
+	@Export("compareStrings")
+	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
+		int var3 = var0.length(); // L: 11
+		int var4 = var1.length(); // L: 12
+		int var5 = 0; // L: 13
+		int var6 = 0; // L: 14
+		byte var7 = 0; // L: 15
+		byte var8 = 0; // L: 16
+
+		while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18
+			if (var5 - var7 >= var3) { // L: 19
+				return -1;
+			}
+
+			if (var6 - var8 >= var4) { // L: 20
+				return 1;
+			}
+
+			char var9;
+			if (var7 != 0) { // L: 23
+				var9 = (char)var7; // L: 24
+				boolean var14 = false; // L: 25
+			} else {
+				var9 = var0.charAt(var5++); // L: 27
+			}
+
+			char var10;
+			if (var8 != 0) { // L: 28
+				var10 = (char)var8; // L: 29
+				boolean var15 = false; // L: 30
+			} else {
+				var10 = var1.charAt(var6++); // L: 32
+			}
+
+			byte var11;
+			if (var9 == 198) { // L: 35
+				var11 = 69; // L: 36
+			} else if (var9 == 230) { // L: 39
+				var11 = 101; // L: 40
+			} else if (var9 == 223) { // L: 43
+				var11 = 115; // L: 44
+			} else if (var9 == 338) { // L: 47
+				var11 = 69; // L: 48
+			} else if (var9 == 339) { // L: 51
+				var11 = 101; // L: 52
+			} else {
+				var11 = 0; // L: 55
+			}
+
+			var7 = var11; // L: 57
+			byte var12;
+			if (var10 == 198) { // L: 60
+				var12 = 69; // L: 61
+			} else if (var10 == 230) { // L: 64
+				var12 = 101; // L: 65
+			} else if (var10 == 223) { // L: 68
+				var12 = 115; // L: 69
+			} else if (var10 == 338) { // L: 72
+				var12 = 69; // L: 73
+			} else if (var10 == 339) { // L: 76
+				var12 = 101; // L: 77
+			} else {
+				var12 = 0; // L: 80
+			}
+
+			var8 = var12; // L: 82
+			var9 = class244.standardizeChar(var9, var2); // L: 83
+			var10 = class244.standardizeChar(var10, var2); // L: 84
+			if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 85
+				var9 = Character.toLowerCase(var9); // L: 86
+				var10 = Character.toLowerCase(var10); // L: 87
+				if (var10 != var9) { // L: 88
+					return SpotAnimationDefinition.lowercaseChar(var9, var2) - SpotAnimationDefinition.lowercaseChar(var10, var2);
+				}
+			}
+		}
+
+		int var16 = Math.min(var3, var4); // L: 91
+
+		int var17;
+		char var20;
+		for (var17 = 0; var17 < var16; ++var17) { // L: 92
+			if (var2 == Language.Language_FR) { // L: 93
+				var5 = var3 - 1 - var17; // L: 94
+				var6 = var4 - 1 - var17; // L: 95
+			} else {
+				var6 = var17; // L: 97
+				var5 = var17;
+			}
+
+			char var18 = var0.charAt(var5); // L: 98
+			var20 = var1.charAt(var6); // L: 99
+			if (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { // L: 100
+				var18 = Character.toLowerCase(var18); // L: 101
+				var20 = Character.toLowerCase(var20); // L: 102
+				if (var20 != var18) {
+					return SpotAnimationDefinition.lowercaseChar(var18, var2) - SpotAnimationDefinition.lowercaseChar(var20, var2); // L: 103
+				}
+			}
+		}
+
+		var17 = var3 - var4; // L: 106
+		if (var17 != 0) { // L: 107
+			return var17;
+		} else {
+			for (int var19 = 0; var19 < var16; ++var19) { // L: 108
+				var20 = var0.charAt(var19); // L: 109
+				char var13 = var1.charAt(var19); // L: 110
+				if (var20 != var13) { // L: 111
+					return SpotAnimationDefinition.lowercaseChar(var20, var2) - SpotAnimationDefinition.lowercaseChar(var13, var2);
+				}
+			}
+
+			return 0; // L: 113
+		}
+	}
+
+	@ObfuscatedName("ke")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1374315028"
+	)
+	@Export("updateSoundEffectVolume")
+	static final void updateSoundEffectVolume(int var0) {
+		var0 = Math.min(Math.max(var0, 0), 127); // L: 11132
+		class4.clientPreferences.soundEffectsVolume = var0; // L: 11133
+		Actor.savePreferences(); // L: 11134
+	} // L: 11135
+}
diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java
deleted file mode 100644
index 4697a1f0ef..0000000000
--- a/runescape-client/src/main/java/class229.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("hu")
-public class class229 {
-	@ObfuscatedName("d")
-	static int[][] field2813;
-
-	@ObfuscatedName("r")
-	public static int method4374(long var0) {
-		return (int)(var0 >>> 7 & 127L); // L: 72
-	}
-}
diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java
index f5b74149ea..eea7049752 100644
--- a/runescape-client/src/main/java/class23.java
+++ b/runescape-client/src/main/java/class23.java
@@ -3,112 +3,79 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("h")
+@ObfuscatedName("l")
 public class class23 extends class14 {
-	@ObfuscatedName("u")
-	@Export("Tiles_saturation")
-	static int[] Tiles_saturation;
-	@ObfuscatedName("au")
-	@Export("client")
-	@ObfuscatedSignature(
-		descriptor = "Lclient;"
-	)
-	static Client client;
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
+	@Export("operatingSystemName")
+	public static String operatingSystemName;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1071704973
+		intValue = 339931933
 	)
-	int field199;
-	@ObfuscatedName("n")
-	byte field198;
+	int field190;
+	@ObfuscatedName("e")
+	byte field189;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class23(class2 var1) {
 		this.this$0 = var1;
-		this.field199 = -1; // L: 128
+		this.field190 = -1; // L: 128
 	} // L: 131
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field199 = var1.readUnsignedShort(); // L: 134
-		this.field198 = var1.readByte(); // L: 135
+	void vmethod363(Buffer var1) {
+		this.field190 = var1.readUnsignedShort(); // L: 134
+		this.field189 = var1.readByte(); // L: 135
 	} // L: 136
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method112(this.field199, this.field198); // L: 139
+	void vmethod354(ClanSettings var1) {
+		var1.method131(this.field190, this.field189); // L: 139
 	} // L: 140
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)Leg;",
-		garbageValue = "-1295127026"
+		descriptor = "(II)Ler;",
+		garbageValue = "202044265"
 	)
-	@Export("getObjectDefinition")
-	public static ObjectComposition getObjectDefinition(int var0) {
-		ObjectComposition var1 = (ObjectComposition)ObjectComposition.ObjectDefinition_cached.get((long)var0); // L: 73
-		if (var1 != null) { // L: 74
+	@Export("KitDefinition_get")
+	public static KitDefinition KitDefinition_get(int var0) {
+		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 27
+		if (var1 != null) { // L: 28
 			return var1;
 		} else {
-			byte[] var2 = ObjectComposition.ObjectDefinition_archive.takeFile(6, var0); // L: 75
-			var1 = new ObjectComposition(); // L: 76
-			var1.id = var0; // L: 77
-			if (var2 != null) { // L: 78
+			byte[] var2 = class125.KitDefinition_archive.takeFile(3, var0); // L: 29
+			var1 = new KitDefinition(); // L: 30
+			if (var2 != null) { // L: 31
 				var1.decode(new Buffer(var2));
 			}
 
-			var1.postDecode(); // L: 79
-			if (var1.isSolid) { // L: 80
-				var1.interactType = 0; // L: 81
-				var1.boolean1 = false; // L: 82
-			}
-
-			ObjectComposition.ObjectDefinition_cached.put(var1, (long)var0); // L: 84
-			return var1; // L: 85
+			KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 32
+			return var1; // L: 33
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-686141430"
+		descriptor = "(I)[Lhl;",
+		garbageValue = "-2126823269"
 	)
-	@Export("Messages_getHistorySize")
-	static int Messages_getHistorySize(int var0) {
-		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44
-		return var1 == null ? 0 : var1.size(); // L: 45 46
+	static LoginPacket[] method318() {
+		return new LoginPacket[]{LoginPacket.field2809, LoginPacket.field2804, LoginPacket.field2802, LoginPacket.field2801, LoginPacket.field2806, LoginPacket.field2803}; // L: 22
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;IB)V",
-		garbageValue = "-43"
-	)
-	@Export("Widget_setKeyIgnoreHeld")
-	static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
-		if (var0.field3033 == null) { // L: 996
-			throw new RuntimeException(); // L: 997
-		} else {
-			if (var0.field3012 == null) { // L: 999
-				var0.field3012 = new int[var0.field3033.length]; // L: 1000
-			}
-
-			var0.field3012[var1] = Integer.MAX_VALUE; // L: 1002
-		}
-	} // L: 1003
 }
diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java
index 8853f51263..a32d2645ba 100644
--- a/runescape-client/src/main/java/class230.java
+++ b/runescape-client/src/main/java/class230.java
@@ -1,20 +1,16 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hi")
+@ObfuscatedName("hq")
 public class class230 {
 	@ObfuscatedName("v")
-	static int[] field2814;
-
-	static {
-		new Object();
-		field2814 = new int[33]; // L: 8
-		field2814[0] = 0; // L: 11
-		int var0 = 2; // L: 12
-
-		for (int var1 = 1; var1 < 33; ++var1) { // L: 13
-			field2814[var1] = var0 - 1; // L: 14
-			var0 += var0; // L: 15
-		}
-
-	} // L: 17
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("soundEffectsArchive")
+	static AbstractArchive soundEffectsArchive;
+	@ObfuscatedName("d")
+	@Export("Tiles_hue")
+	static int[] Tiles_hue;
 }
diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java
new file mode 100644
index 0000000000..6788db27ef
--- /dev/null
+++ b/runescape-client/src/main/java/class231.java
@@ -0,0 +1,24 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("hb")
+public class class231 {
+	@ObfuscatedName("f")
+	static int[] field2817;
+	@ObfuscatedName("o")
+	@Export("Interpreter_intLocals")
+	static int[] Interpreter_intLocals;
+
+	static {
+		new Object();
+		field2817 = new int[33]; // L: 8
+		field2817[0] = 0; // L: 11
+		int var0 = 2; // L: 12
+
+		for (int var1 = 1; var1 < 33; ++var1) { // L: 13
+			field2817[var1] = var0 - 1; // L: 14
+			var0 += var0; // L: 15
+		}
+
+	} // L: 17
+}
diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java
deleted file mode 100644
index ba35650dc4..0000000000
--- a/runescape-client/src/main/java/class232.java
+++ /dev/null
@@ -1,45 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("hx")
-public class class232 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("musicPatchesArchive")
-	public static AbstractArchive musicPatchesArchive;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("musicSamplesArchive")
-	public static AbstractArchive musicSamplesArchive;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1481365935
-	)
-	@Export("musicPlayerStatus")
-	public static int musicPlayerStatus;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = -528081795
-	)
-	@Export("musicTrackVolume")
-	public static int musicTrackVolume;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 974163603
-	)
-	@Export("pcmSampleLength")
-	static int pcmSampleLength;
-	@ObfuscatedName("u")
-	@Export("musicTrackBoolean")
-	public static boolean musicTrackBoolean;
-
-	static {
-		musicPlayerStatus = 0; // L: 11
-	}
-}
diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java
new file mode 100644
index 0000000000..a41fb4e266
--- /dev/null
+++ b/runescape-client/src/main/java/class233.java
@@ -0,0 +1,87 @@
+import java.util.Iterator;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("hu")
+public class class233 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("musicPatchesArchive")
+	static AbstractArchive musicPatchesArchive;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("musicSamplesArchive")
+	static AbstractArchive musicSamplesArchive;
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Lie;"
+	)
+	@Export("midiPcmStream")
+	public static MidiPcmStream midiPcmStream;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 1830470507
+	)
+	@Export("musicPlayerStatus")
+	public static int musicPlayerStatus;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 737536913
+	)
+	@Export("musicTrackGroupId")
+	static int musicTrackGroupId;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 2069397721
+	)
+	@Export("musicTrackFileId")
+	static int musicTrackFileId;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = 1994370717
+	)
+	@Export("musicTrackVolume")
+	public static int musicTrackVolume;
+
+	static {
+		musicPlayerStatus = 0; // L: 11
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-7"
+	)
+	static void method4541() {
+		Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 66
+
+		while (var0.hasNext()) { // L: 71
+			Message var1 = (Message)var0.next(); // L: 67
+			var1.clearIsFromIgnored(); // L: 69
+		}
+
+	} // L: 72
+
+	@ObfuscatedName("fj")
+	@ObfuscatedSignature(
+		descriptor = "(S)V",
+		garbageValue = "850"
+	)
+	@Export("playPcmPlayers")
+	static final void playPcmPlayers() {
+		if (UrlRequester.pcmPlayer1 != null) { // L: 3751
+			UrlRequester.pcmPlayer1.run();
+		}
+
+		if (SoundCache.pcmPlayer0 != null) { // L: 3752
+			SoundCache.pcmPlayer0.run();
+		}
+
+	} // L: 3753
+}
diff --git a/runescape-client/src/main/java/class24.java b/runescape-client/src/main/java/class24.java
index 31952ee62b..6daf3c3af0 100644
--- a/runescape-client/src/main/java/class24.java
+++ b/runescape-client/src/main/java/class24.java
@@ -1,401 +1,18 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("q")
+@ObfuscatedName("w")
 public class class24 {
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "Lca;"
-	)
-	@Export("loginScreenRunesAnimation")
-	static LoginScreenAnimation loginScreenRunesAnimation;
-	@ObfuscatedName("gu")
-	@Export("regionLandArchiveIds")
-	static int[] regionLandArchiveIds;
-	@ObfuscatedName("lp")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1944838207
+		intValue = 2105932695
 	)
-	@Export("menuHeight")
-	static int menuHeight;
+	@Export("idxCount")
+	public static int idxCount;
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Lhl;",
-		garbageValue = "603080453"
-	)
-	@Export("ServerPacket_values")
-	public static ServerPacket[] ServerPacket_values() {
-		return new ServerPacket[]{ServerPacket.field2780, ServerPacket.field2751, ServerPacket.field2702, ServerPacket.field2703, ServerPacket.field2704, ServerPacket.field2705, ServerPacket.field2706, ServerPacket.field2798, ServerPacket.field2708, ServerPacket.field2785, ServerPacket.field2729, ServerPacket.field2711, ServerPacket.field2748, ServerPacket.field2713, ServerPacket.field2714, ServerPacket.field2760, ServerPacket.field2716, ServerPacket.field2717, ServerPacket.field2746, ServerPacket.field2719, ServerPacket.field2709, ServerPacket.field2721, ServerPacket.field2715, ServerPacket.field2723, ServerPacket.field2724, ServerPacket.field2725, ServerPacket.field2726, ServerPacket.field2775, ServerPacket.field2756, ServerPacket.field2722, ServerPacket.field2764, ServerPacket.field2731, ServerPacket.field2712, ServerPacket.field2795, ServerPacket.field2734, ServerPacket.field2735, ServerPacket.field2700, ServerPacket.field2737, ServerPacket.field2749, ServerPacket.field2739, ServerPacket.field2740, ServerPacket.field2741, ServerPacket.field2742, ServerPacket.field2743, ServerPacket.field2744, ServerPacket.field2745, ServerPacket.field2774, ServerPacket.field2732, ServerPacket.field2773, ServerPacket.field2738, ServerPacket.field2750, ServerPacket.field2747, ServerPacket.field2752, ServerPacket.field2753, ServerPacket.field2754, ServerPacket.field2755, ServerPacket.field2757, ServerPacket.field2789, ServerPacket.field2710, ServerPacket.field2759, ServerPacket.field2793, ServerPacket.field2761, ServerPacket.field2762, ServerPacket.field2763, ServerPacket.field2787, ServerPacket.field2765, ServerPacket.field2784, ServerPacket.field2767, ServerPacket.field2730, ServerPacket.field2769, ServerPacket.field2770, ServerPacket.field2771, ServerPacket.field2772, ServerPacket.field2768, ServerPacket.field2701, ServerPacket.field2718, ServerPacket.field2776, ServerPacket.field2777, ServerPacket.field2778, ServerPacket.field2779, ServerPacket.field2794, ServerPacket.field2781, ServerPacket.field2782, ServerPacket.field2783, ServerPacket.field2727, ServerPacket.field2728, ServerPacket.field2786, ServerPacket.field2707, ServerPacket.field2788, ServerPacket.field2766, ServerPacket.field2790, ServerPacket.field2791, ServerPacket.field2792, ServerPacket.field2720, ServerPacket.field2736}; // L: 104
+	@ObfuscatedName("y")
+	public static boolean method329(long var0) {
+		return (int)(var0 >>> 16 & 1L) == 1; // L: 60
 	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;IZB)I",
-		garbageValue = "-105"
-	)
-	public static int method260(CharSequence var0, int var1, boolean var2) {
-		if (var1 >= 2 && var1 <= 36) { // L: 71
-			boolean var3 = false; // L: 72
-			boolean var4 = false; // L: 73
-			int var5 = 0; // L: 74
-			int var6 = var0.length(); // L: 75
-
-			for (int var7 = 0; var7 < var6; ++var7) { // L: 76
-				char var8 = var0.charAt(var7); // L: 77
-				if (var7 == 0) { // L: 78
-					if (var8 == '-') { // L: 79
-						var3 = true; // L: 80
-						continue;
-					}
-
-					if (var8 == '+') { // L: 83
-						continue;
-					}
-				}
-
-				int var10;
-				if (var8 >= '0' && var8 <= '9') { // L: 85
-					var10 = var8 - '0';
-				} else if (var8 >= 'A' && var8 <= 'Z') { // L: 86
-					var10 = var8 - '7';
-				} else {
-					if (var8 < 'a' || var8 > 'z') { // L: 87
-						throw new NumberFormatException(); // L: 88
-					}
-
-					var10 = var8 - 'W';
-				}
-
-				if (var10 >= var1) { // L: 89
-					throw new NumberFormatException();
-				}
-
-				if (var3) { // L: 90
-					var10 = -var10;
-				}
-
-				int var9 = var10 + var5 * var1; // L: 91
-				if (var9 / var1 != var5) { // L: 92
-					throw new NumberFormatException();
-				}
-
-				var5 = var9; // L: 93
-				var4 = true; // L: 94
-			}
-
-			if (!var4) { // L: 96
-				throw new NumberFormatException();
-			} else {
-				return var5; // L: 97
-			}
-		} else {
-			throw new IllegalArgumentException("" + var1);
-		}
-	}
-
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "(S)[Lop;",
-		garbageValue = "-29644"
-	)
-	static IndexedSprite[] method262() {
-		IndexedSprite[] var0 = new IndexedSprite[class396.SpriteBuffer_spriteCount]; // L: 146
-
-		for (int var1 = 0; var1 < class396.SpriteBuffer_spriteCount; ++var1) { // L: 147
-			IndexedSprite var2 = var0[var1] = new IndexedSprite(); // L: 148
-			var2.width = class396.SpriteBuffer_spriteWidth; // L: 149
-			var2.height = UserComparator2.SpriteBuffer_spriteHeight; // L: 150
-			var2.xOffset = WorldMapDecoration.SpriteBuffer_xOffsets[var1]; // L: 151
-			var2.yOffset = Calendar.SpriteBuffer_yOffsets[var1]; // L: 152
-			var2.subWidth = class396.SpriteBuffer_spriteWidths[var1]; // L: 153
-			var2.subHeight = class302.SpriteBuffer_spriteHeights[var1]; // L: 154
-			var2.palette = MilliClock.SpriteBuffer_spritePalette; // L: 155
-			var2.pixels = class396.SpriteBuffer_pixels[var1]; // L: 156
-		}
-
-		MilliClock.method2587(); // L: 158
-		return var0; // L: 159
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-355325275"
-	)
-	public static void method259() {
-		ObjectComposition.ObjectDefinition_cached.clear(); // L: 404
-		ObjectComposition.ObjectDefinition_cachedModelData.clear(); // L: 405
-		ObjectComposition.ObjectDefinition_cachedEntities.clear(); // L: 406
-		ObjectComposition.ObjectDefinition_cachedModels.clear(); // L: 407
-	} // L: 408
-
-	@ObfuscatedName("ar")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "5"
-	)
-	static int method261(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3206
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3207
-			return 1; // L: 3208
-		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3210
-			class44.Interpreter_intStackSize -= 3; // L: 3211
-			Client.publicChatMode = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3212
-			ScriptEvent.privateChatMode = class124.method2498(Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]); // L: 3213
-			if (ScriptEvent.privateChatMode == null) { // L: 3214
-				ScriptEvent.privateChatMode = PrivateChatMode.field3887;
-			}
-
-			Client.tradeChatMode = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 3215
-			PacketBufferNode var13 = class21.getPacketBufferNode(ClientPacket.field2611, Client.packetWriter.isaacCipher); // L: 3217
-			var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3218
-			var13.packetBuffer.writeByte(ScriptEvent.privateChatMode.field3890); // L: 3219
-			var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3220
-			Client.packetWriter.addNode(var13); // L: 3221
-			return 1; // L: 3222
-		} else {
-			PacketBufferNode var6;
-			int var7;
-			String var8;
-			int var9;
-			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3224
-				var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3225
-				class44.Interpreter_intStackSize -= 2; // L: 3226
-				var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3227
-				var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3228
-				var6 = class21.getPacketBufferNode(ClientPacket.field2596, Client.packetWriter.isaacCipher); // L: 3230
-				var6.packetBuffer.writeByte(Tiles.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3231
-				var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3232
-				var6.packetBuffer.writeByte(var7 - 1); // L: 3233
-				var6.packetBuffer.writeByte(var9); // L: 3234
-				Client.packetWriter.addNode(var6); // L: 3235
-				return 1; // L: 3236
-			} else {
-				int var3;
-				Message var5;
-				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3238
-					class44.Interpreter_intStackSize -= 2; // L: 3239
-					var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3240
-					var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3241
-					var5 = ClanChannelMember.Messages_getByChannelAndID(var3, var7); // L: 3242
-					if (var5 != null) { // L: 3243
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.count; // L: 3244
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.cycle; // L: 3245
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3246
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3247
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3248
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3249
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3252
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3253
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3254
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3255
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3256
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3257
-					}
-
-					return 1; // L: 3259
-				} else {
-					Message var4;
-					if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3261
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3262
-						var4 = class124.Messages_getMessage(var3); // L: 3263
-						if (var4 != null) { // L: 3264
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.type; // L: 3265
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.cycle; // L: 3266
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3267
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3268
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3269
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3270
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3273
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3274
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3275
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3276
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3277
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3278
-						}
-
-						return 1; // L: 3280
-					} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3282
-						if (ScriptEvent.privateChatMode == null) { // L: 3283
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1;
-						} else {
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ScriptEvent.privateChatMode.field3890; // L: 3284
-						}
-
-						return 1; // L: 3285
-					} else {
-						PacketBufferNode var12;
-						if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3287
-							var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3288
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3289
-							var12 = WorldMapSectionType.method3596(var7, var8, class378.clientLanguage, -1); // L: 3290
-							Client.packetWriter.addNode(var12); // L: 3291
-							return 1; // L: 3292
-						} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3294
-							Interpreter.Interpreter_stringStackSize -= 2; // L: 3295
-							var8 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3296
-							String var11 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3297
-							var12 = class21.getPacketBufferNode(ClientPacket.field2614, Client.packetWriter.isaacCipher); // L: 3299
-							var12.packetBuffer.writeShort(0); // L: 3300
-							int var10 = var12.packetBuffer.offset; // L: 3301
-							var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3302
-							ParamComposition.method2878(var12.packetBuffer, var11); // L: 3303
-							var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3304
-							Client.packetWriter.addNode(var12); // L: 3305
-							return 1; // L: 3306
-						} else if (var0 == 5010) { // L: 3308
-							var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3309
-							class44.Interpreter_intStackSize -= 2; // L: 3310
-							var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3311
-							var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3312
-							var6 = WorldMapSectionType.method3596(var7, var8, class378.clientLanguage, var9); // L: 3313
-							Client.packetWriter.addNode(var6); // L: 3314
-							return 1; // L: 3315
-						} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3317
-							if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3324
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3325
-								return 1; // L: 3326
-							} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3328
-								var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3329
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class23.Messages_getHistorySize(var3); // L: 3330
-								return 1; // L: 3331
-							} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3333
-								var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3334
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class17.Messages_getLastChatID(var3); // L: 3335
-								return 1; // L: 3336
-							} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3338
-								var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3339
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Timer.method5595(var3); // L: 3340
-								return 1; // L: 3341
-							} else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3343
-								var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3344
-								class302.doCheat(var8); // L: 3345
-								return 1; // L: 3346
-							} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3348
-								Client.field863 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3349
-								return 1; // L: 3350
-							} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3352
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field863; // L: 3353
-								return 1; // L: 3354
-							} else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3356
-								var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3357
-								System.out.println(var8); // L: 3358
-								return 1; // L: 3359
-							} else if (var0 == 5024) { // L: 3361
-								--class44.Interpreter_intStackSize; // L: 3362
-								return 1; // L: 3363
-							} else if (var0 == 5025) { // L: 3365
-								++class44.Interpreter_intStackSize; // L: 3366
-								return 1; // L: 3367
-							} else if (var0 == 5030) { // L: 3369
-								class44.Interpreter_intStackSize -= 2; // L: 3370
-								var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3371
-								var7 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3372
-								var5 = ClanChannelMember.Messages_getByChannelAndID(var3, var7); // L: 3373
-								if (var5 != null) { // L: 3374
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.count; // L: 3375
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.cycle; // L: 3376
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3377
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3378
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3379
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3380
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3381
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3382
-								} else {
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3385
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3386
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3387
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3388
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3389
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3390
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3391
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3392
-								}
-
-								return 1; // L: 3394
-							} else if (var0 == 5031) { // L: 3396
-								var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3397
-								var4 = class124.Messages_getMessage(var3); // L: 3398
-								if (var4 != null) { // L: 3399
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.type; // L: 3400
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.cycle; // L: 3401
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3402
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3403
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3404
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3405
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3406
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3407
-								} else {
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1; // L: 3410
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3411
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3412
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3413
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3414
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3415
-									Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 3416
-									Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3417
-								}
-
-								return 1; // L: 3419
-							} else {
-								return 2; // L: 3421
-							}
-						} else {
-							if (class93.localPlayer != null && class93.localPlayer.username != null) { // L: 3319
-								var8 = class93.localPlayer.username.getName();
-							} else {
-								var8 = ""; // L: 3320
-							}
-
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8; // L: 3321
-							return 1; // L: 3322
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("jl")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;III)V",
-		garbageValue = "-1951037780"
-	)
-	@Export("alignWidgetPosition")
-	static void alignWidgetPosition(Widget var0, int var1, int var2) {
-		if (var0.xAlignment == 0) { // L: 9806
-			var0.x = var0.rawX;
-		} else if (var0.xAlignment == 1) { // L: 9807
-			var0.x = var0.rawX + (var1 - var0.width) / 2;
-		} else if (var0.xAlignment == 2) { // L: 9808
-			var0.x = var1 - var0.width - var0.rawX;
-		} else if (var0.xAlignment == 3) { // L: 9809
-			var0.x = var0.rawX * var1 >> 14;
-		} else if (var0.xAlignment == 4) { // L: 9810
-			var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14);
-		} else {
-			var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9811
-		}
-
-		if (var0.yAlignment == 0) { // L: 9812
-			var0.y = var0.rawY;
-		} else if (var0.yAlignment == 1) { // L: 9813
-			var0.y = (var2 - var0.height) / 2 + var0.rawY;
-		} else if (var0.yAlignment == 2) { // L: 9814
-			var0.y = var2 - var0.height - var0.rawY;
-		} else if (var0.yAlignment == 3) {
-			var0.y = var2 * var0.rawY >> 14; // L: 9815
-		} else if (var0.yAlignment == 4) { // L: 9816
-			var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14);
-		} else {
-			var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9817
-		}
-
-	} // L: 9818
 }
diff --git a/runescape-client/src/main/java/class243.java b/runescape-client/src/main/java/class243.java
deleted file mode 100644
index 922905d4f1..0000000000
--- a/runescape-client/src/main/java/class243.java
+++ /dev/null
@@ -1,56 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("iu")
-public class class243 {
-	@ObfuscatedName("tz")
-	@ObfuscatedSignature(
-		descriptor = "Lmc;"
-	)
-	@Export("worldMap")
-	static WorldMap worldMap;
-	@ObfuscatedName("lb")
-	@ObfuscatedGetter(
-		intValue = -334285379
-	)
-	@Export("menuY")
-	static int menuY;
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "754026835"
-	)
-	static void method4668() {
-		if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119
-			KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120
-			KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121
-			KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122
-			KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123
-			KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124
-			KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125
-			KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126
-			KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127
-			KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128
-			KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129
-			KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130
-			KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131
-		} else {
-			KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134
-			KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135
-			KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136
-			KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137
-			KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138
-			KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139
-			KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140
-			KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141
-			KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142
-			KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143
-			KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144
-			KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145
-		}
-
-	} // L: 147
-}
diff --git a/runescape-client/src/main/java/class244.java b/runescape-client/src/main/java/class244.java
new file mode 100644
index 0000000000..77a92a54e6
--- /dev/null
+++ b/runescape-client/src/main/java/class244.java
@@ -0,0 +1,159 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ip")
+public class class244 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("WorldMapElement_archive")
+	public static AbstractArchive WorldMapElement_archive;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1663390297
+	)
+	@Export("SpriteBuffer_spriteHeight")
+	public static int SpriteBuffer_spriteHeight;
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lls;",
+		garbageValue = "-2119409839"
+	)
+	public static PrivateChatMode method4812(int var0) {
+		PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3885, PrivateChatMode.field3886, PrivateChatMode.field3881}; // L: 18
+		PrivateChatMode[] var2 = var1; // L: 20
+
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 21
+			PrivateChatMode var4 = var2[var3]; // L: 22
+			if (var0 == var4.field3884) { // L: 24
+				return var4;
+			}
+		}
+
+		return null; // L: 28
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(CLkn;I)C",
+		garbageValue = "-531451700"
+	)
+	@Export("standardizeChar")
+	static char standardizeChar(char var0, Language var1) {
+		if (var0 >= 192 && var0 <= 255) { // L: 117
+			if (var0 >= 192 && var0 <= 198) { // L: 118
+				return 'A';
+			}
+
+			if (var0 == 199) { // L: 119
+				return 'C';
+			}
+
+			if (var0 >= 200 && var0 <= 203) { // L: 120
+				return 'E';
+			}
+
+			if (var0 >= 204 && var0 <= 207) { // L: 121
+				return 'I';
+			}
+
+			if (var0 == 209 && var1 != Language.Language_ES) { // L: 122
+				return 'N';
+			}
+
+			if (var0 >= 210 && var0 <= 214) { // L: 123
+				return 'O';
+			}
+
+			if (var0 >= 217 && var0 <= 220) { // L: 124
+				return 'U';
+			}
+
+			if (var0 == 221) { // L: 125
+				return 'Y';
+			}
+
+			if (var0 == 223) { // L: 126
+				return 's';
+			}
+
+			if (var0 >= 224 && var0 <= 230) { // L: 127
+				return 'a';
+			}
+
+			if (var0 == 231) { // L: 128
+				return 'c';
+			}
+
+			if (var0 >= 232 && var0 <= 235) { // L: 129
+				return 'e';
+			}
+
+			if (var0 >= 236 && var0 <= 239) { // L: 130
+				return 'i';
+			}
+
+			if (var0 == 241 && var1 != Language.Language_ES) { // L: 131
+				return 'n';
+			}
+
+			if (var0 >= 242 && var0 <= 246) { // L: 132
+				return 'o';
+			}
+
+			if (var0 >= 249 && var0 <= 252) { // L: 133
+				return 'u';
+			}
+
+			if (var0 == 253 || var0 == 255) { // L: 134
+				return 'y';
+			}
+		}
+
+		if (var0 == 338) { // L: 136
+			return 'O';
+		} else if (var0 == 339) { // L: 137
+			return 'o';
+		} else if (var0 == 376) { // L: 138
+			return 'Y';
+		} else {
+			return var0; // L: 139
+		}
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Lns;I)I",
+		garbageValue = "-2095765890"
+	)
+	static int method4805(PacketBuffer var0) {
+		int var1 = var0.readBits(2); // L: 189
+		int var2;
+		if (var1 == 0) { // L: 191
+			var2 = 0;
+		} else if (var1 == 1) { // L: 192
+			var2 = var0.readBits(5);
+		} else if (var1 == 2) {
+			var2 = var0.readBits(8); // L: 193
+		} else {
+			var2 = var0.readBits(11); // L: 194
+		}
+
+		return var2; // L: 195
+	}
+
+	@ObfuscatedName("fx")
+	@ObfuscatedSignature(
+		descriptor = "(Ljf;Ljava/lang/String;S)V",
+		garbageValue = "128"
+	)
+	static void method4814(Archive var0, String var1) {
+		ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1708
+		Client.archiveLoaders.add(var2); // L: 1709
+		Client.field898 += var2.groupCount; // L: 1710
+	} // L: 1711
+}
diff --git a/runescape-client/src/main/java/class245.java b/runescape-client/src/main/java/class245.java
deleted file mode 100644
index e549bf356c..0000000000
--- a/runescape-client/src/main/java/class245.java
+++ /dev/null
@@ -1,61 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ig")
-public class class245 {
-	@ObfuscatedName("v")
-	public static final short[] field2944;
-	@ObfuscatedName("n")
-	public static final short[][] field2940;
-	@ObfuscatedName("f")
-	public static final short[] field2941;
-	@ObfuscatedName("y")
-	public static final short[][] field2942;
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("Widget_spritesArchive")
-	public static AbstractArchive Widget_spritesArchive;
-
-	static {
-		field2944 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4
-		field2940 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5
-		field2941 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12
-		field2942 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(CI)Z",
-		garbageValue = "2146522147"
-	)
-	@Export("isCharPrintable")
-	public static boolean isCharPrintable(char var0) {
-		if (var0 >= ' ' && var0 <= '~') { // L: 176
-			return true;
-		} else if (var0 >= 160 && var0 <= 255) { // L: 177
-			return true;
-		} else {
-			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 178
-		}
-	}
-
-	@ObfuscatedName("lq")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "1292576632"
-	)
-	static void method4714(Buffer var0, int var1) {
-		KitDefinition.method2687(var0.array, var1); // L: 11464
-		if (JagexCache.JagexCache_randomDat != null) { // L: 11466
-			try {
-				JagexCache.JagexCache_randomDat.seek(0L); // L: 11468
-				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 11469
-			} catch (Exception var3) { // L: 11471
-			}
-		}
-
-	} // L: 11474
-}
diff --git a/runescape-client/src/main/java/class246.java b/runescape-client/src/main/java/class246.java
new file mode 100644
index 0000000000..074fa68eaa
--- /dev/null
+++ b/runescape-client/src/main/java/class246.java
@@ -0,0 +1,96 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("in")
+public class class246 {
+	@ObfuscatedName("f")
+	public static final short[] field2945;
+	@ObfuscatedName("e")
+	public static final short[][] field2944;
+	@ObfuscatedName("v")
+	public static final short[] field2943;
+	@ObfuscatedName("y")
+	public static final short[][] field2946;
+	@ObfuscatedName("ix")
+	@ObfuscatedGetter(
+		intValue = 1746003047
+	)
+	@Export("selectedItemWidget")
+	static int selectedItemWidget;
+
+	static {
+		field2945 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4
+		field2944 = new short[][]{{6798, 107, 10283, 16, 4797, 7744, 5799, 4634, -31839, 22433, 2983, -11343, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {8741, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 25239, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {25238, 8742, 12, -1506, -22374, 7735, 8404, 1701, -27106, 24094, 10153, -8915, 4783, 1341, 16578, -30533, 8, 5281, 10438, 3650, -27322, -21845, 200, 571, 908, 21830, 28946, -15701, -14010}, {4626, 11146, 6439, 12, 4758, 10270}, {4550, 4537, 5681, 5673, 5790, 6806, 8076, 4574, 17050, 0, 127, -31821, -17991}}; // L: 5
+		field2943 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12
+		field2946 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; // L: 13
+	}
+
+	@ObfuscatedName("kn")
+	@ObfuscatedSignature(
+		descriptor = "([Liv;IB)V",
+		garbageValue = "1"
+	)
+	@Export("drawModelComponents")
+	static final void drawModelComponents(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) { // L: 11056
+			Widget var3 = var0[var2]; // L: 11057
+			if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !class35.isComponentHidden(var3))) { // L: 11058 11059 11060
+				if (var3.type == 0) { // L: 11061
+					if (!var3.isIf3 && class35.isComponentHidden(var3) && var3 != MusicPatchNode.mousedOverWidgetIf1) { // L: 11062
+						continue;
+					}
+
+					drawModelComponents(var0, var3.id); // L: 11063
+					if (var3.children != null) { // L: 11064
+						drawModelComponents(var3.children, var3.id);
+					}
+
+					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 11065
+					if (var4 != null) { // L: 11066
+						class25.method330(var4.group);
+					}
+				}
+
+				if (var3.type == 6) { // L: 11068
+					int var5;
+					if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 11069
+						boolean var7 = Friend.runCs1(var3); // L: 11070
+						if (var7) { // L: 11072
+							var5 = var3.sequenceId2;
+						} else {
+							var5 = var3.sequenceId; // L: 11073
+						}
+
+						if (var5 != -1) { // L: 11074
+							SequenceDefinition var6 = WorldMapScaleHandler.SequenceDefinition_get(var5); // L: 11075
+
+							for (var3.modelFrameCycle += Client.field683; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; Script.invalidateWidget(var3)) { // L: 11076 11077 11084
+								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 11078
+								++var3.modelFrame; // L: 11079
+								if (var3.modelFrame >= var6.frameIds.length) { // L: 11080
+									var3.modelFrame -= var6.frameCount; // L: 11081
+									if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 11082
+										var3.modelFrame = 0;
+									}
+								}
+							}
+						}
+					}
+
+					if (var3.field2981 != 0 && !var3.isIf3) { // L: 11088
+						int var8 = var3.field2981 >> 16; // L: 11089
+						var5 = var3.field2981 << 16 >> 16; // L: 11090
+						var8 *= Client.field683; // L: 11091
+						var5 *= Client.field683; // L: 11092
+						var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 11093
+						var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 11094
+						Script.invalidateWidget(var3); // L: 11095
+					}
+				}
+			}
+		}
+
+	} // L: 11099
+}
diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java
deleted file mode 100644
index 58b7cbd9de..0000000000
--- a/runescape-client/src/main/java/class247.java
+++ /dev/null
@@ -1,97 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("is")
-public class class247 {
-	@ObfuscatedName("dt")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive5")
-	static Archive archive5;
-
-	@ObfuscatedName("hd")
-	@ObfuscatedSignature(
-		descriptor = "(IIIIIIII)V",
-		garbageValue = "-1392845138"
-	)
-	@Export("addPendingSpawnToScene")
-	static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 7247
-			if (Client.isLowDetail && var0 != class22.Client_plane) { // L: 7248
-				return;
-			}
-
-			long var7 = 0L; // L: 7249
-			boolean var9 = true; // L: 7250
-			boolean var10 = false; // L: 7251
-			boolean var11 = false; // L: 7252
-			if (var1 == 0) { // L: 7253
-				var7 = AbstractSocket.scene.getBoundaryObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 1) { // L: 7254
-				var7 = AbstractSocket.scene.getWallDecorationTag(var0, var2, var3);
-			}
-
-			if (var1 == 2) { // L: 7255
-				var7 = AbstractSocket.scene.getGameObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 3) { // L: 7256
-				var7 = AbstractSocket.scene.getFloorDecorationTag(var0, var2, var3);
-			}
-
-			int var12;
-			if (0L != var7) { // L: 7257
-				var12 = AbstractSocket.scene.getObjectFlags(var0, var2, var3, var7); // L: 7258
-				int var14 = class93.Entity_unpackID(var7); // L: 7259
-				int var15 = var12 & 31; // L: 7260
-				int var16 = var12 >> 6 & 3; // L: 7261
-				ObjectComposition var13;
-				if (var1 == 0) { // L: 7262
-					AbstractSocket.scene.removeBoundaryObject(var0, var2, var3); // L: 7263
-					var13 = class23.getObjectDefinition(var14); // L: 7264
-					if (var13.interactType != 0) { // L: 7265
-						Client.collisionMaps[var0].method3156(var2, var3, var15, var16, var13.boolean1);
-					}
-				}
-
-				if (var1 == 1) { // L: 7267
-					AbstractSocket.scene.removeWallDecoration(var0, var2, var3);
-				}
-
-				if (var1 == 2) { // L: 7268
-					AbstractSocket.scene.removeGameObject(var0, var2, var3); // L: 7269
-					var13 = class23.getObjectDefinition(var14); // L: 7270
-					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 7271
-						return;
-					}
-
-					if (var13.interactType != 0) { // L: 7272
-						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1);
-					}
-				}
-
-				if (var1 == 3) { // L: 7274
-					AbstractSocket.scene.removeFloorDecoration(var0, var2, var3); // L: 7275
-					var13 = class23.getObjectDefinition(var14); // L: 7276
-					if (var13.interactType == 1) { // L: 7277
-						Client.collisionMaps[var0].method3150(var2, var3);
-					}
-				}
-			}
-
-			if (var4 >= 0) { // L: 7280
-				var12 = var0; // L: 7281
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 7282
-					var12 = var0 + 1;
-				}
-
-				DevicePcmPlayerProvider.method386(var0, var12, var2, var3, var4, var5, var6, AbstractSocket.scene, Client.collisionMaps[var0]); // L: 7283
-			}
-		}
-
-	} // L: 7286
-}
diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java
new file mode 100644
index 0000000000..f21f339bb2
--- /dev/null
+++ b/runescape-client/src/main/java/class248.java
@@ -0,0 +1,50 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ia")
+public class class248 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lev;",
+		garbageValue = "16"
+	)
+	@Export("getNpcDefinition")
+	public static NPCComposition getNpcDefinition(int var0) {
+		NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57
+		if (var1 != null) { // L: 58
+			return var1;
+		} else {
+			byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59
+			var1 = new NPCComposition(); // L: 60
+			var1.id = var0; // L: 61
+			if (var2 != null) { // L: 62
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 63
+			NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64
+			return var1; // L: 65
+		}
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-1168533546"
+	)
+	static int method4915(int var0, int var1) {
+		long var2 = (long)((var0 << 16) + var1); // L: 145
+		return class34.NetCache_currentResponse != null && var2 == class34.NetCache_currentResponse.key ? class254.NetCache_responseArchiveBuffer.offset * 99 / (class254.NetCache_responseArchiveBuffer.array.length - class34.NetCache_currentResponse.padding) + 1 : 0; // L: 146 147
+	}
+
+	@ObfuscatedName("kf")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-1373546761"
+	)
+	static final void method4916() {
+		Client.field882 = Client.cycleCntr; // L: 11461
+		class26.ClanChat_inClanChat = true; // L: 11462
+	} // L: 11463
+}
diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java
deleted file mode 100644
index 9c760cf369..0000000000
--- a/runescape-client/src/main/java/class249.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("il")
-public class class249 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lid;"
-	)
-	@Export("huffman")
-	static Huffman huffman;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -288783387
-	)
-	static int field3118;
-	@ObfuscatedName("cs")
-	public static char field3116;
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;IB)Z",
-		garbageValue = "0"
-	)
-	static boolean method4792(String var0, int var1) {
-		return Script.method1996(var0, var1, "openjs"); // L: 50
-	}
-}
diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java
index d8ee05f1ed..080f24bbff 100644
--- a/runescape-client/src/main/java/class25.java
+++ b/runescape-client/src/main/java/class25.java
@@ -2,67 +2,392 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("i")
+@ObfuscatedName("a")
 public class class25 extends class16 {
-	@ObfuscatedName("bh")
-	@ObfuscatedSignature(
-		descriptor = "[Lop;"
-	)
-	@Export("worldSelectFlagSprites")
-	static IndexedSprite[] worldSelectFlagSprites;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1119027669
+		intValue = -1686215047
 	)
-	int field213;
-	@ObfuscatedName("n")
-	byte field210;
+	@Export("loginBoxCenter")
+	static int loginBoxCenter;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 376208401
+		intValue = 1048031623
 	)
-	int field214;
+	int field198;
+	@ObfuscatedName("e")
+	byte field200;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1621140089
+	)
+	int field199;
 	@ObfuscatedName("y")
-	String field212;
+	String field197;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Ls;"
 	)
 	final class19 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lx;)V"
+		descriptor = "(Ls;)V"
 	)
 	class25(class19 var1) {
 		this.this$0 = var1;
-		this.field213 = -1; // L: 124
+		this.field198 = -1; // L: 124
 	} // L: 129
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "68071115"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "851460888"
 	)
-	void vmethod266(Buffer var1) {
+	void vmethod331(Buffer var1) {
 		var1.readUnsignedByte(); // L: 132
-		this.field213 = var1.readUnsignedShort(); // L: 133
-		this.field210 = var1.readByte(); // L: 134
-		this.field214 = var1.readUnsignedShort(); // L: 135
+		this.field198 = var1.readUnsignedShort(); // L: 133
+		this.field200 = var1.readByte(); // L: 134
+		this.field199 = var1.readUnsignedShort(); // L: 135
 		var1.readLong(); // L: 136
-		this.field212 = var1.readStringCp1252NullTerminated(); // L: 137
+		this.field197 = var1.readStringCp1252NullTerminated(); // L: 137
 		var1.readUnsignedByte(); // L: 138
 	} // L: 139
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ly;I)V",
-		garbageValue = "-1846892157"
+		garbageValue = "-1362614343"
 	)
-	void vmethod264(ClanChannel var1) {
-		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field213); // L: 142
-		var2.rank = this.field210; // L: 143
-		var2.world = this.field214; // L: 144
-		var2.name = this.field212; // L: 145
+	void vmethod332(ClanChannel var1) {
+		ClanChannelMember var2 = (ClanChannelMember)var1.members.get(this.field198); // L: 142
+		var2.rank = this.field200; // L: 143
+		var2.world = this.field199; // L: 144
+		var2.name = this.field197; // L: 145
 	} // L: 146
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "([BIIIIIIILgp;[Lfl;B)V",
+		garbageValue = "32"
+	)
+	static final void method337(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) {
+		Buffer var10 = new Buffer(var0); // L: 178
+		int var11 = -1; // L: 179
+
+		while (true) {
+			int var12 = var10.method6628(); // L: 181
+			if (var12 == 0) { // L: 182
+				return; // L: 209
+			}
+
+			var11 += var12; // L: 183
+			int var13 = 0; // L: 184
+
+			while (true) {
+				int var14 = var10.readUShortSmart(); // L: 186
+				if (var14 == 0) { // L: 187
+					break;
+				}
+
+				var13 += var14 - 1; // L: 188
+				int var15 = var13 & 63; // L: 189
+				int var16 = var13 >> 6 & 63; // L: 190
+				int var17 = var13 >> 12; // L: 191
+				int var18 = var10.readUnsignedByte(); // L: 192
+				int var19 = var18 >> 2; // L: 193
+				int var20 = var18 & 3; // L: 194
+				if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { // L: 195
+					ObjectComposition var21 = Tiles.getObjectDefinition(var11); // L: 196
+					int var22 = var2 + AbstractWorldMapIcon.method3787(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 197
+					int var23 = var3 + FaceNormal.method4253(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20); // L: 198
+					if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) { // L: 199
+						int var24 = var1; // L: 200
+						if ((Tiles.Tiles_renderFlags[1][var22][var23] & 2) == 2) { // L: 201
+							var24 = var1 - 1;
+						}
+
+						CollisionMap var25 = null; // L: 202
+						if (var24 >= 0) { // L: 203
+							var25 = var9[var24];
+						}
+
+						Player.method2258(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25); // L: 204
+					}
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(IIB)V",
+		garbageValue = "-20"
+	)
+	public static final void method339(int var0, int var1) {
+		ViewportMouse.ViewportMouse_x = var0; // L: 74
+		ViewportMouse.ViewportMouse_y = var1; // L: 75
+		ViewportMouse.ViewportMouse_isInViewport = true; // L: 76
+		ViewportMouse.ViewportMouse_entityCount = 0; // L: 77
+		ViewportMouse.ViewportMouse_false0 = false; // L: 78
+	} // L: 79
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;II)V",
+		garbageValue = "-709211391"
+	)
+	@Export("Widget_setKeyIgnoreHeld")
+	static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) {
+		if (var0.field3035 == null) { // L: 1006
+			throw new RuntimeException(); // L: 1007
+		} else {
+			if (var0.field3104 == null) { // L: 1009
+				var0.field3104 = new int[var0.field3035.length]; // L: 1010
+			}
+
+			var0.field3104[var1] = Integer.MAX_VALUE; // L: 1012
+		}
+	} // L: 1013
+
+	@ObfuscatedName("ag")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-1350653396"
+	)
+	static int method336(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 3250
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 3251
+			return 1; // L: 3252
+		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 3254
+			ChatChannel.Interpreter_intStackSize -= 3; // L: 3255
+			Client.publicChatMode = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3256
+			ClanChannel.privateChatMode = class244.method4812(Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 3257
+			if (ClanChannel.privateChatMode == null) { // L: 3258
+				ClanChannel.privateChatMode = PrivateChatMode.field3886;
+			}
+
+			Client.tradeChatMode = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 3259
+			PacketBufferNode var13 = InterfaceParent.getPacketBufferNode(ClientPacket.field2679, Client.packetWriter.isaacCipher); // L: 3261
+			var13.packetBuffer.writeByte(Client.publicChatMode); // L: 3262
+			var13.packetBuffer.writeByte(ClanChannel.privateChatMode.field3884); // L: 3263
+			var13.packetBuffer.writeByte(Client.tradeChatMode); // L: 3264
+			Client.packetWriter.addNode(var13); // L: 3265
+			return 1; // L: 3266
+		} else {
+			PacketBufferNode var6;
+			int var7;
+			String var8;
+			int var9;
+			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 3268
+				var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3269
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 3270
+				var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3271
+				var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3272
+				var6 = InterfaceParent.getPacketBufferNode(ClientPacket.field2636, Client.packetWriter.isaacCipher); // L: 3274
+				var6.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var8) + 2); // L: 3275
+				var6.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3276
+				var6.packetBuffer.writeByte(var7 - 1); // L: 3277
+				var6.packetBuffer.writeByte(var9); // L: 3278
+				Client.packetWriter.addNode(var6); // L: 3279
+				return 1; // L: 3280
+			} else {
+				int var3;
+				Message var5;
+				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 3282
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 3283
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3284
+					var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3285
+					var5 = Client.Messages_getByChannelAndID(var3, var7); // L: 3286
+					if (var5 != null) { // L: 3287
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.count; // L: 3288
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.cycle; // L: 3289
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3290
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3291
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3292
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3293
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3296
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3297
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3298
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3299
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3300
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3301
+					}
+
+					return 1; // L: 3303
+				} else {
+					Message var4;
+					if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 3305
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3306
+						var4 = Client.Messages_getMessage(var3); // L: 3307
+						if (var4 != null) { // L: 3308
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.type; // L: 3309
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.cycle; // L: 3310
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3311
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3312
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3313
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3314
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3317
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3318
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3319
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3320
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3321
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3322
+						}
+
+						return 1; // L: 3324
+					} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 3326
+						if (ClanChannel.privateChatMode == null) { // L: 3327
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1;
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ClanChannel.privateChatMode.field3884; // L: 3328
+						}
+
+						return 1; // L: 3329
+					} else {
+						PacketBufferNode var12;
+						if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 3331
+							var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3332
+							var7 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3333
+							var12 = class342.method6068(var7, var8, AbstractArchive.clientLanguage, -1); // L: 3334
+							Client.packetWriter.addNode(var12); // L: 3335
+							return 1; // L: 3336
+						} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3338
+							UserComparator9.Interpreter_stringStackSize -= 2; // L: 3339
+							var8 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 3340
+							String var11 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 3341
+							var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2668, Client.packetWriter.isaacCipher); // L: 3343
+							var12.packetBuffer.writeShort(0); // L: 3344
+							int var10 = var12.packetBuffer.offset; // L: 3345
+							var12.packetBuffer.writeStringCp1252NullTerminated(var8); // L: 3346
+							ModeWhere.method5292(var12.packetBuffer, var11); // L: 3347
+							var12.packetBuffer.writeLengthShort(var12.packetBuffer.offset - var10); // L: 3348
+							Client.packetWriter.addNode(var12); // L: 3349
+							return 1; // L: 3350
+						} else if (var0 == ScriptOpcodes.CHAT_SENDCLAN) { // L: 3352
+							var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3353
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3354
+							var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3355
+							var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3356
+							var6 = class342.method6068(var7, var8, AbstractArchive.clientLanguage, var9); // L: 3357
+							Client.packetWriter.addNode(var6); // L: 3358
+							return 1; // L: 3359
+						} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3361
+							if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3368
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3369
+								return 1; // L: 3370
+							} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3372
+								var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3373
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AbstractArchive.Messages_getHistorySize(var3); // L: 3374
+								return 1; // L: 3375
+							} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3377
+								var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3378
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class80.Messages_getLastChatID(var3); // L: 3379
+								return 1; // L: 3380
+							} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3382
+								var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3383
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class22.method306(var3); // L: 3384
+								return 1; // L: 3385
+							} else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3387
+								var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3388
+								Canvas.doCheat(var8); // L: 3389
+								return 1; // L: 3390
+							} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3392
+								Client.field642 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3393
+								return 1; // L: 3394
+							} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3396
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = Client.field642; // L: 3397
+								return 1; // L: 3398
+							} else if (var0 == ScriptOpcodes.WRITECONSOLE) { // L: 3400
+								var8 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3401
+								System.out.println(var8); // L: 3402
+								return 1; // L: 3403
+							} else if (var0 == 5024) { // L: 3405
+								--ChatChannel.Interpreter_intStackSize; // L: 3406
+								return 1; // L: 3407
+							} else if (var0 == 5025) { // L: 3409
+								++ChatChannel.Interpreter_intStackSize; // L: 3410
+								return 1; // L: 3411
+							} else if (var0 == 5030) { // L: 3413
+								ChatChannel.Interpreter_intStackSize -= 2; // L: 3414
+								var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3415
+								var7 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3416
+								var5 = Client.Messages_getByChannelAndID(var3, var7); // L: 3417
+								if (var5 != null) { // L: 3418
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.count; // L: 3419
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.cycle; // L: 3420
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.sender != null ? var5.sender : ""; // L: 3421
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.prefix != null ? var5.prefix : ""; // L: 3422
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.text != null ? var5.text : ""; // L: 3423
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var5.isFromFriend() ? 1 : (var5.isFromIgnored() ? 2 : 0); // L: 3424
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3425
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3426
+								} else {
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3429
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3430
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3431
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3432
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3433
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3434
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3435
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3436
+								}
+
+								return 1; // L: 3438
+							} else if (var0 == 5031) { // L: 3440
+								var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3441
+								var4 = Client.Messages_getMessage(var3); // L: 3442
+								if (var4 != null) { // L: 3443
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.type; // L: 3444
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.cycle; // L: 3445
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.sender != null ? var4.sender : ""; // L: 3446
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.prefix != null ? var4.prefix : ""; // L: 3447
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.text != null ? var4.text : ""; // L: 3448
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.isFromFriend() ? 1 : (var4.isFromIgnored() ? 2 : 0); // L: 3449
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3450
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3451
+								} else {
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3454
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3455
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3456
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3457
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3458
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3459
+									Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3460
+									Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3461
+								}
+
+								return 1; // L: 3463
+							} else {
+								return 2; // L: 3465
+							}
+						} else {
+							if (class262.localPlayer != null && class262.localPlayer.username != null) { // L: 3363
+								var8 = class262.localPlayer.username.getName();
+							} else {
+								var8 = ""; // L: 3364
+							}
+
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var8; // L: 3365
+							return 1; // L: 3366
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("kx")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "1366473716"
+	)
+	static final void method330(int var0) {
+		if (class20.loadInterface(var0)) { // L: 11051
+			class246.drawModelComponents(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], -1); // L: 11052
+		}
+	} // L: 11053
 }
diff --git a/runescape-client/src/main/java/class250.java b/runescape-client/src/main/java/class250.java
new file mode 100644
index 0000000000..088986b02c
--- /dev/null
+++ b/runescape-client/src/main/java/class250.java
@@ -0,0 +1,84 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("iz")
+public class class250 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lix;"
+	)
+	@Export("huffman")
+	static Huffman huffman;
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lef;",
+		garbageValue = "1474784029"
+	)
+	@Export("ItemDefinition_get")
+	public static ItemComposition ItemDefinition_get(int var0) {
+		ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84
+		if (var1 != null) { // L: 85
+			return var1;
+		} else {
+			byte[] var2 = ItemComposition.ItemDefinition_archive.takeFile(10, var0); // L: 86
+			var1 = new ItemComposition(); // L: 87
+			var1.id = var0; // L: 88
+			if (var2 != null) { // L: 89
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.post(); // L: 90
+			if (var1.noteTemplate != -1) { // L: 91
+				var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
+			}
+
+			if (var1.notedId != -1) { // L: 92
+				var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
+			}
+
+			if (var1.placeholderTemplate != -1) { // L: 93
+				var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
+			}
+
+			if (!ItemComposition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94
+				var1.name = "Members object"; // L: 95
+				var1.isTradable = false; // L: 96
+
+				int var3;
+				for (var3 = 0; var3 < var1.groundActions.length; ++var3) { // L: 97
+					var1.groundActions[var3] = null; // L: 98
+				}
+
+				for (var3 = 0; var3 < var1.inventoryActions.length; ++var3) { // L: 100
+					if (var3 != 4) { // L: 101
+						var1.inventoryActions[var3] = null; // L: 102
+					}
+				}
+
+				var1.shiftClickIndex = -2; // L: 105
+				var1.team = 0; // L: 106
+				if (var1.params != null) { // L: 107
+					boolean var6 = false; // L: 108
+
+					for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 109
+						ParamComposition var5 = UserComparator10.getParamDefinition((int)var4.key); // L: 110
+						if (var5.autoDisable) { // L: 111
+							var4.remove();
+						} else {
+							var6 = true; // L: 112
+						}
+					}
+
+					if (!var6) {
+						var1.params = null; // L: 114
+					}
+				}
+			}
+
+			ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 117
+			return var1; // L: 118
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class253.java b/runescape-client/src/main/java/class253.java
deleted file mode 100644
index dadaa80d7d..0000000000
--- a/runescape-client/src/main/java/class253.java
+++ /dev/null
@@ -1,44 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ia")
-public class class253 {
-	@ObfuscatedName("p")
-	static byte[][][] field3130;
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I[B[BI)V",
-		garbageValue = "-26460885"
-	)
-	@Export("Widget_setKey")
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
-		if (var0.field3033 == null) { // L: 964
-			if (var2 == null) { // L: 965
-				return; // L: 971
-			}
-
-			var0.field3033 = new byte[11][]; // L: 966
-			var0.field3034 = new byte[11][]; // L: 967
-			var0.field3035 = new int[11]; // L: 968
-			var0.field3079 = new int[11]; // L: 969
-		}
-
-		var0.field3033[var1] = var2; // L: 973
-		if (var2 != null) {
-			var0.field3032 = true; // L: 974
-		} else {
-			var0.field3032 = false; // L: 976
-
-			for (int var4 = 0; var4 < var0.field3033.length; ++var4) { // L: 977
-				if (var0.field3033[var4] != null) { // L: 978
-					var0.field3032 = true; // L: 979
-					break;
-				}
-			}
-		}
-
-		var0.field3034[var1] = var3; // L: 984
-	} // L: 985
-}
diff --git a/runescape-client/src/main/java/class254.java b/runescape-client/src/main/java/class254.java
index 4987242d04..666cabdf80 100644
--- a/runescape-client/src/main/java/class254.java
+++ b/runescape-client/src/main/java/class254.java
@@ -1,62 +1,13 @@
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ij")
-public enum class254 implements Enumerated {
-	@ObfuscatedName("v")
+@ObfuscatedName("if")
+public class class254 {
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		descriptor = "Lij;"
+		descriptor = "Lnt;"
 	)
-	field3138(0),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lij;"
-	)
-	field3134(1),
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lij;"
-	)
-	field3135(2),
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lij;"
-	)
-	field3136(3),
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lij;"
-	)
-	field3137(4);
-
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -709027953
-	)
-	final int field3133;
-
-	class254(int var3) {
-		this.field3133 = var3; // L: 14
-	} // L: 15
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-907662946"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field3133; // L: 18
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "120"
-	)
-	public static boolean method4823(int var0) {
-		return var0 >= WorldMapDecorationType.field3149.id && var0 <= WorldMapDecorationType.field3145.id || var0 == WorldMapDecorationType.field3146.id; // L: 42
-	}
+	@Export("NetCache_responseArchiveBuffer")
+	public static Buffer NetCache_responseArchiveBuffer;
 }
diff --git a/runescape-client/src/main/java/class255.java b/runescape-client/src/main/java/class255.java
new file mode 100644
index 0000000000..32b02e39c9
--- /dev/null
+++ b/runescape-client/src/main/java/class255.java
@@ -0,0 +1,54 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ik")
+public enum class255 implements Enumerated
+{
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lik;"
+	)
+	field3138(0),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lik;"
+	)
+	field3137(1),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lik;"
+	)
+	field3142(2),
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Lik;"
+	)
+	field3139(3),
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lik;"
+	)
+	field3136(4);
+
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1119623575
+	)
+	final int field3141;
+
+	class255(int var3) {
+		this.field3141 = var3; // L: 14
+	} // L: 15
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1154679040"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field3141; // L: 18
+	}
+}
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
deleted file mode 100644
index 35b388cf37..0000000000
--- a/runescape-client/src/main/java/class258.java
+++ /dev/null
@@ -1,94 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("iy")
-public class class258 {
-	@ObfuscatedName("v")
-	@Export("base37DecodeLong")
-	public static String base37DecodeLong(long var0) {
-		if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16
-			if (var0 % 37L == 0L) { // L: 17
-				return null;
-			} else {
-				int var2 = 0; // L: 18
-
-				for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 19 20 22
-					++var2; // L: 21
-				}
-
-				StringBuilder var5;
-				char var8;
-				for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 24 25 34
-					long var6 = var0; // L: 26
-					var0 /= 37L; // L: 27
-					var8 = class305.base37Table[(int)(var6 - 37L * var0)]; // L: 28
-					if (var8 == '_') { // L: 29
-						int var9 = var5.length() - 1; // L: 30
-						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31
-						var8 = 160; // L: 32
-					}
-				}
-
-				var5.reverse(); // L: 36
-				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37
-				return var5.toString(); // L: 38
-			}
-		} else {
-			return null;
-		}
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)[Ljn;",
-		garbageValue = "1808084531"
-	)
-	public static class268[] method4835() {
-		return new class268[]{class268.field3540, class268.field3537, class268.field3538, class268.field3539}; // L: 15
-	}
-
-	@ObfuscatedName("kl")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;I)V",
-		garbageValue = "1084146758"
-	)
-	static final void method4836(Widget var0) {
-		int var1 = var0.contentType; // L: 10993
-		if (var1 == 324) { // L: 10994
-			if (Client.field908 == -1) { // L: 10995
-				Client.field908 = var0.spriteId2; // L: 10996
-				Client.field752 = var0.spriteId; // L: 10997
-			}
-
-			if (Client.playerAppearance.isFemale) { // L: 10999
-				var0.spriteId2 = Client.field908;
-			} else {
-				var0.spriteId2 = Client.field752; // L: 11000
-			}
-
-		} else if (var1 == 325) { // L: 11003
-			if (Client.field908 == -1) { // L: 11004
-				Client.field908 = var0.spriteId2; // L: 11005
-				Client.field752 = var0.spriteId; // L: 11006
-			}
-
-			if (Client.playerAppearance.isFemale) { // L: 11008
-				var0.spriteId2 = Client.field752;
-			} else {
-				var0.spriteId2 = Client.field908; // L: 11009
-			}
-
-		} else if (var1 == 327) { // L: 11012
-			var0.modelAngleX = 150; // L: 11013
-			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11014
-			var0.modelType = 5; // L: 11015
-			var0.modelId = 0; // L: 11016
-		} else if (var1 == 328) { // L: 11019
-			var0.modelAngleX = 150; // L: 11020
-			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11021
-			var0.modelType = 5; // L: 11022
-			var0.modelId = 1; // L: 11023
-		}
-	} // L: 11001 11010 11017 11024 11026
-}
diff --git a/runescape-client/src/main/java/class26.java b/runescape-client/src/main/java/class26.java
index 386dda2b1b..fba35c88e6 100644
--- a/runescape-client/src/main/java/class26.java
+++ b/runescape-client/src/main/java/class26.java
@@ -1,520 +1,189 @@
+import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ae")
+@ObfuscatedName("aw")
 public class class26 extends class14 {
-	@ObfuscatedName("o")
+	@ObfuscatedName("qg")
+	@Export("ClanChat_inClanChat")
+	static boolean ClanChat_inClanChat;
+	@ObfuscatedName("j")
+	@Export("SpriteBuffer_yOffsets")
+	public static int[] SpriteBuffer_yOffsets;
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
-		descriptor = "Lbh;"
+		descriptor = "Ljf;"
 	)
-	@Export("pcmPlayerProvider")
-	static PlayerProvider pcmPlayerProvider;
-	@ObfuscatedName("k")
+	@Export("archive4")
+	static Archive archive4;
+	@ObfuscatedName("ow")
 	@ObfuscatedSignature(
-		descriptor = "Ll;"
+		descriptor = "Lnz;"
 	)
-	static ClanSettings field220;
-	@ObfuscatedName("ac")
-	@ObfuscatedSignature(
-		descriptor = "Loe;"
-	)
-	@Export("rasterProvider")
-	public static AbstractRasterProvider rasterProvider;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		longValue = 1552499431731106411L
-	)
-	long field217;
-	@ObfuscatedName("n")
-	String field218;
+	@Export("HitSplatDefinition_cachedSprites")
+	static class370 HitSplatDefinition_cachedSprites;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1135955153
+		longValue = -6615327962346059687L
 	)
-	int field219;
+	long field212;
+	@ObfuscatedName("e")
+	String field206;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1300359525
+	)
+	int field208;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class26(class2 var1) {
 		this.this$0 = var1;
-		this.field217 = -1L; // L: 93
-		this.field218 = null; // L: 94
-		this.field219 = 0; // L: 95
+		this.field212 = -1L; // L: 93
+		this.field206 = null; // L: 94
+		this.field208 = 0; // L: 95
 	} // L: 97
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
+	void vmethod363(Buffer var1) {
 		if (var1.readUnsignedByte() != 255) { // L: 100
 			--var1.offset; // L: 101
-			this.field217 = var1.readLong(); // L: 102
+			this.field212 = var1.readLong(); // L: 102
 		}
 
-		this.field218 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104
-		this.field219 = var1.readUnsignedShort(); // L: 105
+		this.field206 = var1.readStringCp1252NullTerminatedOrNull(); // L: 104
+		this.field208 = var1.readUnsignedShort(); // L: 105
 	} // L: 106
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
-	)
-	void vmethod281(ClanSettings var1) {
-		var1.method103(this.field217, this.field218, this.field219); // L: 109
-	} // L: 110
-
 	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
+	)
+	void vmethod354(ClanSettings var1) {
+		var1.method126(this.field212, this.field206, this.field208); // L: 109
+	} // L: 110
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/io/File;I)V",
+		garbageValue = "-1576725209"
+	)
+	public static void method344(File var0) {
+		FileSystem.FileSystem_cacheDir = var0; // L: 16
+		if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17
+			throw new RuntimeException("");
+		} else {
+			FileSystem.FileSystem_hasPermissions = true; // L: 18
+		}
+	} // L: 19
+
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "-1494621592"
+		garbageValue = "-1566691777"
 	)
-	static final int method272(int var0, int var1) {
-		if (var0 == -2) { // L: 855
-			return 12345678;
-		} else if (var0 == -1) { // L: 856
-			if (var1 < 2) {
-				var1 = 2; // L: 857
-			} else if (var1 > 126) { // L: 858
-				var1 = 126;
-			}
-
-			return var1; // L: 859
+	static int method351(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28
+		if (var2 == null) { // L: 29
+			return 0;
+		} else if (var1 == -1) { // L: 30
+			return 0;
 		} else {
-			var1 = (var0 & 127) * var1 / 128; // L: 861
-			if (var1 < 2) { // L: 862
-				var1 = 2;
-			} else if (var1 > 126) { // L: 863
-				var1 = 126;
+			int var3 = 0; // L: 31
+
+			for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32
+				if (var2.ids[var4] == var1) {
+					var3 += var2.quantities[var4]; // L: 33
+				}
 			}
 
-			return (var0 & 65408) + var1; // L: 864
+			return var3; // L: 35
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1261558074"
+		descriptor = "(I)V",
+		garbageValue = "-2003470705"
 	)
-	static int method274(int var0, Script var1, boolean var2) {
-		Widget var6;
-		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1211
-			int var4;
-			if (var0 == 1928) { // L: 1228
-				var6 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1229
-				var4 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1230
-				if (var4 >= 1 && var4 <= 10) { // L: 1231
-					class376.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1234
-					return 1; // L: 1235
-				} else {
-					throw new RuntimeException(); // L: 1232
-				}
-			} else if (var0 == 2928) { // L: 1237
-				class44.Interpreter_intStackSize -= 3; // L: 1238
-				int var3 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 1239
-				var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 1240
-				int var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 1241
-				if (var5 >= 1 && var5 <= 10) { // L: 1242
-					class376.widgetDefaultMenuAction(var5, var3, var4, Frames.getWidget(var3).itemId, ""); // L: 1245
-					return 1; // L: 1246
-				} else {
-					throw new RuntimeException(); // L: 1243
-				}
-			} else {
-				return 2; // L: 1248
-			}
-		} else if (Interpreter.field987 >= 10) { // L: 1212
-			throw new RuntimeException(); // L: 1213
-		} else {
-			if (var0 >= 2000) { // L: 1216
-				var6 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1217
-			} else {
-				var6 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 1219
-			}
+	protected static final void method350() {
+		class160.clock.mark(); // L: 406
 
-			if (var6.onResize == null) { // L: 1220
-				return 0;
-			} else {
-				ScriptEvent var7 = new ScriptEvent(); // L: 1221
-				var7.widget = var6; // L: 1222
-				var7.args = var6.onResize; // L: 1223
-				var7.field1180 = Interpreter.field987 + 1; // L: 1224
-				Client.scriptEvents.addFirst(var7); // L: 1225
-				return 1; // L: 1226
-			}
+		int var0;
+		for (var0 = 0; var0 < 32; ++var0) { // L: 407
+			GameEngine.graphicsTickTimes[var0] = 0L;
 		}
-	}
 
-	@ObfuscatedName("i")
+		for (var0 = 0; var0 < 32; ++var0) { // L: 408
+			GameEngine.clientTickTimes[var0] = 0L;
+		}
+
+		class372.gameCyclesToDo = 0; // L: 409
+	} // L: 410
+
+	@ObfuscatedName("hg")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "55"
+		descriptor = "(IIB)V",
+		garbageValue = "46"
 	)
-	static int method273(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 2053
-			if (NetSocket.friendSystem.field941 == 0) { // L: 2054
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -2;
-			} else if (NetSocket.friendSystem.field941 == 1) { // L: 2055
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.friendsList.getSize(); // L: 2056
+	@Export("updateItemPile")
+	static final void updateItemPile(int var0, int var1) {
+		NodeDeque var2 = Client.groundItems[SoundSystem.Client_plane][var0][var1]; // L: 7442
+		if (var2 == null) { // L: 7443
+			DevicePcmPlayerProvider.scene.removeGroundItemPile(SoundSystem.Client_plane, var0, var1); // L: 7444
+		} else {
+			long var3 = -99999999L; // L: 7447
+			TileItem var5 = null; // L: 7448
+
+			TileItem var6;
+			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7449 7450 7458
+				ItemComposition var7 = class250.ItemDefinition_get(var6.id); // L: 7451
+				long var11 = (long)var7.price; // L: 7452
+				if (var7.isStackable == 1) { // L: 7453
+					var11 *= (long)(var6.quantity + 1);
+				}
+
+				if (var11 > var3) { // L: 7454
+					var3 = var11; // L: 7455
+					var5 = var6; // L: 7456
+				}
 			}
 
-			return 1; // L: 2057
-		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2060
-				if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.friendsList.getSize()) { // L: 2061
-					Friend var8 = (Friend)NetSocket.friendSystem.friendsList.get(var3); // L: 2062
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); // L: 2063
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 2064
-				} else {
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2067
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2068
-				}
-
-				return 1; // L: 2070
-			} else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2073
-				if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.friendsList.getSize()) { // L: 2074
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)NetSocket.friendSystem.friendsList.get(var3)).world; // L: 2075
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2077
-				}
-
-				return 1; // L: 2078
-			} else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2081
-				if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.friendsList.getSize()) { // L: 2082
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)NetSocket.friendSystem.friendsList.get(var3)).rank; // L: 2083
-				} else {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2085
-				}
-
-				return 1; // L: 2086
+			if (var5 == null) { // L: 7460
+				DevicePcmPlayerProvider.scene.removeGroundItemPile(SoundSystem.Client_plane, var0, var1); // L: 7461
 			} else {
-				String var5;
-				if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2089
-					int var6 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2090
-					VerticalAlignment.method2796(var5, var6); // L: 2091
-					return 1; // L: 2092
-				} else if (var0 == ScriptOpcodes.FRIEND_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2095
-					NetSocket.friendSystem.addFriend(var5); // L: 2096
-					return 1; // L: 2097
-				} else if (var0 == ScriptOpcodes.FRIEND_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2100
-					NetSocket.friendSystem.removeFriend(var5); // L: 2101
-					return 1; // L: 2102
-				} else if (var0 == ScriptOpcodes.IGNORE_ADD) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2105
-					NetSocket.friendSystem.addIgnore(var5); // L: 2106
-					return 1; // L: 2107
-				} else if (var0 == ScriptOpcodes.IGNORE_DEL) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2110
-					NetSocket.friendSystem.removeIgnore(var5); // L: 2111
-					return 1; // L: 2112
-				} else if (var0 == ScriptOpcodes.FRIEND_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2115
-					var5 = class15.method189(var5); // L: 2116
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.isFriended(new Username(var5, WorldMapSection0.loginType), false) ? 1 : 0; // L: 2117
-					return 1; // L: 2118
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
-					if (WorldMapRegion.friendsChat != null) { // L: 2121
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapRegion.friendsChat.name; // L: 2122
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2124
-					}
+				var2.addLast(var5); // L: 7464
+				TileItem var13 = null; // L: 7465
+				TileItem var8 = null; // L: 7466
 
-					return 1; // L: 2125
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
-					if (WorldMapRegion.friendsChat != null) { // L: 2128
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapRegion.friendsChat.getSize(); // L: 2129
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2131
-					}
+				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7467 7468 7473
+					if (var5.id != var6.id) { // L: 7469
+						if (var13 == null) { // L: 7470
+							var13 = var6;
+						}
 
-					return 1; // L: 2132
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2135
-					if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize()) { // L: 2136
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapRegion.friendsChat.get(var3).getUsername().getName(); // L: 2137
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2139
-					}
-
-					return 1; // L: 2140
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2143
-					if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize()) { // L: 2144
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)WorldMapRegion.friendsChat.get(var3)).getWorld(); // L: 2145
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2147
-					}
-
-					return 1; // L: 2148
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2151
-					if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize()) { // L: 2152
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ((Buddy)WorldMapRegion.friendsChat.get(var3)).rank; // L: 2153
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2155
-					}
-
-					return 1; // L: 2156
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapRegion.friendsChat != null ? WorldMapRegion.friendsChat.minKick : 0; // L: 2159
-					return 1; // L: 2160
-				} else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2163
-					class105.clanKickUser(var5); // L: 2164
-					return 1; // L: 2165
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapRegion.friendsChat != null ? WorldMapRegion.friendsChat.rank * -759593825 * -78473377 : 0; // L: 2168
-					return 1; // L: 2169
-				} else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2172
-					NPCComposition.Clan_joinChat(var5); // L: 2173
-					return 1; // L: 2174
-				} else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
-					MouseHandler.Clan_leaveChat(); // L: 2177
-					return 1; // L: 2178
-				} else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
-					if (!NetSocket.friendSystem.method1689()) { // L: 2181
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = -1;
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.ignoreList.getSize(); // L: 2182
-					}
-
-					return 1; // L: 2183
-				} else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2186
-					if (NetSocket.friendSystem.method1689() && var3 >= 0 && var3 < NetSocket.friendSystem.ignoreList.getSize()) { // L: 2187
-						Ignored var4 = (Ignored)NetSocket.friendSystem.ignoreList.get(var3); // L: 2188
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2189
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2190
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2193
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2194
-					}
-
-					return 1; // L: 2196
-				} else if (var0 == ScriptOpcodes.IGNORE_TEST) {
-					var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2199
-					var5 = class15.method189(var5); // L: 2200
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = NetSocket.friendSystem.isIgnored(new Username(var5, WorldMapSection0.loginType)) ? 1 : 0; // L: 2201
-					return 1; // L: 2202
-				} else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2205
-					if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize() && WorldMapRegion.friendsChat.get(var3).getUsername().equals(class93.localPlayer.username)) { // L: 2206
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2207
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2209
-					}
-
-					return 1; // L: 2210
-				} else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
-					if (WorldMapRegion.friendsChat != null && WorldMapRegion.friendsChat.owner != null) { // L: 2213
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapRegion.friendsChat.owner; // L: 2214
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; // L: 2216
-					}
-
-					return 1; // L: 2217
-				} else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2220
-					if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize() && ((ClanMate)WorldMapRegion.friendsChat.get(var3)).isFriend()) { // L: 2221
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2222
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2224
-					}
-
-					return 1; // L: 2225
-				} else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
-					if (var0 == 3628) {
-						NetSocket.friendSystem.friendsList.removeComparator(); // L: 2236
-						return 1; // L: 2237
-					} else {
-						boolean var7;
-						if (var0 == 3629) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2240
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2241
-							return 1; // L: 2242
-						} else if (var0 == 3630) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2245
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2246
-							return 1; // L: 2247
-						} else if (var0 == 3631) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2250
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2251
-							return 1; // L: 2252
-						} else if (var0 == 3632) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2255
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2256
-							return 1; // L: 2257
-						} else if (var0 == 3633) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2260
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2261
-							return 1; // L: 2262
-						} else if (var0 == 3634) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2265
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2266
-							return 1; // L: 2267
-						} else if (var0 == 3635) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2270
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2271
-							return 1; // L: 2272
-						} else if (var0 == 3636) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2275
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2276
-							return 1; // L: 2277
-						} else if (var0 == 3637) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2280
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2281
-							return 1; // L: 2282
-						} else if (var0 == 3638) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2285
-							NetSocket.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2286
-							return 1; // L: 2287
-						} else if (var0 == 3639) {
-							NetSocket.friendSystem.friendsList.sort(); // L: 2290
-							return 1; // L: 2291
-						} else if (var0 == 3640) {
-							NetSocket.friendSystem.ignoreList.removeComparator(); // L: 2294
-							return 1; // L: 2295
-						} else if (var0 == 3641) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2298
-							NetSocket.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2299
-							return 1; // L: 2300
-						} else if (var0 == 3642) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2303
-							NetSocket.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2304
-							return 1; // L: 2305
-						} else if (var0 == 3643) {
-							NetSocket.friendSystem.ignoreList.sort(); // L: 2308
-							return 1; // L: 2309
-						} else if (var0 == 3644) {
-							if (WorldMapRegion.friendsChat != null) { // L: 2312
-								WorldMapRegion.friendsChat.removeComparator(); // L: 2313
-							}
-
-							return 1; // L: 2315
-						} else if (var0 == 3645) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2318
-							if (WorldMapRegion.friendsChat != null) { // L: 2319
-								WorldMapRegion.friendsChat.addComparator(new UserComparator1(var7)); // L: 2320
-							}
-
-							return 1; // L: 2322
-						} else if (var0 == 3646) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2325
-							if (WorldMapRegion.friendsChat != null) { // L: 2326
-								WorldMapRegion.friendsChat.addComparator(new UserComparator2(var7)); // L: 2327
-							}
-
-							return 1; // L: 2329
-						} else if (var0 == 3647) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2332
-							if (WorldMapRegion.friendsChat != null) { // L: 2333
-								WorldMapRegion.friendsChat.addComparator(new UserComparator3(var7)); // L: 2334
-							}
-
-							return 1; // L: 2336
-						} else if (var0 == 3648) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2339
-							if (WorldMapRegion.friendsChat != null) { // L: 2340
-								WorldMapRegion.friendsChat.addComparator(new UserComparator4(var7)); // L: 2341
-							}
-
-							return 1; // L: 2343
-						} else if (var0 == 3649) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2346
-							if (WorldMapRegion.friendsChat != null) { // L: 2347
-								WorldMapRegion.friendsChat.addComparator(new UserComparator5(var7)); // L: 2348
-							}
-
-							return 1; // L: 2350
-						} else if (var0 == 3650) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2353
-							if (WorldMapRegion.friendsChat != null) { // L: 2354
-								WorldMapRegion.friendsChat.addComparator(new UserComparator6(var7)); // L: 2355
-							}
-
-							return 1; // L: 2357
-						} else if (var0 == 3651) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2360
-							if (WorldMapRegion.friendsChat != null) { // L: 2361
-								WorldMapRegion.friendsChat.addComparator(new UserComparator7(var7)); // L: 2362
-							}
-
-							return 1; // L: 2364
-						} else if (var0 == 3652) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2367
-							if (WorldMapRegion.friendsChat != null) { // L: 2368
-								WorldMapRegion.friendsChat.addComparator(new UserComparator8(var7)); // L: 2369
-							}
-
-							return 1; // L: 2371
-						} else if (var0 == 3653) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2374
-							if (WorldMapRegion.friendsChat != null) { // L: 2375
-								WorldMapRegion.friendsChat.addComparator(new UserComparator9(var7)); // L: 2376
-							}
-
-							return 1; // L: 2378
-						} else if (var0 == 3654) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2381
-							if (WorldMapRegion.friendsChat != null) { // L: 2382
-								WorldMapRegion.friendsChat.addComparator(new UserComparator10(var7)); // L: 2383
-							}
-
-							return 1; // L: 2385
-						} else if (var0 == 3655) {
-							if (WorldMapRegion.friendsChat != null) { // L: 2388
-								WorldMapRegion.friendsChat.sort(); // L: 2389
-							}
-
-							return 1; // L: 2391
-						} else if (var0 == 3656) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2394
-							NetSocket.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2395
-							return 1; // L: 2396
-						} else if (var0 == 3657) {
-							var7 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2399
-							if (WorldMapRegion.friendsChat != null) { // L: 2400
-								WorldMapRegion.friendsChat.addComparator(new BuddyRankComparator(var7)); // L: 2401
-							}
-
-							return 1; // L: 2403
-						} else {
-							return 2; // L: 2405
+						if (var13.id != var6.id && var8 == null) { // L: 7471
+							var8 = var6;
 						}
 					}
-				} else {
-					var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2228
-					if (WorldMapRegion.friendsChat != null && var3 < WorldMapRegion.friendsChat.getSize() && ((ClanMate)WorldMapRegion.friendsChat.get(var3)).isIgnored()) { // L: 2229
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1; // L: 2230
-					} else {
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 2232
-					}
-
-					return 1; // L: 2233
 				}
+
+				long var9 = UserComparator3.calculateTag(var0, var1, 3, false, 0); // L: 7475
+				DevicePcmPlayerProvider.scene.newGroundItemPile(SoundSystem.Client_plane, var0, var1, ItemContainer.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.Client_plane), var5, var9, var13, var8); // L: 7476
 			}
 		}
-	}
+	} // L: 7445 7462 7477
 }
diff --git a/runescape-client/src/main/java/class260.java b/runescape-client/src/main/java/class260.java
deleted file mode 100644
index a4431009b2..0000000000
--- a/runescape-client/src/main/java/class260.java
+++ /dev/null
@@ -1,97 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ji")
-public class class260 {
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	@Export("titleboxSprite")
-	static IndexedSprite titleboxSprite;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -1644040669
-	)
-	@Export("gameCyclesToDo")
-	protected static int gameCyclesToDo;
-
-	static {
-		Math.sqrt(8192.0D); // L: 9
-	} // L: 10
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Leq;",
-		garbageValue = "-1090210304"
-	)
-	@Export("ItemDefinition_get")
-	public static ItemComposition ItemDefinition_get(int var0) {
-		ItemComposition var1 = (ItemComposition)ItemComposition.ItemDefinition_cached.get((long)var0); // L: 84
-		if (var1 != null) { // L: 85
-			return var1;
-		} else {
-			byte[] var2 = class341.ItemDefinition_archive.takeFile(10, var0); // L: 86
-			var1 = new ItemComposition(); // L: 87
-			var1.id = var0; // L: 88
-			if (var2 != null) { // L: 89
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.post(); // L: 90
-			if (var1.noteTemplate != -1) { // L: 91
-				var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
-			}
-
-			if (var1.notedId != -1) { // L: 92
-				var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
-			}
-
-			if (var1.placeholderTemplate != -1) { // L: 93
-				var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
-			}
-
-			if (!ItemContainer.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 94
-				var1.name = "Members object"; // L: 95
-				var1.isTradable = false; // L: 96
-				var1.groundActions = null; // L: 97
-				var1.inventoryActions = null; // L: 98
-				var1.shiftClickIndex = -1; // L: 99
-				var1.team = 0; // L: 100
-				if (var1.params != null) { // L: 101
-					boolean var3 = false; // L: 102
-
-					for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 103
-						ParamComposition var5 = Varcs.getParamDefinition((int)var4.key); // L: 104
-						if (var5.autoDisable) { // L: 105
-							var4.remove();
-						} else {
-							var3 = true; // L: 106
-						}
-					}
-
-					if (!var3) { // L: 108
-						var1.params = null;
-					}
-				}
-			}
-
-			ItemComposition.ItemDefinition_cached.put(var1, (long)var0); // L: 111
-			return var1; // L: 112
-		}
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V",
-		garbageValue = "-60"
-	)
-	@Export("setLoginResponseString")
-	static void setLoginResponseString(String var0, String var1, String var2) {
-		Login.Login_response1 = var0; // L: 1525
-		Login.Login_response2 = var1; // L: 1526
-		Login.Login_response3 = var2; // L: 1527
-	} // L: 1528
-}
diff --git a/runescape-client/src/main/java/class261.java b/runescape-client/src/main/java/class261.java
index 8c6814f988..e412853536 100644
--- a/runescape-client/src/main/java/class261.java
+++ b/runescape-client/src/main/java/class261.java
@@ -1,48 +1,227 @@
-import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jw")
+@ObfuscatedName("jj")
 public class class261 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljw;"
-	)
-	static final class261 field3201;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljw;"
-	)
-	static final class261 field3200;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 310151433
-	)
-	final int field3199;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -715016481
-	)
-	final int field3202;
-
 	static {
-		field3201 = new class261(51, 27, 800, 0, 16, 16); // L: 29
-		field3200 = new class261(25, 28, 800, 656, 40, 40); // L: 30
-	}
+		Math.sqrt(8192.0D); // L: 9
+	} // L: 10
 
-	class261(int var1, int var2, int var3, int var4, int var5, int var6) {
-		this.field3199 = var5; // L: 39
-		this.field3202 = var6; // L: 40
-	} // L: 41
-
-	@ObfuscatedName("b")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "0"
+		descriptor = "(II)Lex;",
+		garbageValue = "-1540124861"
 	)
-	public static int method4842(int var0) {
-		long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; // L: 77
-		int var1 = (int)(var2 >>> 14 & 3L); // L: 79
-		return var1; // L: 81
+	@Export("getInvDefinition")
+	public static InvDefinition getInvDefinition(int var0) {
+		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 17
+		if (var1 != null) { // L: 18
+			return var1;
+		} else {
+			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 19
+			var1 = new InvDefinition(); // L: 20
+			if (var2 != null) { // L: 21
+				var1.decode(new Buffer(var2));
+			}
+
+			InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 22
+			return var1; // L: 23
+		}
 	}
+
+	@ObfuscatedName("jp")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;IIB)V",
+		garbageValue = "-13"
+	)
+	@Export("Widget_addToMenu")
+	static final void Widget_addToMenu(Widget var0, int var1, int var2) {
+		if (var0.buttonType == 1) { // L: 10173
+			class22.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 10174
+		}
+
+		String var3;
+		if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 10177
+			var3 = SecureRandomCallable.Widget_getSpellActionName(var0); // L: 10178
+			if (var3 != null) { // L: 10179
+				class22.insertMenuItemNoShift(var3, SecureRandomFuture.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 10180
+			}
+		}
+
+		if (var0.buttonType == 3) { // L: 10184
+			class22.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 10185
+		}
+
+		if (var0.buttonType == 4) { // L: 10188
+			class22.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 10189
+		}
+
+		if (var0.buttonType == 5) { // L: 10192
+			class22.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 10193
+		}
+
+		if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 10196
+			class22.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 10197
+		}
+
+		int var4;
+		int var5;
+		int var15;
+		if (var0.type == 2) { // L: 10200
+			var15 = 0; // L: 10201
+
+			for (var4 = 0; var4 < var0.height; ++var4) { // L: 10202
+				for (var5 = 0; var5 < var0.width; ++var5) { // L: 10203
+					int var18 = (var0.paddingX + 32) * var5; // L: 10204
+					int var7 = (var0.paddingY + 32) * var4; // L: 10205
+					if (var15 < 20) { // L: 10206
+						var18 += var0.inventoryXOffsets[var15]; // L: 10207
+						var7 += var0.inventoryYOffsets[var15]; // L: 10208
+					}
+
+					if (var1 >= var18 && var2 >= var7 && var1 < var18 + 32 && var2 < var7 + 32) { // L: 10210
+						Client.dragItemSlotDestination = var15; // L: 10211
+						UserComparator2.hoveredItemContainer = var0; // L: 10212
+						if (var0.itemIds[var15] > 0) { // L: 10213
+							ItemComposition var8 = class250.ItemDefinition_get(var0.itemIds[var15] - 1); // L: 10214
+							if (Client.isItemSelected == 1 && class372.method6497(class22.getWidgetFlags(var0))) { // L: 10215
+								if (var0.id != class246.selectedItemWidget || var15 != Timer.selectedItemSlot) { // L: 10216
+									class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); // L: 10217
+								}
+							} else if (Client.isSpellSelected && class372.method6497(class22.getWidgetFlags(var0))) { // L: 10221
+								if ((LoginPacket.selectedSpellFlags & 16) == 16) { // L: 10222
+									class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); // L: 10223
+								}
+							} else {
+								String[] var9 = var8.inventoryActions; // L: 10228
+								int var10 = -1; // L: 10229
+								boolean var11;
+								if (Client.shiftClickDrop) { // L: 10230
+									var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 10233
+									if (var11) { // L: 10235
+										var10 = var8.getShiftClickIndex(); // L: 10236
+									}
+								}
+
+								if (class372.method6497(class22.getWidgetFlags(var0))) { // L: 10239
+									for (int var20 = 4; var20 >= 3; --var20) { // L: 10240
+										if (var10 != var20) { // L: 10241
+											class14.addWidgetItemMenuItem(var0, var8, var15, var20, false); // L: 10242
+										}
+									}
+								}
+
+								int var12 = class22.getWidgetFlags(var0); // L: 10246
+								var11 = (var12 >> 31 & 1) != 0; // L: 10248
+								if (var11) { // L: 10250
+									class22.insertMenuItemNoShift("Use", SecureRandomFuture.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); // L: 10251
+								}
+
+								Object var10000 = null; // L: 10254
+								int var13;
+								if (class372.method6497(class22.getWidgetFlags(var0))) {
+									for (var13 = 2; var13 >= 0; --var13) { // L: 10255
+										if (var13 != var10) { // L: 10256
+											class14.addWidgetItemMenuItem(var0, var8, var15, var13, false); // L: 10257
+										}
+									}
+
+									if (var10 >= 0) { // L: 10259
+										class14.addWidgetItemMenuItem(var0, var8, var15, var10, true); // L: 10260
+									}
+								}
+
+								var9 = var0.itemActions; // L: 10263
+								if (var9 != null) { // L: 10264
+									for (var13 = 4; var13 >= 0; --var13) { // L: 10265
+										if (var9[var13] != null) { // L: 10266
+											byte var14 = 0; // L: 10267
+											if (var13 == 0) { // L: 10268
+												var14 = 39;
+											}
+
+											if (var13 == 1) { // L: 10269
+												var14 = 40;
+											}
+
+											if (var13 == 2) { // L: 10270
+												var14 = 41;
+											}
+
+											if (var13 == 3) { // L: 10271
+												var14 = 42;
+											}
+
+											if (var13 == 4) { // L: 10272
+												var14 = 43;
+											}
+
+											class22.insertMenuItemNoShift(var9[var13], SecureRandomFuture.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); // L: 10273
+										}
+									}
+								}
+
+								class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); // L: 10278
+							}
+						}
+					}
+
+					++var15; // L: 10283
+				}
+			}
+		}
+
+		if (var0.isIf3) { // L: 10287
+			if (Client.isSpellSelected) { // L: 10288
+				var4 = class22.getWidgetFlags(var0); // L: 10290
+				boolean var21 = (var4 >> 21 & 1) != 0; // L: 10292
+				if (var21 && (LoginPacket.selectedSpellFlags & 32) == 32) { // L: 10294
+					class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 10295
+				}
+			} else {
+				for (var15 = 9; var15 >= 5; --var15) { // L: 10300
+					String var17;
+					if (!class136.method2696(class22.getWidgetFlags(var0), var15) && var0.onOp == null) { // L: 10303
+						var17 = null; // L: 10304
+					} else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { // L: 10307
+						var17 = var0.actions[var15]; // L: 10311
+					} else {
+						var17 = null; // L: 10308
+					}
+
+					if (var17 != null) { // L: 10314
+						class22.insertMenuItemNoShift(var17, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); // L: 10315
+					}
+				}
+
+				var3 = SecureRandomCallable.Widget_getSpellActionName(var0); // L: 10319
+				if (var3 != null) { // L: 10320
+					class22.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 10321
+				}
+
+				for (var4 = 4; var4 >= 0; --var4) { // L: 10324
+					String var16;
+					if (!class136.method2696(class22.getWidgetFlags(var0), var4) && var0.onOp == null) { // L: 10327
+						var16 = null; // L: 10328
+					} else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { // L: 10331
+						var16 = var0.actions[var4]; // L: 10335
+					} else {
+						var16 = null; // L: 10332
+					}
+
+					if (var16 != null) { // L: 10338
+						PacketWriter.insertMenuItem(var16, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 10339
+					}
+				}
+
+				var5 = class22.getWidgetFlags(var0); // L: 10344
+				boolean var19 = (var5 & 1) != 0; // L: 10346
+				if (var19) { // L: 10348
+					class22.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 10349
+				}
+			}
+		}
+
+	} // L: 10354
 }
diff --git a/runescape-client/src/main/java/class262.java b/runescape-client/src/main/java/class262.java
new file mode 100644
index 0000000000..f25e65e9be
--- /dev/null
+++ b/runescape-client/src/main/java/class262.java
@@ -0,0 +1,87 @@
+import java.io.File;
+import java.io.IOException;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("ji")
+public class class262 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lji;"
+	)
+	static final class262 field3194;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lji;"
+	)
+	static final class262 field3193;
+	@ObfuscatedName("kg")
+	@ObfuscatedSignature(
+		descriptor = "Lcj;"
+	)
+	@Export("localPlayer")
+	static Player localPlayer;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1602122901
+	)
+	final int field3192;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = -2082142029
+	)
+	final int field3195;
+
+	static {
+		field3194 = new class262(51, 27, 800, 0, 16, 16); // L: 33
+		field3193 = new class262(25, 28, 800, 656, 40, 40); // L: 34
+	}
+
+	class262(int var1, int var2, int var3, int var4, int var5, int var6) {
+		this.field3192 = var5; // L: 39
+		this.field3195 = var6; // L: 40
+	} // L: 41
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lnp;",
+		garbageValue = "724440260"
+	)
+	@Export("getPreferencesFile")
+	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
+		File var3 = new File(WorldMapDecoration.cacheDir, "preferences" + var0 + ".dat"); // L: 183
+		if (var3.exists()) { // L: 184
+			try {
+				AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 186
+				return var10; // L: 187
+			} catch (IOException var9) { // L: 189
+			}
+		}
+
+		String var4 = ""; // L: 191
+		if (ClanChannel.cacheGamebuild == 33) { // L: 192
+			var4 = "_rc";
+		} else if (ClanChannel.cacheGamebuild == 34) { // L: 193
+			var4 = "_wip";
+		}
+
+		File var5 = new File(JagexCache.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 194
+		AccessFile var6;
+		if (!var2 && var5.exists()) { // L: 195
+			try {
+				var6 = new AccessFile(var5, "rw", 10000L); // L: 197
+				return var6; // L: 198
+			} catch (IOException var8) { // L: 200
+			}
+		}
+
+		try {
+			var6 = new AccessFile(var3, "rw", 10000L); // L: 203
+			return var6; // L: 204
+		} catch (IOException var7) { // L: 206
+			throw new RuntimeException(); // L: 207
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class265.java b/runescape-client/src/main/java/class265.java
index 3921082af1..e238766d59 100644
--- a/runescape-client/src/main/java/class265.java
+++ b/runescape-client/src/main/java/class265.java
@@ -1,14 +1,128 @@
+import java.awt.FontMetrics;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jh")
+@ObfuscatedName("jg")
 public class class265 {
-	@ObfuscatedName("r")
+	@ObfuscatedName("ah")
+	@Export("loginScreenFontMetrics")
+	static FontMetrics loginScreenFontMetrics;
+
+	@ObfuscatedName("hc")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "54"
+		descriptor = "(IIZI)V",
+		garbageValue = "2064916669"
 	)
-	public static void method4848() {
-		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 86
-	} // L: 87
+	static final void method4984(int var0, int var1, boolean var2) {
+		if (!var2 || var0 != class12.field111 || RouteStrategy.field1919 != var1) { // L: 5615
+			class12.field111 = var0; // L: 5618
+			RouteStrategy.field1919 = var1; // L: 5619
+			Projectile.updateGameState(25); // L: 5620
+			class143.drawLoadingMessage("Loading - please wait.", true); // L: 5621
+			int var3 = class15.baseX; // L: 5622
+			int var4 = WorldMapSprite.baseY; // L: 5623
+			class15.baseX = (var0 - 6) * 8; // L: 5624
+			WorldMapSprite.baseY = (var1 - 6) * 8; // L: 5625
+			int var5 = class15.baseX - var3; // L: 5626
+			int var6 = WorldMapSprite.baseY - var4; // L: 5627
+			var3 = class15.baseX; // L: 5628
+			var4 = WorldMapSprite.baseY; // L: 5629
+
+			int var7;
+			int var9;
+			int[] var10000;
+			for (var7 = 0; var7 < 32768; ++var7) { // L: 5630
+				NPC var19 = Client.npcs[var7]; // L: 5631
+				if (var19 != null) { // L: 5632
+					for (var9 = 0; var9 < 10; ++var9) { // L: 5633
+						var10000 = var19.pathX; // L: 5634
+						var10000[var9] -= var5;
+						var10000 = var19.pathY; // L: 5635
+						var10000[var9] -= var6;
+					}
+
+					var19.x -= var5 * 128; // L: 5637
+					var19.y -= var6 * 128; // L: 5638
+				}
+			}
+
+			for (var7 = 0; var7 < 2048; ++var7) { // L: 5641
+				Player var22 = Client.players[var7]; // L: 5642
+				if (var22 != null) { // L: 5643
+					for (var9 = 0; var9 < 10; ++var9) { // L: 5644
+						var10000 = var22.pathX; // L: 5645
+						var10000[var9] -= var5;
+						var10000 = var22.pathY; // L: 5646
+						var10000[var9] -= var6;
+					}
+
+					var22.x -= var5 * 128; // L: 5648
+					var22.y -= var6 * 128; // L: 5649
+				}
+			}
+
+			byte var20 = 0; // L: 5652
+			byte var8 = 104; // L: 5653
+			byte var21 = 1; // L: 5654
+			if (var5 < 0) { // L: 5655
+				var20 = 103; // L: 5656
+				var8 = -1; // L: 5657
+				var21 = -1; // L: 5658
+			}
+
+			byte var10 = 0; // L: 5660
+			byte var11 = 104; // L: 5661
+			byte var12 = 1; // L: 5662
+			if (var6 < 0) { // L: 5663
+				var10 = 103; // L: 5664
+				var11 = -1; // L: 5665
+				var12 = -1; // L: 5666
+			}
+
+			int var14;
+			for (int var13 = var20; var8 != var13; var13 += var21) { // L: 5668
+				for (var14 = var10; var11 != var14; var14 += var12) { // L: 5669
+					int var15 = var5 + var13; // L: 5670
+					int var16 = var14 + var6; // L: 5671
+
+					for (int var17 = 0; var17 < 4; ++var17) { // L: 5672
+						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
+							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5673
+						} else {
+							Client.groundItems[var17][var13][var14] = null; // L: 5674
+						}
+					}
+				}
+			}
+
+			for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5678 5679 5683
+				var18.x -= var5; // L: 5680
+				var18.y -= var6; // L: 5681
+				if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5682
+					var18.remove();
+				}
+			}
+
+			if (Client.destinationX != 0) { // L: 5685
+				Client.destinationX -= var5; // L: 5686
+				Client.destinationY -= var6; // L: 5687
+			}
+
+			Client.soundEffectCount = 0; // L: 5689
+			Client.isCameraLocked = false; // L: 5690
+			ObjectSound.cameraX -= var5 << 7; // L: 5691
+			Canvas.cameraZ -= var6 << 7; // L: 5692
+			FriendSystem.oculusOrbFocalPointX -= var5 << 7; // L: 5693
+			VarbitComposition.oculusOrbFocalPointY -= var6 << 7; // L: 5694
+			Client.field853 = -1; // L: 5695
+			Client.graphicsObjects.clear(); // L: 5696
+			Client.projectiles.clear(); // L: 5697
+
+			for (var14 = 0; var14 < 4; ++var14) { // L: 5698
+				Client.collisionMaps[var14].clear();
+			}
+
+		}
+	} // L: 5616 5699
 }
diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java
index 8a075015b2..306198bd4d 100644
--- a/runescape-client/src/main/java/class266.java
+++ b/runescape-client/src/main/java/class266.java
@@ -1,120 +1,7 @@
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.URL;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jq")
+@ObfuscatedName("jm")
 public class class266 {
-	static {
-		int var0 = 0; // L: 9
-		int var1 = 0; // L: 10
-		class261[] var2 = WorldMapData_1.method3525(); // L: 12
-
-		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 13
-			class261 var4 = var2[var3]; // L: 14
-			if (var4.field3199 > var0) {
-				var0 = var4.field3199; // L: 16
-			}
-
-			if (var4.field3202 > var1) { // L: 17
-				var1 = var4.field3202;
-			}
-		}
-
-	} // L: 21
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V",
-		garbageValue = "2070444539"
-	)
-	@Export("RunException_sendStackTrace")
-	public static void RunException_sendStackTrace(String var0, Throwable var1) {
-		if (var1 != null) {
-			var1.printStackTrace();
-		} else {
-			try {
-				String var2 = ""; // L: 33
-				if (var1 != null) { // L: 34
-					Throwable var4 = var1; // L: 36
-					String var5;
-					if (var1 instanceof RunException) { // L: 39
-						RunException var6 = (RunException)var1; // L: 40
-						var5 = var6.message + " | "; // L: 41
-						var4 = var6.throwable; // L: 42
-					} else {
-						var5 = ""; // L: 44
-					}
-
-					StringWriter var18 = new StringWriter(); // L: 45
-					PrintWriter var7 = new PrintWriter(var18); // L: 46
-					var4.printStackTrace(var7); // L: 47
-					var7.close(); // L: 48
-					String var8 = var18.toString(); // L: 49
-					BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50
-					String var10 = var9.readLine(); // L: 51
-
-					label63:
-					while (true) {
-						while (true) {
-							String var11 = var9.readLine(); // L: 53
-							if (var11 == null) { // L: 54
-								var5 = var5 + "| " + var10; // L: 72
-								var2 = var5; // L: 75
-								break label63;
-							}
-
-							int var12 = var11.indexOf(40); // L: 55
-							int var13 = var11.indexOf(41, var12 + 1); // L: 56
-							if (var12 >= 0 && var13 >= 0) { // L: 57
-								String var14 = var11.substring(var12 + 1, var13); // L: 58
-								int var15 = var14.indexOf(".java:"); // L: 59
-								if (var15 >= 0) { // L: 60
-									var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61
-									var5 = var5 + var14 + ' '; // L: 62
-									continue; // L: 63
-								}
-
-								var11 = var11.substring(0, var12); // L: 65
-							}
-
-							var11 = var11.trim(); // L: 67
-							var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68
-							var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69
-							var5 = var5 + var11 + ' '; // L: 70
-						}
-					}
-				}
-
-				if (var0 != null) { // L: 77
-					if (var1 != null) { // L: 78
-						var2 = var2 + " | ";
-					}
-
-					var2 = var2 + var0; // L: 79
-				}
-
-				System.out.println("Error: " + var2); // L: 81
-				var2 = var2.replace(':', '.'); // L: 82
-				var2 = var2.replace('@', '_'); // L: 83
-				var2 = var2.replace('&', '_'); // L: 84
-				var2 = var2.replace('#', '_'); // L: 85
-				if (RunException.RunException_applet == null) { // L: 86
-					return;
-				}
-
-				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); // L: 87
-				DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88
-				var17.read(); // L: 89
-				var17.close(); // L: 90
-			} catch (Exception var16) { // L: 92
-			}
-
-		}
-	} // L: 93
+	@ObfuscatedName("i")
+	public static boolean field3222;
 }
diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java
new file mode 100644
index 0000000000..bae26faaaa
--- /dev/null
+++ b/runescape-client/src/main/java/class267.java
@@ -0,0 +1,175 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("jd")
+public class class267 {
+	@ObfuscatedName("sz")
+	@ObfuscatedSignature(
+		descriptor = "Ljk;"
+	)
+	@Export("grandExchangeEvents")
+	static GrandExchangeEvents grandExchangeEvents;
+
+	static {
+		int var0 = 0; // L: 9
+		int var1 = 0; // L: 10
+		class262[] var2 = new class262[]{class262.field3194, class262.field3193}; // L: 14
+		class262[] var3 = var2; // L: 16
+
+		for (int var4 = 0; var4 < var3.length; ++var4) { // L: 17
+			class262 var5 = var3[var4]; // L: 18
+			if (var5.field3192 > var0) { // L: 20
+				var0 = var5.field3192;
+			}
+
+			if (var5.field3195 > var1) { // L: 21
+				var1 = var5.field3195;
+			}
+		}
+
+	} // L: 25
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "2132527544"
+	)
+	static int method4991(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1869
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.cycle; // L: 1870
+			return 1; // L: 1871
+		} else {
+			int var3;
+			int var4;
+			if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1873
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 1874
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1875
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1876
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Canvas.method498(var3, var4); // L: 1877
+				return 1; // L: 1878
+			} else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1880
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 1881
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1882
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1883
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class143.ItemContainer_getCount(var3, var4); // L: 1884
+				return 1; // L: 1885
+			} else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1887
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 1888
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1889
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1890
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class26.method351(var3, var4); // L: 1891
+				return 1; // L: 1892
+			} else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1894
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1895
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class261.getInvDefinition(var3).size; // L: 1896
+				return 1; // L: 1897
+			} else if (var0 == ScriptOpcodes.STAT) { // L: 1899
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1900
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1901
+				return 1; // L: 1902
+			} else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1904
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1905
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1906
+				return 1; // L: 1907
+			} else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1909
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1910
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1911
+				return 1; // L: 1912
+			} else {
+				int var5;
+				if (var0 == ScriptOpcodes.COORD) { // L: 1914
+					var3 = SoundSystem.Client_plane; // L: 1915
+					var4 = (class262.localPlayer.x >> 7) + class15.baseX; // L: 1916
+					var5 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY; // L: 1917
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1918
+					return 1; // L: 1919
+				} else if (var0 == ScriptOpcodes.COORDX) { // L: 1921
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1922
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1923
+					return 1; // L: 1924
+				} else if (var0 == ScriptOpcodes.COORDZ) { // L: 1926
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1927
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1928
+					return 1; // L: 1929
+				} else if (var0 == ScriptOpcodes.COORDY) { // L: 1931
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1932
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1933
+					return 1; // L: 1934
+				} else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1936
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1937
+					return 1; // L: 1938
+				} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1940
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 1941
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] + 32768; // L: 1942
+					var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1943
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Canvas.method498(var3, var4); // L: 1944
+					return 1; // L: 1945
+				} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1947
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 1948
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] + 32768; // L: 1949
+					var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1950
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class143.ItemContainer_getCount(var3, var4); // L: 1951
+					return 1; // L: 1952
+				} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1954
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 1955
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] + 32768; // L: 1956
+					var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1957
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class26.method351(var3, var4); // L: 1958
+					return 1; // L: 1959
+				} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1961
+					if (Client.staffModLevel >= 2) { // L: 1962
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.staffModLevel;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1963
+					}
+
+					return 1; // L: 1964
+				} else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1966
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1967
+					return 1; // L: 1968
+				} else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1970
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.worldId; // L: 1971
+					return 1; // L: 1972
+				} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1974
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1975
+					return 1; // L: 1976
+				} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1978
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.weight; // L: 1979
+					return 1; // L: 1980
+				} else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1982
+					if (Client.playerMod) { // L: 1983
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1984
+					}
+
+					return 1; // L: 1985
+				} else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1987
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1988
+					return 1; // L: 1989
+				} else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1991
+					ChatChannel.Interpreter_intStackSize -= 4; // L: 1992
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1993
+					var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1994
+					var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 1995
+					int var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3]; // L: 1996
+					var3 += var4 << 14; // L: 1997
+					var3 += var5 << 28; // L: 1998
+					var3 += var6; // L: 1999
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 2000
+					return 1; // L: 2001
+				} else if (var0 == 3326) { // L: 2003
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.field843; // L: 2004
+					return 1; // L: 2005
+				} else if (var0 == 3327) { // L: 2007
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.field633; // L: 2008
+					return 1; // L: 2009
+				} else {
+					return 2; // L: 2011
+				}
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java
deleted file mode 100644
index 3a9ad7fc34..0000000000
--- a/runescape-client/src/main/java/class268.java
+++ /dev/null
@@ -1,84 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jn")
-public enum class268 implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljn;"
-	)
-	field3537(-1),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljn;"
-	)
-	field3540(0),
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Ljn;"
-	)
-	field3538(1),
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Ljn;"
-	)
-	field3539(2);
-
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = -1451177967
-	)
-	final int field3536;
-
-	class268(int var3) {
-		this.field3536 = var3; // L: 19
-	} // L: 20
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-907662946"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field3536; // L: 23
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IIILeg;IB)V",
-		garbageValue = "2"
-	)
-	static void method4851(int var0, int var1, int var2, ObjectComposition var3, int var4) {
-		ObjectSound var5 = new ObjectSound(); // L: 73
-		var5.plane = var0; // L: 74
-		var5.x = var1 * 128; // L: 75
-		var5.y = var2 * 128; // L: 76
-		int var6 = var3.sizeX; // L: 77
-		int var7 = var3.sizeY; // L: 78
-		if (var4 == 1 || var4 == 3) { // L: 79
-			var6 = var3.sizeY; // L: 80
-			var7 = var3.sizeX; // L: 81
-		}
-
-		var5.field956 = (var6 + var1) * 128; // L: 83
-		var5.field957 = (var7 + var2) * 128; // L: 84
-		var5.soundEffectId = var3.ambientSoundId; // L: 85
-		var5.field958 = var3.int4 * 128; // L: 86
-		var5.field961 = var3.int5; // L: 87
-		var5.field964 = var3.int6; // L: 88
-		var5.soundEffectIds = var3.soundEffectIds; // L: 89
-		if (var3.transforms != null) { // L: 90
-			var5.obj = var3; // L: 91
-			var5.set(); // L: 92
-		}
-
-		ObjectSound.objectSounds.addFirst(var5); // L: 94
-		if (var5.soundEffectIds != null) { // L: 95
-			var5.field954 = var5.field961 + (int)(Math.random() * (double)(var5.field964 - var5.field961));
-		}
-
-	} // L: 96
-}
diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java
new file mode 100644
index 0000000000..afe3b481f7
--- /dev/null
+++ b/runescape-client/src/main/java/class269.java
@@ -0,0 +1,132 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("jo")
+public enum class269 implements Enumerated
+{
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Ljo;"
+	)
+	field3535(-1),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ljo;"
+	)
+	field3533(0),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Ljo;"
+	)
+	field3534(1),
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Ljo;"
+	)
+	field3532(2);
+
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -2043119815
+	)
+	final int field3536;
+
+	class269(int var3) {
+		this.field3536 = var3; // L: 19
+	} // L: 20
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1154679040"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field3536; // L: 23
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "-1302219293"
+	)
+	public static int method4992(int var0) {
+		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 42
+		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 43
+		var0 = var0 + (var0 >>> 4) & 252645135; // L: 44
+		var0 += var0 >>> 8; // L: 45
+		var0 += var0 >>> 16; // L: 46
+		return var0 & 255; // L: 47
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "405198099"
+	)
+	public static int method5000(int var0) {
+		if (var0 > 0) { // L: 207
+			return 1;
+		} else {
+			return var0 < 0 ? -1 : 0; // L: 208 209
+		}
+	}
+
+	@ObfuscatedName("am")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "-246993316"
+	)
+	static int method4996(int var0, Script var1, boolean var2) {
+		if (var0 != 7000 && var0 != 7005 && var0 != 7010 && var0 != 7015 && var0 != 7020 && var0 != 7025 && var0 != 7030 && var0 != 7035) { // L: 4273
+			if (var0 != 7001 && var0 != 7002 && var0 != 7011 && var0 != 7012 && var0 != 7021 && var0 != 7022) { // L: 4277
+				if (var0 != 7003 && var0 != 7013 && var0 != 7023) { // L: 4281
+					if (var0 != 7006 && var0 != 7007 && var0 != 7016 && var0 != 7017 && var0 != 7026 && var0 != 7027) { // L: 4285
+						if (var0 != 7008 && var0 != 7018 && var0 != 7028) { // L: 4289
+							if (var0 != 7031 && var0 != 7032) { // L: 4293
+								if (var0 == 7033) { // L: 4298
+									--UserComparator9.Interpreter_stringStackSize; // L: 4299
+									return 1; // L: 4300
+								} else if (var0 != 7036 && var0 != 7037) { // L: 4302
+									if (var0 == 7038) { // L: 4306
+										--ChatChannel.Interpreter_intStackSize; // L: 4307
+										return 1; // L: 4308
+									} else if (var0 != 7004 && var0 != 7009 && var0 != 7014 && var0 != 7019 && var0 != 7024 && var0 != 7029 && var0 != 7034 && var0 != 7039) { // L: 4310
+										return 2; // L: 4314
+									} else {
+										--ChatChannel.Interpreter_intStackSize; // L: 4311
+										return 1; // L: 4312
+									}
+								} else {
+									ChatChannel.Interpreter_intStackSize -= 2; // L: 4303
+									return 1; // L: 4304
+								}
+							} else {
+								--UserComparator9.Interpreter_stringStackSize; // L: 4294
+								--ChatChannel.Interpreter_intStackSize; // L: 4295
+								return 1; // L: 4296
+							}
+						} else {
+							--ChatChannel.Interpreter_intStackSize; // L: 4290
+							return 1; // L: 4291
+						}
+					} else {
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 4286
+						return 1; // L: 4287
+					}
+				} else {
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 4282
+					return 1; // L: 4283
+				}
+			} else {
+				ChatChannel.Interpreter_intStackSize -= 3; // L: 4278
+				return 1; // L: 4279
+			}
+		} else {
+			ChatChannel.Interpreter_intStackSize -= 5; // L: 4274
+			return 1; // L: 4275
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java
index 4ad068e6e7..fa8f83fd69 100644
--- a/runescape-client/src/main/java/class27.java
+++ b/runescape-client/src/main/java/class27.java
@@ -1,176 +1,510 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ap")
+@ObfuscatedName("ak")
 public class class27 extends class14 {
-	@ObfuscatedName("da")
+	@ObfuscatedName("oz")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Lnz;"
 	)
-	@Export("archive1")
-	static Archive archive1;
-	@ObfuscatedName("eh")
+	static class370 field215;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 2057684511
+		intValue = 1631949421
 	)
-	static int field231;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 718732187
-	)
-	int field227;
+	int field216;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class27(class2 var1) {
 		this.this$0 = var1;
-		this.field227 = -1; // L: 144
+		this.field216 = -1; // L: 144
 	} // L: 146
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field227 = var1.readUnsignedShort(); // L: 149
+	void vmethod363(Buffer var1) {
+		this.field216 = var1.readUnsignedShort(); // L: 149
 	} // L: 150
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method109(this.field227); // L: 153
+	void vmethod354(ClanSettings var1) {
+		var1.method132(this.field216); // L: 153
 	} // L: 154
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Ljv;I)V",
-		garbageValue = "-1597980436"
+		descriptor = "(Ljp;IB)V",
+		garbageValue = "-1"
 	)
-	public static void method277(AbstractArchive var0) {
-		FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 21
-	} // L: 22
+	static void method364(AbstractArchive var0, int var1) {
+		if ((var1 & 536870912) != 0) { // L: 183
+			Messages.logoSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var0, "logo_deadman_mode", ""); // L: 184
+		} else if ((var1 & 1073741824) != 0) { // L: 186
+			Messages.logoSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var0, "logo_seasonal_mode", ""); // L: 187
+		} else {
+			Messages.logoSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(var0, "logo", ""); // L: 190
+		}
 
-	@ObfuscatedName("at")
+	} // L: 192
+
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1927970682"
+		descriptor = "(Lkj;Lkj;B)V",
+		garbageValue = "0"
 	)
-	static int method280(int var0, Script var1, boolean var2) {
-		if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4158
-			if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4163
-				if (var0 == 6750) { // L: 4167
-					++Interpreter.Interpreter_stringStackSize; // L: 4168
-					return 1; // L: 4169
-				} else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4171
-					if (var0 == 6754) { // L: 4175
-						int var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 4176
-						NPCComposition var4 = StructComposition.getNpcDefinition(var3); // L: 4177
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4178
-						return 1; // L: 4179
-					} else {
-						return 2; // L: 4181
-					}
-				} else {
-					++class44.Interpreter_intStackSize; // L: 4172
-					return 1; // L: 4173
-				}
+	static void method353(Font var0, Font var1) {
+		int var4;
+		int var5;
+		int var9;
+		int var11;
+		int var13;
+		if (Varcs.worldSelectBackSprites == null) { // L: 1224
+			Archive var3 = ModeWhere.archive8; // L: 1226
+			var4 = var3.getGroupId("sl_back"); // L: 1228
+			var5 = var3.getFileId(var4, ""); // L: 1229
+			SpritePixels[] var6;
+			if (!Message.method1263(var3, var4, var5)) { // L: 1232
+				var6 = null; // L: 1233
 			} else {
-				--class44.Interpreter_intStackSize; // L: 4164
-				return 1; // L: 4165
+				SpritePixels[] var8 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 1238
+				var9 = 0;
+
+				while (true) {
+					if (var9 >= class397.SpriteBuffer_spriteCount) {
+						ArchiveDisk.method5993(); // L: 1252
+						var6 = var8; // L: 1255
+						break;
+					}
+
+					SpritePixels var10 = var8[var9] = new SpritePixels(); // L: 1240
+					var10.width = class397.SpriteBuffer_spriteWidth; // L: 1241
+					var10.height = class244.SpriteBuffer_spriteHeight; // L: 1242
+					var10.xOffset = class397.SpriteBuffer_xOffsets[var9]; // L: 1243
+					var10.yOffset = class26.SpriteBuffer_yOffsets[var9]; // L: 1244
+					var10.subWidth = Canvas.SpriteBuffer_spriteWidths[var9]; // L: 1245
+					var10.subHeight = Clock.SpriteBuffer_spriteHeights[var9]; // L: 1246
+					var11 = var10.subHeight * var10.subWidth; // L: 1247
+					byte[] var12 = class126.SpriteBuffer_pixels[var9]; // L: 1248
+					var10.pixels = new int[var11]; // L: 1249
+
+					for (var13 = 0; var13 < var11; ++var13) { // L: 1250
+						var10.pixels[var13] = class397.SpriteBuffer_spritePalette[var12[var13] & 255];
+					}
+
+					++var9; // L: 1239
+				}
+			}
+
+			Varcs.worldSelectBackSprites = var6; // L: 1259
+		}
+
+		if (class364.worldSelectFlagSprites == null) { // L: 1261
+			class364.worldSelectFlagSprites = WorldMapLabelSize.method3268(ModeWhere.archive8, "sl_flags", "");
+		}
+
+		if (class10.worldSelectArrows == null) { // L: 1262
+			class10.worldSelectArrows = WorldMapLabelSize.method3268(ModeWhere.archive8, "sl_arrows", "");
+		}
+
+		if (Huffman.worldSelectStars == null) { // L: 1263
+			Huffman.worldSelectStars = WorldMapLabelSize.method3268(ModeWhere.archive8, "sl_stars", "");
+		}
+
+		if (NetCache.worldSelectLeftSprite == null) { // L: 1264
+			NetCache.worldSelectLeftSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "leftarrow", "");
+		}
+
+		if (class12.worldSelectRightSprite == null) { // L: 1265
+			class12.worldSelectRightSprite = TextureProvider.SpriteBuffer_getIndexedSpriteByName(ModeWhere.archive8, "rightarrow", "");
+		}
+
+		Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1266
+		Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1267
+		Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1268
+		var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1269
+		if (Huffman.worldSelectStars != null) { // L: 1270
+			Huffman.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1271
+			var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1272
+			Huffman.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1273
+			var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1274
+		}
+
+		if (class10.worldSelectArrows != null) { // L: 1276
+			int var22 = Login.xPadding + 280; // L: 1277
+			if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1278
+				class10.worldSelectArrows[2].drawAt(var22, 4);
+			} else {
+				class10.worldSelectArrows[0].drawAt(var22, 4); // L: 1279
+			}
+
+			if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1280
+				class10.worldSelectArrows[3].drawAt(var22 + 15, 4);
+			} else {
+				class10.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1281
+			}
+
+			var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1282
+			int var23 = Login.xPadding + 390; // L: 1283
+			if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1284
+				class10.worldSelectArrows[2].drawAt(var23, 4);
+			} else {
+				class10.worldSelectArrows[0].drawAt(var23, 4); // L: 1285
+			}
+
+			if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1286
+				class10.worldSelectArrows[3].drawAt(var23 + 15, 4);
+			} else {
+				class10.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1287
+			}
+
+			var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1288
+			var4 = Login.xPadding + 500; // L: 1289
+			if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1290
+				class10.worldSelectArrows[2].drawAt(var4, 4);
+			} else {
+				class10.worldSelectArrows[0].drawAt(var4, 4); // L: 1291
+			}
+
+			if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1292
+				class10.worldSelectArrows[3].drawAt(var4 + 15, 4);
+			} else {
+				class10.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1293
+			}
+
+			var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1294
+			var5 = Login.xPadding + 610; // L: 1295
+			if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1296
+				class10.worldSelectArrows[2].drawAt(var5, 4);
+			} else {
+				class10.worldSelectArrows[0].drawAt(var5, 4); // L: 1297
+			}
+
+			if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1298
+				class10.worldSelectArrows[3].drawAt(var5 + 15, 4);
+			} else {
+				class10.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1299
+			}
+
+			var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1300
+		}
+
+		Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1302
+		var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1303
+		Login.hoveredWorldIndex = -1; // L: 1304
+		if (Varcs.worldSelectBackSprites != null) { // L: 1305
+			byte var31 = 88; // L: 1306
+			byte var32 = 19; // L: 1307
+			var4 = 765 / (var31 + 1) - 1; // L: 1308
+			var5 = 480 / (var32 + 1); // L: 1309
+
+			int var24;
+			int var25;
+			do {
+				var24 = var5; // L: 1311
+				var25 = var4; // L: 1312
+				if (var5 * (var4 - 1) >= World.World_count) { // L: 1313
+					--var4;
+				}
+
+				if (var4 * (var5 - 1) >= World.World_count) { // L: 1314
+					--var5;
+				}
+
+				if (var4 * (var5 - 1) >= World.World_count) { // L: 1315
+					--var5;
+				}
+			} while(var24 != var5 || var25 != var4); // L: 1316
+
+			var24 = (765 - var31 * var4) / (var4 + 1); // L: 1318
+			if (var24 > 5) { // L: 1319
+				var24 = 5;
+			}
+
+			var25 = (480 - var5 * var32) / (var5 + 1); // L: 1320
+			if (var25 > 5) { // L: 1321
+				var25 = 5;
+			}
+
+			int var26 = (765 - var4 * var31 - var24 * (var4 - 1)) / 2; // L: 1322
+			var9 = (480 - var32 * var5 - var25 * (var5 - 1)) / 2; // L: 1323
+			int var27 = (var5 + World.World_count - 1) / var5; // L: 1324
+			Login.worldSelectPagesCount = var27 - var4; // L: 1325
+			if (NetCache.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1326
+				NetCache.worldSelectLeftSprite.drawAt(8, class0.canvasHeight / 2 - NetCache.worldSelectLeftSprite.subHeight / 2); // L: 1327
+			}
+
+			if (class12.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1329
+				class12.worldSelectRightSprite.drawAt(AttackOption.canvasWidth - class12.worldSelectRightSprite.subWidth - 8, class0.canvasHeight / 2 - class12.worldSelectRightSprite.subHeight / 2); // L: 1330
+			}
+
+			var11 = var9 + 23; // L: 1332
+			int var28 = var26 + Login.xPadding; // L: 1333
+			var13 = 0; // L: 1334
+			boolean var14 = false; // L: 1335
+			int var15 = Login.worldSelectPage; // L: 1336
+
+			int var16;
+			for (var16 = var15 * var5; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1337 1338
+				World var17 = World.World_worlds[var16]; // L: 1341
+				boolean var18 = true; // L: 1342
+				String var19 = Integer.toString(var17.population); // L: 1343
+				if (var17.population == -1) { // L: 1344
+					var19 = "OFF"; // L: 1345
+					var18 = false; // L: 1346
+				} else if (var17.population > 1980) { // L: 1348
+					var19 = "FULL"; // L: 1349
+					var18 = false; // L: 1350
+				}
+
+				int var21 = 0; // L: 1353
+				byte var20;
+				if (var17.isBeta()) { // L: 1354
+					if (var17.isMembersOnly()) { // L: 1355
+						var20 = 7;
+					} else {
+						var20 = 6; // L: 1356
+					}
+				} else if (var17.isDeadman()) { // L: 1358
+					var21 = 16711680; // L: 1359
+					if (var17.isMembersOnly()) { // L: 1360
+						var20 = 5;
+					} else {
+						var20 = 4; // L: 1361
+					}
+				} else if (var17.method1778()) { // L: 1363
+					if (var17.isMembersOnly()) { // L: 1364
+						var20 = 9;
+					} else {
+						var20 = 8; // L: 1365
+					}
+				} else if (var17.isPvp()) { // L: 1367
+					if (var17.isMembersOnly()) { // L: 1368
+						var20 = 3;
+					} else {
+						var20 = 2; // L: 1369
+					}
+				} else if (var17.isMembersOnly()) { // L: 1372
+					var20 = 1;
+				} else {
+					var20 = 0; // L: 1373
+				}
+
+				if (MouseHandler.MouseHandler_x >= var28 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var31 + var28 && MouseHandler.MouseHandler_y < var32 + var11 && var18) { // L: 1375
+					Login.hoveredWorldIndex = var16; // L: 1376
+					Varcs.worldSelectBackSprites[var20].drawTransOverlayAt(var28, var11, 128, 16777215); // L: 1377
+					var14 = true; // L: 1378
+				} else {
+					Varcs.worldSelectBackSprites[var20].drawAt(var28, var11); // L: 1380
+				}
+
+				if (class364.worldSelectFlagSprites != null) { // L: 1381
+					class364.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var28 + 29, var11);
+				}
+
+				var0.drawCentered(Integer.toString(var17.id), var28 + 15, var32 / 2 + var11 + 5, var21, -1); // L: 1382
+				var1.drawCentered(var19, var28 + 60, var32 / 2 + var11 + 5, 268435455, -1); // L: 1383
+				var11 = var11 + var25 + var32; // L: 1384
+				++var13; // L: 1385
+				if (var13 >= var5) {
+					var11 = var9 + 23; // L: 1386
+					var28 = var28 + var24 + var31; // L: 1387
+					var13 = 0; // L: 1388
+					++var15; // L: 1389
+				}
+			}
+
+			if (var14) { // L: 1392
+				var16 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1393
+				int var29 = var1.ascent + 8; // L: 1394
+				int var30 = MouseHandler.MouseHandler_y + 25; // L: 1395
+				if (var29 + var30 > 480) { // L: 1396
+					var30 = MouseHandler.MouseHandler_y - 25 - var29; // L: 1397
+				}
+
+				Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var30, var16, var29, 16777120); // L: 1399
+				Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var30, var16, var29, 0); // L: 1400
+				var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var30 + var1.ascent + 4, 0, -1); // L: 1401
+			}
+		}
+
+		AbstractWorldMapData.rasterProvider.drawFull(0, 0); // L: 1404
+	} // L: 1405
+
+	@ObfuscatedName("jf")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;IB)I",
+		garbageValue = "1"
+	)
+	static final int method355(Widget var0, int var1) {
+		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 10070
+			try {
+				int[] var2 = var0.cs1Instructions[var1]; // L: 10072
+				int var3 = 0; // L: 10073
+				int var4 = 0; // L: 10074
+				byte var5 = 0; // L: 10075
+
+				while (true) {
+					int var6 = var2[var4++]; // L: 10077
+					int var7 = 0; // L: 10078
+					byte var8 = 0; // L: 10079
+					if (var6 == 0) { // L: 10080
+						return var3;
+					}
+
+					if (var6 == 1) { // L: 10081
+						var7 = Client.currentLevels[var2[var4++]];
+					}
+
+					if (var6 == 2) { // L: 10082
+						var7 = Client.levels[var2[var4++]];
+					}
+
+					if (var6 == 3) { // L: 10083
+						var7 = Client.experience[var2[var4++]];
+					}
+
+					int var9;
+					Widget var10;
+					int var11;
+					int var12;
+					if (var6 == 4) { // L: 10084
+						var9 = var2[var4++] << 16; // L: 10085
+						var9 += var2[var4++]; // L: 10086
+						var10 = WorldMapData_1.getWidget(var9); // L: 10087
+						var11 = var2[var4++]; // L: 10088
+						if (var11 != -1 && (!class250.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10089
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10090
+								if (var11 + 1 == var10.itemIds[var12]) { // L: 10091
+									var7 += var10.itemQuantities[var12];
+								}
+							}
+						}
+					}
+
+					if (var6 == 5) { // L: 10095
+						var7 = Varps.Varps_main[var2[var4++]];
+					}
+
+					if (var6 == 6) { // L: 10096
+						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
+					}
+
+					if (var6 == 7) { // L: 10097
+						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
+					}
+
+					if (var6 == 8) { // L: 10098
+						var7 = class262.localPlayer.combatLevel;
+					}
+
+					if (var6 == 9) { // L: 10099
+						for (var9 = 0; var9 < 25; ++var9) { // L: 10100
+							if (Skills.Skills_enabled[var9]) { // L: 10101
+								var7 += Client.levels[var9];
+							}
+						}
+					}
+
+					if (var6 == 10) { // L: 10104
+						var9 = var2[var4++] << 16; // L: 10105
+						var9 += var2[var4++]; // L: 10106
+						var10 = WorldMapData_1.getWidget(var9); // L: 10107
+						var11 = var2[var4++]; // L: 10108
+						if (var11 != -1 && (!class250.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 10109
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 10110
+								if (var11 + 1 == var10.itemIds[var12]) { // L: 10111
+									var7 = 999999999; // L: 10112
+									break; // L: 10113
+								}
+							}
+						}
+					}
+
+					if (var6 == 11) { // L: 10118
+						var7 = Client.runEnergy;
+					}
+
+					if (var6 == 12) { // L: 10119
+						var7 = Client.weight;
+					}
+
+					if (var6 == 13) { // L: 10120
+						var9 = Varps.Varps_main[var2[var4++]]; // L: 10121
+						int var13 = var2[var4++]; // L: 10122
+						var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 10123
+					}
+
+					if (var6 == 14) { // L: 10125
+						var9 = var2[var4++]; // L: 10126
+						var7 = ScriptFrame.getVarbit(var9); // L: 10127
+					}
+
+					if (var6 == 15) { // L: 10129
+						var8 = 1;
+					}
+
+					if (var6 == 16) { // L: 10130
+						var8 = 2;
+					}
+
+					if (var6 == 17) { // L: 10131
+						var8 = 3;
+					}
+
+					if (var6 == 18) { // L: 10132
+						var7 = (class262.localPlayer.x >> 7) + class15.baseX;
+					}
+
+					if (var6 == 19) { // L: 10133
+						var7 = (class262.localPlayer.y >> 7) + WorldMapSprite.baseY;
+					}
+
+					if (var6 == 20) { // L: 10134
+						var7 = var2[var4++];
+					}
+
+					if (var8 == 0) { // L: 10135
+						if (var5 == 0) { // L: 10136
+							var3 += var7;
+						}
+
+						if (var5 == 1) { // L: 10137
+							var3 -= var7;
+						}
+
+						if (var5 == 2 && var7 != 0) { // L: 10138
+							var3 /= var7;
+						}
+
+						if (var5 == 3) { // L: 10139
+							var3 *= var7;
+						}
+
+						var5 = 0; // L: 10140
+					} else {
+						var5 = var8; // L: 10142
+					}
+				}
+			} catch (Exception var14) { // L: 10145
+				return -1; // L: 10146
 			}
 		} else {
-			class44.Interpreter_intStackSize -= 2; // L: 4159
-			--Interpreter.Interpreter_stringStackSize; // L: 4160
-			return 1; // L: 4161
+			return -2;
 		}
 	}
-
-	@ObfuscatedName("fm")
-	@ObfuscatedSignature(
-		descriptor = "(IB)V",
-		garbageValue = "-43"
-	)
-	@Export("playSong")
-	static void playSong(int var0) {
-		if (var0 == -1 && !Client.field881) { // L: 3387
-			class124.midiPcmStream.clear(); // L: 3389
-			class232.musicPlayerStatus = 1; // L: 3390
-			ModelData0.musicTrackArchive = null; // L: 3391
-		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && ObjectComposition.clientPreferences.musicVolume != 0 && !Client.field881) { // L: 3394
-			Canvas.method395(2, UrlRequest.archive6, var0, 0, ObjectComposition.clientPreferences.musicVolume, false); // L: 3395
-		}
-
-		Client.currentTrackGroupId = var0; // L: 3397
-	} // L: 3398
-
-	@ObfuscatedName("ga")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-630332055"
-	)
-	static final void method283(int var0, int var1, int var2, int var3) {
-		Client.field755 = 0; // L: 4987
-		int var4 = (class93.localPlayer.x >> 7) + VertexNormal.baseX; // L: 4988
-		int var5 = (class93.localPlayer.y >> 7) + SoundSystem.baseY; // L: 4989
-		if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { // L: 4990
-			Client.field755 = 1;
-		}
-
-		if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { // L: 4991
-			Client.field755 = 1;
-		}
-
-		if (Client.field755 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { // L: 4992
-			Client.field755 = 0;
-		}
-
-	} // L: 4994
-
-	@ObfuscatedName("jk")
-	@ObfuscatedSignature(
-		descriptor = "([Lio;IIIZI)V",
-		garbageValue = "2021358420"
-	)
-	@Export("resizeInterface")
-	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
-		for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9771
-			Widget var6 = var0[var5]; // L: 9772
-			if (var6 != null && var6.parentId == var1) { // L: 9773 9774
-				Clock.alignWidgetSize(var6, var2, var3, var4); // L: 9775
-				class24.alignWidgetPosition(var6, var2, var3); // L: 9776
-				if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9777
-					var6.scrollX = var6.scrollWidth - var6.width;
-				}
-
-				if (var6.scrollX < 0) { // L: 9778
-					var6.scrollX = 0;
-				}
-
-				if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9779
-					var6.scrollY = var6.scrollHeight - var6.height;
-				}
-
-				if (var6.scrollY < 0) { // L: 9780
-					var6.scrollY = 0;
-				}
-
-				if (var6.type == 0) { // L: 9781
-					class313.revalidateWidgetScroll(var0, var6, var4);
-				}
-			}
-		}
-
-	} // L: 9783
 }
diff --git a/runescape-client/src/main/java/class28.java b/runescape-client/src/main/java/class28.java
index ad898e7707..55ff2ce0ec 100644
--- a/runescape-client/src/main/java/class28.java
+++ b/runescape-client/src/main/java/class28.java
@@ -1,33 +1,30 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ab")
+@ObfuscatedName("ad")
 public class class28 implements class31 {
-	class28() {
-	} // L: 8
-
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)Lnd;"
+		descriptor = "(Lnt;)Lnt;"
 	)
-	public Buffer vmethod297(Buffer var1) {
-		Buffer var2 = new Buffer(100); // L: 11
-		this.method285(var1, var2); // L: 12
-		return var2; // L: 13
+	public Buffer vmethod381(Buffer var1) {
+		Buffer var2 = new Buffer(100); // L: 9
+		this.method367(var1, var2); // L: 10
+		return var2; // L: 11
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Lnd;)V"
+		descriptor = "(Lnt;Lnt;)V"
 	)
-	void method285(Buffer var1, Buffer var2) {
-		class36 var3 = new class36(var1); // L: 17
-		class33 var4 = new class33(var3); // L: 18
+	void method367(Buffer var1, Buffer var2) {
+		class36 var3 = new class36(var1); // L: 15
+		class33 var4 = new class33(var3); // L: 16
 
 		long var5;
-		for (var5 = 0L; !var4.method307(var3.method346(), var3.method345(), var5); ++var5) { // L: 19 20 21
+		for (var5 = 0L; !var4.method389(var3.method430(), var3.method425(), var5); ++var5) { // L: 17 18 19
 		}
 
-		var2.writeLong(var5); // L: 23
-	} // L: 24
+		var2.writeLong(var5); // L: 21
+	} // L: 22
 }
diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java
deleted file mode 100644
index ba4ef43a8e..0000000000
--- a/runescape-client/src/main/java/class280.java
+++ /dev/null
@@ -1,28 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jb")
-public class class280 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;I)V",
-		garbageValue = "236508743"
-	)
-	public static void method5070(AbstractArchive var0) {
-		VarpDefinition.VarpDefinition_archive = var0; // L: 18
-		VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19
-	} // L: 20
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IIS)V",
-		garbageValue = "925"
-	)
-	static void method5071(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1); // L: 107
-		NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 108
-		if (var4 != null) { // L: 109
-			NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 110
-		}
-	} // L: 111
-}
diff --git a/runescape-client/src/main/java/class281.java b/runescape-client/src/main/java/class281.java
new file mode 100644
index 0000000000..a9d59a8abd
--- /dev/null
+++ b/runescape-client/src/main/java/class281.java
@@ -0,0 +1,191 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
+
+@ObfuscatedName("jv")
+public class class281 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "([Ljava/lang/String;[SIII)V",
+		garbageValue = "-1059362880"
+	)
+	@Export("sortItemsByName")
+	public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
+		if (var2 < var3) { // L: 9
+			int var4 = (var3 + var2) / 2; // L: 10
+			int var5 = var2; // L: 11
+			String var6 = var0[var4]; // L: 12
+			var0[var4] = var0[var3]; // L: 13
+			var0[var3] = var6; // L: 14
+			short var7 = var1[var4]; // L: 15
+			var1[var4] = var1[var3]; // L: 16
+			var1[var3] = var7; // L: 17
+
+			for (int var8 = var2; var8 < var3; ++var8) { // L: 18
+				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19
+					String var9 = var0[var8]; // L: 20
+					var0[var8] = var0[var5]; // L: 21
+					var0[var5] = var9; // L: 22
+					short var10 = var1[var8]; // L: 23
+					var1[var8] = var1[var5]; // L: 24
+					var1[var5++] = var10; // L: 25
+				}
+			}
+
+			var0[var3] = var0[var5]; // L: 29
+			var0[var5] = var6; // L: 30
+			var1[var3] = var1[var5]; // L: 31
+			var1[var5] = var7; // L: 32
+			sortItemsByName(var0, var1, var2, var5 - 1); // L: 33
+			sortItemsByName(var0, var1, var5 + 1, var3); // L: 34
+		}
+
+	} // L: 36
+
+	@ObfuscatedName("at")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "0"
+	)
+	static int method5204(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2637
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2638
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2639
+			return 1; // L: 2640
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2642
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2643
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2644
+			return 1; // L: 2645
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2647
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2648
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2649
+			return 1; // L: 2650
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2652
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2653
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2654
+			return 1; // L: 2655
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2657
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2658
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2659
+			return 1; // L: 2660
+		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2662
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2663
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2664
+			return 1; // L: 2665
+		} else {
+			int var13;
+			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2667
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2668
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2669
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2670
+				return 1; // L: 2671
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2673
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2674
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2675
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2676
+				return 1; // L: 2677
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2679
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2680
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2681
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2682
+				return 1; // L: 2683
+			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2685
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2686
+				var13 = Client.grandExchangeOffers[var3].status(); // L: 2687
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2688
+				return 1; // L: 2689
+			} else {
+				boolean var12;
+				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2691
+					var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2692
+					if (class267.grandExchangeEvents != null) { // L: 2693
+						class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2694
+					}
+
+					return 1; // L: 2696
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2698
+					var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2699
+					if (class267.grandExchangeEvents != null) { // L: 2700
+						class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2701
+					}
+
+					return 1; // L: 2703
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2705
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 2706
+					var12 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize] == 1; // L: 2707
+					boolean var11 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 2708
+					if (class267.grandExchangeEvents != null) { // L: 2709
+						Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2710
+						class267.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2711
+					}
+
+					return 1; // L: 2713
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2715
+					var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2716
+					if (class267.grandExchangeEvents != null) { // L: 2717
+						class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2718
+					}
+
+					return 1; // L: 2720
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2722
+					var12 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 2723
+					if (class267.grandExchangeEvents != null) { // L: 2724
+						class267.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2725
+					}
+
+					return 1; // L: 2727
+				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2729
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class267.grandExchangeEvents == null ? 0 : class267.grandExchangeEvents.events.size(); // L: 2730
+					return 1; // L: 2731
+				} else {
+					GrandExchangeEvent var4;
+					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2733
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2734
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2735
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.world; // L: 2736
+						return 1; // L: 2737
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2739
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2740
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2741
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2742
+						return 1; // L: 2743
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2745
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2746
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2747
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2748
+						return 1; // L: 2749
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2751
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2752
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2753
+						long var5 = ClientPacket.currentTimeMillis() - WorldMapEvent.field2150 - var4.age; // L: 2754
+						int var7 = (int)(var5 / 3600000L); // L: 2755
+						int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2756
+						int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2757
+						String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2758
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var10; // L: 2759
+						return 1; // L: 2760
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2762
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2763
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2764
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2765
+						return 1; // L: 2766
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2768
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2769
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2770
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2771
+						return 1; // L: 2772
+					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2774
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2775
+						var4 = (GrandExchangeEvent)class267.grandExchangeEvents.events.get(var3); // L: 2776
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2777
+						return 1; // L: 2778
+					} else {
+						return 2; // L: 2780
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class285.java b/runescape-client/src/main/java/class285.java
deleted file mode 100644
index fb2834ad9e..0000000000
--- a/runescape-client/src/main/java/class285.java
+++ /dev/null
@@ -1,211 +0,0 @@
-import java.util.HashMap;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("je")
-public class class285 {
-	@ObfuscatedName("v")
-	@Export("spriteMap")
-	final HashMap spriteMap;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lli;"
-	)
-	@Export("bounds")
-	Bounds bounds;
-	@ObfuscatedName("f")
-	int[] field3664;
-	@ObfuscatedName("y")
-	int[] field3665;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 686309897
-	)
-	int field3666;
-
-	public class285() {
-		this.spriteMap = new HashMap(); // L: 10
-		this.bounds = new Bounds(0, 0); // L: 11
-		this.field3664 = new int[2048]; // L: 12
-		this.field3665 = new int[2048]; // L: 13
-		this.field3666 = 0; // L: 14
-		WorldMapID.field2112 = new int[2000]; // L: 22
-		int var1 = 0; // L: 23
-		int var2 = 240; // L: 24
-
-		int var4;
-		for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25
-			var4 = WorldMapRegion.method3437((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + (float)var1 * 0.425F / 16.0F)); // L: 27
-			WorldMapID.field2112[var1] = var4; // L: 28
-			++var1; // L: 26
-		}
-
-		var2 = 48; // L: 30
-
-		for (int var6 = var2 / 6; var1 < WorldMapID.field2112.length; var2 -= var6) { // L: 31 32 38
-			var4 = var1 * 2; // L: 33
-
-			for (int var5 = WorldMapRegion.method3437((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < WorldMapID.field2112.length; ++var1) { // L: 34 35
-				WorldMapID.field2112[var1] = var5; // L: 36
-			}
-		}
-
-	} // L: 41
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)V",
-		garbageValue = "-969189545"
-	)
-	void method5113(int var1) {
-		int var2 = var1 * 2 + 1; // L: 44
-		double var4 = (double)((float)var1 / 3.0F); // L: 46
-		int var6 = var1 * 2 + 1; // L: 48
-		double[] var7 = new double[var6]; // L: 49
-		int var8 = -var1;
-
-		for (int var9 = 0; var8 <= var1; ++var9) {
-			var7[var9] = class13.method182((double)var8, 0.0D, var4); // L: 51
-			++var8; // L: 50
-		}
-
-		double[] var14 = var7; // L: 55
-		double var15 = var7[var1] * var7[var1]; // L: 56
-		int[] var17 = new int[var2 * var2]; // L: 57
-		boolean var10 = false; // L: 58
-
-		for (int var11 = 0; var11 < var2; ++var11) { // L: 59
-			for (int var12 = 0; var12 < var2; ++var12) { // L: 60
-				int var13 = var17[var12 + var11 * var2] = (int)(var14[var12] * var14[var11] / var15 * 256.0D); // L: 61
-				if (!var10 && var13 > 0) { // L: 62
-					var10 = true; // L: 63
-				}
-			}
-		}
-
-		SpritePixels var18 = new SpritePixels(var17, var2, var2); // L: 67
-		this.spriteMap.put(var1, var18); // L: 68
-	} // L: 69
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(II)Loh;",
-		garbageValue = "-158733567"
-	)
-	SpritePixels method5115(int var1) {
-		if (!this.spriteMap.containsKey(var1)) { // L: 72
-			this.method5113(var1); // L: 73
-		}
-
-		return (SpritePixels)this.spriteMap.get(var1); // L: 75
-	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "14"
-	)
-	public final void method5117(int var1, int var2) {
-		if (this.field3666 < this.field3664.length) { // L: 79
-			this.field3664[this.field3666] = var1; // L: 80
-			this.field3665[this.field3666] = var2; // L: 81
-			++this.field3666; // L: 82
-		}
-	} // L: 83
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-2075850075"
-	)
-	public final void method5126() {
-		this.field3666 = 0; // L: 86
-	} // L: 87
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IILoh;FI)V",
-		garbageValue = "-7099286"
-	)
-	public final void method5116(int var1, int var2, SpritePixels var3, float var4) {
-		int var5 = (int)(18.0F * var4); // L: 90
-		SpritePixels var6 = this.method5115(var5); // L: 91
-		int var7 = var5 * 2 + 1; // L: 92
-		Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 93
-		Bounds var9 = new Bounds(0, 0); // L: 94
-		this.bounds.setHigh(var7, var7); // L: 95
-		System.nanoTime(); // L: 96
-
-		int var10;
-		int var11;
-		int var12;
-		for (var10 = 0; var10 < this.field3666; ++var10) { // L: 97
-			var11 = this.field3664[var10]; // L: 98
-			var12 = this.field3665[var10]; // L: 99
-			int var13 = (int)((float)(var11 - var1) * var4) - var5; // L: 100
-			int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 101
-			this.bounds.setLow(var13, var14); // L: 102
-			this.bounds.method5977(var8, var9); // L: 103
-			this.method5118(var6, var3, var9); // L: 104
-		}
-
-		System.nanoTime(); // L: 106
-		System.nanoTime(); // L: 107
-
-		for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 108
-			if (var3.pixels[var10] == 0) { // L: 109
-				var3.pixels[var10] = -16777216; // L: 110
-			} else {
-				var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 113
-				if (var11 <= 0) { // L: 114
-					var3.pixels[var10] = -16777216; // L: 115
-				} else {
-					if (var11 > WorldMapID.field2112.length) { // L: 118
-						var11 = WorldMapID.field2112.length;
-					}
-
-					var12 = WorldMapID.field2112[var11 - 1]; // L: 119
-					var3.pixels[var10] = -16777216 | var12; // L: 120
-				}
-			}
-		}
-
-		System.nanoTime(); // L: 122
-	} // L: 123
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(Loh;Loh;Lli;I)V",
-		garbageValue = "1348286634"
-	)
-	void method5118(SpritePixels var1, SpritePixels var2, Bounds var3) {
-		if (var3.highX != 0 && var3.highY != 0) { // L: 126
-			int var4 = 0; // L: 127
-			int var5 = 0; // L: 128
-			if (var3.lowX == 0) { // L: 129
-				var4 = var1.subWidth - var3.highX;
-			}
-
-			if (var3.lowY == 0) { // L: 130
-				var5 = var1.subHeight - var3.highY;
-			}
-
-			int var6 = var4 + var5 * var1.subWidth; // L: 131
-			int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 132
-
-			for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 133
-				for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 134
-					int[] var10000 = var2.pixels; // L: 135
-					int var10001 = var7++;
-					var10000[var10001] += var1.pixels[var6++];
-				}
-
-				var6 += var1.subWidth - var3.highX; // L: 137
-				var7 += var2.subWidth - var3.highX; // L: 138
-			}
-
-		}
-	} // L: 140
-}
diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java
index 44cb6bedd7..967031dc74 100644
--- a/runescape-client/src/main/java/class286.java
+++ b/runescape-client/src/main/java/class286.java
@@ -1,30 +1,204 @@
+import java.util.HashMap;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ky")
+@ObfuscatedName("ku")
 public class class286 {
+	@ObfuscatedName("gm")
+	@Export("regionLandArchiveIds")
+	static int[] regionLandArchiveIds;
+	@ObfuscatedName("f")
+	@Export("spriteMap")
+	final HashMap spriteMap;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Llw;"
+	)
+	@Export("bounds")
+	Bounds bounds;
 	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lky;"
+	int[] field3664;
+	@ObfuscatedName("y")
+	int[] field3665;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 1113129793
 	)
-	static final class286 field3671;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lky;"
-	)
-	static final class286 field3668;
+	int field3663;
+
+	public class286() {
+		this.spriteMap = new HashMap(); // L: 10
+		this.bounds = new Bounds(0, 0); // L: 11
+		this.field3664 = new int[2048]; // L: 12
+		this.field3665 = new int[2048]; // L: 13
+		this.field3663 = 0; // L: 14
+		class379.field4145 = new int[2000]; // L: 22
+		int var1 = 0; // L: 23
+		int var2 = 240; // L: 24
+
+		int var4;
+		for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25
+			var4 = class93.method2186((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var1 / 16.0F + 0.075F)); // L: 27
+			class379.field4145[var1] = var4; // L: 28
+			++var1; // L: 26
+		}
+
+		var2 = 48; // L: 30
+
+		for (int var6 = var2 / 6; var1 < class379.field4145.length; var2 -= var6) { // L: 31 32 38
+			var4 = var1 * 2; // L: 33
+
+			for (int var5 = class93.method2186((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class379.field4145.length; ++var1) { // L: 34 35
+				class379.field4145[var1] = var5; // L: 36
+			}
+		}
+
+	} // L: 41
+
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lky;"
+		descriptor = "(II)V",
+		garbageValue = "-1586624720"
 	)
-	static final class286 field3667;
+	void method5250(int var1) {
+		int var2 = var1 * 2 + 1; // L: 44
+		double[] var3 = class171.method3616(0.0D, (double)((float)var1 / 3.0F), var1); // L: 45
+		double var4 = var3[var1] * var3[var1]; // L: 46
+		int[] var6 = new int[var2 * var2]; // L: 47
+		boolean var7 = false; // L: 48
 
-	static {
-		field3671 = new class286(); // L: 4
-		field3668 = new class286(); // L: 5
-		field3667 = new class286(); // L: 6
+		for (int var8 = 0; var8 < var2; ++var8) { // L: 49
+			for (int var9 = 0; var9 < var2; ++var9) { // L: 50
+				int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); // L: 51
+				if (!var7 && var10 > 0) { // L: 52
+					var7 = true; // L: 53
+				}
+			}
+		}
+
+		SpritePixels var11 = new SpritePixels(var6, var2, var2); // L: 57
+		this.spriteMap.put(var1, var11); // L: 58
+	} // L: 59
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Loa;",
+		garbageValue = "62"
+	)
+	SpritePixels method5244(int var1) {
+		if (!this.spriteMap.containsKey(var1)) { // L: 62
+			this.method5250(var1); // L: 63
+		}
+
+		return (SpritePixels)this.spriteMap.get(var1); // L: 65
 	}
 
-	class286() {
-	} // L: 8
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-1758461055"
+	)
+	public final void method5245(int var1, int var2) {
+		if (this.field3663 < this.field3664.length) { // L: 69
+			this.field3664[this.field3663] = var1; // L: 70
+			this.field3665[this.field3663] = var2; // L: 71
+			++this.field3663; // L: 72
+		}
+	} // L: 73
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "-633875575"
+	)
+	public final void method5246() {
+		this.field3663 = 0; // L: 76
+	} // L: 77
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(IILoa;FB)V",
+		garbageValue = "12"
+	)
+	public final void method5247(int var1, int var2, SpritePixels var3, float var4) {
+		int var5 = (int)(18.0F * var4); // L: 80
+		SpritePixels var6 = this.method5244(var5); // L: 81
+		int var7 = var5 * 2 + 1; // L: 82
+		Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 83
+		Bounds var9 = new Bounds(0, 0); // L: 84
+		this.bounds.setHigh(var7, var7); // L: 85
+		System.nanoTime(); // L: 86
+
+		int var10;
+		int var11;
+		int var12;
+		for (var10 = 0; var10 < this.field3663; ++var10) { // L: 87
+			var11 = this.field3664[var10]; // L: 88
+			var12 = this.field3665[var10]; // L: 89
+			int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 90
+			int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; // L: 91
+			this.bounds.setLow(var13, var14); // L: 92
+			this.bounds.method6009(var8, var9); // L: 93
+			this.method5243(var6, var3, var9); // L: 94
+		}
+
+		System.nanoTime(); // L: 96
+		System.nanoTime(); // L: 97
+
+		for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 98
+			if (var3.pixels[var10] == 0) { // L: 99
+				var3.pixels[var10] = -16777216; // L: 100
+			} else {
+				var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 103
+				if (var11 <= 0) { // L: 104
+					var3.pixels[var10] = -16777216; // L: 105
+				} else {
+					if (var11 > class379.field4145.length) { // L: 108
+						var11 = class379.field4145.length;
+					}
+
+					var12 = class379.field4145[var11 - 1]; // L: 109
+					var3.pixels[var10] = -16777216 | var12; // L: 110
+				}
+			}
+		}
+
+		System.nanoTime(); // L: 112
+	} // L: 113
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Loa;Loa;Llw;I)V",
+		garbageValue = "1918246887"
+	)
+	void method5243(SpritePixels var1, SpritePixels var2, Bounds var3) {
+		if (var3.highX != 0 && var3.highY != 0) { // L: 116
+			int var4 = 0; // L: 117
+			int var5 = 0; // L: 118
+			if (var3.lowX == 0) { // L: 119
+				var4 = var1.subWidth - var3.highX;
+			}
+
+			if (var3.lowY == 0) { // L: 120
+				var5 = var1.subHeight - var3.highY;
+			}
+
+			int var6 = var4 + var5 * var1.subWidth; // L: 121
+			int var7 = var2.subWidth * var3.lowY + var3.lowX; // L: 122
+
+			for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 123
+				for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 124
+					int[] var10000 = var2.pixels; // L: 125
+					int var10001 = var7++;
+					var10000[var10001] += var1.pixels[var6++];
+				}
+
+				var6 += var1.subWidth - var3.highX; // L: 127
+				var7 += var2.subWidth - var3.highX; // L: 128
+			}
+
+		}
+	} // L: 130
 }
diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java
new file mode 100644
index 0000000000..116d0fb9a8
--- /dev/null
+++ b/runescape-client/src/main/java/class287.java
@@ -0,0 +1,51 @@
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kc")
+public class class287 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lkc;"
+	)
+	static final class287 field3672;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lkc;"
+	)
+	static final class287 field3671;
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lkc;"
+	)
+	static final class287 field3673;
+
+	static {
+		field3672 = new class287(); // L: 4
+		field3671 = new class287(); // L: 5
+		field3673 = new class287(); // L: 6
+	}
+
+	class287() {
+	} // L: 8
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Ley;",
+		garbageValue = "-31"
+	)
+	public static HealthBarDefinition method5260(int var0) {
+		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 37
+		if (var1 != null) { // L: 38
+			return var1;
+		} else {
+			byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 39
+			var1 = new HealthBarDefinition(); // L: 40
+			if (var2 != null) { // L: 41
+				var1.decode(new Buffer(var2));
+			}
+
+			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); // L: 42
+			return var1; // L: 43
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java
deleted file mode 100644
index e7bd6a9480..0000000000
--- a/runescape-client/src/main/java/class288.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.util.HashMap;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kh")
-public class class288 {
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "Lkt;"
-	)
-	@Export("ItemDefinition_fontPlain11")
-	public static Font ItemDefinition_fontPlain11;
-
-	static {
-		new HashMap();
-	} // L: 9
-}
diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java
new file mode 100644
index 0000000000..f659daf5c5
--- /dev/null
+++ b/runescape-client/src/main/java/class289.java
@@ -0,0 +1,24 @@
+import java.util.HashMap;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kx")
+public class class289 {
+	@ObfuscatedName("ql")
+	@ObfuscatedSignature(
+		descriptor = "Llj;"
+	)
+	@Export("friendsChat")
+	static FriendsChat friendsChat;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lof;"
+	)
+	@Export("titlebuttonSprite")
+	static IndexedSprite titlebuttonSprite;
+
+	static {
+		new HashMap();
+	} // L: 9
+}
diff --git a/runescape-client/src/main/java/class29.java b/runescape-client/src/main/java/class29.java
index 6e68229d9c..2ea244a58a 100644
--- a/runescape-client/src/main/java/class29.java
+++ b/runescape-client/src/main/java/class29.java
@@ -1,45 +1,181 @@
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.Iterator;
 import java.util.concurrent.Callable;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("al")
+@ObfuscatedName("at")
 public class class29 implements Callable {
-	@ObfuscatedName("d")
-	public static short[] field233;
-	@ObfuscatedName("lt")
-	@ObfuscatedGetter(
-		intValue = 1498703923
-	)
-	@Export("menuWidth")
-	static int menuWidth;
-	@ObfuscatedName("v")
+	@ObfuscatedName("lm")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lcz;"
 	)
-	final Buffer field238;
-	@ObfuscatedName("n")
+	@Export("tempMenuAction")
+	static MenuAction tempMenuAction;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lai;"
+		descriptor = "Lnt;"
 	)
-	final class31 field235;
+	final Buffer field224;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Laz;"
+	)
+	final class31 field220;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Las;"
+		descriptor = "Laq;"
 	)
 	final class35 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Las;Lnd;Lai;)V"
+		descriptor = "(Laq;Lnt;Laz;)V"
 	)
 	class29(class35 var1, Buffer var2, class31 var3) {
 		this.this$0 = var1; // L: 47
-		this.field238 = var2; // L: 48
-		this.field235 = var3; // L: 49
+		this.field224 = var2; // L: 48
+		this.field220 = var3; // L: 49
 	} // L: 50
 
 	public Object call() {
-		return this.field235.vmethod297(this.field238); // L: 53
+		return this.field220.vmethod381(this.field224); // L: 53
 	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "([BI)V",
+		garbageValue = "10193583"
+	)
+	@Export("SpriteBuffer_decode")
+	static void SpriteBuffer_decode(byte[] var0) {
+		Buffer var1 = new Buffer(var0); // L: 147
+		var1.offset = var0.length - 2; // L: 148
+		class397.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 149
+		class397.SpriteBuffer_xOffsets = new int[class397.SpriteBuffer_spriteCount]; // L: 150
+		class26.SpriteBuffer_yOffsets = new int[class397.SpriteBuffer_spriteCount]; // L: 151
+		Canvas.SpriteBuffer_spriteWidths = new int[class397.SpriteBuffer_spriteCount]; // L: 152
+		Clock.SpriteBuffer_spriteHeights = new int[class397.SpriteBuffer_spriteCount]; // L: 153
+		class126.SpriteBuffer_pixels = new byte[class397.SpriteBuffer_spriteCount][]; // L: 154
+		var1.offset = var0.length - 7 - class397.SpriteBuffer_spriteCount * 8; // L: 155
+		class397.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 156
+		class244.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 157
+		int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 158
+
+		int var3;
+		for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 159
+			class397.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 160
+			class26.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 161
+			Canvas.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 162
+			Clock.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
+		}
+
+		var1.offset = var0.length - 7 - class397.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 163
+		class397.SpriteBuffer_spritePalette = new int[var2]; // L: 164
+
+		for (var3 = 1; var3 < var2; ++var3) { // L: 165
+			class397.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 166
+			if (class397.SpriteBuffer_spritePalette[var3] == 0) { // L: 167
+				class397.SpriteBuffer_spritePalette[var3] = 1;
+			}
+		}
+
+		var1.offset = 0; // L: 169
+
+		for (var3 = 0; var3 < class397.SpriteBuffer_spriteCount; ++var3) { // L: 170
+			int var4 = Canvas.SpriteBuffer_spriteWidths[var3]; // L: 171
+			int var5 = Clock.SpriteBuffer_spriteHeights[var3]; // L: 172
+			int var6 = var4 * var5; // L: 173
+			byte[] var7 = new byte[var6]; // L: 174
+			class126.SpriteBuffer_pixels[var3] = var7; // L: 175
+			int var8 = var1.readUnsignedByte(); // L: 176
+			int var9;
+			if (var8 == 0) { // L: 177
+				for (var9 = 0; var9 < var6; ++var9) { // L: 178
+					var7[var9] = var1.readByte();
+				}
+			} else if (var8 == 1) { // L: 180
+				for (var9 = 0; var9 < var4; ++var9) { // L: 181
+					for (int var10 = 0; var10 < var5; ++var10) { // L: 182
+						var7[var9 + var10 * var4] = var1.readByte(); // L: 183
+					}
+				}
+			}
+		}
+
+	} // L: 188
+
+	@ObfuscatedName("aq")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-2077147833"
+	)
+	@Export("getGcDuration")
+	protected static int getGcDuration() {
+		int var0 = 0; // L: 551
+		if (class14.garbageCollector == null || !class14.garbageCollector.isValid()) { // L: 552
+			try {
+				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 554
+
+				while (var1.hasNext()) {
+					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 555
+					if (var2.isValid()) { // L: 557
+						class14.garbageCollector = var2; // L: 558
+						GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 559
+						GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 560
+					}
+				}
+			} catch (Throwable var11) { // L: 565
+			}
+		}
+
+		if (class14.garbageCollector != null) { // L: 567
+			long var9 = ClientPacket.currentTimeMillis(); // L: 568
+			long var3 = class14.garbageCollector.getCollectionTime(); // L: 569
+			if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 570
+				long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 571
+				long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 572
+				if (var7 != 0L) { // L: 573
+					var0 = (int)(100L * var5 / var7);
+				}
+			}
+
+			GameEngine.garbageCollectorLastCollectionTime = var3; // L: 575
+			GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 576
+		}
+
+		return var0; // L: 578
+	}
+
+	@ObfuscatedName("le")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "-2119346046"
+	)
+	static final void method378(int var0, int var1) {
+		ClanChannel var2 = var0 >= 0 ? Client.currentClanChannels[var0] : AttackOption.guestClanChannel; // L: 11495
+		if (var2 != null && var1 >= 0 && var1 < var2.method49()) { // L: 11496
+			ClanChannelMember var3 = (ClanChannelMember)var2.members.get(var1); // L: 11497
+			if (var3.rank == -1) { // L: 11498
+				String var4 = var3.name; // L: 11499
+				PacketWriter var5 = Client.packetWriter; // L: 11500
+				PacketBufferNode var6 = InterfaceParent.getPacketBufferNode(ClientPacket.field2583, var5.isaacCipher); // L: 11501
+				var6.packetBuffer.writeByte(3 + class44.stringCp1252NullTerminatedByteSize(var4)); // L: 11502
+				var6.packetBuffer.writeByte(var0); // L: 11503
+				var6.packetBuffer.writeShort(var1); // L: 11504
+				var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 11505
+				var5.addNode(var6); // L: 11506
+			}
+		}
+	} // L: 11507
 }
diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java
index 8bb4a1687d..aee2366f58 100644
--- a/runescape-client/src/main/java/class30.java
+++ b/runescape-client/src/main/java/class30.java
@@ -1,5 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ad")
+@ObfuscatedName("ah")
 public interface class30 {
 }
diff --git a/runescape-client/src/main/java/class301.java b/runescape-client/src/main/java/class301.java
deleted file mode 100644
index f296694641..0000000000
--- a/runescape-client/src/main/java/class301.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("kz")
-public class class301 {
-	@ObfuscatedName("v")
-	@Export("cp1252AsciiExtension")
-	public static final char[] cp1252AsciiExtension;
-
-	static {
-		cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4
-	}
-}
diff --git a/runescape-client/src/main/java/class302.java b/runescape-client/src/main/java/class302.java
index be9708db8d..4e24f434bf 100644
--- a/runescape-client/src/main/java/class302.java
+++ b/runescape-client/src/main/java/class302.java
@@ -2,154 +2,42 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kd")
+@ObfuscatedName("ko")
 public class class302 {
-	@ObfuscatedName("v")
-	public static char[] field3743;
-	@ObfuscatedName("n")
-	static char[] field3742;
 	@ObfuscatedName("f")
-	static char[] field3744;
-	@ObfuscatedName("y")
-	static int[] field3746;
-	@ObfuscatedName("r")
-	@Export("SpriteBuffer_spriteHeights")
-	public static int[] SpriteBuffer_spriteHeights;
+	@Export("cp1252AsciiExtension")
+	public static final char[] cp1252AsciiExtension;
 
 	static {
-		field3743 = new char[64]; // L: 7
+		cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4
+	}
 
-		int var0;
-		for (var0 = 0; var0 < 26; ++var0) { // L: 8
-			field3743[var0] = (char)(var0 + 65);
-		}
-
-		for (var0 = 26; var0 < 52; ++var0) { // L: 9
-			field3743[var0] = (char)(var0 + 97 - 26);
-		}
-
-		for (var0 = 52; var0 < 62; ++var0) { // L: 10
-			field3743[var0] = (char)(var0 + 48 - 52);
-		}
-
-		field3743[62] = '+'; // L: 11
-		field3743[63] = '/'; // L: 12
-		field3742 = new char[64]; // L: 18
-
-		for (var0 = 0; var0 < 26; ++var0) { // L: 19
-			field3742[var0] = (char)(var0 + 65);
-		}
-
-		for (var0 = 26; var0 < 52; ++var0) { // L: 20
-			field3742[var0] = (char)(var0 + 97 - 26);
-		}
-
-		for (var0 = 52; var0 < 62; ++var0) { // L: 21
-			field3742[var0] = (char)(var0 + 48 - 52);
-		}
-
-		field3742[62] = '*'; // L: 22
-		field3742[63] = '-'; // L: 23
-		field3744 = new char[64]; // L: 29
-
-		for (var0 = 0; var0 < 26; ++var0) { // L: 30
-			field3744[var0] = (char)(var0 + 65);
-		}
-
-		for (var0 = 26; var0 < 52; ++var0) { // L: 31
-			field3744[var0] = (char)(var0 + 97 - 26);
-		}
-
-		for (var0 = 52; var0 < 62; ++var0) { // L: 32
-			field3744[var0] = (char)(var0 + 48 - 52);
-		}
-
-		field3744[62] = '-'; // L: 33
-		field3744[63] = '_'; // L: 34
-		field3746 = new int[128]; // L: 40
-
-		for (var0 = 0; var0 < field3746.length; ++var0) { // L: 41
-			field3746[var0] = -1;
-		}
-
-		for (var0 = 65; var0 <= 90; ++var0) { // L: 42
-			field3746[var0] = var0 - 65;
-		}
-
-		for (var0 = 97; var0 <= 122; ++var0) { // L: 43
-			field3746[var0] = var0 - 97 + 26;
-		}
-
-		for (var0 = 48; var0 <= 57; ++var0) { // L: 44
-			field3746[var0] = var0 - 48 + 52;
-		}
-
-		int[] var2 = field3746; // L: 45
-		field3746[43] = 62; // L: 46
-		var2[42] = 62; // L: 47
-		int[] var1 = field3746; // L: 48
-		field3746[47] = 63; // L: 49
-		var1[45] = 63; // L: 50
-	} // L: 51
-
-	@ObfuscatedName("fn")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1106369714"
+		descriptor = "(B)Lof;",
+		garbageValue = "-5"
 	)
-	@Export("doCheat")
-	static final void doCheat(String var0) {
-		if (var0.equalsIgnoreCase("toggleroof")) { // L: 3479
-			ObjectComposition.clientPreferences.roofsHidden = !ObjectComposition.clientPreferences.roofsHidden; // L: 3480
-			TileItem.savePreferences(); // L: 3481
-			if (ObjectComposition.clientPreferences.roofsHidden) { // L: 3482
-				World.addGameMessage(99, "", "Roofs are now all hidden");
-			} else {
-				World.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3483
-			}
-		}
+	static IndexedSprite method5571() {
+		IndexedSprite var0 = new IndexedSprite(); // L: 110
+		var0.width = class397.SpriteBuffer_spriteWidth; // L: 111
+		var0.height = class244.SpriteBuffer_spriteHeight; // L: 112
+		var0.xOffset = class397.SpriteBuffer_xOffsets[0]; // L: 113
+		var0.yOffset = class26.SpriteBuffer_yOffsets[0]; // L: 114
+		var0.subWidth = Canvas.SpriteBuffer_spriteWidths[0]; // L: 115
+		var0.subHeight = Clock.SpriteBuffer_spriteHeights[0]; // L: 116
+		var0.palette = class397.SpriteBuffer_spritePalette; // L: 117
+		var0.pixels = class126.SpriteBuffer_pixels[0]; // L: 118
+		ArchiveDisk.method5993(); // L: 119
+		return var0; // L: 120
+	}
 
-		if (var0.equalsIgnoreCase("displayfps")) { // L: 3485
-			Client.displayFps = !Client.displayFps;
-		}
-
-		if (var0.equalsIgnoreCase("renderself")) { // L: 3486
-			Client.renderSelf = !Client.renderSelf;
-		}
-
-		if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3487
-			Client.showMouseOverText = !Client.showMouseOverText;
-		}
-
-		if (Client.staffModLevel >= 2) { // L: 3488
-			if (var0.equalsIgnoreCase("errortest")) { // L: 3489
-				throw new RuntimeException();
-			}
-
-			if (var0.equalsIgnoreCase("showcoord")) { // L: 3490
-				class243.worldMap.showCoord = !class243.worldMap.showCoord;
-			}
-
-			if (var0.equalsIgnoreCase("fpson")) { // L: 3491
-				Client.displayFps = true;
-			}
-
-			if (var0.equalsIgnoreCase("fpsoff")) { // L: 3492
-				Client.displayFps = false;
-			}
-
-			if (var0.equalsIgnoreCase("gc")) { // L: 3493
-				System.gc();
-			}
-
-			if (var0.equalsIgnoreCase("clientdrop")) { // L: 3494
-				NetFileRequest.method4912();
-			}
-		}
-
-		PacketBufferNode var1 = class21.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); // L: 3497
-		var1.packetBuffer.writeByte(var0.length() + 1); // L: 3498
-		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3499
-		Client.packetWriter.addNode(var1); // L: 3500
-	} // L: 3501
+	@ObfuscatedName("gm")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "11"
+	)
+	@Export("getWindowedMode")
+	static int getWindowedMode() {
+		return Client.isResizable ? 2 : 1; // L: 4394
+	}
 }
diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java
index fd76e46628..bcebe2b846 100644
--- a/runescape-client/src/main/java/class303.java
+++ b/runescape-client/src/main/java/class303.java
@@ -1,637 +1,89 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kp")
-public final class class303 {
-	@ObfuscatedName("ij")
-	@ObfuscatedSignature(
-		descriptor = "([Lio;IIIIIIIII)V",
-		garbageValue = "-1945038256"
-	)
-	@Export("drawInterface")
-	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9210
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9211
-
-		for (int var9 = 0; var9 < var0.length; ++var9) { // L: 9212
-			Widget var10 = var0[var9]; // L: 9213
-			if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 9214 9215
-				int var11;
-				if (var8 == -1) { // L: 9217
-					Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 9218
-					Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 9219
-					Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 9220
-					Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 9221
-					var11 = ++Client.rootWidgetCount - 1; // L: 9222
-				} else {
-					var11 = var8; // L: 9224
-				}
-
-				var10.rootIndex = var11; // L: 9225
-				var10.cycle = Client.cycle; // L: 9226
-				if (!var10.isIf3 || !HitSplatDefinition.isComponentHidden(var10)) { // L: 9227
-					if (var10.contentType > 0) { // L: 9228
-						class258.method4836(var10);
-					}
-
-					int var12 = var10.x + var6; // L: 9229
-					int var13 = var7 + var10.y; // L: 9230
-					int var14 = var10.transparencyTop; // L: 9231
-					int var15;
-					int var16;
-					if (var10 == Client.clickedWidget) { // L: 9232
-						if (var1 != -1412584499 && !var10.isScrollBar) { // L: 9233
-							class4.field49 = var0; // L: 9234
-							ClanChannel.field38 = var6; // L: 9235
-							class82.field1020 = var7; // L: 9236
-							continue;
-						}
-
-						if (Client.isDraggingWidget && Client.field819) { // L: 9239
-							var15 = MouseHandler.MouseHandler_x; // L: 9240
-							var16 = MouseHandler.MouseHandler_y; // L: 9241
-							var15 -= Client.widgetClickX; // L: 9242
-							var16 -= Client.widgetClickY; // L: 9243
-							if (var15 < Client.field740) { // L: 9244
-								var15 = Client.field740;
-							}
-
-							if (var15 + var10.width > Client.field740 + Client.clickedWidgetParent.width) { // L: 9245
-								var15 = Client.field740 + Client.clickedWidgetParent.width - var10.width;
-							}
-
-							if (var16 < Client.field821) { // L: 9246
-								var16 = Client.field821;
-							}
-
-							if (var16 + var10.height > Client.field821 + Client.clickedWidgetParent.height) { // L: 9247
-								var16 = Client.field821 + Client.clickedWidgetParent.height - var10.height;
-							}
-
-							var12 = var15; // L: 9248
-							var13 = var16; // L: 9249
-						}
-
-						if (!var10.isScrollBar) { // L: 9251
-							var14 = 128;
-						}
-					}
-
-					int var17;
-					int var18;
-					int var19;
-					int var20;
-					int var21;
-					int var22;
-					if (var10.type == 2) { // L: 9257
-						var15 = var2; // L: 9258
-						var16 = var3; // L: 9259
-						var17 = var4; // L: 9260
-						var18 = var5; // L: 9261
-					} else if (var10.type == 9) { // L: 9263
-						var19 = var12; // L: 9264
-						var20 = var13; // L: 9265
-						var21 = var12 + var10.width; // L: 9266
-						var22 = var13 + var10.height; // L: 9267
-						if (var21 < var12) { // L: 9268
-							var19 = var21; // L: 9270
-							var21 = var12; // L: 9271
-						}
-
-						if (var22 < var13) { // L: 9273
-							var20 = var22; // L: 9275
-							var22 = var13; // L: 9276
-						}
-
-						++var21; // L: 9278
-						++var22; // L: 9279
-						var15 = var19 > var2 ? var19 : var2; // L: 9280
-						var16 = var20 > var3 ? var20 : var3; // L: 9281
-						var17 = var21 < var4 ? var21 : var4; // L: 9282
-						var18 = var22 < var5 ? var22 : var5; // L: 9283
-					} else {
-						var19 = var12 + var10.width; // L: 9286
-						var20 = var13 + var10.height; // L: 9287
-						var15 = var12 > var2 ? var12 : var2; // L: 9288
-						var16 = var13 > var3 ? var13 : var3; // L: 9289
-						var17 = var19 < var4 ? var19 : var4; // L: 9290
-						var18 = var20 < var5 ? var20 : var5; // L: 9291
-					}
-
-					if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 9293
-						if (var10.contentType != 0) { // L: 9294
-							if (var10.contentType == 1336) { // L: 9295
-								if (Client.displayFps) { // L: 9296
-									var13 += 15; // L: 9297
-									UserComparator3.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9298
-									var13 += 15; // L: 9299
-									Runtime var42 = Runtime.getRuntime(); // L: 9300
-									var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9301
-									var21 = 16776960; // L: 9302
-									if (var20 > 327680 && !Client.isLowDetail) { // L: 9303
-										var21 = 16711680;
-									}
-
-									UserComparator3.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 9304
-									var13 += 15; // L: 9305
-								}
-								continue;
-							}
-
-							if (var10.contentType == 1337) { // L: 9309
-								Client.viewportX = var12; // L: 9310
-								Client.viewportY = var13; // L: 9311
-								ScriptFrame.drawEntities(var12, var13, var10.width, var10.height); // L: 9312
-								Client.field719[var10.rootIndex] = true; // L: 9313
-								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9314
-								continue; // L: 9315
-							}
-
-							if (var10.contentType == 1338) { // L: 9317
-								ObjectSound.drawMinimap(var10, var12, var13, var11); // L: 9318
-								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9319
-								continue; // L: 9320
-							}
-
-							if (var10.contentType == 1339) { // L: 9322
-								class13.drawCompass(var10, var12, var13, var11); // L: 9323
-								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9324
-								continue; // L: 9325
-							}
-
-							if (var10.contentType == 1400) { // L: 9327
-								class243.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 9328
-							}
-
-							if (var10.contentType == 1401) { // L: 9330
-								class243.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 9331
-							}
-
-							if (var10.contentType == 1402) { // L: 9333
-								class24.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 9334
-							}
-						}
-
-						if (var10.type == 0) { // L: 9337
-							if (!var10.isIf3 && HitSplatDefinition.isComponentHidden(var10) && var10 != World.mousedOverWidgetIf1) { // L: 9338
-								continue;
-							}
-
-							if (!var10.isIf3) { // L: 9339
-								if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 9340
-									var10.scrollY = var10.scrollHeight - var10.height;
-								}
-
-								if (var10.scrollY < 0) { // L: 9341
-									var10.scrollY = 0;
-								}
-							}
-
-							drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 9343
-							if (var10.children != null) { // L: 9344
-								drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
-							}
-
-							InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 9345
-							if (var30 != null) { // L: 9346
-								class225.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 9347
-							}
-
-							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9349
-							Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 9350
-						}
-
-						if (Client.isResizable || Client.field860[var11] || Client.gameDrawingMode > 1) { // L: 9352
-							if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 9353 9354
-								class32.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
-							}
-
-							if (var10.type != 1) { // L: 9356
-								int var23;
-								int var24;
-								int var25;
-								int var26;
-								if (var10.type == 2) { // L: 9359
-									var19 = 0; // L: 9360
-
-									for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 9361
-										for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 9362
-											var22 = var12 + var21 * (var10.paddingX + 32); // L: 9363
-											var23 = var20 * (var10.paddingY + 32) + var13; // L: 9364
-											if (var19 < 20) { // L: 9365
-												var22 += var10.inventoryXOffsets[var19]; // L: 9366
-												var23 += var10.inventoryYOffsets[var19]; // L: 9367
-											}
-
-											if (var10.itemIds[var19] <= 0) { // L: 9369
-												if (var10.inventorySprites != null && var19 < 20) { // L: 9414
-													SpritePixels var46 = var10.getInventorySprite(var19); // L: 9415
-													if (var46 != null) { // L: 9416
-														var46.drawTransBgAt(var22, var23);
-													} else if (Widget.field2956) { // L: 9417
-														WorldMapCacheName.invalidateWidget(var10);
-													}
-												}
-											} else {
-												boolean var37 = false; // L: 9370
-												boolean var38 = false; // L: 9371
-												var26 = var10.itemIds[var19] - 1; // L: 9372
-												if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == Script.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9373
-													SpritePixels var35;
-													if (Client.isItemSelected == 1 && var19 == ClanChannelMember.selectedItemSlot && var10.id == Player.selectedItemWidget) { // L: 9375
-														var35 = ModelData0.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
-													} else {
-														var35 = ModelData0.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 9376
-													}
-
-													if (var35 != null) { // L: 9377
-														if (var10 == Script.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 9378
-															var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 9379
-															var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 9380
-															if (var24 < 5 && var24 > -5) { // L: 9381
-																var24 = 0;
-															}
-
-															if (var25 < 5 && var25 > -5) { // L: 9382
-																var25 = 0;
-															}
-
-															if (Client.itemDragDuration < 5) { // L: 9383
-																var24 = 0; // L: 9384
-																var25 = 0; // L: 9385
-															}
-
-															var35.drawTransAt(var24 + var22, var23 + var25, 128); // L: 9387
-															if (var1 != -1) { // L: 9388
-																Widget var28 = var0[var1 & 65535]; // L: 9389
-																int var29;
-																if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 9390
-																	var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field913 / 3; // L: 9391
-																	if (var29 > Client.field913 * 10) { // L: 9392
-																		var29 = Client.field913 * 10;
-																	}
-
-																	if (var29 > var28.scrollY) { // L: 9393
-																		var29 = var28.scrollY;
-																	}
-
-																	var28.scrollY -= var29; // L: 9394
-																	Client.draggedWidgetY += var29; // L: 9395
-																	WorldMapCacheName.invalidateWidget(var28); // L: 9396
-																}
-
-																if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 9398
-																	var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field913 / 3; // L: 9399
-																	if (var29 > Client.field913 * 10) { // L: 9400
-																		var29 = Client.field913 * 10;
-																	}
-
-																	if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 9401
-																		var29 = var28.scrollHeight - var28.height - var28.scrollY;
-																	}
-
-																	var28.scrollY += var29; // L: 9402
-																	Client.draggedWidgetY -= var29; // L: 9403
-																	WorldMapCacheName.invalidateWidget(var28); // L: 9404
-																}
-															}
-														} else if (var10 == GrandExchangeEvents.field3626 && var19 == Client.field841) { // L: 9408
-															var35.drawTransAt(var22, var23, 128);
-														} else {
-															var35.drawTransBgAt(var22, var23); // L: 9409
-														}
-													} else {
-														WorldMapCacheName.invalidateWidget(var10); // L: 9411
-													}
-												}
-											}
-
-											++var19; // L: 9419
-										}
-									}
-								} else if (var10.type == 3) { // L: 9424
-									if (InvDefinition.runCs1(var10)) { // L: 9426
-										var19 = var10.color2; // L: 9427
-										if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9428
-											var19 = var10.mouseOverColor2;
-										}
-									} else {
-										var19 = var10.color; // L: 9431
-										if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9432
-											var19 = var10.mouseOverColor;
-										}
-									}
-
-									if (var10.fill) { // L: 9434
-										switch(var10.fillMode.field4230) { // L: 9435
-										case 1:
-											Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 9437
-											break; // L: 9438
-										case 2:
-											Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 9444
-											break; // L: 9445
-										default:
-											if (var14 == 0) { // L: 9440
-												Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19);
-											} else {
-												Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9441
-											}
-										}
-									} else if (var14 == 0) { // L: 9449
-										Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
-									} else {
-										Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 9450
-									}
-								} else {
-									Font var39;
-									if (var10.type == 4) { // L: 9454
-										var39 = var10.getFont(); // L: 9455
-										if (var39 == null) { // L: 9456
-											if (Widget.field2956) { // L: 9457
-												WorldMapCacheName.invalidateWidget(var10);
-											}
-										} else {
-											String var44 = var10.text; // L: 9461
-											if (InvDefinition.runCs1(var10)) { // L: 9462
-												var20 = var10.color2; // L: 9463
-												if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 9464
-													var20 = var10.mouseOverColor2;
-												}
-
-												if (var10.text2.length() > 0) { // L: 9465
-													var44 = var10.text2;
-												}
-											} else {
-												var20 = var10.color; // L: 9468
-												if (var10 == World.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 9469
-													var20 = var10.mouseOverColor;
-												}
-											}
-
-											if (var10.isIf3 && var10.itemId != -1) { // L: 9471
-												ItemComposition var45 = class260.ItemDefinition_get(var10.itemId); // L: 9472
-												var44 = var45.name; // L: 9473
-												if (var44 == null) { // L: 9474
-													var44 = "null";
-												}
-
-												if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 9475
-													var44 = class44.colorStartTag(16748608) + var44 + "</col>" + " " + 'x' + UserComparator3.formatItemStacks(var10.itemQuantity);
-												}
-											}
-
-											if (var10 == Client.meslayerContinueWidget) { // L: 9477
-												var44 = "Please wait..."; // L: 9478
-												var20 = var10.color; // L: 9479
-											}
-
-											if (!var10.isIf3) { // L: 9481
-												var44 = JagexCache.method2540(var44, var10);
-											}
-
-											var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 9482
-										}
-									} else if (var10.type == 5) { // L: 9485
-										SpritePixels var40;
-										if (!var10.isIf3) { // L: 9486
-											var40 = var10.getSprite(InvDefinition.runCs1(var10)); // L: 9487
-											if (var40 != null) { // L: 9488
-												var40.drawTransBgAt(var12, var13);
-											} else if (Widget.field2956) { // L: 9489
-												WorldMapCacheName.invalidateWidget(var10);
-											}
-										} else {
-											if (var10.itemId != -1) { // L: 9493
-												var40 = ModelData0.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
-											} else {
-												var40 = var10.getSprite(false); // L: 9494
-											}
-
-											if (var40 == null) { // L: 9495
-												if (Widget.field2956) { // L: 9519
-													WorldMapCacheName.invalidateWidget(var10);
-												}
-											} else {
-												var20 = var40.width; // L: 9496
-												var21 = var40.height; // L: 9497
-												if (!var10.spriteTiling) { // L: 9498
-													var22 = var10.width * 4096 / var20; // L: 9512
-													if (var10.spriteAngle != 0) { // L: 9513
-														var40.method6991(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
-													} else if (var14 != 0) { // L: 9514
-														var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
-													} else if (var20 == var10.width && var21 == var10.height) { // L: 9515
-														var40.drawTransBgAt(var12, var13); // L: 9516
-													} else {
-														var40.drawScaledAt(var12, var13, var10.width, var10.height);
-													}
-												} else {
-													Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 9499
-													var22 = (var20 - 1 + var10.width) / var20; // L: 9500
-													var23 = (var21 - 1 + var10.height) / var21; // L: 9501
-
-													for (var24 = 0; var24 < var22; ++var24) { // L: 9502
-														for (var25 = 0; var25 < var23; ++var25) { // L: 9503
-															if (var10.spriteAngle != 0) { // L: 9504
-																var40.method6991(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
-															} else if (var14 != 0) { // L: 9505
-																var40.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
-															} else {
-																var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); // L: 9506
-															}
-														}
-													}
-
-													Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 9509
-												}
-											}
-										}
-									} else {
-										ItemComposition var33;
-										if (var10.type == 6) { // L: 9523
-											boolean var36 = InvDefinition.runCs1(var10); // L: 9524
-											if (var36) { // L: 9526
-												var20 = var10.sequenceId2;
-											} else {
-												var20 = var10.sequenceId; // L: 9527
-											}
-
-											Model var41 = null; // L: 9528
-											var22 = 0; // L: 9529
-											if (var10.itemId != -1) { // L: 9530
-												var33 = class260.ItemDefinition_get(var10.itemId); // L: 9531
-												if (var33 != null) { // L: 9532
-													var33 = var33.getCountObj(var10.itemQuantity); // L: 9533
-													var41 = var33.getModel(1); // L: 9534
-													if (var41 != null) { // L: 9535
-														var41.calculateBoundsCylinder(); // L: 9536
-														var22 = var41.height / 2; // L: 9537
-													} else {
-														WorldMapCacheName.invalidateWidget(var10); // L: 9539
-													}
-												}
-											} else if (var10.modelType == 5) { // L: 9542
-												if (var10.modelId == 0) { // L: 9543
-													var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
-												} else {
-													var41 = class93.localPlayer.getModel(); // L: 9544
-												}
-											} else if (var20 == -1) { // L: 9546
-												var41 = var10.getModel((SequenceDefinition)null, -1, var36, class93.localPlayer.appearance); // L: 9547
-												if (var41 == null && Widget.field2956) { // L: 9548
-													WorldMapCacheName.invalidateWidget(var10);
-												}
-											} else {
-												SequenceDefinition var47 = LoginScreenAnimation.SequenceDefinition_get(var20); // L: 9551
-												var41 = var10.getModel(var47, var10.modelFrame, var36, class93.localPlayer.appearance); // L: 9552
-												if (var41 == null && Widget.field2956) { // L: 9553
-													WorldMapCacheName.invalidateWidget(var10);
-												}
-											}
-
-											Rasterizer3D.method3848(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9555
-											var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9556
-											var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9557
-											if (var41 != null) { // L: 9558
-												if (!var10.isIf3) { // L: 9559
-													var41.method4217(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
-												} else {
-													var41.calculateBoundsCylinder(); // L: 9561
-													if (var10.modelOrthog) { // L: 9562
-														var41.method4209(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
-													} else {
-														var41.method4217(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9563
-													}
-												}
-											}
-
-											Rasterizer3D.Rasterizer3D_method3(); // L: 9566
-										} else {
-											if (var10.type == 7) { // L: 9569
-												var39 = var10.getFont(); // L: 9570
-												if (var39 == null) { // L: 9571
-													if (Widget.field2956) { // L: 9572
-														WorldMapCacheName.invalidateWidget(var10);
-													}
-													continue;
-												}
-
-												var20 = 0; // L: 9575
-
-												for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9576
-													for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9577
-														if (var10.itemIds[var20] > 0) { // L: 9578
-															var33 = class260.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9579
-															String var34;
-															if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9581
-																var34 = class44.colorStartTag(16748608) + var33.name + "</col>";
-															} else {
-																var34 = class44.colorStartTag(16748608) + var33.name + "</col>" + " " + 'x' + UserComparator3.formatItemStacks(var10.itemQuantities[var20]); // L: 9582
-															}
-
-															var25 = var22 * (var10.paddingX + 115) + var12; // L: 9583
-															var26 = var21 * (var10.paddingY + 12) + var13; // L: 9584
-															if (var10.textXAlignment == 0) { // L: 9585
-																var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
-															} else if (var10.textXAlignment == 1) { // L: 9586
-																var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
-															} else {
-																var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9587
-															}
-														}
-
-														++var20; // L: 9589
-													}
-												}
-											}
-
-											if (var10.type == 8 && var10 == ReflectionCheck.field609 && Client.field833 == Client.field792) { // L: 9593 9594
-												var19 = 0; // L: 9595
-												var20 = 0; // L: 9596
-												Font var31 = UserComparator3.fontPlain12; // L: 9597
-												String var32 = var10.text; // L: 9598
-
-												String var43;
-												for (var32 = JagexCache.method2540(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9600 9601 9613
-													var24 = var32.indexOf("<br>"); // L: 9602
-													if (var24 != -1) { // L: 9603
-														var43 = var32.substring(0, var24); // L: 9604
-														var32 = var32.substring(var24 + 4); // L: 9605
-													} else {
-														var43 = var32; // L: 9608
-														var32 = ""; // L: 9609
-													}
-
-													var25 = var31.stringWidth(var43); // L: 9611
-													if (var25 > var19) { // L: 9612
-														var19 = var25;
-													}
-												}
-
-												var19 += 6; // L: 9615
-												var20 += 7; // L: 9616
-												var24 = var12 + var10.width - 5 - var19; // L: 9617
-												var25 = var13 + var10.height + 5; // L: 9618
-												if (var24 < var12 + 5) { // L: 9619
-													var24 = var12 + 5;
-												}
-
-												if (var19 + var24 > var4) { // L: 9620
-													var24 = var4 - var19;
-												}
-
-												if (var25 + var20 > var5) { // L: 9621
-													var25 = var5 - var20;
-												}
-
-												Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9622
-												Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9623
-												var32 = var10.text; // L: 9624
-												var26 = var25 + var31.ascent + 2; // L: 9625
-
-												for (var32 = JagexCache.method2540(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9626 9627 9638
-													int var27 = var32.indexOf("<br>"); // L: 9628
-													if (var27 != -1) { // L: 9629
-														var43 = var32.substring(0, var27); // L: 9630
-														var32 = var32.substring(var27 + 4); // L: 9631
-													} else {
-														var43 = var32; // L: 9634
-														var32 = ""; // L: 9635
-													}
-
-													var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9637
-												}
-											}
-
-											if (var10.type == 9) { // L: 9642
-												if (var10.field2992) { // L: 9647
-													var19 = var12; // L: 9648
-													var20 = var13 + var10.height; // L: 9649
-													var21 = var12 + var10.width; // L: 9650
-													var22 = var13; // L: 9651
-												} else {
-													var19 = var12; // L: 9654
-													var20 = var13; // L: 9655
-													var21 = var12 + var10.width; // L: 9656
-													var22 = var13 + var10.height; // L: 9657
-												}
-
-												if (var10.lineWid == 1) { // L: 9659
-													Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9660
-												} else {
-													ClanChannel.method36(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9663
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
+@ObfuscatedName("kw")
+public class class303 {
+	@ObfuscatedName("f")
+	public static char[] field3747;
+	@ObfuscatedName("e")
+	static char[] field3745;
+	@ObfuscatedName("v")
+	static char[] field3748;
+	@ObfuscatedName("y")
+	static int[] field3746;
+
+	static {
+		field3747 = new char[64]; // L: 7
+
+		int var0;
+		for (var0 = 0; var0 < 26; ++var0) { // L: 8
+			field3747[var0] = (char)(var0 + 65);
 		}
 
-	} // L: 9668
+		for (var0 = 26; var0 < 52; ++var0) { // L: 9
+			field3747[var0] = (char)(var0 + 97 - 26);
+		}
+
+		for (var0 = 52; var0 < 62; ++var0) { // L: 10
+			field3747[var0] = (char)(var0 + 48 - 52);
+		}
+
+		field3747[62] = '+'; // L: 11
+		field3747[63] = '/'; // L: 12
+		field3745 = new char[64]; // L: 18
+
+		for (var0 = 0; var0 < 26; ++var0) { // L: 19
+			field3745[var0] = (char)(var0 + 65);
+		}
+
+		for (var0 = 26; var0 < 52; ++var0) { // L: 20
+			field3745[var0] = (char)(var0 + 97 - 26);
+		}
+
+		for (var0 = 52; var0 < 62; ++var0) { // L: 21
+			field3745[var0] = (char)(var0 + 48 - 52);
+		}
+
+		field3745[62] = '*'; // L: 22
+		field3745[63] = '-'; // L: 23
+		field3748 = new char[64]; // L: 29
+
+		for (var0 = 0; var0 < 26; ++var0) { // L: 30
+			field3748[var0] = (char)(var0 + 65);
+		}
+
+		for (var0 = 26; var0 < 52; ++var0) { // L: 31
+			field3748[var0] = (char)(var0 + 97 - 26);
+		}
+
+		for (var0 = 52; var0 < 62; ++var0) { // L: 32
+			field3748[var0] = (char)(var0 + 48 - 52);
+		}
+
+		field3748[62] = '-'; // L: 33
+		field3748[63] = '_'; // L: 34
+		field3746 = new int[128]; // L: 40
+
+		for (var0 = 0; var0 < field3746.length; ++var0) { // L: 41
+			field3746[var0] = -1;
+		}
+
+		for (var0 = 65; var0 <= 90; ++var0) { // L: 42
+			field3746[var0] = var0 - 65;
+		}
+
+		for (var0 = 97; var0 <= 122; ++var0) { // L: 43
+			field3746[var0] = var0 - 97 + 26;
+		}
+
+		for (var0 = 48; var0 <= 57; ++var0) { // L: 44
+			field3746[var0] = var0 - 48 + 52;
+		}
+
+		int[] var2 = field3746; // L: 45
+		field3746[43] = 62; // L: 46
+		var2[42] = 62; // L: 47
+		int[] var1 = field3746; // L: 48
+		field3746[47] = 63; // L: 49
+		var1[45] = 63; // L: 50
+	} // L: 51
 }
diff --git a/runescape-client/src/main/java/class304.java b/runescape-client/src/main/java/class304.java
index 5652373e5a..194ec3bc03 100644
--- a/runescape-client/src/main/java/class304.java
+++ b/runescape-client/src/main/java/class304.java
@@ -1,152 +1,31 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("kw")
-public class class304 {
-	@ObfuscatedName("ab")
+@ObfuscatedName("kt")
+public final class class304 {
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1682823323"
+		descriptor = "(Ljava/lang/Object;ZI)[B",
+		garbageValue = "-238084679"
 	)
-	static int method5528(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2604
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2605
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2606
-			return 1; // L: 2607
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2609
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2610
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2611
-			return 1; // L: 2612
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2614
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2615
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2616
-			return 1; // L: 2617
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2619
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2620
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2621
-			return 1; // L: 2622
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2624
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2625
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2626
-			return 1; // L: 2627
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2629
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2630
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2631
-			return 1; // L: 2632
-		} else {
-			int var13;
-			if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2634
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2635
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2636
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2637
-				return 1; // L: 2638
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2640
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2641
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2642
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2643
-				return 1; // L: 2644
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2646
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2647
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2648
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2649
-				return 1; // L: 2650
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2652
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2653
-				var13 = Client.grandExchangeOffers[var3].status(); // L: 2654
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2655
-				return 1; // L: 2656
+	public static byte[] method5597(Object var0, boolean var1) {
+		if (var0 == null) { // L: 8
+			return null;
+		} else if (var0 instanceof byte[]) { // L: 9
+			byte[] var6 = (byte[])((byte[])var0); // L: 10
+			if (var1) { // L: 11
+				int var4 = var6.length; // L: 14
+				byte[] var5 = new byte[var4]; // L: 15
+				System.arraycopy(var6, 0, var5, 0, var4); // L: 16
+				return var5; // L: 19
 			} else {
-				boolean var12;
-				if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2658
-					var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2659
-					if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2660
-						BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2661
-					}
-
-					return 1; // L: 2663
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2665
-					var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2666
-					if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2667
-						BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2668
-					}
-
-					return 1; // L: 2670
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2672
-					class44.Interpreter_intStackSize -= 2; // L: 2673
-					var12 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize] == 1; // L: 2674
-					boolean var11 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1] == 1; // L: 2675
-					if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2676
-						Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2677
-						BuddyRankComparator.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2678
-					}
-
-					return 1; // L: 2680
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2682
-					var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2683
-					if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2684
-						BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2685
-					}
-
-					return 1; // L: 2687
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2689
-					var12 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 2690
-					if (BuddyRankComparator.grandExchangeEvents != null) { // L: 2691
-						BuddyRankComparator.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2692
-					}
-
-					return 1; // L: 2694
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2696
-					Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = BuddyRankComparator.grandExchangeEvents == null ? 0 : BuddyRankComparator.grandExchangeEvents.events.size(); // L: 2697
-					return 1; // L: 2698
-				} else {
-					GrandExchangeEvent var4;
-					if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2700
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2701
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2702
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.world; // L: 2703
-						return 1; // L: 2704
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2706
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2707
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2708
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2709
-						return 1; // L: 2710
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2712
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2713
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2714
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2715
-						return 1; // L: 2716
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2718
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2719
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2720
-						long var5 = ObjectComposition.currentTimeMillis() - Widget.field3099 - var4.age; // L: 2721
-						int var7 = (int)(var5 / 3600000L); // L: 2722
-						int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2723
-						int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2724
-						String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2725
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10; // L: 2726
-						return 1; // L: 2727
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2729
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2730
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2731
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2732
-						return 1; // L: 2733
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2735
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2736
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2737
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2738
-						return 1; // L: 2739
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2741
-						var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2742
-						var4 = (GrandExchangeEvent)BuddyRankComparator.grandExchangeEvents.events.get(var3); // L: 2743
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2744
-						return 1; // L: 2745
-					} else {
-						return 2; // L: 2747
-					}
-				}
+				return var6; // L: 21
 			}
+		} else if (var0 instanceof AbstractByteArrayCopier) { // L: 23
+			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 24
+			return var2.get(); // L: 25
+		} else {
+			throw new IllegalArgumentException(); // L: 27
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java
index c510b8df53..b398506548 100644
--- a/runescape-client/src/main/java/class305.java
+++ b/runescape-client/src/main/java/class305.java
@@ -1,44 +1,9 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ku")
-public final class class305 {
-	@ObfuscatedName("v")
-	@Export("base37Table")
-	public static final char[] base37Table;
-	@ObfuscatedName("n")
-	static long[] field3751;
-
-	static {
-		base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4
-		field3751 = new long[12]; // L: 5
-
-		for (int var0 = 0; var0 < field3751.length; ++var0) { // L: 8
-			field3751[var0] = (long)Math.pow(37.0D, (double)var0);
-		}
-
-	} // L: 9
-
-	@ObfuscatedName("kv")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)V",
-		garbageValue = "28"
-	)
-	static final void method5533(int var0, int var1) {
-		if (Client.currentClanChannels[var0] != null) { // L: 11329
-			if (var1 >= 0 && var1 < Client.currentClanChannels[var0].method27()) { // L: 11330
-				ClanChannelMember var2 = (ClanChannelMember)Client.currentClanChannels[var0].members.get(var1); // L: 11331
-				if (var2.rank == -1) { // L: 11332
-					PacketWriter var3 = Client.packetWriter; // L: 11333
-					PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2612, var3.isaacCipher); // L: 11334
-					var4.packetBuffer.writeByte(3 + Tiles.stringCp1252NullTerminatedByteSize(var2.name)); // L: 11335
-					var4.packetBuffer.writeByte(var0); // L: 11336
-					var4.packetBuffer.writeShort(var1); // L: 11337
-					var4.packetBuffer.writeStringCp1252NullTerminated(var2.name); // L: 11338
-					var3.addNode(var4); // L: 11339
-				}
-			}
-		}
-	} // L: 11340
+@ObfuscatedName("kp")
+public class class305 {
+	@ObfuscatedName("j")
+	@Export("ArchiveDiskActionHandler_thread")
+	static Thread ArchiveDiskActionHandler_thread;
 }
diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java
index ba89fe0335..8f78a77dd4 100644
--- a/runescape-client/src/main/java/class306.java
+++ b/runescape-client/src/main/java/class306.java
@@ -1,71 +1,28 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("kb")
-public class class306 {
-	@ObfuscatedName("v")
-	@Export("writeRandomDat")
-	public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) {
-		if (var2 == var0) { // L: 12
-			if (var3 == var1) { // L: 13
-				return;
-			}
+public final class class306 {
+	@ObfuscatedName("f")
+	@Export("base37Table")
+	public static final char[] base37Table;
+	@ObfuscatedName("e")
+	static long[] field3756;
+	@ObfuscatedName("ej")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive15")
+	static Archive archive15;
 
-			if (var3 > var1 && var3 < var4 + var1) { // L: 14
-				--var4; // L: 15
-				var1 += var4; // L: 16
-				var3 += var4; // L: 17
-				var4 = var1 - var4; // L: 18
+	static {
+		base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4
+		field3756 = new long[12]; // L: 5
 
-				for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28
-					var2[var3--] = var0[var1--]; // L: 21
-					var2[var3--] = var0[var1--]; // L: 22
-					var2[var3--] = var0[var1--]; // L: 23
-					var2[var3--] = var0[var1--]; // L: 24
-					var2[var3--] = var0[var1--]; // L: 25
-					var2[var3--] = var0[var1--]; // L: 26
-					var2[var3--] = var0[var1--]; // L: 27
-				}
-
-				for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31
-				}
-
-				return; // L: 32
-			}
+		for (int var0 = 0; var0 < field3756.length; ++var0) { // L: 8
+			field3756[var0] = (long)Math.pow(37.0D, (double)var0);
 		}
 
-		var4 += var1; // L: 35
-
-		for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45
-			var2[var3++] = var0[var1++]; // L: 38
-			var2[var3++] = var0[var1++]; // L: 39
-			var2[var3++] = var0[var1++]; // L: 40
-			var2[var3++] = var0[var1++]; // L: 41
-			var2[var3++] = var0[var1++]; // L: 42
-			var2[var3++] = var0[var1++]; // L: 43
-			var2[var3++] = var0[var1++]; // L: 44
-		}
-
-		for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48
-		}
-
-	} // L: 49
-
-	@ObfuscatedName("s")
-	@Export("clearIntArray")
-	public static void clearIntArray(int[] var0, int var1, int var2) {
-		for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373
-			var0[var1++] = 0; // L: 366
-			var0[var1++] = 0; // L: 367
-			var0[var1++] = 0; // L: 368
-			var0[var1++] = 0; // L: 369
-			var0[var1++] = 0; // L: 370
-			var0[var1++] = 0; // L: 371
-			var0[var1++] = 0; // L: 372
-		}
-
-		for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376
-		}
-
-	} // L: 377
+	} // L: 9
 }
diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java
new file mode 100644
index 0000000000..09920efa79
--- /dev/null
+++ b/runescape-client/src/main/java/class307.java
@@ -0,0 +1,71 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("kh")
+public class class307 {
+	@ObfuscatedName("f")
+	@Export("writeRandomDat")
+	public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) {
+		if (var2 == var0) { // L: 12
+			if (var3 == var1) { // L: 13
+				return;
+			}
+
+			if (var3 > var1 && var3 < var4 + var1) { // L: 14
+				--var4; // L: 15
+				var1 += var4; // L: 16
+				var3 += var4; // L: 17
+				var4 = var1 - var4; // L: 18
+
+				for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28
+					var2[var3--] = var0[var1--]; // L: 21
+					var2[var3--] = var0[var1--]; // L: 22
+					var2[var3--] = var0[var1--]; // L: 23
+					var2[var3--] = var0[var1--]; // L: 24
+					var2[var3--] = var0[var1--]; // L: 25
+					var2[var3--] = var0[var1--]; // L: 26
+					var2[var3--] = var0[var1--]; // L: 27
+				}
+
+				for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31
+				}
+
+				return; // L: 32
+			}
+		}
+
+		var4 += var1; // L: 35
+
+		for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45
+			var2[var3++] = var0[var1++]; // L: 38
+			var2[var3++] = var0[var1++]; // L: 39
+			var2[var3++] = var0[var1++]; // L: 40
+			var2[var3++] = var0[var1++]; // L: 41
+			var2[var3++] = var0[var1++]; // L: 42
+			var2[var3++] = var0[var1++]; // L: 43
+			var2[var3++] = var0[var1++]; // L: 44
+		}
+
+		for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48
+		}
+
+	} // L: 49
+
+	@ObfuscatedName("d")
+	@Export("clearIntArray")
+	public static void clearIntArray(int[] var0, int var1, int var2) {
+		for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373
+			var0[var1++] = 0; // L: 366
+			var0[var1++] = 0; // L: 367
+			var0[var1++] = 0; // L: 368
+			var0[var1++] = 0; // L: 369
+			var0[var1++] = 0; // L: 370
+			var0[var1++] = 0; // L: 371
+			var0[var1++] = 0; // L: 372
+		}
+
+		for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376
+		}
+
+	} // L: 377
+}
diff --git a/runescape-client/src/main/java/class308.java b/runescape-client/src/main/java/class308.java
deleted file mode 100644
index bad352e425..0000000000
--- a/runescape-client/src/main/java/class308.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kf")
-public class class308 {
-	@ObfuscatedName("qm")
-	@ObfuscatedSignature(
-		descriptor = "Lay;"
-	)
-	@Export("pcmStreamMixer")
-	static PcmStreamMixer pcmStreamMixer;
-}
diff --git a/runescape-client/src/main/java/class309.java b/runescape-client/src/main/java/class309.java
new file mode 100644
index 0000000000..d81ac93e36
--- /dev/null
+++ b/runescape-client/src/main/java/class309.java
@@ -0,0 +1,57 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("kf")
+public class class309 {
+	@ObfuscatedName("fk")
+	@ObfuscatedSignature(
+		descriptor = "Lkj;"
+	)
+	@Export("fontBold12")
+	static Font fontBold12;
+
+	@ObfuscatedName("kz")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I)V",
+		garbageValue = "1818635453"
+	)
+	static final void method5671(Widget var0) {
+		int var1 = var0.contentType; // L: 11205
+		if (var1 == 324) { // L: 11206
+			if (Client.field890 == -1) { // L: 11207
+				Client.field890 = var0.spriteId2; // L: 11208
+				Client.field902 = var0.spriteId; // L: 11209
+			}
+
+			if (Client.playerAppearance.isFemale) { // L: 11211
+				var0.spriteId2 = Client.field890;
+			} else {
+				var0.spriteId2 = Client.field902; // L: 11212
+			}
+
+		} else if (var1 == 325) { // L: 11215
+			if (Client.field890 == -1) { // L: 11216
+				Client.field890 = var0.spriteId2; // L: 11217
+				Client.field902 = var0.spriteId; // L: 11218
+			}
+
+			if (Client.playerAppearance.isFemale) { // L: 11220
+				var0.spriteId2 = Client.field902;
+			} else {
+				var0.spriteId2 = Client.field890; // L: 11221
+			}
+
+		} else if (var1 == 327) { // L: 11224
+			var0.modelAngleX = 150; // L: 11225
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11226
+			var0.modelType = 5; // L: 11227
+			var0.modelId = 0; // L: 11228
+		} else if (var1 == 328) { // L: 11231
+			var0.modelAngleX = 150; // L: 11232
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11233
+			var0.modelType = 5; // L: 11234
+			var0.modelId = 1; // L: 11235
+		}
+	} // L: 11213 11222 11229 11236 11238
+}
diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java
index 823c006af6..96945230a3 100644
--- a/runescape-client/src/main/java/class31.java
+++ b/runescape-client/src/main/java/class31.java
@@ -1,11 +1,11 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ai")
+@ObfuscatedName("az")
 public interface class31 {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)Lnd;"
+		descriptor = "(Lnt;)Lnt;"
 	)
-	Buffer vmethod297(Buffer var1);
+	Buffer vmethod381(Buffer var1);
 }
diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java
deleted file mode 100644
index 1eb557d730..0000000000
--- a/runescape-client/src/main/java/class310.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("kn")
-public class class310 {
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("ObjectDefinition_modelsArchive")
-	public static AbstractArchive ObjectDefinition_modelsArchive;
-}
diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/class311.java
deleted file mode 100644
index 0911688ffa..0000000000
--- a/runescape-client/src/main/java/class311.java
+++ /dev/null
@@ -1,20 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ks")
-public class class311 {
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -617825071
-	)
-	@Export("WorldMapElement_count")
-	public static int WorldMapElement_count;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("ItemDefinition_modelArchive")
-	public static AbstractArchive ItemDefinition_modelArchive;
-}
diff --git a/runescape-client/src/main/java/class312.java b/runescape-client/src/main/java/class312.java
deleted file mode 100644
index 8dfcdf8723..0000000000
--- a/runescape-client/src/main/java/class312.java
+++ /dev/null
@@ -1,67 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
-
-@ObfuscatedName("lr")
-public class class312 {
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "-9"
-	)
-	static int method5616(int var0, Script var1, boolean var2) {
-		int var3 = -1; // L: 555
-		Widget var4;
-		if (var0 >= 2000) { // L: 557
-			var0 -= 1000; // L: 558
-			var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 559
-			var4 = Frames.getWidget(var3); // L: 560
-		} else {
-			var4 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 562
-		}
-
-		if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 563
-			class44.Interpreter_intStackSize -= 4; // L: 564
-			var4.rawX = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 565
-			var4.rawY = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 566
-			var4.xAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 567
-			var4.yAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 568
-			WorldMapCacheName.invalidateWidget(var4); // L: 569
-			class23.client.alignWidget(var4); // L: 570
-			if (var3 != -1 && var4.type == 0) { // L: 571
-				class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
-			}
-
-			return 1; // L: 572
-		} else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 574
-			class44.Interpreter_intStackSize -= 4; // L: 575
-			var4.rawWidth = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 576
-			var4.rawHeight = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 577
-			var4.widthAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 2]; // L: 578
-			var4.heightAlignment = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 3]; // L: 579
-			WorldMapCacheName.invalidateWidget(var4); // L: 580
-			class23.client.alignWidget(var4); // L: 581
-			if (var3 != -1 && var4.type == 0) { // L: 582
-				class313.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
-			}
-
-			return 1; // L: 583
-		} else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 585
-			boolean var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 586
-			if (var5 != var4.isHidden) { // L: 587
-				var4.isHidden = var5; // L: 588
-				WorldMapCacheName.invalidateWidget(var4); // L: 589
-			}
-
-			return 1; // L: 591
-		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 593
-			var4.noClickThrough = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 594
-			return 1; // L: 595
-		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 597
-			var4.noScrollThrough = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1; // L: 598
-			return 1; // L: 599
-		} else {
-			return 2; // L: 601
-		}
-	}
-}
diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java
deleted file mode 100644
index a1dde5b0cb..0000000000
--- a/runescape-client/src/main/java/class313.java
+++ /dev/null
@@ -1,75 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("lk")
-public class class313 {
-	@ObfuscatedName("ji")
-	@ObfuscatedSignature(
-		descriptor = "([Lio;Lio;ZI)V",
-		garbageValue = "1078266988"
-	)
-	@Export("revalidateWidgetScroll")
-	static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
-		int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1489642403 * 1932863499 : var1.width * -1921178137 * 1163271639; // L: 9756
-		int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -1137939101 * 1577090123 : var1.height * 202863387 * -571887853; // L: 9757
-		class27.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9758
-		if (var1.children != null) { // L: 9759
-			class27.resizeInterface(var1.children, var1.id, var3, var4, var2);
-		}
-
-		InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9760
-		if (var5 != null) {
-			PlayerType.method4857(var5.group, var3, var4, var2); // L: 9761
-		}
-
-		if (var1.contentType == 1337) { // L: 9762
-		}
-
-	} // L: 9763
-
-	@ObfuscatedName("jh")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;IIIIIII)V",
-		garbageValue = "584848260"
-	)
-	static final void method5617(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (Client.field708) { // L: 9821
-			Client.alternativeScrollbarWidth = 32;
-		} else {
-			Client.alternativeScrollbarWidth = 0; // L: 9822
-		}
-
-		Client.field708 = false; // L: 9823
-		int var7;
-		if (MouseHandler.MouseHandler_currentButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 9824
-			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 9825
-				var0.scrollY -= 4; // L: 9826
-				WorldMapCacheName.invalidateWidget(var0); // L: 9827
-			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 9829
-				var0.scrollY += 4; // L: 9830
-				WorldMapCacheName.invalidateWidget(var0); // L: 9831
-			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 9833
-				var7 = var3 * (var3 - 32) / var4; // L: 9834
-				if (var7 < 8) { // L: 9835
-					var7 = 8;
-				}
-
-				int var8 = var6 - var2 - 16 - var7 / 2; // L: 9836
-				int var9 = var3 - 32 - var7; // L: 9837
-				var0.scrollY = var8 * (var4 - var3) / var9; // L: 9838
-				WorldMapCacheName.invalidateWidget(var0); // L: 9839
-				Client.field708 = true; // L: 9840
-			}
-		}
-
-		if (Client.mouseWheelRotation != 0) { // L: 9843
-			var7 = var0.width; // L: 9844
-			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 9845
-				var0.scrollY += Client.mouseWheelRotation * 45; // L: 9846
-				WorldMapCacheName.invalidateWidget(var0); // L: 9847
-			}
-		}
-
-	} // L: 9850
-}
diff --git a/runescape-client/src/main/java/class314.java b/runescape-client/src/main/java/class314.java
new file mode 100644
index 0000000000..e0e7f554c6
--- /dev/null
+++ b/runescape-client/src/main/java/class314.java
@@ -0,0 +1,25 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("le")
+public class class314 {
+	@ObfuscatedName("fy")
+	@ObfuscatedSignature(
+		descriptor = "Lmk;"
+	)
+	@Export("WorldMapElement_fonts")
+	static Fonts WorldMapElement_fonts;
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "1476009263"
+	)
+	static final void method5693(String var0) {
+		StringBuilder var10000 = (new StringBuilder()).append(var0);
+		Object var10001 = null;
+		String var1 = var10000.append(" is already on your ignore list").toString(); // L: 183
+		UserComparator10.addGameMessage(30, "", var1); // L: 185
+	} // L: 187
+}
diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java
index 9565bab18f..c47114e429 100644
--- a/runescape-client/src/main/java/class32.java
+++ b/runescape-client/src/main/java/class32.java
@@ -2,108 +2,230 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ar")
+@ObfuscatedName("ap")
 public final class class32 {
-	@ObfuscatedName("r")
+	@ObfuscatedName("hg")
 	@ObfuscatedGetter(
-		intValue = -812894805
+		intValue = 450314799
 	)
-	@Export("musicTrackGroupId")
-	public static int musicTrackGroupId;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = 646214551
-	)
-	@Export("canvasWidth")
-	public static int canvasWidth;
-	@ObfuscatedName("du")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive4")
-	static Archive archive4;
+	@Export("cameraYaw")
+	static int cameraYaw;
 
-	@ObfuscatedName("gz")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lce;IIB)V",
-		garbageValue = "-92"
+		descriptor = "(IB)Z",
+		garbageValue = "121"
 	)
-	@Export("performPlayerAnimation")
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
-		if (var0.sequence == var1 && var1 != -1) { // L: 3886
-			int var3 = LoginScreenAnimation.SequenceDefinition_get(var1).field1891; // L: 3887
-			if (var3 == 1) { // L: 3888
-				var0.sequenceFrame = 0; // L: 3889
-				var0.sequenceFrameCycle = 0; // L: 3890
-				var0.sequenceDelay = var2; // L: 3891
-				var0.field1245 = 0; // L: 3892
+	public static boolean method384(int var0) {
+		return var0 == WorldMapDecorationType.field3168.id; // L: 46
+	}
+
+	@ObfuscatedName("ad")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "-88"
+	)
+	static int method386(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_LISTENED) { // L: 2455
+			if (WorldMapManager.guestClanSettings != null) { // L: 2456
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2457
+				DirectByteArrayCopier.field3128 = WorldMapManager.guestClanSettings; // L: 2458
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2460
 			}
 
-			if (var3 == 2) { // L: 3894
-				var0.field1245 = 0; // L: 3895
-			}
-		} else if (var1 == -1 || var0.sequence == -1 || LoginScreenAnimation.SequenceDefinition_get(var1).field1885 >= LoginScreenAnimation.SequenceDefinition_get(var0.sequence).field1885) { // L: 3898
-			var0.sequence = var1; // L: 3899
-			var0.sequenceFrame = 0; // L: 3900
-			var0.sequenceFrameCycle = 0; // L: 3901
-			var0.sequenceDelay = var2; // L: 3902
-			var0.field1245 = 0; // L: 3903
-			var0.field1274 = var0.pathLength; // L: 3904
-		}
-
-	} // L: 3906
-
-	@ObfuscatedName("gk")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "26"
-	)
-	static final int method305() {
-		if (ObjectComposition.clientPreferences.roofsHidden) { // L: 4409
-			return class22.Client_plane;
+			return 1; // L: 2461
 		} else {
-			int var0 = class105.getTileHeight(MouseHandler.cameraX, class105.cameraZ, class22.Client_plane); // L: 4410
-			return var0 - SecureRandomCallable.cameraY < 800 && (Tiles.Tiles_renderFlags[class22.Client_plane][MouseHandler.cameraX >> 7][class105.cameraZ >> 7] & 4) != 0 ? class22.Client_plane : 3; // L: 4411 4412
+			int var3;
+			if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_FIND_AFFINED) { // L: 2463
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2464
+				if (Client.currentClanSettings[var3] != null) { // L: 2465
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2466
+					DirectByteArrayCopier.field3128 = Client.currentClanSettings[var3]; // L: 2467
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2469
+				}
+
+				return 1; // L: 2470
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCLANNAME) { // L: 2472
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = DirectByteArrayCopier.field3128.name; // L: 2473
+				return 1; // L: 2474
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETALLOWUNAFFINED) { // L: 2476
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.allowGuests ? 1 : 0; // L: 2477
+				return 1; // L: 2478
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKTALK) { // L: 2480
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field87; // L: 2481
+				return 1; // L: 2482
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKKICK) { // L: 2484
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field88; // L: 2485
+				return 1; // L: 2486
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETRANKLOOTSHARE) { // L: 2488
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field93; // L: 2489
+				return 1; // L: 2490
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCOINSHARE) { // L: 2492
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field90; // L: 2493
+				return 1; // L: 2494
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDCOUNT) { // L: 2496
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.memberCount; // L: 2497
+				return 1; // L: 2498
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME) { // L: 2500
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2501
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = DirectByteArrayCopier.field3128.memberNames[var3]; // L: 2502
+				return 1; // L: 2503
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDRANK) { // L: 2505
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2506
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.memberRanks[var3]; // L: 2507
+				return 1; // L: 2508
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDCOUNT) { // L: 2510
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.bannedMemberCount; // L: 2511
+				return 1; // L: 2512
+			} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME) { // L: 2514
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2515
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = DirectByteArrayCopier.field3128.bannedMemberNames[var3]; // L: 2516
+				return 1; // L: 2517
+			} else {
+				int var5;
+				int var6;
+				if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO) { // L: 2519
+					ChatChannel.Interpreter_intStackSize -= 3; // L: 2520
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2521
+					var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2522
+					var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2523
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.method170(var3, var6, var5); // L: 2524
+					return 1; // L: 2525
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT) { // L: 2527
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.currentOwner; // L: 2528
+					return 1; // L: 2529
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT) { // L: 2531
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field99; // L: 2532
+					return 1; // L: 2533
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDSLOT) { // L: 2535
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.method196(Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 2536
+					return 1; // L: 2537
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT) { // L: 2539
+					Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.getSortedMembers()[Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1]]; // L: 2540
+					return 1; // L: 2541
+				} else if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL) { // L: 2543
+					ChatChannel.Interpreter_intStackSize -= 2; // L: 2544
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2545
+					var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 2546
+					WorldMapRegion.method3519(var6, var3); // L: 2547
+					return 1; // L: 2548
+				} else if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY) { // L: 2550
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2551
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field96[var3]; // L: 2552
+					return 1; // L: 2553
+				} else {
+					if (var0 == ScriptOpcodes.AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL) { // L: 2555
+						ChatChannel.Interpreter_intStackSize -= 3; // L: 2556
+						var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 2557
+						boolean var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 2558
+						var5 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 2559
+						GrandExchangeOfferAgeComparator.method5203(var5, var3, var4); // L: 2560
+					}
+
+					if (var0 == ScriptOpcodes.ACTIVECLANSETTINGS_GETAFFINEDMUTED) { // L: 2562
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2563
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = DirectByteArrayCopier.field3128.field97[var3] ? 1 : 0; // L: 2564
+						return 1; // L: 2565
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_LISTENED) { // L: 2567
+						if (AttackOption.guestClanChannel != null) { // L: 2568
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2569
+							WorldMapIcon_0.field2031 = AttackOption.guestClanChannel; // L: 2570
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2572
+						}
+
+						return 1; // L: 2573
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_FIND_AFFINED) { // L: 2575
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2576
+						if (Client.currentClanChannels[var3] != null) { // L: 2577
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 2578
+							WorldMapIcon_0.field2031 = Client.currentClanChannels[var3]; // L: 2579
+							class21.field171 = var3; // L: 2580
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 2582
+						}
+
+						return 1; // L: 2583
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETCLANNAME) { // L: 2585
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = WorldMapIcon_0.field2031.name; // L: 2586
+						return 1; // L: 2587
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKKICK) { // L: 2589
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.field28; // L: 2590
+						return 1; // L: 2591
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETRANKTALK) { // L: 2593
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.field27; // L: 2594
+						return 1; // L: 2595
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERCOUNT) { // L: 2597
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.method49(); // L: 2598
+						return 1; // L: 2599
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERDISPLAYNAME) { // L: 2601
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2602
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ((ClanChannelMember)WorldMapIcon_0.field2031.members.get(var3)).name; // L: 2603
+						return 1; // L: 2604
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERRANK) { // L: 2606
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2607
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapIcon_0.field2031.members.get(var3)).rank; // L: 2608
+						return 1; // L: 2609
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERWORLD) { // L: 2611
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2612
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ((ClanChannelMember)WorldMapIcon_0.field2031.members.get(var3)).world; // L: 2613
+						return 1; // L: 2614
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_KICKUSER) { // L: 2616
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 2617
+						class29.method378(class21.field171, var3); // L: 2618
+						return 1; // L: 2619
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETUSERSLOT) { // L: 2621
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.method38(Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]); // L: 2622
+						return 1; // L: 2623
+					} else if (var0 == ScriptOpcodes.ACTIVECLANCHANNEL_GETSORTEDUSERSLOT) { // L: 2625
+						Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1] = WorldMapIcon_0.field2031.getSortedMembers()[Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize - 1]]; // L: 2626
+						return 1; // L: 2627
+					} else if (var0 == ScriptOpcodes.CLANPROFILE_FIND) { // L: 2629
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class10.field74 != null ? 1 : 0; // L: 2630
+						return 1; // L: 2631
+					} else {
+						return 2; // L: 2633
+					}
+				}
+			}
 		}
 	}
 
-	@ObfuscatedName("jq")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIB)V",
-		garbageValue = "126"
+		descriptor = "(Ljava/lang/String;B)I",
+		garbageValue = "-45"
 	)
-	@Export("drawScrollBar")
-	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
-		Player.scrollBarSprites[0].drawAt(var0, var1); // L: 9853
-		Player.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 9854
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field704); // L: 9855
-		int var5 = var3 * (var3 - 32) / var4; // L: 9856
-		if (var5 < 8) { // L: 9857
-			var5 = 8;
-		}
+	public static int method387(String var0) {
+		return var0.length() + 2; // L: 130
+	}
 
-		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 9858
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field705); // L: 9859
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field707); // L: 9860
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field707); // L: 9861
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field707); // L: 9862
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field707); // L: 9863
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field706); // L: 9864
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field706); // L: 9865
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field706); // L: 9866
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field706); // L: 9867
-	} // L: 9868
-
-	@ObfuscatedName("jf")
+	@ObfuscatedName("kt")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIB)V",
-		garbageValue = "-20"
+		descriptor = "(IIIILoa;Liq;B)V",
+		garbageValue = "-104"
 	)
-	@Export("updateRootInterface")
-	static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (Clock.loadInterface(var0)) { // L: 10180
-			WorldMapManager.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 10181
+	@Export("drawSpriteOnMinimap")
+	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, SpritePixels var4, SpriteMask var5) {
+		if (var4 != null) { // L: 11423
+			int var6 = Client.camAngleY & 2047; // L: 11424
+			int var7 = var3 * var3 + var2 * var2; // L: 11425
+			if (var7 <= 6400) { // L: 11426
+				int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 11427
+				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 11428
+				int var10 = var9 * var2 + var3 * var8 >> 16; // L: 11429
+				int var11 = var3 * var9 - var8 * var2 >> 16; // L: 11430
+				if (var7 > 2500) {
+					var4.method7041(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 11431
+				} else {
+					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 11432
+				}
+
+			}
 		}
-	} // L: 10182
+	} // L: 11433
 }
diff --git a/runescape-client/src/main/java/class33.java b/runescape-client/src/main/java/class33.java
index a656255fbe..8f30acc0ff 100644
--- a/runescape-client/src/main/java/class33.java
+++ b/runescape-client/src/main/java/class33.java
@@ -6,39 +6,39 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ag")
 public class class33 implements class30 {
-	@ObfuscatedName("v")
-	final MessageDigest field249;
+	@ObfuscatedName("f")
+	final MessageDigest field230;
 
 	@ObfuscatedSignature(
-		descriptor = "(Laj;)V"
+		descriptor = "(Lae;)V"
 	)
 	class33(class36 var1) {
-		this.field249 = this.method321(); // L: 14
+		this.field230 = this.method393(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("v")
-	boolean method307(int var1, String var2, long var3) {
-		byte[] var5 = this.method310(var2, var3); // L: 18
-		return method308(var5) >= var1; // L: 19
+	@ObfuscatedName("f")
+	boolean method389(int var1, String var2, long var3) {
+		byte[] var5 = this.method388(var2, var3); // L: 18
+		return method392(var5) >= var1; // L: 19
 	}
 
 	@ObfuscatedName("y")
-	byte[] method310(String var1, long var2) {
+	byte[] method388(String var1, long var2) {
 		StringBuilder var4 = new StringBuilder(); // L: 56
 		var4.append(var1).append(Long.toHexString(var2)); // L: 57
-		this.field249.reset(); // L: 58
+		this.field230.reset(); // L: 58
 
 		try {
-			this.field249.update(var4.toString().getBytes("UTF-8")); // L: 60
+			this.field230.update(var4.toString().getBytes("UTF-8")); // L: 60
 		} catch (UnsupportedEncodingException var6) { // L: 62
 			var6.printStackTrace(); // L: 63
 		}
 
-		return this.field249.digest(); // L: 65
+		return this.field230.digest(); // L: 65
 	}
 
-	@ObfuscatedName("p")
-	MessageDigest method321() {
+	@ObfuscatedName("j")
+	MessageDigest method393() {
 		try {
 			return MessageDigest.getInstance("SHA-256"); // L: 70
 		} catch (NoSuchAlgorithmException var2) { // L: 72
@@ -47,14 +47,14 @@ public class class33 implements class30 {
 		}
 	}
 
-	@ObfuscatedName("n")
-	static int method308(byte[] var0) {
+	@ObfuscatedName("e")
+	static int method392(byte[] var0) {
 		int var1 = 0; // L: 23
 		byte[] var2 = var0; // L: 25
 
 		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26
 			byte var4 = var2[var3]; // L: 27
-			int var5 = method309(var4); // L: 29
+			int var5 = method391(var4); // L: 29
 			var1 += var5; // L: 30
 			if (var5 != 8) { // L: 31
 				break;
@@ -64,8 +64,8 @@ public class class33 implements class30 {
 		return var1; // L: 37
 	}
 
-	@ObfuscatedName("f")
-	static int method309(byte var0) {
+	@ObfuscatedName("v")
+	static int method391(byte var0) {
 		int var1 = 0; // L: 41
 		if (var0 == 0) { // L: 42
 			var1 = 8; // L: 43
diff --git a/runescape-client/src/main/java/class337.java b/runescape-client/src/main/java/class337.java
deleted file mode 100644
index 0bdf71b1a1..0000000000
--- a/runescape-client/src/main/java/class337.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ld")
-public class class337 {
-	@ObfuscatedName("bz")
-	@ObfuscatedSignature(
-		descriptor = "[Loh;"
-	)
-	@Export("worldSelectBackSprites")
-	static SpritePixels[] worldSelectBackSprites;
-}
diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java
deleted file mode 100644
index 5a69490034..0000000000
--- a/runescape-client/src/main/java/class338.java
+++ /dev/null
@@ -1,54 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mi")
-public enum class338 implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lmi;"
-	)
-	field3917(1, 1),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lmi;"
-	)
-	field3915(0, 2),
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lmi;"
-	)
-	field3916(3, 3),
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lmi;"
-	)
-	field3914(2, 10);
-
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1709225651
-	)
-	final int field3918;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 1076676609
-	)
-	final int field3919;
-
-	class338(int var3, int var4) {
-		this.field3918 = var3; // L: 20
-		this.field3919 = var4; // L: 21
-	} // L: 22
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-907662946"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field3919; // L: 25
-	}
-}
diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java
index 1162a992d9..98d95603c8 100644
--- a/runescape-client/src/main/java/class339.java
+++ b/runescape-client/src/main/java/class339.java
@@ -1,177 +1,61 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ms")
-public class class339 implements class344 {
+@ObfuscatedName("mw")
+public enum class339 implements Enumerated
+{
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lmw;"
+	)
+	field3916(0, 1),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lmw;"
+	)
+	field3913(3, 2),
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lmg;"
+		descriptor = "Lmw;"
 	)
-	public final class362 field3921;
-
+	field3914(2, 3),
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lmt;)V"
+		descriptor = "Lmw;"
 	)
-	class339(class363 var1) {
-		this.field3921 = var1; // L: 14
-	} // L: 15
+	field3915(1, 10);
 
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lme;)V"
+		descriptor = "Loa;"
 	)
-	public class339(class340 var1) {
-		this(new class363(var1)); // L: 10
-	} // L: 11
+	@Export("leftTitleSprite")
+	static SpritePixels leftTitleSprite;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -1941464297
+	)
+	final int field3912;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1941103959
+	)
+	final int field3917;
 
-	@ObfuscatedName("v")
+	class339(int var3, int var4) {
+		this.field3912 = var3; // L: 16
+		this.field3917 = var4; // L: 17
+	} // L: 18
+
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "423690194"
+		descriptor = "(I)I",
+		garbageValue = "-1154679040"
 	)
-	public int method6014(int var1) {
-		return this.field3921.vmethod6362(var1); // L: 18
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field3917; // L: 21
 	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;IIB)Z",
-		garbageValue = "47"
-	)
-	static boolean method6015(AbstractArchive var0, int var1, int var2) {
-		byte[] var3 = var0.takeFile(var1, var2); // L: 182
-		if (var3 == null) { // L: 183
-			return false;
-		} else {
-			ItemLayer.SpriteBuffer_decode(var3); // L: 184
-			return true; // L: 185
-		}
-	}
-
-	@ObfuscatedName("ho")
-	@ObfuscatedSignature(
-		descriptor = "(ZLnb;I)V",
-		garbageValue = "-2130717093"
-	)
-	@Export("loadRegions")
-	static final void loadRegions(boolean var0, PacketBuffer var1) {
-		Client.isInInstance = var0; // L: 5048
-		int var2;
-		int var3;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		if (!Client.isInInstance) { // L: 5049
-			var2 = var1.method6605(); // L: 5050
-			var3 = var1.method6603(); // L: 5051
-			int var4 = var1.readUnsignedShort(); // L: 5052
-			WorldMapAreaData.xteaKeys = new int[var4][4]; // L: 5053
-
-			for (var5 = 0; var5 < var4; ++var5) { // L: 5054
-				for (var6 = 0; var6 < 4; ++var6) { // L: 5055
-					WorldMapAreaData.xteaKeys[var5][var6] = var1.readInt(); // L: 5056
-				}
-			}
-
-			PlayerComposition.regions = new int[var4]; // L: 5059
-			class16.regionMapArchiveIds = new int[var4]; // L: 5060
-			class24.regionLandArchiveIds = new int[var4]; // L: 5061
-			class18.regionLandArchives = new byte[var4][]; // L: 5062
-			class82.regionMapArchives = new byte[var4][]; // L: 5063
-			boolean var16 = false; // L: 5064
-			if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { // L: 5065
-				var16 = true;
-			}
-
-			if (var3 / 8 == 48 && var2 / 8 == 148) { // L: 5066
-				var16 = true;
-			}
-
-			var4 = 0; // L: 5067
-
-			for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { // L: 5068
-				for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { // L: 5069
-					var8 = var7 + (var6 << 8); // L: 5070
-					if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5071
-						PlayerComposition.regions[var4] = var8; // L: 5072
-						class16.regionMapArchiveIds[var4] = class247.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5073
-						class24.regionLandArchiveIds[var4] = class247.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5074
-						++var4; // L: 5075
-					}
-				}
-			}
-
-			Canvas.method391(var3, var2, true); // L: 5078
-		} else {
-			var2 = var1.readUnsignedShort(); // L: 5081
-			var3 = var1.method6603(); // L: 5082
-			boolean var15 = var1.method6549() == 1; // L: 5083
-			var5 = var1.readUnsignedShort(); // L: 5084
-			var1.importIndex(); // L: 5085
-
-			int var9;
-			for (var6 = 0; var6 < 4; ++var6) { // L: 5086
-				for (var7 = 0; var7 < 13; ++var7) { // L: 5087
-					for (var8 = 0; var8 < 13; ++var8) { // L: 5088
-						var9 = var1.readBits(1); // L: 5089
-						if (var9 == 1) {
-							Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5090
-						} else {
-							Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5091
-						}
-					}
-				}
-			}
-
-			var1.exportIndex(); // L: 5095
-			WorldMapAreaData.xteaKeys = new int[var5][4]; // L: 5096
-
-			for (var6 = 0; var6 < var5; ++var6) { // L: 5097
-				for (var7 = 0; var7 < 4; ++var7) { // L: 5098
-					WorldMapAreaData.xteaKeys[var6][var7] = var1.readInt(); // L: 5099
-				}
-			}
-
-			PlayerComposition.regions = new int[var5]; // L: 5102
-			class16.regionMapArchiveIds = new int[var5]; // L: 5103
-			class24.regionLandArchiveIds = new int[var5]; // L: 5104
-			class18.regionLandArchives = new byte[var5][]; // L: 5105
-			class82.regionMapArchives = new byte[var5][]; // L: 5106
-			var5 = 0; // L: 5107
-
-			for (var6 = 0; var6 < 4; ++var6) { // L: 5108
-				for (var7 = 0; var7 < 13; ++var7) { // L: 5109
-					for (var8 = 0; var8 < 13; ++var8) { // L: 5110
-						var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5111
-						if (var9 != -1) { // L: 5112
-							int var10 = var9 >> 14 & 1023; // L: 5113
-							int var11 = var9 >> 3 & 2047; // L: 5114
-							int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5115
-
-							int var13;
-							for (var13 = 0; var13 < var5; ++var13) { // L: 5116
-								if (PlayerComposition.regions[var13] == var12) {
-									var12 = -1; // L: 5117
-									break; // L: 5118
-								}
-							}
-
-							if (var12 != -1) { // L: 5120
-								PlayerComposition.regions[var5] = var12; // L: 5121
-								var13 = var12 >> 8 & 255; // L: 5122
-								int var14 = var12 & 255; // L: 5123
-								class16.regionMapArchiveIds[var5] = class247.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5124
-								class24.regionLandArchiveIds[var5] = class247.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5125
-								++var5; // L: 5126
-							}
-						}
-					}
-				}
-			}
-
-			Canvas.method391(var3, var2, !var15); // L: 5132
-		}
-
-	} // L: 5134
 }
diff --git a/runescape-client/src/main/java/class34.java b/runescape-client/src/main/java/class34.java
index d23de174f0..f32d74523b 100644
--- a/runescape-client/src/main/java/class34.java
+++ b/runescape-client/src/main/java/class34.java
@@ -3,83 +3,806 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ax")
-public enum class34 implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lax;"
-	)
-	field256(0, 0);
-
-	@ObfuscatedName("oa")
-	@ObfuscatedSignature(
-		descriptor = "Lms;"
-	)
-	static class339 field254;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -537510065
-	)
-	final int field252;
+@ObfuscatedName("ab")
+public enum class34 implements Enumerated
+{
 	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -1586527889
+	@ObfuscatedSignature(
+		descriptor = "Lab;"
 	)
-	final int field253;
+	field232(0, 0);
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		descriptor = "Ljq;"
+	)
+	@Export("NetCache_currentResponse")
+	public static NetFileRequest NetCache_currentResponse;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -1096929681
+	)
+	public final int field233;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1588992419
+	)
+	final int field236;
 
 	class34(int var3, int var4) {
-		this.field252 = var3; // L: 12
-		this.field253 = var4; // L: 13
+		this.field233 = var3; // L: 12
+		this.field236 = var4; // L: 13
 	} // L: 14
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-907662946"
+		garbageValue = "-1154679040"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
-		return this.field253; // L: 17
+		return this.field236; // L: 17
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-67481948"
+		descriptor = "(III)I",
+		garbageValue = "2123996277"
 	)
-	static void method327() {
-		Tiles.Tiles_minPlane = 99; // L: 48
-		Tiles.field1120 = new byte[4][104][104]; // L: 49
-		class253.field3130 = new byte[4][104][104]; // L: 50
-		class20.field182 = new byte[4][104][104]; // L: 51
-		DirectByteArrayCopier.field3128 = new byte[4][104][104]; // L: 52
-		UrlRequester.field1419 = new int[4][105][105]; // L: 53
-		class372.field4123 = new byte[4][105][105]; // L: 54
-		class229.field2813 = new int[105][105]; // L: 55
-		ChatChannel.Tiles_hue = new int[104]; // L: 56
-		class23.Tiles_saturation = new int[104]; // L: 57
-		Tiles.Tiles_lightness = new int[104]; // L: 58
-		ParamComposition.Tiles_hueMultiplier = new int[104]; // L: 59
-		DefaultsGroup.field3894 = new int[104]; // L: 60
-	} // L: 61
+	public static int method402(int var0, int var1) {
+		int var2;
+		if (var1 > var0) { // L: 24
+			var2 = var0; // L: 25
+			var0 = var1; // L: 26
+			var1 = var2; // L: 27
+		}
 
-	@ObfuscatedName("n")
+		while (var1 != 0) { // L: 29
+			var2 = var0 % var1; // L: 30
+			var0 = var1; // L: 31
+			var1 = var2; // L: 32
+		}
+
+		return var0; // L: 34
+	}
+
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(B)V",
-		garbageValue = "0"
+		garbageValue = "63"
 	)
-	static void method328() {
-		Tiles.field1120 = null; // L: 64
-		class253.field3130 = null; // L: 65
-		class20.field182 = null; // L: 66
-		DirectByteArrayCopier.field3128 = null; // L: 67
-		UrlRequester.field1419 = null; // L: 68
-		class372.field4123 = null; // L: 69
-		class229.field2813 = null; // L: 70
-		ChatChannel.Tiles_hue = null; // L: 71
-		class23.Tiles_saturation = null; // L: 72
-		Tiles.Tiles_lightness = null; // L: 73
-		ParamComposition.Tiles_hueMultiplier = null; // L: 74
-		DefaultsGroup.field3894 = null; // L: 75
-	} // L: 76
+	public static void method406() {
+		synchronized(MouseHandler.MouseHandler_instance) { // L: 43
+			MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 44
+			MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 45
+			MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 46
+			MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 47
+			MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 48
+			MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 49
+			MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 50
+			MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 51
+			MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 52
+		}
+	} // L: 54
+
+	@ObfuscatedName("fe")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "1"
+	)
+	@Export("load")
+	static void load() {
+		int var21;
+		if (Client.titleLoadingStage == 0) { // L: 1747
+			DevicePcmPlayerProvider.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1748
+
+			for (var21 = 0; var21 < 4; ++var21) { // L: 1749
+				Client.collisionMaps[var21] = new CollisionMap(104, 104);
+			}
+
+			class69.sceneMinimapSprite = new SpritePixels(512, 512); // L: 1750
+			Login.Login_loadingText = "Starting game engine..."; // L: 1751
+			Login.Login_loadingPercent = 5; // L: 1752
+			Client.titleLoadingStage = 20; // L: 1753
+		} else if (Client.titleLoadingStage == 20) { // L: 1756
+			Login.Login_loadingText = "Prepared visibility map"; // L: 1757
+			Login.Login_loadingPercent = 10; // L: 1758
+			Client.titleLoadingStage = 30; // L: 1759
+		} else if (Client.titleLoadingStage == 30) { // L: 1762
+			ClanChannel.archive0 = UrlRequest.newArchive(0, false, true, true); // L: 1763
+			KitDefinition.archive1 = UrlRequest.newArchive(1, false, true, true); // L: 1764
+			SecureRandomFuture.archive2 = UrlRequest.newArchive(2, true, false, true); // L: 1765
+			class18.archive3 = UrlRequest.newArchive(3, false, true, true); // L: 1766
+			class26.archive4 = UrlRequest.newArchive(4, false, true, true); // L: 1767
+			class4.archive5 = UrlRequest.newArchive(5, true, true, true); // L: 1768
+			DynamicObject.archive6 = UrlRequest.newArchive(6, true, true, true); // L: 1769
+			PcmPlayer.archive7 = UrlRequest.newArchive(7, false, true, true); // L: 1770
+			ModeWhere.archive8 = UrlRequest.newArchive(8, false, true, true); // L: 1771
+			class16.archive9 = UrlRequest.newArchive(9, false, true, true); // L: 1772
+			JagexCache.archive10 = UrlRequest.newArchive(10, false, true, true); // L: 1773
+			class160.archive11 = UrlRequest.newArchive(11, false, true, true); // L: 1774
+			Varcs.archive12 = UrlRequest.newArchive(12, false, true, true); // L: 1775
+			GrandExchangeOfferOwnWorldComparator.archive13 = UrlRequest.newArchive(13, true, false, true); // L: 1776
+			PacketWriter.archive14 = UrlRequest.newArchive(14, false, true, true); // L: 1777
+			class306.archive15 = UrlRequest.newArchive(15, false, true, true); // L: 1778
+			class10.archive17 = UrlRequest.newArchive(17, true, true, true); // L: 1779
+			class6.archive18 = UrlRequest.newArchive(18, false, true, true); // L: 1780
+			WorldMapEvent.archive19 = UrlRequest.newArchive(19, false, true, true); // L: 1781
+			WorldMapLabel.archive20 = UrlRequest.newArchive(20, false, true, true); // L: 1782
+			Login.Login_loadingText = "Connecting to update server"; // L: 1783
+			Login.Login_loadingPercent = 20; // L: 1784
+			Client.titleLoadingStage = 40; // L: 1785
+		} else if (Client.titleLoadingStage == 40) { // L: 1788
+			byte var43 = 0; // L: 1789
+			var21 = var43 + ClanChannel.archive0.percentage() * 4 / 100; // L: 1790
+			var21 += KitDefinition.archive1.percentage() * 4 / 100; // L: 1791
+			var21 += SecureRandomFuture.archive2.percentage() * 2 / 100; // L: 1792
+			var21 += class18.archive3.percentage() * 2 / 100; // L: 1793
+			var21 += class26.archive4.percentage() * 6 / 100; // L: 1794
+			var21 += class4.archive5.percentage() * 4 / 100; // L: 1795
+			var21 += DynamicObject.archive6.percentage() * 2 / 100; // L: 1796
+			var21 += PcmPlayer.archive7.percentage() * 56 / 100; // L: 1797
+			var21 += ModeWhere.archive8.percentage() * 2 / 100; // L: 1798
+			var21 += class16.archive9.percentage() * 2 / 100; // L: 1799
+			var21 += JagexCache.archive10.percentage() * 2 / 100; // L: 1800
+			var21 += class160.archive11.percentage() * 2 / 100; // L: 1801
+			var21 += Varcs.archive12.percentage() * 2 / 100; // L: 1802
+			var21 += GrandExchangeOfferOwnWorldComparator.archive13.percentage() * 2 / 100; // L: 1803
+			var21 += PacketWriter.archive14.percentage() * 2 / 100; // L: 1804
+			var21 += class306.archive15.percentage() * 2 / 100; // L: 1805
+			var21 += WorldMapEvent.archive19.percentage() / 100; // L: 1806
+			var21 += class6.archive18.percentage() / 100; // L: 1807
+			var21 += WorldMapLabel.archive20.percentage() / 100; // L: 1808
+			var21 += class10.archive17.method5044() && class10.archive17.isFullyLoaded() ? 1 : 0; // L: 1809
+			if (var21 != 100) { // L: 1810
+				if (var21 != 0) { // L: 1811
+					Login.Login_loadingText = "Checking for updates - " + var21 + "%";
+				}
+
+				Login.Login_loadingPercent = 30; // L: 1812
+			} else {
+				class244.method4814(ClanChannel.archive0, "Animations"); // L: 1815
+				class244.method4814(KitDefinition.archive1, "Skeletons"); // L: 1816
+				class244.method4814(class26.archive4, "Sound FX"); // L: 1817
+				class244.method4814(class4.archive5, "Maps"); // L: 1818
+				class244.method4814(DynamicObject.archive6, "Music Tracks"); // L: 1819
+				class244.method4814(PcmPlayer.archive7, "Models"); // L: 1820
+				class244.method4814(ModeWhere.archive8, "Sprites"); // L: 1821
+				class244.method4814(class160.archive11, "Music Jingles"); // L: 1822
+				class244.method4814(PacketWriter.archive14, "Music Samples"); // L: 1823
+				class244.method4814(class306.archive15, "Music Patches"); // L: 1824
+				class244.method4814(WorldMapEvent.archive19, "World Map"); // L: 1825
+				class244.method4814(class6.archive18, "World Map Geography"); // L: 1826
+				class244.method4814(WorldMapLabel.archive20, "World Map Ground"); // L: 1827
+				ClanChannel.spriteIds = new GraphicsDefaults(); // L: 1828
+				ClanChannel.spriteIds.decode(class10.archive17); // L: 1829
+				Login.Login_loadingText = "Loaded update list"; // L: 1830
+				Login.Login_loadingPercent = 30; // L: 1831
+				Client.titleLoadingStage = 45; // L: 1832
+			}
+		} else if (Client.titleLoadingStage == 45) { // L: 1835
+			boolean var42 = !Client.isLowDetail; // L: 1836
+			class341.field3921 = 22050; // L: 1839
+			PcmPlayer.PcmPlayer_stereo = var42; // L: 1840
+			UserComparator1.field4220 = 2; // L: 1841
+			MidiPcmStream var39 = new MidiPcmStream(); // L: 1843
+			var39.method4563(9, 128); // L: 1844
+			SoundCache.pcmPlayer0 = class93.method2187(GameEngine.taskHandler, 0, 22050); // L: 1845
+			SoundCache.pcmPlayer0.setStream(var39); // L: 1846
+			ItemLayer.method3860(class306.archive15, PacketWriter.archive14, class26.archive4, var39); // L: 1847
+			UrlRequester.pcmPlayer1 = class93.method2187(GameEngine.taskHandler, 1, 2048); // L: 1848
+			UserComparator7.pcmStreamMixer = new PcmStreamMixer(); // L: 1849
+			UrlRequester.pcmPlayer1.setStream(UserComparator7.pcmStreamMixer); // L: 1850
+			WorldMapAreaData.decimator = new Decimator(22050, class341.field3921); // L: 1851
+			Login.Login_loadingText = "Prepared sound engine"; // L: 1852
+			Login.Login_loadingPercent = 35; // L: 1853
+			Client.titleLoadingStage = 50; // L: 1854
+			class314.WorldMapElement_fonts = new Fonts(ModeWhere.archive8, GrandExchangeOfferOwnWorldComparator.archive13); // L: 1855
+		} else if (Client.titleLoadingStage == 50) { // L: 1858
+			var21 = FontName.method6334().length; // L: 1859
+			Fonts var38 = class314.WorldMapElement_fonts; // L: 1860
+			FontName[] var32 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_plain12}; // L: 1863
+			Client.fontsMap = var38.createMap(var32); // L: 1865
+			if (Client.fontsMap.size() < var21) { // L: 1866
+				Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var21 + "%"; // L: 1867
+				Login.Login_loadingPercent = 40; // L: 1868
+			} else {
+				UserComparator10.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1871
+				AbstractSocket.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1872
+				class309.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1873
+				ClanSettings.platformInfo = Client.platformInfoProvider.get(); // L: 1874
+				Login.Login_loadingText = "Loaded fonts"; // L: 1875
+				Login.Login_loadingPercent = 40; // L: 1876
+				Client.titleLoadingStage = 60; // L: 1877
+			}
+		} else {
+			Archive var2;
+			int var3;
+			Archive var35;
+			if (Client.titleLoadingStage == 60) { // L: 1880
+				var35 = JagexCache.archive10; // L: 1882
+				var2 = ModeWhere.archive8; // L: 1883
+				var3 = 0; // L: 1885
+				if (var35.tryLoadFileByNames("title.jpg", "")) { // L: 1886
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("logo", "")) { // L: 1887
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1888
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1889
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("titlebox", "")) { // L: 1890
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("titlebutton", "")) { // L: 1891
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("runes", "")) { // L: 1892
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("title_mute", "")) { // L: 1893
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1894
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1895
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1896
+					++var3;
+				}
+
+				if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1897
+					++var3;
+				}
+
+				var2.tryLoadFileByNames("sl_back", ""); // L: 1898
+				var2.tryLoadFileByNames("sl_flags", ""); // L: 1899
+				var2.tryLoadFileByNames("sl_arrows", ""); // L: 1900
+				var2.tryLoadFileByNames("sl_stars", ""); // L: 1901
+				var2.tryLoadFileByNames("sl_button", ""); // L: 1902
+				byte var41 = 12; // L: 1908
+				if (var3 < var41) { // L: 1911
+					Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var41 + "%"; // L: 1912
+					Login.Login_loadingPercent = 50; // L: 1913
+				} else {
+					Login.Login_loadingText = "Loaded title screen"; // L: 1916
+					Login.Login_loadingPercent = 50; // L: 1917
+					Projectile.updateGameState(5); // L: 1918
+					Client.titleLoadingStage = 70; // L: 1919
+				}
+			} else if (Client.titleLoadingStage == 70) { // L: 1922
+				if (!SecureRandomFuture.archive2.isFullyLoaded()) { // L: 1923
+					Login.Login_loadingText = "Loading config - " + SecureRandomFuture.archive2.loadPercent() + "%"; // L: 1924
+					Login.Login_loadingPercent = 60; // L: 1925
+				} else {
+					FaceNormal.method4252(SecureRandomFuture.archive2); // L: 1928
+					Archive var29 = SecureRandomFuture.archive2; // L: 1929
+					FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var29; // L: 1931
+					var35 = SecureRandomFuture.archive2; // L: 1933
+					var2 = PcmPlayer.archive7; // L: 1934
+					class125.KitDefinition_archive = var35; // L: 1936
+					KitDefinition.KitDefinition_modelsArchive = var2; // L: 1937
+					TileItem.KitDefinition_fileCount = class125.KitDefinition_archive.getGroupFileCount(3); // L: 1938
+					Actor.method2262(SecureRandomFuture.archive2, PcmPlayer.archive7, Client.isLowDetail); // L: 1940
+					Archive var25 = SecureRandomFuture.archive2; // L: 1941
+					Archive var4 = PcmPlayer.archive7; // L: 1942
+					NPCComposition.NpcDefinition_archive = var25; // L: 1944
+					NPCComposition.NpcDefinition_modelArchive = var4; // L: 1945
+					Archive var34 = SecureRandomFuture.archive2; // L: 1947
+					StructComposition.StructDefinition_archive = var34; // L: 1949
+					Archive var26 = SecureRandomFuture.archive2; // L: 1951
+					Archive var36 = PcmPlayer.archive7; // L: 1952
+					boolean var37 = Client.isMembersWorld; // L: 1953
+					Font var40 = UserComparator10.fontPlain11; // L: 1954
+					ItemComposition.ItemDefinition_archive = var26; // L: 1956
+					SoundCache.ItemDefinition_modelArchive = var36; // L: 1957
+					ItemComposition.ItemDefinition_inMembersWorld = var37; // L: 1958
+					ItemComposition.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10); // L: 1959
+					ItemComposition.ItemDefinition_fontPlain11 = var40; // L: 1960
+					Archive var27 = SecureRandomFuture.archive2; // L: 1962
+					Archive var11 = ClanChannel.archive0; // L: 1963
+					Archive var12 = KitDefinition.archive1; // L: 1964
+					SequenceDefinition.SequenceDefinition_archive = var27; // L: 1966
+					SequenceDefinition.SequenceDefinition_animationsArchive = var11; // L: 1967
+					SequenceDefinition.SequenceDefinition_skeletonsArchive = var12; // L: 1968
+					ObjectComposition.method3069(SecureRandomFuture.archive2, PcmPlayer.archive7); // L: 1970
+					Archive var13 = SecureRandomFuture.archive2; // L: 1971
+					VarbitComposition.VarbitDefinition_archive = var13; // L: 1973
+					class125.method2587(SecureRandomFuture.archive2); // L: 1975
+					NPCComposition.method2868(class18.archive3, PcmPlayer.archive7, ModeWhere.archive8, GrandExchangeOfferOwnWorldComparator.archive13); // L: 1976
+					Archive var14 = SecureRandomFuture.archive2; // L: 1977
+					InvDefinition.InvDefinition_archive = var14; // L: 1979
+					class10.method109(SecureRandomFuture.archive2); // L: 1981
+					Archive var15 = SecureRandomFuture.archive2; // L: 1982
+					VarcInt.VarcInt_archive = var15; // L: 1984
+					Archive var16 = SecureRandomFuture.archive2; // L: 1986
+					ParamComposition.ParamDefinition_archive = var16; // L: 1988
+					class27.field215 = new class370(class182.field2114, 54, AbstractArchive.clientLanguage, SecureRandomFuture.archive2); // L: 1990
+					class26.HitSplatDefinition_cachedSprites = new class370(class182.field2114, 47, AbstractArchive.clientLanguage, SecureRandomFuture.archive2); // L: 1991
+					class20.varcs = new Varcs(); // L: 1992
+					LoginScreenAnimation.method2312(SecureRandomFuture.archive2, ModeWhere.archive8, GrandExchangeOfferOwnWorldComparator.archive13); // L: 1993
+					ClanSettings.method203(SecureRandomFuture.archive2, ModeWhere.archive8); // L: 1994
+					Archive var17 = SecureRandomFuture.archive2; // L: 1995
+					Archive var18 = ModeWhere.archive8; // L: 1996
+					class244.WorldMapElement_archive = var18; // L: 1998
+					if (var17.isFullyLoaded()) { // L: 1999
+						WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35); // L: 2002
+						WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 2003
+
+						for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) { // L: 2004
+							byte[] var20 = var17.takeFile(35, var19); // L: 2005
+							WorldMapElement.WorldMapElement_cached[var19] = new WorldMapElement(var19); // L: 2006
+							if (var20 != null) { // L: 2007
+								WorldMapElement.WorldMapElement_cached[var19].decode(new Buffer(var20)); // L: 2008
+								WorldMapElement.WorldMapElement_cached[var19].method2724(); // L: 2009
+							}
+						}
+					}
+
+					Login.Login_loadingText = "Loaded config"; // L: 2013
+					Login.Login_loadingPercent = 60; // L: 2014
+					Client.titleLoadingStage = 80; // L: 2015
+				}
+			} else if (Client.titleLoadingStage == 80) { // L: 2018
+				var21 = 0; // L: 2019
+				if (Friend.compass == null) { // L: 2020
+					Friend.compass = Tile.SpriteBuffer_getSprite(ModeWhere.archive8, ClanChannel.spriteIds.compass, 0);
+				} else {
+					++var21; // L: 2021
+				}
+
+				if (class22.redHintArrowSprite == null) { // L: 2022
+					class22.redHintArrowSprite = Tile.SpriteBuffer_getSprite(ModeWhere.archive8, ClanChannel.spriteIds.field3892, 0);
+				} else {
+					++var21; // L: 2023
+				}
+
+				IndexedSprite[] var1;
+				IndexedSprite[] var5;
+				int var6;
+				IndexedSprite var7;
+				if (FloorDecoration.mapSceneSprites == null) { // L: 2024
+					var2 = ModeWhere.archive8; // L: 2026
+					var3 = ClanChannel.spriteIds.mapScenes; // L: 2027
+					if (!Message.method1263(var2, var3, 0)) { // L: 2029
+						var1 = null; // L: 2030
+					} else {
+						var5 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 2035
+
+						for (var6 = 0; var6 < class397.SpriteBuffer_spriteCount; ++var6) { // L: 2036
+							var7 = var5[var6] = new IndexedSprite(); // L: 2037
+							var7.width = class397.SpriteBuffer_spriteWidth; // L: 2038
+							var7.height = class244.SpriteBuffer_spriteHeight; // L: 2039
+							var7.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2040
+							var7.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2041
+							var7.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2042
+							var7.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2043
+							var7.palette = class397.SpriteBuffer_spritePalette; // L: 2044
+							var7.pixels = class126.SpriteBuffer_pixels[var6]; // L: 2045
+						}
+
+						ArchiveDisk.method5993(); // L: 2047
+						var1 = var5; // L: 2050
+					}
+
+					FloorDecoration.mapSceneSprites = var1; // L: 2052
+				} else {
+					++var21; // L: 2054
+				}
+
+				int var8;
+				byte[] var9;
+				int var10;
+				SpritePixels[] var30;
+				SpritePixels[] var31;
+				SpritePixels var33;
+				if (ScriptFrame.headIconPkSprites == null) { // L: 2055
+					var2 = ModeWhere.archive8; // L: 2057
+					var3 = ClanChannel.spriteIds.headIconsPk; // L: 2058
+					if (!Message.method1263(var2, var3, 0)) { // L: 2060
+						var30 = null; // L: 2061
+					} else {
+						var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2066
+						var6 = 0;
+
+						while (true) {
+							if (var6 >= class397.SpriteBuffer_spriteCount) {
+								ArchiveDisk.method5993(); // L: 2080
+								var30 = var31; // L: 2083
+								break;
+							}
+
+							var33 = var31[var6] = new SpritePixels(); // L: 2068
+							var33.width = class397.SpriteBuffer_spriteWidth; // L: 2069
+							var33.height = class244.SpriteBuffer_spriteHeight; // L: 2070
+							var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2071
+							var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2072
+							var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2073
+							var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2074
+							var8 = var33.subHeight * var33.subWidth; // L: 2075
+							var9 = class126.SpriteBuffer_pixels[var6]; // L: 2076
+							var33.pixels = new int[var8]; // L: 2077
+
+							for (var10 = 0; var10 < var8; ++var10) { // L: 2078
+								var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255];
+							}
+
+							++var6; // L: 2067
+						}
+					}
+
+					ScriptFrame.headIconPkSprites = var30; // L: 2085
+				} else {
+					++var21; // L: 2087
+				}
+
+				if (class20.headIconPrayerSprites == null) { // L: 2088
+					var2 = ModeWhere.archive8; // L: 2090
+					var3 = ClanChannel.spriteIds.field3903; // L: 2091
+					if (!Message.method1263(var2, var3, 0)) { // L: 2093
+						var30 = null; // L: 2094
+					} else {
+						var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2099
+						var6 = 0;
+
+						while (true) {
+							if (var6 >= class397.SpriteBuffer_spriteCount) {
+								ArchiveDisk.method5993(); // L: 2113
+								var30 = var31; // L: 2116
+								break;
+							}
+
+							var33 = var31[var6] = new SpritePixels(); // L: 2101
+							var33.width = class397.SpriteBuffer_spriteWidth; // L: 2102
+							var33.height = class244.SpriteBuffer_spriteHeight; // L: 2103
+							var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2104
+							var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2105
+							var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2106
+							var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2107
+							var8 = var33.subWidth * var33.subHeight; // L: 2108
+							var9 = class126.SpriteBuffer_pixels[var6]; // L: 2109
+							var33.pixels = new int[var8]; // L: 2110
+
+							for (var10 = 0; var10 < var8; ++var10) { // L: 2111
+								var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255];
+							}
+
+							++var6; // L: 2100
+						}
+					}
+
+					class20.headIconPrayerSprites = var30; // L: 2118
+				} else {
+					++var21; // L: 2120
+				}
+
+				if (Skills.headIconHintSprites == null) { // L: 2121
+					var2 = ModeWhere.archive8; // L: 2123
+					var3 = ClanChannel.spriteIds.field3902; // L: 2124
+					if (!Message.method1263(var2, var3, 0)) { // L: 2126
+						var30 = null; // L: 2127
+					} else {
+						var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2132
+						var6 = 0;
+
+						while (true) {
+							if (var6 >= class397.SpriteBuffer_spriteCount) {
+								ArchiveDisk.method5993(); // L: 2146
+								var30 = var31; // L: 2149
+								break;
+							}
+
+							var33 = var31[var6] = new SpritePixels(); // L: 2134
+							var33.width = class397.SpriteBuffer_spriteWidth; // L: 2135
+							var33.height = class244.SpriteBuffer_spriteHeight; // L: 2136
+							var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2137
+							var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2138
+							var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2139
+							var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2140
+							var8 = var33.subHeight * var33.subWidth; // L: 2141
+							var9 = class126.SpriteBuffer_pixels[var6]; // L: 2142
+							var33.pixels = new int[var8]; // L: 2143
+
+							for (var10 = 0; var10 < var8; ++var10) { // L: 2144
+								var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255];
+							}
+
+							++var6; // L: 2133
+						}
+					}
+
+					Skills.headIconHintSprites = var30; // L: 2151
+				} else {
+					++var21; // L: 2153
+				}
+
+				if (BuddyRankComparator.mapMarkerSprites == null) { // L: 2154
+					var2 = ModeWhere.archive8; // L: 2156
+					var3 = ClanChannel.spriteIds.field3897; // L: 2157
+					if (!Message.method1263(var2, var3, 0)) { // L: 2159
+						var30 = null; // L: 2160
+					} else {
+						var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2165
+						var6 = 0;
+
+						while (true) {
+							if (var6 >= class397.SpriteBuffer_spriteCount) {
+								ArchiveDisk.method5993(); // L: 2179
+								var30 = var31; // L: 2182
+								break;
+							}
+
+							var33 = var31[var6] = new SpritePixels(); // L: 2167
+							var33.width = class397.SpriteBuffer_spriteWidth; // L: 2168
+							var33.height = class244.SpriteBuffer_spriteHeight; // L: 2169
+							var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2170
+							var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2171
+							var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2172
+							var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2173
+							var8 = var33.subWidth * var33.subHeight; // L: 2174
+							var9 = class126.SpriteBuffer_pixels[var6]; // L: 2175
+							var33.pixels = new int[var8]; // L: 2176
+
+							for (var10 = 0; var10 < var8; ++var10) { // L: 2177
+								var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255];
+							}
+
+							++var6; // L: 2166
+						}
+					}
+
+					BuddyRankComparator.mapMarkerSprites = var30; // L: 2184
+				} else {
+					++var21; // L: 2186
+				}
+
+				if (NPCComposition.crossSprites == null) { // L: 2187
+					var2 = ModeWhere.archive8; // L: 2189
+					var3 = ClanChannel.spriteIds.field3899; // L: 2190
+					if (!Message.method1263(var2, var3, 0)) { // L: 2192
+						var30 = null; // L: 2193
+					} else {
+						var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2198
+						var6 = 0;
+
+						while (true) {
+							if (var6 >= class397.SpriteBuffer_spriteCount) {
+								ArchiveDisk.method5993(); // L: 2212
+								var30 = var31; // L: 2215
+								break;
+							}
+
+							var33 = var31[var6] = new SpritePixels(); // L: 2200
+							var33.width = class397.SpriteBuffer_spriteWidth; // L: 2201
+							var33.height = class244.SpriteBuffer_spriteHeight; // L: 2202
+							var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2203
+							var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2204
+							var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2205
+							var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2206
+							var8 = var33.subWidth * var33.subHeight; // L: 2207
+							var9 = class126.SpriteBuffer_pixels[var6]; // L: 2208
+							var33.pixels = new int[var8]; // L: 2209
+
+							for (var10 = 0; var10 < var8; ++var10) { // L: 2210
+								var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255];
+							}
+
+							++var6; // L: 2199
+						}
+					}
+
+					NPCComposition.crossSprites = var30; // L: 2217
+				} else {
+					++var21; // L: 2219
+				}
+
+				if (class171.mapDotSprites == null) { // L: 2220
+					var2 = ModeWhere.archive8; // L: 2222
+					var3 = ClanChannel.spriteIds.field3900; // L: 2223
+					if (!Message.method1263(var2, var3, 0)) { // L: 2225
+						var30 = null; // L: 2226
+					} else {
+						var31 = new SpritePixels[class397.SpriteBuffer_spriteCount]; // L: 2231
+						var6 = 0;
+
+						while (true) {
+							if (var6 >= class397.SpriteBuffer_spriteCount) {
+								ArchiveDisk.method5993(); // L: 2245
+								var30 = var31; // L: 2248
+								break;
+							}
+
+							var33 = var31[var6] = new SpritePixels(); // L: 2233
+							var33.width = class397.SpriteBuffer_spriteWidth; // L: 2234
+							var33.height = class244.SpriteBuffer_spriteHeight; // L: 2235
+							var33.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2236
+							var33.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2237
+							var33.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2238
+							var33.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2239
+							var8 = var33.subHeight * var33.subWidth; // L: 2240
+							var9 = class126.SpriteBuffer_pixels[var6]; // L: 2241
+							var33.pixels = new int[var8]; // L: 2242
+
+							for (var10 = 0; var10 < var8; ++var10) { // L: 2243
+								var33.pixels[var10] = class397.SpriteBuffer_spritePalette[var9[var10] & 255];
+							}
+
+							++var6; // L: 2232
+						}
+					}
+
+					class171.mapDotSprites = var30; // L: 2250
+				} else {
+					++var21; // L: 2252
+				}
+
+				if (Client.scrollBarSprites == null) { // L: 2253
+					var2 = ModeWhere.archive8; // L: 2255
+					var3 = ClanChannel.spriteIds.field3901; // L: 2256
+					if (!Message.method1263(var2, var3, 0)) { // L: 2258
+						var1 = null; // L: 2259
+					} else {
+						var5 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 2264
+
+						for (var6 = 0; var6 < class397.SpriteBuffer_spriteCount; ++var6) { // L: 2265
+							var7 = var5[var6] = new IndexedSprite(); // L: 2266
+							var7.width = class397.SpriteBuffer_spriteWidth; // L: 2267
+							var7.height = class244.SpriteBuffer_spriteHeight; // L: 2268
+							var7.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2269
+							var7.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2270
+							var7.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2271
+							var7.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2272
+							var7.palette = class397.SpriteBuffer_spritePalette; // L: 2273
+							var7.pixels = class126.SpriteBuffer_pixels[var6]; // L: 2274
+						}
+
+						ArchiveDisk.method5993(); // L: 2276
+						var1 = var5; // L: 2279
+					}
+
+					Client.scrollBarSprites = var1; // L: 2281
+				} else {
+					++var21; // L: 2283
+				}
+
+				if (class35.modIconSprites == null) { // L: 2284
+					var2 = ModeWhere.archive8; // L: 2286
+					var3 = ClanChannel.spriteIds.field3896; // L: 2287
+					if (!Message.method1263(var2, var3, 0)) { // L: 2289
+						var1 = null; // L: 2290
+					} else {
+						var5 = new IndexedSprite[class397.SpriteBuffer_spriteCount]; // L: 2295
+
+						for (var6 = 0; var6 < class397.SpriteBuffer_spriteCount; ++var6) { // L: 2296
+							var7 = var5[var6] = new IndexedSprite(); // L: 2297
+							var7.width = class397.SpriteBuffer_spriteWidth; // L: 2298
+							var7.height = class244.SpriteBuffer_spriteHeight; // L: 2299
+							var7.xOffset = class397.SpriteBuffer_xOffsets[var6]; // L: 2300
+							var7.yOffset = class26.SpriteBuffer_yOffsets[var6]; // L: 2301
+							var7.subWidth = Canvas.SpriteBuffer_spriteWidths[var6]; // L: 2302
+							var7.subHeight = Clock.SpriteBuffer_spriteHeights[var6]; // L: 2303
+							var7.palette = class397.SpriteBuffer_spritePalette; // L: 2304
+							var7.pixels = class126.SpriteBuffer_pixels[var6]; // L: 2305
+						}
+
+						ArchiveDisk.method5993(); // L: 2307
+						var1 = var5; // L: 2310
+					}
+
+					class35.modIconSprites = var1; // L: 2312
+				} else {
+					++var21; // L: 2314
+				}
+
+				if (var21 < 11) { // L: 2315
+					Login.Login_loadingText = "Loading sprites - " + var21 * 100 / 12 + "%"; // L: 2316
+					Login.Login_loadingPercent = 70; // L: 2317
+				} else {
+					AbstractFont.AbstractFont_modIconSprites = class35.modIconSprites; // L: 2320
+					class22.redHintArrowSprite.normalize(); // L: 2321
+					int var22 = (int)(Math.random() * 21.0D) - 10; // L: 2322
+					int var23 = (int)(Math.random() * 21.0D) - 10; // L: 2323
+					var3 = (int)(Math.random() * 21.0D) - 10; // L: 2324
+					int var24 = (int)(Math.random() * 41.0D) - 20; // L: 2325
+					FloorDecoration.mapSceneSprites[0].shiftColors(var22 + var24, var23 + var24, var3 + var24); // L: 2326
+					Login.Login_loadingText = "Loaded sprites"; // L: 2327
+					Login.Login_loadingPercent = 70; // L: 2328
+					Client.titleLoadingStage = 90; // L: 2329
+				}
+			} else if (Client.titleLoadingStage == 90) { // L: 2332
+				if (!class16.archive9.isFullyLoaded()) { // L: 2333
+					Login.Login_loadingText = "Loading textures - " + "0%"; // L: 2334
+					Login.Login_loadingPercent = 90; // L: 2335
+				} else {
+					Renderable.textureProvider = new TextureProvider(class16.archive9, ModeWhere.archive8, 20, class4.clientPreferences.field1312, Client.isLowDetail ? 64 : 128); // L: 2338
+					Rasterizer3D.Rasterizer3D_setTextureLoader(Renderable.textureProvider); // L: 2339
+					Rasterizer3D.Rasterizer3D_setBrightness(class4.clientPreferences.field1312); // L: 2340
+					Client.titleLoadingStage = 100; // L: 2341
+				}
+			} else if (Client.titleLoadingStage == 100) { // L: 2344
+				var21 = Renderable.textureProvider.getLoadedPercentage(); // L: 2345
+				if (var21 < 100) { // L: 2346
+					Login.Login_loadingText = "Loading textures - " + var21 + "%"; // L: 2347
+					Login.Login_loadingPercent = 90; // L: 2348
+				} else {
+					Login.Login_loadingText = "Loaded textures"; // L: 2351
+					Login.Login_loadingPercent = 90; // L: 2352
+					Client.titleLoadingStage = 110; // L: 2353
+				}
+			} else if (Client.titleLoadingStage == 110) { // L: 2356
+				UrlRequester.mouseRecorder = new MouseRecorder(); // L: 2357
+				GameEngine.taskHandler.newThreadTask(UrlRequester.mouseRecorder, 10); // L: 2358
+				Login.Login_loadingText = "Loaded input handler"; // L: 2359
+				Login.Login_loadingPercent = 92; // L: 2360
+				Client.titleLoadingStage = 120; // L: 2361
+			} else if (Client.titleLoadingStage == 120) { // L: 2364
+				if (!JagexCache.archive10.tryLoadFileByNames("huffman", "")) { // L: 2365
+					Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 2366
+					Login.Login_loadingPercent = 94; // L: 2367
+				} else {
+					Huffman var0 = new Huffman(JagexCache.archive10.takeFileByNames("huffman", "")); // L: 2370
+					WorldMapCacheName.method3789(var0); // L: 2371
+					Login.Login_loadingText = "Loaded wordpack"; // L: 2372
+					Login.Login_loadingPercent = 94; // L: 2373
+					Client.titleLoadingStage = 130; // L: 2374
+				}
+			} else if (Client.titleLoadingStage == 130) { // L: 2377
+				if (!class18.archive3.isFullyLoaded()) { // L: 2378
+					Login.Login_loadingText = "Loading interfaces - " + class18.archive3.loadPercent() * 4 / 5 + "%"; // L: 2379
+					Login.Login_loadingPercent = 96; // L: 2380
+				} else if (!Varcs.archive12.isFullyLoaded()) { // L: 2383
+					Login.Login_loadingText = "Loading interfaces - " + (80 + Varcs.archive12.loadPercent() / 6) + "%"; // L: 2384
+					Login.Login_loadingPercent = 96; // L: 2385
+				} else if (!GrandExchangeOfferOwnWorldComparator.archive13.isFullyLoaded()) { // L: 2388
+					Login.Login_loadingText = "Loading interfaces - " + (96 + GrandExchangeOfferOwnWorldComparator.archive13.loadPercent() / 50) + "%"; // L: 2389
+					Login.Login_loadingPercent = 96; // L: 2390
+				} else {
+					Login.Login_loadingText = "Loaded interfaces"; // L: 2393
+					Login.Login_loadingPercent = 98; // L: 2394
+					Client.titleLoadingStage = 140; // L: 2395
+				}
+			} else if (Client.titleLoadingStage == 140) { // L: 2398
+				Login.Login_loadingPercent = 100; // L: 2399
+				if (!WorldMapEvent.archive19.tryLoadGroupByName(WorldMapCacheName.field2131.name)) { // L: 2400
+					Login.Login_loadingText = "Loading world map - " + WorldMapEvent.archive19.groupLoadPercentByName(WorldMapCacheName.field2131.name) / 10 + "%"; // L: 2401
+				} else {
+					if (class80.worldMap == null) { // L: 2404
+						class80.worldMap = new WorldMap(); // L: 2405
+						class80.worldMap.init(WorldMapEvent.archive19, class6.archive18, WorldMapLabel.archive20, class309.fontBold12, Client.fontsMap, FloorDecoration.mapSceneSprites); // L: 2406
+					}
+
+					Login.Login_loadingText = "Loaded world map"; // L: 2408
+					Client.titleLoadingStage = 150; // L: 2409
+				}
+			} else if (Client.titleLoadingStage == 150) { // L: 2412
+				Projectile.updateGameState(10); // L: 2413
+			}
+		}
+	} // L: 1754 1760 1786 1813 1833 1856 1869 1878 1914 1920 1926 2016 2318 2330 2336 2342 2349 2354 2362 2368 2375 2381 2386 2391 2396 2402 2410 2414 2416
+
+	@ObfuscatedName("hq")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "125685661"
+	)
+	static void method407() {
+		Client.menuOptionsCount = 0; // L: 7730
+		Client.isMenuOpen = false; // L: 7731
+	} // L: 7732
 }
diff --git a/runescape-client/src/main/java/class340.java b/runescape-client/src/main/java/class340.java
index b31a67cffe..310a274a21 100644
--- a/runescape-client/src/main/java/class340.java
+++ b/runescape-client/src/main/java/class340.java
@@ -1,71 +1,34 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("me")
-public abstract class class340 extends class214 implements class389 {
+@ObfuscatedName("mv")
+public class class340 implements class345 {
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljd;Lkk;I)V"
+		descriptor = "Lmd;"
 	)
-	protected class340(StudioGame var1, Language var2, int var3) {
-		super(var1, var2, var3); // L: 15
-	} // L: 16
+	public final class363 field3919;
 
-	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lml;",
-		garbageValue = "1996028065"
+		descriptor = "(Lnv;)V"
 	)
-	protected abstract class342 vmethod6434(int var1);
+	class340(class364 var1) {
+		this.field3919 = var1; // L: 14
+	} // L: 15
 
-	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1710884845"
+		descriptor = "(Lmt;)V"
 	)
-	public int method6018() {
-		return super.field2558; // L: 19
-	}
+	public class340(class341 var1) {
+		this(new class364(var1)); // L: 10
+	} // L: 11
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/Object;",
-		garbageValue = "-1572379722"
+		descriptor = "(II)I",
+		garbageValue = "1896564158"
 	)
-	public Object vmethod6837(int var1) {
-		class342 var2 = this.vmethod6434(var1); // L: 23
-		return var2 != null && var2.method6040() ? var2.method6038() : null; // L: 24 25
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;B)Loc;",
-		garbageValue = "66"
-	)
-	public class390 method6021(Buffer var1) {
-		int var2 = var1.readUnsignedShort(); // L: 29
-		class342 var3 = this.vmethod6434(var2); // L: 30
-		class390 var4 = new class390(var2); // L: 31
-		Class var5 = var3.field3927.field4127; // L: 32
-		if (var5 == Integer.class) { // L: 33
-			var4.field4218 = var1.readInt();
-		} else if (var5 == Long.class) {
-			var4.field4218 = var1.readLong(); // L: 34
-		} else if (var5 == String.class) { // L: 35
-			var4.field4218 = var1.readStringCp1252NullCircumfixed();
-		} else {
-			if (!class385.class.isAssignableFrom(var5)) { // L: 36
-				throw new IllegalStateException(); // L: 45
-			}
-
-			try {
-				class385 var6 = (class385)var5.newInstance(); // L: 38
-				var6.method6815(var1); // L: 39
-				var4.field4218 = var6; // L: 40
-			} catch (InstantiationException var7) { // L: 42
-			} catch (IllegalAccessException var8) { // L: 43
-			}
-		}
-
-		return var4; // L: 46
+	public int method6047(int var1) {
+		return this.field3919.vmethod6399(var1); // L: 18
 	}
 }
diff --git a/runescape-client/src/main/java/class341.java b/runescape-client/src/main/java/class341.java
index f4b2c7e781..72d20671a7 100644
--- a/runescape-client/src/main/java/class341.java
+++ b/runescape-client/src/main/java/class341.java
@@ -1,25 +1,78 @@
-import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mq")
-public class class341 extends class342 {
+@ObfuscatedName("mt")
+public abstract class class341 extends class215 implements class390 {
 	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
+	@ObfuscatedGetter(
+		intValue = -504771019
 	)
-	@Export("ItemDefinition_archive")
-	public static AbstractArchive ItemDefinition_archive;
+	public static int field3921;
 
-	public class341(int var1) {
-		super(var1); // L: 7
-	} // L: 8
+	@ObfuscatedSignature(
+		descriptor = "(Ljl;Lkn;I)V"
+	)
+	protected class341(StudioGame var1, Language var2, int var3) {
+		super(var1, var2, var3); // L: 15
+	} // L: 16
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lmq;",
+		garbageValue = "-898201969"
+	)
+	protected abstract class343 vmethod6482(int var1);
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-29"
+	)
+	public int method6050() {
+		return super.field2559; // L: 19
+	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1773936298"
+		descriptor = "(II)Ljava/lang/Object;",
+		garbageValue = "-898289717"
 	)
-	void vmethod6036(Buffer var1, int var2) {
-	} // L: 11
+	public Object vmethod6893(int var1) {
+		class343 var2 = this.vmethod6482(var1); // L: 23
+		return var2 != null && var2.method6072() ? var2.method6073() : null; // L: 24 25
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;B)Loo;",
+		garbageValue = "124"
+	)
+	public class391 method6052(Buffer var1) {
+		int var2 = var1.readUnsignedShort(); // L: 29
+		class343 var3 = this.vmethod6482(var2); // L: 30
+		class391 var4 = new class391(var2); // L: 31
+		Class var5 = var3.field3924.field4132; // L: 32
+		if (var5 == Integer.class) { // L: 33
+			var4.field4227 = var1.readInt();
+		} else if (var5 == Long.class) {
+			var4.field4227 = var1.readLong(); // L: 34
+		} else if (var5 == String.class) { // L: 35
+			var4.field4227 = var1.readStringCp1252NullCircumfixed();
+		} else {
+			if (!class386.class.isAssignableFrom(var5)) { // L: 36
+				throw new IllegalStateException(); // L: 45
+			}
+
+			try {
+				class386 var6 = (class386)var5.newInstance(); // L: 38
+				var6.method6869(var1); // L: 39
+				var4.field4227 = var6; // L: 40
+			} catch (InstantiationException var7) { // L: 42
+			} catch (IllegalAccessException var8) { // L: 43
+			}
+		}
+
+		return var4; // L: 46
+	}
 }
diff --git a/runescape-client/src/main/java/class342.java b/runescape-client/src/main/java/class342.java
index 39c5328cfe..5316a4168a 100644
--- a/runescape-client/src/main/java/class342.java
+++ b/runescape-client/src/main/java/class342.java
@@ -1,107 +1,152 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ml")
-public abstract class class342 implements class213 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lnp;"
-	)
-	class374 field3927;
-
-	class342(int var1) {
-	} // L: 13
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;II)V",
-		garbageValue = "-1773936298"
-	)
-	abstract void vmethod6036(Buffer var1, int var2);
+@ObfuscatedName("ma")
+public class class342 extends class343 {
+	public class342(int var1) {
+		super(var1); // L: 7
+	} // L: 8
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1490587397"
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-1006321266"
 	)
-	public void method6035(Buffer var1) {
-		while (true) {
-			int var2 = var1.readUnsignedByte(); // L: 17
-			if (var2 == 0) { // L: 18
-				return; // L: 56
-			}
+	void vmethod6077(Buffer var1, int var2) {
+	} // L: 11
 
-			class338 var3 = (class338)Messages.findEnumerated(FloorDecoration.method3834(), var2); // L: 19
-			if (var3 != null) { // L: 20
-				switch(var3.field3918) { // L: 21
-				case 0:
-					Messages.findEnumerated(class258.method4835(), var1.readUnsignedByte()); // L: 23
-					break;
-				case 1:
-					int var4 = var1.readUnsignedByte(); // L: 29
-					int var6 = class372.field4124[var4]; // L: 32
-					class374 var5;
-					if (var6 == 1) { // L: 33
-						var5 = class374.field4131; // L: 34
-					} else if (var6 == 2) { // L: 37
-						var5 = class374.field4129; // L: 38
-					} else if (var6 == 3) { // L: 41
-						var5 = class374.field4128; // L: 42
-					} else {
-						var5 = null; // L: 45
-					}
-
-					this.field3927 = var5; // L: 47
-					if (this.field3927 != null) {
-						break;
-					}
-
-					throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var4); // L: 48
-				case 2:
-					var1.readStringCp1252NullCircumfixed(); // L: 26
-					break; // L: 27
-				default:
-					throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var3); // L: 51
-				}
-			} else {
-				this.vmethod6036(var1, var2); // L: 54
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;Lkn;II)Lhg;",
+		garbageValue = "15047047"
+	)
+	public static PacketBufferNode method6068(int var0, String var1, Language var2, int var3) {
+		PacketBufferNode var4 = InterfaceParent.getPacketBufferNode(ClientPacket.field2669, Client.packetWriter.isaacCipher); // L: 17
+		var4.packetBuffer.writeByte(0); // L: 18
+		int var5 = var4.packetBuffer.offset; // L: 19
+		var4.packetBuffer.writeByte(var0); // L: 20
+		String var6 = var1.toLowerCase(); // L: 21
+		byte var7 = 0; // L: 22
+		if (var6.startsWith("yellow:")) { // L: 23
+			var7 = 0; // L: 24
+			var1 = var1.substring("yellow:".length()); // L: 25
+		} else if (var6.startsWith("red:")) { // L: 27
+			var7 = 1; // L: 28
+			var1 = var1.substring("red:".length()); // L: 29
+		} else if (var6.startsWith("green:")) { // L: 31
+			var7 = 2; // L: 32
+			var1 = var1.substring("green:".length()); // L: 33
+		} else if (var6.startsWith("cyan:")) { // L: 35
+			var7 = 3; // L: 36
+			var1 = var1.substring("cyan:".length()); // L: 37
+		} else if (var6.startsWith("purple:")) { // L: 39
+			var7 = 4; // L: 40
+			var1 = var1.substring("purple:".length()); // L: 41
+		} else if (var6.startsWith("white:")) { // L: 43
+			var7 = 5; // L: 44
+			var1 = var1.substring("white:".length()); // L: 45
+		} else if (var6.startsWith("flash1:")) { // L: 47
+			var7 = 6; // L: 48
+			var1 = var1.substring("flash1:".length()); // L: 49
+		} else if (var6.startsWith("flash2:")) { // L: 51
+			var7 = 7; // L: 52
+			var1 = var1.substring("flash2:".length()); // L: 53
+		} else if (var6.startsWith("flash3:")) { // L: 55
+			var7 = 8; // L: 56
+			var1 = var1.substring("flash3:".length()); // L: 57
+		} else if (var6.startsWith("glow1:")) { // L: 59
+			var7 = 9; // L: 60
+			var1 = var1.substring("glow1:".length()); // L: 61
+		} else if (var6.startsWith("glow2:")) { // L: 63
+			var7 = 10; // L: 64
+			var1 = var1.substring("glow2:".length()); // L: 65
+		} else if (var6.startsWith("glow3:")) { // L: 67
+			var7 = 11; // L: 68
+			var1 = var1.substring("glow3:".length()); // L: 69
+		} else if (var2 != Language.Language_EN) { // L: 71
+			if (var6.startsWith("yellow:")) { // L: 72
+				var7 = 0; // L: 73
+				var1 = var1.substring("yellow:".length()); // L: 74
+			} else if (var6.startsWith("red:")) { // L: 76
+				var7 = 1; // L: 77
+				var1 = var1.substring("red:".length()); // L: 78
+			} else if (var6.startsWith("green:")) { // L: 80
+				var7 = 2; // L: 81
+				var1 = var1.substring("green:".length()); // L: 82
+			} else if (var6.startsWith("cyan:")) { // L: 84
+				var7 = 3; // L: 85
+				var1 = var1.substring("cyan:".length()); // L: 86
+			} else if (var6.startsWith("purple:")) { // L: 88
+				var7 = 4; // L: 89
+				var1 = var1.substring("purple:".length()); // L: 90
+			} else if (var6.startsWith("white:")) { // L: 92
+				var7 = 5; // L: 93
+				var1 = var1.substring("white:".length()); // L: 94
+			} else if (var6.startsWith("flash1:")) { // L: 96
+				var7 = 6; // L: 97
+				var1 = var1.substring("flash1:".length()); // L: 98
+			} else if (var6.startsWith("flash2:")) { // L: 100
+				var7 = 7; // L: 101
+				var1 = var1.substring("flash2:".length()); // L: 102
+			} else if (var6.startsWith("flash3:")) { // L: 104
+				var7 = 8; // L: 105
+				var1 = var1.substring("flash3:".length()); // L: 106
+			} else if (var6.startsWith("glow1:")) { // L: 108
+				var7 = 9; // L: 109
+				var1 = var1.substring("glow1:".length()); // L: 110
+			} else if (var6.startsWith("glow2:")) { // L: 112
+				var7 = 10; // L: 113
+				var1 = var1.substring("glow2:".length()); // L: 114
+			} else if (var6.startsWith("glow3:")) { // L: 116
+				var7 = 11; // L: 117
+				var1 = var1.substring("glow3:".length()); // L: 118
 			}
 		}
-	}
 
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1118376221"
-	)
-	boolean method6040() {
-		return this.field3927 != null; // L: 61
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/Object;",
-		garbageValue = "-334523720"
-	)
-	Object method6038() {
-		if (this.field3927 == class374.field4131) { // L: 65
-			return 0; // L: 66
-		} else if (this.field3927 == class374.field4128) { // L: 68
-			return -1L; // L: 69
-		} else {
-			return this.field3927 == class374.field4129 ? "" : null; // L: 71 72 74
+		var6 = var1.toLowerCase(); // L: 121
+		byte var8 = 0; // L: 122
+		if (var6.startsWith("wave:")) { // L: 123
+			var8 = 1; // L: 124
+			var1 = var1.substring("wave:".length()); // L: 125
+		} else if (var6.startsWith("wave2:")) { // L: 127
+			var8 = 2; // L: 128
+			var1 = var1.substring("wave2:".length()); // L: 129
+		} else if (var6.startsWith("shake:")) { // L: 131
+			var8 = 3; // L: 132
+			var1 = var1.substring("shake:".length()); // L: 133
+		} else if (var6.startsWith("scroll:")) { // L: 135
+			var8 = 4; // L: 136
+			var1 = var1.substring("scroll:".length()); // L: 137
+		} else if (var6.startsWith("slide:")) { // L: 139
+			var8 = 5; // L: 140
+			var1 = var1.substring("slide:".length()); // L: 141
+		} else if (var2 != Language.Language_EN) { // L: 143
+			if (var6.startsWith("wave:")) { // L: 144
+				var8 = 1; // L: 145
+				var1 = var1.substring("wave:".length()); // L: 146
+			} else if (var6.startsWith("wave2:")) { // L: 148
+				var8 = 2; // L: 149
+				var1 = var1.substring("wave2:".length()); // L: 150
+			} else if (var6.startsWith("shake:")) { // L: 152
+				var8 = 3; // L: 153
+				var1 = var1.substring("shake:".length()); // L: 154
+			} else if (var6.startsWith("scroll:")) { // L: 156
+				var8 = 4; // L: 157
+				var1 = var1.substring("scroll:".length()); // L: 158
+			} else if (var6.startsWith("slide:")) { // L: 160
+				var8 = 5; // L: 161
+				var1 = var1.substring("slide:".length()); // L: 162
+			}
 		}
-	}
 
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)I",
-		garbageValue = "15704077"
-	)
-	public static int method6043(int var0, int var1, int var2) {
-		int var3 = CollisionMap.method3185(var2 - var1 + 1); // L: 57
-		var3 <<= var1; // L: 58
-		var0 |= var3; // L: 59
-		return var0; // L: 60
+		var4.packetBuffer.writeByte(var7); // L: 165
+		var4.packetBuffer.writeByte(var8); // L: 166
+		ModeWhere.method5292(var4.packetBuffer, var1); // L: 167
+		if (var0 == class255.field3139.rsOrdinal()) { // L: 168
+			var4.packetBuffer.writeByte(var3); // L: 169
+		}
+
+		var4.packetBuffer.writeLengthByte(var4.packetBuffer.offset - var5); // L: 171
+		return var4; // L: 172
 	}
 }
diff --git a/runescape-client/src/main/java/class343.java b/runescape-client/src/main/java/class343.java
index 570901a120..997603f676 100644
--- a/runescape-client/src/main/java/class343.java
+++ b/runescape-client/src/main/java/class343.java
@@ -1,5 +1,140 @@
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mm")
-public interface class343 {
+@ObfuscatedName("mq")
+public abstract class class343 implements class214 {
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lne;"
+	)
+	class375 field3924;
+
+	class343(int var1) {
+	} // L: 13
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;II)V",
+		garbageValue = "-1006321266"
+	)
+	abstract void vmethod6077(Buffer var1, int var2);
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "-2064643819"
+	)
+	public void method6070(Buffer var1) {
+		while (true) {
+			int var2 = var1.readUnsignedByte(); // L: 17
+			if (var2 == 0) { // L: 18
+				return; // L: 60
+			}
+
+			class339[] var3 = new class339[]{class339.field3916, class339.field3914, class339.field3913, class339.field3915}; // L: 21
+			class339 var4 = (class339)Clock.findEnumerated(var3, var2); // L: 23
+			if (var4 != null) { // L: 24
+				switch(var4.field3912) { // L: 25
+				case 0:
+					int var5 = var1.readUnsignedByte(); // L: 27
+					int var7 = class373.field4126[var5]; // L: 30
+					class375 var6;
+					if (var7 == 1) { // L: 31
+						var6 = class375.field4134; // L: 32
+					} else if (var7 == 2) { // L: 35
+						var6 = class375.field4128; // L: 36
+					} else if (var7 == 3) { // L: 39
+						var6 = class375.field4127; // L: 40
+					} else {
+						var6 = null; // L: 43
+					}
+
+					this.field3924 = var6; // L: 45
+					if (this.field3924 != null) {
+						break;
+					}
+
+					throw new IllegalStateException("Unknown ScriptVarType ID in VarType.decode: " + var5); // L: 46
+				case 1:
+					var1.readStringCp1252NullCircumfixed(); // L: 54
+					break;
+				case 2:
+				default:
+					throw new IllegalStateException("Unrecognised VarTypeEncodingKey - " + var4); // L: 49
+				case 3:
+					Clock.findEnumerated(LoginPacket.method4510(), var1.readUnsignedByte()); // L: 51
+				}
+			} else {
+				this.vmethod6077(var1, var2); // L: 58
+			}
+		}
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "826495123"
+	)
+	boolean method6072() {
+		return this.field3924 != null; // L: 65
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/Object;",
+		garbageValue = "1136165556"
+	)
+	Object method6073() {
+		if (this.field3924 == class375.field4134) { // L: 69
+			return 0; // L: 70
+		} else if (this.field3924 == class375.field4127) { // L: 72
+			return -1L; // L: 73
+		} else {
+			return this.field3924 == class375.field4128 ? "" : null; // L: 75 76 78
+		}
+	}
+
+	@ObfuscatedName("kj")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I)Z",
+		garbageValue = "900256799"
+	)
+	static final boolean method6080(Widget var0) {
+		int var1 = var0.contentType; // L: 11285
+		if (var1 == 205) { // L: 11286
+			Client.logoutTimer = 250; // L: 11287
+			return true; // L: 11288
+		} else {
+			int var2;
+			int var3;
+			if (var1 >= 300 && var1 <= 313) { // L: 11290
+				var2 = (var1 - 300) / 2; // L: 11291
+				var3 = var1 & 1; // L: 11292
+				Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 11293
+			}
+
+			if (var1 >= 314 && var1 <= 323) { // L: 11295
+				var2 = (var1 - 314) / 2; // L: 11296
+				var3 = var1 & 1; // L: 11297
+				Client.playerAppearance.method4820(var2, var3 == 1); // L: 11298
+			}
+
+			if (var1 == 324) { // L: 11300
+				Client.playerAppearance.changeSex(false);
+			}
+
+			if (var1 == 325) { // L: 11301
+				Client.playerAppearance.changeSex(true);
+			}
+
+			if (var1 == 326) { // L: 11302
+				PacketBufferNode var4 = InterfaceParent.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); // L: 11304
+				Client.playerAppearance.write(var4.packetBuffer); // L: 11305
+				Client.packetWriter.addNode(var4); // L: 11306
+				return true; // L: 11307
+			} else {
+				return false; // L: 11309
+			}
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/class344.java b/runescape-client/src/main/java/class344.java
index c1cacf646d..3a2c22d3a9 100644
--- a/runescape-client/src/main/java/class344.java
+++ b/runescape-client/src/main/java/class344.java
@@ -1,5 +1,5 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("mp")
-public interface class344 extends class343 {
+@ObfuscatedName("mu")
+public interface class344 {
 }
diff --git a/runescape-client/src/main/java/class345.java b/runescape-client/src/main/java/class345.java
new file mode 100644
index 0000000000..591770bd56
--- /dev/null
+++ b/runescape-client/src/main/java/class345.java
@@ -0,0 +1,5 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ml")
+public interface class345 extends class344 {
+}
diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java
deleted file mode 100644
index 995d4a5ea6..0000000000
--- a/runescape-client/src/main/java/class349.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("mx")
-public class class349 extends Node {
-	@ObfuscatedName("v")
-	public long field3935;
-
-	public class349(long var1) {
-		this.field3935 = var1; // L: 7
-	} // L: 8
-}
diff --git a/runescape-client/src/main/java/class35.java b/runescape-client/src/main/java/class35.java
index 63daf5e3ea..402a39c293 100644
--- a/runescape-client/src/main/java/class35.java
+++ b/runescape-client/src/main/java/class35.java
@@ -2,78 +2,74 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("as")
+@ObfuscatedName("aq")
 public class class35 {
-	@ObfuscatedName("ra")
-	@ObfuscatedGetter(
-		intValue = -1989236693
-	)
-	static int field264;
-	@ObfuscatedName("w")
-	@Export("operatingSystemName")
-	public static String operatingSystemName;
-	@ObfuscatedName("ga")
+	@ObfuscatedName("bw")
 	@ObfuscatedSignature(
-		descriptor = "[Loh;"
+		descriptor = "Lof;"
 	)
-	@Export("headIconPkSprites")
-	static SpritePixels[] headIconPkSprites;
-	@ObfuscatedName("v")
-	ExecutorService field262;
-	@ObfuscatedName("n")
-	Future field260;
+	static IndexedSprite field244;
+	@ObfuscatedName("hi")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
+	)
+	@Export("modIconSprites")
+	static IndexedSprite[] modIconSprites;
 	@ObfuscatedName("f")
+	ExecutorService field245;
+	@ObfuscatedName("e")
+	Future field239;
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Lnd;"
+		descriptor = "Lnt;"
 	)
-	final Buffer field261;
+	final Buffer field247;
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "Lai;"
+		descriptor = "Laz;"
 	)
-	final class31 field268;
+	final class31 field241;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;Lai;)V"
+		descriptor = "(Lnt;Laz;)V"
 	)
 	public class35(Buffer var1, class31 var2) {
-		this.field262 = Executors.newSingleThreadExecutor(); // L: 10
-		this.field261 = var1; // L: 16
-		this.field268 = var2; // L: 17
-		this.method335(); // L: 18
+		this.field245 = Executors.newSingleThreadExecutor(); // L: 10
+		this.field247 = var1; // L: 16
+		this.field241 = var2; // L: 17
+		this.method413(); // L: 18
 	} // L: 19
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "70"
-	)
-	public boolean method342() {
-		return this.field260.isDone(); // L: 22
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "-47"
-	)
-	public void method332() {
-		this.field262.shutdown(); // L: 26
-		this.field262 = null; // L: 27
-	} // L: 28
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lnd;",
-		garbageValue = "-1675442246"
+		descriptor = "(I)Z",
+		garbageValue = "-1008458441"
 	)
-	public Buffer method331() {
+	public boolean method420() {
+		return this.field239.isDone(); // L: 22
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "22"
+	)
+	public void method410() {
+		this.field245.shutdown(); // L: 26
+		this.field245 = null; // L: 27
+	} // L: 28
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lnt;",
+		garbageValue = "627853337"
+	)
+	public Buffer method416() {
 		try {
-			return (Buffer)this.field260.get(); // L: 32
+			return (Buffer)this.field239.get(); // L: 32
 		} catch (Exception var2) { // L: 34
 			return null; // L: 35
 		}
@@ -81,145 +77,196 @@ public class class35 {
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "4"
+		descriptor = "(I)V",
+		garbageValue = "2058888310"
 	)
-	void method335() {
-		this.field260 = this.field262.submit(new class29(this, this.field261, this.field268)); // L: 40
+	void method413() {
+		this.field239 = this.field245.submit(new class29(this, this.field247, this.field241)); // L: 40
 	} // L: 41
 
-	@ObfuscatedName("ip")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lef;IIII)V",
-		garbageValue = "-336055981"
+		descriptor = "(I)V",
+		garbageValue = "-2087422044"
 	)
-	@Export("addNpcToMenu")
-	static final void addNpcToMenu(NPCComposition var0, int var1, int var2, int var3) {
-		if (Client.menuOptionsCount < 400) { // L: 8995
-			if (var0.transforms != null) { // L: 8996
-				var0 = var0.transform();
+	public static void method422() {
+		while (true) {
+			ArchiveDiskAction var0;
+			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 60
+				var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 61
+			} // L: 62
+
+			if (var0 == null) {
+				return; // L: 63
 			}
 
-			if (var0 != null) { // L: 8997
-				if (var0.isInteractable) { // L: 8998
-					if (!var0.isFollower || Client.followerIndex == var1) { // L: 8999
-						String var4 = var0.name; // L: 9000
-						int var7;
-						int var8;
-						if (var0.combatLevel != 0) { // L: 9001
-							var7 = var0.combatLevel; // L: 9004
-							var8 = class93.localPlayer.combatLevel; // L: 9005
-							int var9 = var8 - var7; // L: 9007
-							String var6;
-							if (var9 < -9) { // L: 9008
-								var6 = class44.colorStartTag(16711680); // L: 9009
-							} else if (var9 < -6) { // L: 9012
-								var6 = class44.colorStartTag(16723968); // L: 9013
-							} else if (var9 < -3) { // L: 9016
-								var6 = class44.colorStartTag(16740352); // L: 9017
-							} else if (var9 < 0) { // L: 9020
-								var6 = class44.colorStartTag(16756736); // L: 9021
-							} else if (var9 > 9) { // L: 9024
-								var6 = class44.colorStartTag(65280); // L: 9025
-							} else if (var9 > 6) { // L: 9028
-								var6 = class44.colorStartTag(4259584); // L: 9029
-							} else if (var9 > 3) { // L: 9032
-								var6 = class44.colorStartTag(8453888); // L: 9033
-							} else if (var9 > 0) { // L: 9036
-								var6 = class44.colorStartTag(12648192); // L: 9037
-							} else {
-								var6 = class44.colorStartTag(16776960); // L: 9040
-							}
+			var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 64
+		}
+	}
 
-							var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 9042
-						}
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(IIIZIZI)V",
+		garbageValue = "-1578358976"
+	)
+	@Export("doWorldSorting")
+	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
+		if (var0 < var1) { // L: 177
+			int var6 = (var0 + var1) / 2; // L: 178
+			int var7 = var0; // L: 179
+			World var8 = World.World_worlds[var6]; // L: 180
+			World.World_worlds[var6] = World.World_worlds[var1]; // L: 181
+			World.World_worlds[var1] = var8; // L: 182
 
-						if (var0.isFollower && Client.followerOpsLowPriority) { // L: 9044
-							Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9045
-						}
-
-						if (Client.isItemSelected == 1) { // L: 9048
-							Occluder.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class44.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 9049
-						} else if (Client.isSpellSelected) { // L: 9052
-							if ((class4.selectedSpellFlags & 2) == 2) { // L: 9053
-								Occluder.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class44.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 9054
-							}
-						} else {
-							int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 9059
-							String[] var11 = var0.actions; // L: 9060
-							if (var11 != null) { // L: 9061
-								for (var7 = 4; var7 >= 0; --var7) { // L: 9062
-									if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 9063
-										var8 = 0; // L: 9064
-										if (var7 == 0) { // L: 9065
-											var8 = var10 + 9;
-										}
-
-										if (var7 == 1) { // L: 9066
-											var8 = var10 + 10;
-										}
-
-										if (var7 == 2) { // L: 9067
-											var8 = var10 + 11;
-										}
-
-										if (var7 == 3) { // L: 9068
-											var8 = var10 + 12;
-										}
-
-										if (var7 == 4) { // L: 9069
-											var8 = var10 + 13;
-										}
-
-										Occluder.insertMenuItemNoShift(var11[var7], class44.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9070
-									}
-								}
-							}
-
-							if (var11 != null) { // L: 9075
-								for (var7 = 4; var7 >= 0; --var7) { // L: 9076
-									if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 9077
-										short var12 = 0; // L: 9078
-										if (Client.npcAttackOption != AttackOption.AttackOption_hidden) { // L: 9079
-											if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class93.localPlayer.combatLevel) { // L: 9080
-												var12 = 2000; // L: 9081
-											}
-
-											var8 = 0; // L: 9083
-											if (var7 == 0) { // L: 9084
-												var8 = var12 + 9;
-											}
-
-											if (var7 == 1) { // L: 9085
-												var8 = var12 + 10;
-											}
-
-											if (var7 == 2) { // L: 9086
-												var8 = var12 + 11;
-											}
-
-											if (var7 == 3) { // L: 9087
-												var8 = var12 + 12;
-											}
-
-											if (var7 == 4) { // L: 9088
-												var8 = var12 + 13;
-											}
-
-											Occluder.insertMenuItemNoShift(var11[var7], class44.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 9089
-										}
-									}
-								}
-							}
-
-							if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 9094
-								Occluder.insertMenuItemNoShift("Examine", class44.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 9095
-							}
-						}
-
-					}
+			for (int var9 = var0; var9 < var1; ++var9) { // L: 183
+				if (ReflectionCheck.method1227(World.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184
+					World var10 = World.World_worlds[var9]; // L: 185
+					World.World_worlds[var9] = World.World_worlds[var7]; // L: 186
+					World.World_worlds[var7++] = var10; // L: 187
 				}
 			}
+
+			World.World_worlds[var1] = World.World_worlds[var7]; // L: 191
+			World.World_worlds[var7] = var8; // L: 192
+			doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193
+			doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194
 		}
-	} // L: 9099
+
+	} // L: 196
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Lns;II)Z",
+		garbageValue = "-685210313"
+	)
+	@Export("updateExternalPlayer")
+	static boolean updateExternalPlayer(PacketBuffer var0, int var1) {
+		int var2 = var0.readBits(2); // L: 378
+		int var3;
+		int var4;
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		if (var2 == 0) { // L: 379
+			if (var0.readBits(1) != 0) { // L: 380
+				updateExternalPlayer(var0, var1);
+			}
+
+			var3 = var0.readBits(13); // L: 381
+			var4 = var0.readBits(13); // L: 382
+			boolean var12 = var0.readBits(1) == 1; // L: 383
+			if (var12) { // L: 384
+				Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+			}
+
+			if (Client.players[var1] != null) { // L: 385
+				throw new RuntimeException(); // L: 386
+			} else {
+				Player var11 = Client.players[var1] = new Player(); // L: 388
+				var11.index = var1; // L: 389
+				if (Players.field1362[var1] != null) { // L: 390
+					var11.read(Players.field1362[var1]);
+				}
+
+				var11.orientation = Players.Players_orientations[var1]; // L: 391
+				var11.targetIndex = Players.Players_targetIndices[var1]; // L: 392
+				var7 = Players.Players_regions[var1]; // L: 393
+				var8 = var7 >> 28; // L: 394
+				var9 = var7 >> 14 & 255; // L: 395
+				var10 = var7 & 255; // L: 396
+				var11.pathTraversed[0] = Players.field1361[var1]; // L: 397
+				var11.plane = (byte)var8; // L: 398
+				var11.resetPath((var9 << 13) + var3 - class15.baseX, (var10 << 13) + var4 - WorldMapSprite.baseY); // L: 399
+				var11.field1201 = false; // L: 400
+				return true; // L: 401
+			}
+		} else if (var2 == 1) { // L: 403
+			var3 = var0.readBits(2); // L: 404
+			var4 = Players.Players_regions[var1]; // L: 405
+			Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); // L: 406
+			return false; // L: 407
+		} else {
+			int var5;
+			int var6;
+			if (var2 == 2) { // L: 409
+				var3 = var0.readBits(5); // L: 410
+				var4 = var3 >> 3; // L: 411
+				var5 = var3 & 7; // L: 412
+				var6 = Players.Players_regions[var1]; // L: 413
+				var7 = (var6 >> 28) + var4 & 3; // L: 414
+				var8 = var6 >> 14 & 255; // L: 415
+				var9 = var6 & 255; // L: 416
+				if (var5 == 0) { // L: 417
+					--var8; // L: 418
+					--var9; // L: 419
+				}
+
+				if (var5 == 1) { // L: 421
+					--var9;
+				}
+
+				if (var5 == 2) { // L: 422
+					++var8; // L: 423
+					--var9; // L: 424
+				}
+
+				if (var5 == 3) { // L: 426
+					--var8;
+				}
+
+				if (var5 == 4) { // L: 427
+					++var8;
+				}
+
+				if (var5 == 5) { // L: 428
+					--var8; // L: 429
+					++var9; // L: 430
+				}
+
+				if (var5 == 6) { // L: 432
+					++var9;
+				}
+
+				if (var5 == 7) { // L: 433
+					++var8; // L: 434
+					++var9; // L: 435
+				}
+
+				Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 437
+				return false; // L: 438
+			} else {
+				var3 = var0.readBits(18); // L: 440
+				var4 = var3 >> 16; // L: 441
+				var5 = var3 >> 8 & 255; // L: 442
+				var6 = var3 & 255; // L: 443
+				var7 = Players.Players_regions[var1]; // L: 444
+				var8 = (var7 >> 28) + var4 & 3; // L: 445
+				var9 = var5 + (var7 >> 14) & 255; // L: 446
+				var10 = var6 + var7 & 255; // L: 447
+				Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 448
+				return false; // L: 449
+			}
+		}
+	}
+
+	@ObfuscatedName("lh")
+	@ObfuscatedSignature(
+		descriptor = "(Liv;I)Z",
+		garbageValue = "2109502620"
+	)
+	@Export("isComponentHidden")
+	static boolean isComponentHidden(Widget var0) {
+		return var0.isHidden; // L: 11562
+	}
+
+	@ObfuscatedName("lc")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "163144058"
+	)
+	static void method421() {
+		Client.packetWriter.addNode(InterfaceParent.getPacketBufferNode(ClientPacket.field2599, Client.packetWriter.isaacCipher)); // L: 11673
+		Client.oculusOrbState = 0; // L: 11674
+	} // L: 11675
 }
diff --git a/runescape-client/src/main/java/class350.java b/runescape-client/src/main/java/class350.java
new file mode 100644
index 0000000000..47983ee33e
--- /dev/null
+++ b/runescape-client/src/main/java/class350.java
@@ -0,0 +1,11 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("my")
+public class class350 extends Node {
+	@ObfuscatedName("f")
+	public long field3932;
+
+	public class350(long var1) {
+		this.field3932 = var1; // L: 7
+	} // L: 8
+}
diff --git a/runescape-client/src/main/java/class36.java b/runescape-client/src/main/java/class36.java
index 5eb538b5cd..fdda054b5f 100644
--- a/runescape-client/src/main/java/class36.java
+++ b/runescape-client/src/main/java/class36.java
@@ -1,35 +1,35 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aj")
+@ObfuscatedName("ae")
 public class class36 {
-	@ObfuscatedName("v")
-	final int field271;
-	@ObfuscatedName("n")
-	final int field272;
 	@ObfuscatedName("f")
-	final String field270;
+	final int field250;
+	@ObfuscatedName("e")
+	final int field249;
+	@ObfuscatedName("v")
+	final String field248;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;)V"
+		descriptor = "(Lnt;)V"
 	)
 	class36(Buffer var1) {
 		this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19
 	} // L: 20
 
 	class36(int var1, int var2, String var3) {
-		this.field271 = var1; // L: 13
-		this.field272 = var2; // L: 14
-		this.field270 = var3; // L: 15
+		this.field250 = var1; // L: 13
+		this.field249 = var2; // L: 14
+		this.field248 = var3; // L: 15
 	} // L: 16
 
-	@ObfuscatedName("v")
-	String method345() {
-		return Integer.toHexString(this.field271) + Integer.toHexString(this.field272) + this.field270; // L: 23
+	@ObfuscatedName("f")
+	String method425() {
+		return Integer.toHexString(this.field250) + Integer.toHexString(this.field249) + this.field248; // L: 23
 	}
 
-	@ObfuscatedName("n")
-	int method346() {
-		return this.field272; // L: 27
+	@ObfuscatedName("e")
+	int method430() {
+		return this.field249; // L: 27
 	}
 }
diff --git a/runescape-client/src/main/java/class362.java b/runescape-client/src/main/java/class362.java
deleted file mode 100644
index 4ff631031a..0000000000
--- a/runescape-client/src/main/java/class362.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("mg")
-public interface class362 extends Iterable {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)I",
-		garbageValue = "-350566290"
-	)
-	int vmethod6362(int var1);
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/Object;I)V",
-		garbageValue = "-1681668792"
-	)
-	void vmethod6364(int var1, Object var2);
-}
diff --git a/runescape-client/src/main/java/class363.java b/runescape-client/src/main/java/class363.java
index 7a979e3768..b29a894005 100644
--- a/runescape-client/src/main/java/class363.java
+++ b/runescape-client/src/main/java/class363.java
@@ -1,66 +1,19 @@
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mt")
-public class class363 implements class362 {
-	@ObfuscatedName("br")
-	static String field4079;
-	@ObfuscatedName("v")
-	Map field4082;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lne;"
-	)
-	final class389 field4078;
-
-	@ObfuscatedSignature(
-		descriptor = "(Lne;)V"
-	)
-	public class363(class389 var1) {
-		this.field4078 = var1; // L: 15
-	} // L: 16
-
-	@ObfuscatedName("v")
+@ObfuscatedName("md")
+public interface class363 extends Iterable {
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(II)I",
-		garbageValue = "-350566290"
+		garbageValue = "-1883866066"
 	)
-	public int vmethod6362(int var1) {
-		if (this.field4082 != null) { // L: 19
-			class390 var2 = (class390)this.field4082.get(var1); // L: 20
-			if (var2 != null) {
-				return (Integer)var2.field4218; // L: 21
-			}
-		}
+	int vmethod6399(int var1);
 
-		return (Integer)this.field4078.vmethod6837(var1); // L: 23
-	}
-
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/Object;I)V",
-		garbageValue = "-1681668792"
+		garbageValue = "-1983435032"
 	)
-	public void vmethod6364(int var1, Object var2) {
-		if (this.field4082 == null) { // L: 27
-			this.field4082 = new HashMap(); // L: 28
-			this.field4082.put(var1, new class390(var1, var2)); // L: 29
-		} else {
-			class390 var3 = (class390)this.field4082.get(var1); // L: 32
-			if (var3 == null) {
-				this.field4082.put(var1, new class390(var1, var2)); // L: 33
-			} else {
-				var3.field4218 = var2; // L: 34
-			}
-		}
-
-	} // L: 36
-
-	public Iterator iterator() {
-		return this.field4082 == null ? Collections.emptyList().iterator() : this.field4082.values().iterator(); // L: 39 40
-	}
+	void vmethod6398(int var1, Object var2);
 }
diff --git a/runescape-client/src/main/java/class364.java b/runescape-client/src/main/java/class364.java
new file mode 100644
index 0000000000..36bbc33e7c
--- /dev/null
+++ b/runescape-client/src/main/java/class364.java
@@ -0,0 +1,71 @@
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nv")
+public class class364 implements class363 {
+	@ObfuscatedName("ba")
+	@ObfuscatedSignature(
+		descriptor = "[Lof;"
+	)
+	@Export("worldSelectFlagSprites")
+	static IndexedSprite[] worldSelectFlagSprites;
+	@ObfuscatedName("f")
+	Map field4079;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lon;"
+	)
+	final class390 field4080;
+
+	@ObfuscatedSignature(
+		descriptor = "(Lon;)V"
+	)
+	public class364(class390 var1) {
+		this.field4080 = var1; // L: 15
+	} // L: 16
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "-1883866066"
+	)
+	public int vmethod6399(int var1) {
+		if (this.field4079 != null) { // L: 19
+			class391 var2 = (class391)this.field4079.get(var1); // L: 20
+			if (var2 != null) {
+				return (Integer)var2.field4227; // L: 21
+			}
+		}
+
+		return (Integer)this.field4080.vmethod6893(var1); // L: 23
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/Object;I)V",
+		garbageValue = "-1983435032"
+	)
+	public void vmethod6398(int var1, Object var2) {
+		if (this.field4079 == null) { // L: 27
+			this.field4079 = new HashMap(); // L: 28
+			this.field4079.put(var1, new class391(var1, var2)); // L: 29
+		} else {
+			class391 var3 = (class391)this.field4079.get(var1); // L: 32
+			if (var3 == null) {
+				this.field4079.put(var1, new class391(var1, var2)); // L: 33
+			} else {
+				var3.field4227 = var2; // L: 34
+			}
+		}
+
+	} // L: 36
+
+	public Iterator iterator() {
+		return this.field4079 == null ? Collections.emptyList().iterator() : this.field4079.values().iterator(); // L: 39 40
+	}
+}
diff --git a/runescape-client/src/main/java/class365.java b/runescape-client/src/main/java/class366.java
similarity index 60%
rename from runescape-client/src/main/java/class365.java
rename to runescape-client/src/main/java/class366.java
index bdd9722c6d..f7d642e315 100644
--- a/runescape-client/src/main/java/class365.java
+++ b/runescape-client/src/main/java/class366.java
@@ -1,14 +1,14 @@
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("nk")
-public class class365 {
-	@ObfuscatedName("f")
-	static final char[] field4096;
+@ObfuscatedName("nc")
+public class class366 {
+	@ObfuscatedName("v")
+	static final char[] field4093;
 	@ObfuscatedName("y")
-	static final char[] field4097;
+	static final char[] field4092;
 
 	static {
-		field4096 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8
-		field4097 = new char[]{'[', ']', '#'}; // L: 9
+		field4093 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8
+		field4092 = new char[]{'[', ']', '#'}; // L: 9
 	}
 }
diff --git a/runescape-client/src/main/java/class368.java b/runescape-client/src/main/java/class368.java
deleted file mode 100644
index 4ed3f4e03d..0000000000
--- a/runescape-client/src/main/java/class368.java
+++ /dev/null
@@ -1,43 +0,0 @@
-import java.util.Iterator;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ni")
-class class368 implements Iterator {
-	@ObfuscatedName("j")
-	@Export("Interpreter_intLocals")
-	static int[] Interpreter_intLocals;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 425017273
-	)
-	int field4115;
-	// $FF: synthetic field
-	@ObfuscatedSignature(
-		descriptor = "Lnu;"
-	)
-	final class369 this$0;
-
-	@ObfuscatedSignature(
-		descriptor = "(Lnu;)V"
-	)
-	class368(class369 var1) {
-		this.this$0 = var1; // L: 50
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException(); // L: 65
-	}
-
-	public Object next() {
-		int var1 = ++this.field4115 - 1; // L: 58
-		class341 var2 = (class341)this.this$0.field4118.get((long)var1); // L: 59
-		return var2 != null ? var2 : this.this$0.method6432(var1); // L: 60 61
-	}
-
-	public boolean hasNext() {
-		return this.field4115 < this.this$0.method6018(); // L: 54
-	}
-}
diff --git a/runescape-client/src/main/java/class369.java b/runescape-client/src/main/java/class369.java
index aaf0b09369..98d5d178a5 100644
--- a/runescape-client/src/main/java/class369.java
+++ b/runescape-client/src/main/java/class369.java
@@ -1,91 +1,46 @@
 import java.util.Iterator;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nu")
-public class class369 extends class340 implements class216 {
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	final AbstractArchive field4119;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "Lhn;"
-	)
-	final DemotingHashTable field4118;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = 640434103
-	)
-	final int field4117;
-
-	@ObfuscatedSignature(
-		descriptor = "(Ljd;ILkk;Ljv;)V"
-	)
-	public class369(StudioGame var1, int var2, Language var3, AbstractArchive var4) {
-		super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19
-		this.field4118 = new DemotingHashTable(64); // L: 15
-		this.field4119 = var4; // L: 20
-		this.field4117 = var2; // L: 21
-	} // L: 22
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lml;",
-		garbageValue = "1996028065"
-	)
-	protected class342 vmethod6434(int var1) {
-		synchronized(this.field4118) { // L: 26
-			class341 var2 = (class341)this.field4118.get((long)var1); // L: 27
-			if (var2 == null) { // L: 28
-				var2 = this.method6432(var1); // L: 29
-				this.field4118.method4290(var2, (long)var1); // L: 30
-			}
-
-			return var2; // L: 33
-		}
-	}
-
+@ObfuscatedName("nm")
+class class369 implements Iterator {
 	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lmq;",
-		garbageValue = "1323866848"
+		descriptor = "[Lna;"
 	)
-	class341 method6432(int var1) {
-		byte[] var2 = this.field4119.takeFile(this.field4117, var1); // L: 37
-		class341 var3 = new class341(var1); // L: 38
-		if (var2 != null) {
-			var3.method6035(new Buffer(var2)); // L: 39
-		}
+	@Export("JagexCache_idxFiles")
+	public static BufferedFile[] JagexCache_idxFiles;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -1278704295
+	)
+	int field4114;
+	// $FF: synthetic field
+	@ObfuscatedSignature(
+		descriptor = "Lnz;"
+	)
+	final class370 this$0;
 
-		return var3; // L: 40
+	@ObfuscatedSignature(
+		descriptor = "(Lnz;)V"
+	)
+	class369(class370 var1) {
+		this.this$0 = var1; // L: 50
 	}
 
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-174176415"
-	)
-	public void method6433() {
-		synchronized(this.field4118) { // L: 44
-			this.field4118.clear(); // L: 45
-		}
-	} // L: 47
-
-	public Iterator iterator() {
-		return new class368(this); // L: 50
+	public boolean hasNext() {
+		return this.field4114 < this.this$0.method6050(); // L: 54
 	}
 
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(Ljv;Ljava/lang/String;Ljava/lang/String;B)[Loh;",
-		garbageValue = "103"
-	)
-	public static SpritePixels[] method6443(AbstractArchive var0, String var1, String var2) {
-		int var3 = var0.getGroupId(var1); // L: 115
-		int var4 = var0.getFileId(var3, var2); // L: 116
-		return ItemComposition.method3087(var0, var3, var4); // L: 117
+	public Object next() {
+		int var1 = ++this.field4114 - 1; // L: 58
+		class342 var2 = (class342)this.this$0.field4120.get((long)var1); // L: 59
+		return var2 != null ? var2 : this.this$0.method6475(var1); // L: 60 61
+	}
+
+	public void remove() {
+		throw new UnsupportedOperationException(); // L: 65
 	}
 }
diff --git a/runescape-client/src/main/java/class370.java b/runescape-client/src/main/java/class370.java
index 9849bcba2c..994560511c 100644
--- a/runescape-client/src/main/java/class370.java
+++ b/runescape-client/src/main/java/class370.java
@@ -1,19 +1,80 @@
+import java.util.Iterator;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nv")
-public interface class370 {
+@ObfuscatedName("nz")
+public class class370 extends class341 implements class217 {
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	final AbstractArchive field4116;
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lnd;I)V",
-		garbageValue = "510448708"
+		descriptor = "Lhh;"
 	)
-	void vmethod6493(Object var1, Buffer var2);
+	final DemotingHashTable field4120;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 283772949
+	)
+	final int field4118;
 
-	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Ljava/lang/Object;",
-		garbageValue = "-1954872085"
+		descriptor = "(Ljl;ILkn;Ljp;)V"
 	)
-	Object vmethod6500(Buffer var1);
+	public class370(StudioGame var1, int var2, Language var3, AbstractArchive var4) {
+		super(var1, var3, var4 != null ? var4.getGroupFileCount(var2) : 0); // L: 19
+		this.field4120 = new DemotingHashTable(64); // L: 15
+		this.field4116 = var4; // L: 20
+		this.field4118 = var2; // L: 21
+	} // L: 22
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lmq;",
+		garbageValue = "-898201969"
+	)
+	protected class343 vmethod6482(int var1) {
+		synchronized(this.field4120) { // L: 26
+			class342 var2 = (class342)this.field4120.get((long)var1); // L: 27
+			if (var2 == null) { // L: 28
+				var2 = this.method6475(var1); // L: 29
+				this.field4120.method4456(var2, (long)var1); // L: 30
+			}
+
+			return var2; // L: 33
+		}
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lma;",
+		garbageValue = "867476406"
+	)
+	class342 method6475(int var1) {
+		byte[] var2 = this.field4116.takeFile(this.field4118, var1); // L: 37
+		class342 var3 = new class342(var1); // L: 38
+		if (var2 != null) {
+			var3.method6070(new Buffer(var2)); // L: 39
+		}
+
+		return var3; // L: 40
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "2"
+	)
+	public void method6474() {
+		synchronized(this.field4120) { // L: 44
+			this.field4120.clear(); // L: 45
+		}
+	} // L: 47
+
+	public Iterator iterator() {
+		return new class369(this); // L: 50
+	}
 }
diff --git a/runescape-client/src/main/java/class371.java b/runescape-client/src/main/java/class371.java
index 0c6063dcdc..3dc6c89c5d 100644
--- a/runescape-client/src/main/java/class371.java
+++ b/runescape-client/src/main/java/class371.java
@@ -1,32 +1,19 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("no")
-final class class371 implements class370 {
-	@ObfuscatedName("v")
+@ObfuscatedName("nq")
+public interface class371 {
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lnd;I)V",
-		garbageValue = "510448708"
+		descriptor = "(Ljava/lang/Object;Lnt;I)V",
+		garbageValue = "1796019185"
 	)
-	public void vmethod6493(Object var1, Buffer var2) {
-		this.method6452((Integer)var1, var2); // L: 20
-	} // L: 21
+	void vmethod6536(Object var1, Buffer var2);
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Ljava/lang/Object;",
-		garbageValue = "-1954872085"
+		descriptor = "(Lnt;B)Ljava/lang/Object;",
+		garbageValue = "-46"
 	)
-	public Object vmethod6500(Buffer var1) {
-		return var1.readInt(); // L: 16
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Integer;Lnd;B)V",
-		garbageValue = "105"
-	)
-	void method6452(Integer var1, Buffer var2) {
-		var2.writeInt(var1); // L: 12
-	} // L: 13
+	Object vmethod6533(Buffer var1);
 }
diff --git a/runescape-client/src/main/java/class372.java b/runescape-client/src/main/java/class372.java
index 525c46af5a..563ecbad26 100644
--- a/runescape-client/src/main/java/class372.java
+++ b/runescape-client/src/main/java/class372.java
@@ -1,38 +1,53 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nx")
-public class class372 {
-	@ObfuscatedName("v")
-	public static final int[] field4124;
-	@ObfuscatedName("b")
-	static byte[][][] field4123;
+@ObfuscatedName("nj")
+final class class372 implements class371 {
+	@ObfuscatedName("m")
+	@Export("ByteArrayPool_alternativeSizes")
+	public static int[] ByteArrayPool_alternativeSizes;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -414913701
+	)
+	@Export("gameCyclesToDo")
+	static int gameCyclesToDo;
 
-	static {
-		field4124 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lnt;I)V",
+		garbageValue = "1796019185"
+	)
+	public void vmethod6536(Object var1, Buffer var2) {
+		this.method6492((Integer)var1, var2); // L: 20
+	} // L: 21
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;B)Ljava/lang/Object;",
+		garbageValue = "-46"
+	)
+	public Object vmethod6533(Buffer var1) {
+		return var1.readInt(); // L: 16
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)[Lja;",
+		descriptor = "(Ljava/lang/Integer;Lnt;B)V",
 		garbageValue = "5"
 	)
-	@Export("PlayerType_values")
-	public static PlayerType[] PlayerType_values() {
-		return new PlayerType[]{PlayerType.field3548, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal}; // L: 20
-	}
+	void method6492(Integer var1, Buffer var2) {
+		var2.writeInt(var1); // L: 12
+	} // L: 13
 
-	@ObfuscatedName("ha")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lfc;",
-		garbageValue = "-43218468"
+		descriptor = "(IB)Z",
+		garbageValue = "-10"
 	)
-	static RouteStrategy method6463(int var0, int var1) {
-		Client.field785.approxDestinationX = var0; // L: 7577
-		Client.field785.approxDestinationY = var1; // L: 7578
-		Client.field785.approxDestinationSizeX = 1; // L: 7579
-		Client.field785.approxDestinationSizeY = 1; // L: 7580
-		return Client.field785; // L: 7581
+	public static boolean method6497(int var0) {
+		return (var0 >> 30 & 1) != 0; // L: 25
 	}
 }
diff --git a/runescape-client/src/main/java/class373.java b/runescape-client/src/main/java/class373.java
index 11273b3f4e..6f4c8e5367 100644
--- a/runescape-client/src/main/java/class373.java
+++ b/runescape-client/src/main/java/class373.java
@@ -1,49 +1,11 @@
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nw")
-final class class373 implements class370 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lnd;I)V",
-		garbageValue = "510448708"
-	)
-	public void vmethod6493(Object var1, Buffer var2) {
-		this.method6465((Long)var1, var2); // L: 33
-	} // L: 34
+@ObfuscatedName("nn")
+public class class373 {
+	@ObfuscatedName("f")
+	public static final int[] field4126;
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Ljava/lang/Object;",
-		garbageValue = "-1954872085"
-	)
-	public Object vmethod6500(Buffer var1) {
-		return var1.readLong(); // L: 29
+	static {
+		field4126 = new int[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, -1, 1, -1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 3, 3}; // L: 4
 	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Long;Lnd;I)V",
-		garbageValue = "-1988673452"
-	)
-	void method6465(Long var1, Buffer var2) {
-		var2.writeLong(var1); // L: 25
-	} // L: 26
-
-	@ObfuscatedName("ge")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1793660977"
-	)
-	static void method6474() {
-		int var0 = Players.Players_count; // L: 4352
-		int[] var1 = Players.Players_indices; // L: 4353
-
-		for (int var2 = 0; var2 < var0; ++var2) { // L: 4354
-			if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { // L: 4355
-				NetSocket.addPlayerToScene(Client.players[var1[var2]], true); // L: 4356
-			}
-		}
-
-	} // L: 4358
 }
diff --git a/runescape-client/src/main/java/class374.java b/runescape-client/src/main/java/class374.java
index 812cef56e8..3c3b665131 100644
--- a/runescape-client/src/main/java/class374.java
+++ b/runescape-client/src/main/java/class374.java
@@ -1,140 +1,32 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("np")
-public class class374 implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lnp;"
-	)
-	public static final class374 field4131;
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lnp;"
-	)
-	public static final class374 field4128;
+@ObfuscatedName("nk")
+final class class374 implements class371 {
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lnp;"
+		descriptor = "(Ljava/lang/Object;Lnt;I)V",
+		garbageValue = "1796019185"
 	)
-	public static final class374 field4129;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -1536498237
-	)
-	final int field4130;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 618578037
-	)
-	public final int field4135;
-	@ObfuscatedName("j")
-	public final Class field4127;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "Lnv;"
-	)
-	final class370 field4133;
-
-	static {
-		field4131 = new class374(2, 0, Integer.class, new class371()); // L: 10
-		field4128 = new class374(0, 1, Long.class, new class373()); // L: 23
-		field4129 = new class374(1, 2, String.class, new class375()); // L: 36
-	}
+	public void vmethod6536(Object var1, Buffer var2) {
+		this.method6502((Long)var1, var2); // L: 33
+	} // L: 34
 
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(IILjava/lang/Class;Lnv;)V"
-	)
-	class374(int var1, int var2, Class var3, class370 var4) {
-		this.field4130 = var1; // L: 59
-		this.field4135 = var2; // L: 60
-		this.field4127 = var3; // L: 61
-		this.field4133 = var4; // L: 62
-	} // L: 63
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-907662946"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field4135; // L: 90
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Ljava/lang/Object;",
-		garbageValue = "-2104172776"
-	)
-	public Object method6480(Buffer var1) {
-		return this.field4133.vmethod6500(var1); // L: 94
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lax;B)Lai;",
+		descriptor = "(Lnt;B)Ljava/lang/Object;",
 		garbageValue = "-46"
 	)
-	public static class31 method6477(class34 var0) {
-		switch(var0.field252) { // L: 9
-		case 0:
-			return new class28(); // L: 16
-		default:
-			throw new IllegalArgumentException(); // L: 12
-		}
+	public Object vmethod6533(Buffer var1) {
+		return var1.readLong(); // L: 29
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(I)[Lnp;",
-		garbageValue = "-72158502"
+		descriptor = "(Ljava/lang/Long;Lnt;B)V",
+		garbageValue = "1"
 	)
-	public static class374[] method6476() {
-		return new class374[]{field4131, field4128, field4129}; // L: 55
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Class;B)Lnp;",
-		garbageValue = "-16"
-	)
-	public static class374 method6479(Class var0) {
-		class374[] var1 = method6476(); // L: 67
-
-		for (int var2 = 0; var2 < var1.length; ++var2) { // L: 68
-			class374 var3 = var1[var2]; // L: 69
-			if (var3.field4127 == var0) {
-				return var3; // L: 71
-			}
-		}
-
-		return null; // L: 75
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lnd;I)V",
-		garbageValue = "-926534106"
-	)
-	public static void method6475(Object var0, Buffer var1) {
-		class370 var2 = method6478(var0.getClass()); // L: 79
-		var2.vmethod6493(var0, var1); // L: 80
-	} // L: 81
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Class;S)Lnv;",
-		garbageValue = "-2594"
-	)
-	static class370 method6478(Class var0) {
-		class374 var1 = method6479(var0); // L: 84
-		if (var1 == null) {
-			throw new IllegalArgumentException(); // L: 85
-		} else {
-			return var1.field4133; // L: 86
-		}
-	}
+	void method6502(Long var1, Buffer var2) {
+		var2.writeLong(var1); // L: 25
+	} // L: 26
 }
diff --git a/runescape-client/src/main/java/class375.java b/runescape-client/src/main/java/class375.java
index 37f9907501..3278687690 100644
--- a/runescape-client/src/main/java/class375.java
+++ b/runescape-client/src/main/java/class375.java
@@ -1,37 +1,313 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("nq")
-final class class375 implements class370 {
-	@ObfuscatedName("q")
-	@Export("BZip2Decompressor_block")
-	static int[] BZip2Decompressor_block;
-
+@ObfuscatedName("ne")
+public class class375 implements Enumerated
+{
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lne;"
+	)
+	public static final class375 field4134;
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lne;"
+	)
+	public static final class375 field4127;
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/Object;Lnd;I)V",
-		garbageValue = "510448708"
+		descriptor = "Lne;"
 	)
-	public void vmethod6493(Object var1, Buffer var2) {
-		this.method6491((String)var1, var2); // L: 46
-	} // L: 47
-
-	@ObfuscatedName("n")
+	public static final class375 field4128;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)Ljava/lang/Object;",
-		garbageValue = "-1954872085"
+		descriptor = "Ljp;"
 	)
-	public Object vmethod6500(Buffer var1) {
-		return var1.readStringCp1252NullTerminated(); // L: 42
+	@Export("Widget_modelsArchive")
+	static AbstractArchive Widget_modelsArchive;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1544272871
+	)
+	final int field4129;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = 928638061
+	)
+	public final int field4137;
+	@ObfuscatedName("o")
+	public final Class field4132;
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "Lnq;"
+	)
+	final class371 field4133;
+
+	static {
+		field4134 = new class375(1, 0, Integer.class, new class372()); // L: 10
+		field4127 = new class375(0, 1, Long.class, new class374()); // L: 23
+		field4128 = new class375(2, 2, String.class, new class376()); // L: 36
 	}
 
-	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Lnd;B)V",
-		garbageValue = "-43"
+		descriptor = "(IILjava/lang/Class;Lnq;)V"
 	)
-	void method6491(String var1, Buffer var2) {
-		var2.writeStringCp1252NullTerminated(var1); // L: 38
-	} // L: 39
+	class375(int var1, int var2, Class var3, class371 var4) {
+		this.field4129 = var1; // L: 55
+		this.field4137 = var2; // L: 56
+		this.field4132 = var3; // L: 57
+		this.field4133 = var4; // L: 58
+	} // L: 59
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1154679040"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field4137; // L: 91
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)Ljava/lang/Object;",
+		garbageValue = "728831584"
+	)
+	public Object method6510(Buffer var1) {
+		return this.field4133.vmethod6533(var1); // L: 95
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(II)Lcf;",
+		garbageValue = "268757704"
+	)
+	@Export("getScript")
+	static Script getScript(int var0) {
+		Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 26
+		if (var1 != null) { // L: 27
+			return var1;
+		} else {
+			byte[] var2 = Varcs.archive12.takeFile(var0, 0); // L: 28
+			if (var2 == null) { // L: 29
+				return null; // L: 30
+			} else {
+				var1 = NetSocket.newScript(var2); // L: 32
+				Script.Script_cached.put(var1, (long)var0); // L: 33
+				return var1; // L: 34
+			}
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Class;I)Lne;",
+		garbageValue = "1422033008"
+	)
+	public static class375 method6511(Class var0) {
+		class375[] var1 = new class375[]{field4128, field4134, field4127}; // L: 65
+		class375[] var2 = var1; // L: 67
+
+		for (int var3 = 0; var3 < var2.length; ++var3) { // L: 68
+			class375 var4 = var2[var3]; // L: 69
+			if (var4.field4132 == var0) { // L: 71
+				return var4;
+			}
+		}
+
+		return null; // L: 75
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/Object;Lnt;I)V",
+		garbageValue = "-1820805265"
+	)
+	public static void method6512(Object var0, Buffer var1) {
+		Class var3 = var0.getClass(); // L: 80
+		class375 var4 = method6511(var3); // L: 82
+		if (var4 == null) {
+			throw new IllegalArgumentException(); // L: 83
+		} else {
+			class371 var2 = var4.field4133; // L: 84
+			var2.vmethod6536(var0, var1); // L: 87
+		}
+	} // L: 88
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;I)V",
+		garbageValue = "-1726872314"
+	)
+	static final void method6530(String var0) {
+		PacketBufferNode var1 = InterfaceParent.getPacketBufferNode(ClientPacket.field2665, Client.packetWriter.isaacCipher); // L: 136
+		var1.packetBuffer.writeByte(class44.stringCp1252NullTerminatedByteSize(var0)); // L: 137
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 138
+		Client.packetWriter.addNode(var1); // L: 139
+	} // L: 140
+
+	@ObfuscatedName("ap")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "784066620"
+	)
+	static int method6531(int var0, Script var1, boolean var2) {
+		int var3;
+		if (var0 == ScriptOpcodes.OC_NAME) { // L: 3153
+			var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3154
+			Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class250.ItemDefinition_get(var3).name; // L: 3155
+			return 1; // L: 3156
+		} else {
+			int var4;
+			ItemComposition var5;
+			if (var0 == ScriptOpcodes.OC_OP) { // L: 3158
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 3159
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3160
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3161
+				var5 = class250.ItemDefinition_get(var3); // L: 3162
+				if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; // L: 3163
+				} else {
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3164
+				}
+
+				return 1; // L: 3165
+			} else if (var0 == ScriptOpcodes.OC_IOP) { // L: 3167
+				ChatChannel.Interpreter_intStackSize -= 2; // L: 3168
+				var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3169
+				var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3170
+				var5 = class250.ItemDefinition_get(var3); // L: 3171
+				if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 3172
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
+				} else {
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3173
+				}
+
+				return 1; // L: 3174
+			} else if (var0 == ScriptOpcodes.OC_COST) { // L: 3176
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3177
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).price; // L: 3178
+				return 1; // L: 3179
+			} else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 3181
+				var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3182
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; // L: 3183
+				return 1; // L: 3184
+			} else {
+				ItemComposition var7;
+				if (var0 == ScriptOpcodes.OC_CERT) { // L: 3186
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3187
+					var7 = class250.ItemDefinition_get(var3); // L: 3188
+					if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 3189
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3190
+					}
+
+					return 1; // L: 3191
+				} else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 3193
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3194
+					var7 = class250.ItemDefinition_get(var3); // L: 3195
+					if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 3196
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.note;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3197
+					}
+
+					return 1; // L: 3198
+				} else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 3200
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3201
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; // L: 3202
+					return 1; // L: 3203
+				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 3205
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3206
+					var7 = class250.ItemDefinition_get(var3); // L: 3207
+					if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 3208
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3209
+					}
+
+					return 1; // L: 3210
+				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 3212
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3213
+					var7 = class250.ItemDefinition_get(var3); // L: 3214
+					if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 3215
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.placeholder;
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var3; // L: 3216
+					}
+
+					return 1; // L: 3217
+				} else if (var0 == ScriptOpcodes.OC_FIND) { // L: 3219
+					String var6 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 3220
+					var4 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3221
+					DevicePcmPlayerProvider.findItemDefinitions(var6, var4 == 1); // L: 3222
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.foundItemIdCount; // L: 3223
+					return 1; // L: 3224
+				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 3226
+					if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 3231
+						PcmPlayer.foundItemIndex = 0; // L: 3232
+						return 1; // L: 3233
+					} else if (var0 == 4213) { // L: 3235
+						var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3236
+						var4 = class250.ItemDefinition_get(var3).getShiftClickIndex(); // L: 3237
+						if (var4 == -1) { // L: 3238
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4; // L: 3239
+						} else {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var4 + 1; // L: 3242
+						}
+
+						return 1; // L: 3244
+					} else {
+						return 2; // L: 3246
+					}
+				} else {
+					if (ClanChannel.foundItemIds != null && PcmPlayer.foundItemIndex < ApproximateRouteStrategy.foundItemIdCount) { // L: 3227
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = ClanChannel.foundItemIds[++PcmPlayer.foundItemIndex - 1] & '\uffff'; // L: 3228
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1;
+					}
+
+					return 1; // L: 3229
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("hv")
+	@ObfuscatedSignature(
+		descriptor = "(IIIIIIIIII)V",
+		garbageValue = "-25477474"
+	)
+	@Export("updatePendingSpawn")
+	static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+		PendingSpawn var9 = null; // L: 7293
+
+		for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 7294 7295 7300
+			if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 7296
+				var9 = var10; // L: 7297
+				break;
+			}
+		}
+
+		if (var9 == null) { // L: 7302
+			var9 = new PendingSpawn(); // L: 7303
+			var9.plane = var0; // L: 7304
+			var9.type = var3; // L: 7305
+			var9.x = var1; // L: 7306
+			var9.y = var2; // L: 7307
+			FriendSystem.method1875(var9); // L: 7308
+			Client.pendingSpawns.addFirst(var9); // L: 7309
+		}
+
+		var9.id = var4; // L: 7311
+		var9.field1213 = var5; // L: 7312
+		var9.orientation = var6; // L: 7313
+		var9.delay = var7; // L: 7314
+		var9.hitpoints = var8; // L: 7315
+	} // L: 7316
 }
diff --git a/runescape-client/src/main/java/class376.java b/runescape-client/src/main/java/class376.java
index 829fc4cda0..0552184f84 100644
--- a/runescape-client/src/main/java/class376.java
+++ b/runescape-client/src/main/java/class376.java
@@ -1,125 +1,32 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nl")
-public final class class376 {
-	@ObfuscatedName("hl")
-	@ObfuscatedGetter(
-		intValue = 611240317
-	)
-	@Export("cameraYaw")
-	static int cameraYaw;
-
-	@ObfuscatedName("iu")
+@ObfuscatedName("nf")
+final class class376 implements class371 {
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IIIILjava/lang/String;I)V",
-		garbageValue = "-537904006"
+		descriptor = "(Ljava/lang/Object;Lnt;I)V",
+		garbageValue = "1796019185"
 	)
-	@Export("widgetDefaultMenuAction")
-	static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
-		Widget var5 = ModeWhere.getWidgetChild(var1, var2); // L: 8669
-		if (var5 != null) { // L: 8670
-			if (var5.onOp != null) { // L: 8671
-				ScriptEvent var6 = new ScriptEvent(); // L: 8672
-				var6.widget = var5; // L: 8673
-				var6.opIndex = var0; // L: 8674
-				var6.targetName = var4; // L: 8675
-				var6.args = var5.onOp; // L: 8676
-				PacketWriter.runScriptEvent(var6); // L: 8677
-			}
+	public void vmethod6536(Object var1, Buffer var2) {
+		this.method6534((String)var1, var2); // L: 46
+	} // L: 47
 
-			boolean var8 = true; // L: 8679
-			if (var5.contentType > 0) { // L: 8680
-				var8 = SequenceDefinition.method3148(var5);
-			}
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;B)Ljava/lang/Object;",
+		garbageValue = "-46"
+	)
+	public Object vmethod6533(Buffer var1) {
+		return var1.readStringCp1252NullTerminated(); // L: 42
+	}
 
-			if (var8) { // L: 8681
-				if (TextureProvider.method4141(class21.getWidgetFlags(var5), var0 - 1)) { // L: 8682
-					PacketBufferNode var7;
-					if (var0 == 1) { // L: 8685
-						var7 = class21.getPacketBufferNode(ClientPacket.field2604, Client.packetWriter.isaacCipher); // L: 8687
-						var7.packetBuffer.writeInt(var1); // L: 8688
-						var7.packetBuffer.writeShort(var2); // L: 8689
-						var7.packetBuffer.writeShort(var3); // L: 8690
-						Client.packetWriter.addNode(var7); // L: 8691
-					}
-
-					if (var0 == 2) { // L: 8693
-						var7 = class21.getPacketBufferNode(ClientPacket.field2603, Client.packetWriter.isaacCipher); // L: 8695
-						var7.packetBuffer.writeInt(var1); // L: 8696
-						var7.packetBuffer.writeShort(var2); // L: 8697
-						var7.packetBuffer.writeShort(var3); // L: 8698
-						Client.packetWriter.addNode(var7); // L: 8699
-					}
-
-					if (var0 == 3) { // L: 8701
-						var7 = class21.getPacketBufferNode(ClientPacket.field2616, Client.packetWriter.isaacCipher); // L: 8703
-						var7.packetBuffer.writeInt(var1); // L: 8704
-						var7.packetBuffer.writeShort(var2); // L: 8705
-						var7.packetBuffer.writeShort(var3); // L: 8706
-						Client.packetWriter.addNode(var7); // L: 8707
-					}
-
-					if (var0 == 4) { // L: 8709
-						var7 = class21.getPacketBufferNode(ClientPacket.field2678, Client.packetWriter.isaacCipher); // L: 8711
-						var7.packetBuffer.writeInt(var1); // L: 8712
-						var7.packetBuffer.writeShort(var2); // L: 8713
-						var7.packetBuffer.writeShort(var3); // L: 8714
-						Client.packetWriter.addNode(var7); // L: 8715
-					}
-
-					if (var0 == 5) { // L: 8717
-						var7 = class21.getPacketBufferNode(ClientPacket.field2592, Client.packetWriter.isaacCipher); // L: 8719
-						var7.packetBuffer.writeInt(var1); // L: 8720
-						var7.packetBuffer.writeShort(var2); // L: 8721
-						var7.packetBuffer.writeShort(var3); // L: 8722
-						Client.packetWriter.addNode(var7); // L: 8723
-					}
-
-					if (var0 == 6) { // L: 8725
-						var7 = class21.getPacketBufferNode(ClientPacket.field2650, Client.packetWriter.isaacCipher); // L: 8727
-						var7.packetBuffer.writeInt(var1); // L: 8728
-						var7.packetBuffer.writeShort(var2); // L: 8729
-						var7.packetBuffer.writeShort(var3); // L: 8730
-						Client.packetWriter.addNode(var7); // L: 8731
-					}
-
-					if (var0 == 7) { // L: 8733
-						var7 = class21.getPacketBufferNode(ClientPacket.field2648, Client.packetWriter.isaacCipher); // L: 8735
-						var7.packetBuffer.writeInt(var1); // L: 8736
-						var7.packetBuffer.writeShort(var2); // L: 8737
-						var7.packetBuffer.writeShort(var3); // L: 8738
-						Client.packetWriter.addNode(var7); // L: 8739
-					}
-
-					if (var0 == 8) { // L: 8741
-						var7 = class21.getPacketBufferNode(ClientPacket.field2613, Client.packetWriter.isaacCipher); // L: 8743
-						var7.packetBuffer.writeInt(var1); // L: 8744
-						var7.packetBuffer.writeShort(var2); // L: 8745
-						var7.packetBuffer.writeShort(var3); // L: 8746
-						Client.packetWriter.addNode(var7); // L: 8747
-					}
-
-					if (var0 == 9) { // L: 8749
-						var7 = class21.getPacketBufferNode(ClientPacket.field2593, Client.packetWriter.isaacCipher); // L: 8751
-						var7.packetBuffer.writeInt(var1); // L: 8752
-						var7.packetBuffer.writeShort(var2); // L: 8753
-						var7.packetBuffer.writeShort(var3); // L: 8754
-						Client.packetWriter.addNode(var7); // L: 8755
-					}
-
-					if (var0 == 10) { // L: 8757
-						var7 = class21.getPacketBufferNode(ClientPacket.field2632, Client.packetWriter.isaacCipher); // L: 8759
-						var7.packetBuffer.writeInt(var1); // L: 8760
-						var7.packetBuffer.writeShort(var2); // L: 8761
-						var7.packetBuffer.writeShort(var3); // L: 8762
-						Client.packetWriter.addNode(var7); // L: 8763
-					}
-
-				}
-			}
-		}
-	} // L: 8683 8765
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(Ljava/lang/String;Lnt;B)V",
+		garbageValue = "123"
+	)
+	void method6534(String var1, Buffer var2) {
+		var2.writeStringCp1252NullTerminated(var1); // L: 38
+	} // L: 39
 }
diff --git a/runescape-client/src/main/java/class377.java b/runescape-client/src/main/java/class377.java
index 07bba922ad..163e0630c8 100644
--- a/runescape-client/src/main/java/class377.java
+++ b/runescape-client/src/main/java/class377.java
@@ -1,46 +1,16 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nz")
-public class class377 {
-	@ObfuscatedName("ic")
+@ObfuscatedName("nl")
+public final class class377 {
+	@ObfuscatedName("e")
+	@Export("clearLoginScreen")
+	static boolean clearLoginScreen;
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1164354941"
+		descriptor = "Loa;"
 	)
-	static final void method6509() {
-		boolean var0 = false; // L: 8768
-
-		while (!var0) { // L: 8769
-			var0 = true; // L: 8770
-
-			for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8771
-				if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { // L: 8772
-					String var2 = Client.menuTargets[var1]; // L: 8773
-					Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8774
-					Client.menuTargets[var1 + 1] = var2; // L: 8775
-					String var3 = Client.menuActions[var1]; // L: 8776
-					Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8777
-					Client.menuActions[var1 + 1] = var3; // L: 8778
-					int var4 = Client.menuOpcodes[var1]; // L: 8779
-					Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8780
-					Client.menuOpcodes[var1 + 1] = var4; // L: 8781
-					var4 = Client.menuArguments1[var1]; // L: 8782
-					Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8783
-					Client.menuArguments1[var1 + 1] = var4; // L: 8784
-					var4 = Client.menuArguments2[var1]; // L: 8785
-					Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8786
-					Client.menuArguments2[var1 + 1] = var4; // L: 8787
-					var4 = Client.menuIdentifiers[var1]; // L: 8788
-					Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8789
-					Client.menuIdentifiers[var1 + 1] = var4; // L: 8790
-					boolean var5 = Client.menuShiftClick[var1]; // L: 8791
-					Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8792
-					Client.menuShiftClick[var1 + 1] = var5; // L: 8793
-					var0 = false; // L: 8794
-				}
-			}
-		}
-
-	} // L: 8798
+	@Export("rightTitleSprite")
+	static SpritePixels rightTitleSprite;
 }
diff --git a/runescape-client/src/main/java/class378.java b/runescape-client/src/main/java/class378.java
index 17c7e2c641..c9b7b1359f 100644
--- a/runescape-client/src/main/java/class378.java
+++ b/runescape-client/src/main/java/class378.java
@@ -2,12 +2,32 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("nr")
+@ObfuscatedName("nh")
 public class class378 {
-	@ObfuscatedName("bh")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lkk;"
+		descriptor = "Ljp;"
 	)
-	@Export("clientLanguage")
-	static Language clientLanguage;
+	@Export("HitSplatDefinition_spritesArchive")
+	static AbstractArchive HitSplatDefinition_spritesArchive;
+
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "(III)I",
+		garbageValue = "-53601525"
+	)
+	static final int method6550(int var0, int var1) {
+		if (var0 == -1) { // L: 844
+			return 12345678;
+		} else {
+			var1 = (var0 & 127) * var1 / 128; // L: 845
+			if (var1 < 2) { // L: 846
+				var1 = 2;
+			} else if (var1 > 126) { // L: 847
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1; // L: 848
+		}
+	}
 }
diff --git a/runescape-client/src/main/java/class379.java b/runescape-client/src/main/java/class379.java
index 65a233cb35..7f6670aa9c 100644
--- a/runescape-client/src/main/java/class379.java
+++ b/runescape-client/src/main/java/class379.java
@@ -1,16 +1,7 @@
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ng")
-public final class class379 {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		longValue = -7034796619104833383L
-	)
-	static long field4146;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		longValue = 1841679994680013491L
-	)
-	static long field4147;
+@ObfuscatedName("nw")
+public class class379 {
+	@ObfuscatedName("h")
+	static int[] field4145;
 }
diff --git a/runescape-client/src/main/java/class380.java b/runescape-client/src/main/java/class380.java
new file mode 100644
index 0000000000..61b09df6a1
--- /dev/null
+++ b/runescape-client/src/main/java/class380.java
@@ -0,0 +1,11 @@
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("nx")
+public final class class380 {
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		longValue = -3054785751312639975L
+	)
+	static long field4151;
+}
diff --git a/runescape-client/src/main/java/class385.java b/runescape-client/src/main/java/class385.java
deleted file mode 100644
index 261fa23e75..0000000000
--- a/runescape-client/src/main/java/class385.java
+++ /dev/null
@@ -1,11 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("nn")
-public interface class385 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V"
-	)
-	void method6815(Buffer var1);
-}
diff --git a/runescape-client/src/main/java/class386.java b/runescape-client/src/main/java/class386.java
index f57708bb42..389641b5eb 100644
--- a/runescape-client/src/main/java/class386.java
+++ b/runescape-client/src/main/java/class386.java
@@ -1,86 +1,11 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("na")
-public enum class386 implements Enumerated {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Lna;"
-	)
-	field4210(0, 0),
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "Lna;"
-	)
-	field4207(3, 2),
+@ObfuscatedName("ni")
+public interface class386 {
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lna;"
+		descriptor = "(Lnt;I)V"
 	)
-	field4208(5, 5),
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "Lna;"
-	)
-	field4209(2, 6),
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		descriptor = "Lna;"
-	)
-	field4213(1, 7),
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "Lna;"
-	)
-	field4211(4, 8);
-
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -1819892595
-	)
-	final int field4212;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -1356390723
-	)
-	final int field4206;
-
-	class386(int var3, int var4) {
-		this.field4212 = var3; // L: 18
-		this.field4206 = var4; // L: 19
-	} // L: 20
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-907662946"
-	)
-	@Export("rsOrdinal")
-	public int rsOrdinal() {
-		return this.field4206; // L: 23
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "-6"
-	)
-	public static int method6818(int var0, int var1) {
-		int var2;
-		if (var1 > var0) { // L: 24
-			var2 = var0; // L: 25
-			var0 = var1; // L: 26
-			var1 = var2; // L: 27
-		}
-
-		while (var1 != 0) { // L: 29
-			var2 = var0 % var1; // L: 30
-			var0 = var1; // L: 31
-			var1 = var2; // L: 32
-		}
-
-		return var0; // L: 34
-	}
+	void method6869(Buffer var1);
 }
diff --git a/runescape-client/src/main/java/class387.java b/runescape-client/src/main/java/class387.java
new file mode 100644
index 0000000000..aa912723e9
--- /dev/null
+++ b/runescape-client/src/main/java/class387.java
@@ -0,0 +1,65 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("nr")
+public enum class387 implements Enumerated
+{
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lnr;"
+	)
+	field4211(4, 0),
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "Lnr;"
+	)
+	field4213(5, 2),
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "Lnr;"
+	)
+	field4212(0, 5),
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "Lnr;"
+	)
+	field4214(2, 6),
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "Lnr;"
+	)
+	field4215(1, 7),
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "Lnr;"
+	)
+	field4216(3, 8);
+
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -281212927
+	)
+	final int field4217;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 2118941453
+	)
+	final int field4218;
+
+	class387(int var3, int var4) {
+		this.field4217 = var3; // L: 18
+		this.field4218 = var4; // L: 19
+	} // L: 20
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1154679040"
+	)
+	@Export("rsOrdinal")
+	public int rsOrdinal() {
+		return this.field4218; // L: 23
+	}
+}
diff --git a/runescape-client/src/main/java/class389.java b/runescape-client/src/main/java/class389.java
deleted file mode 100644
index b786a62068..0000000000
--- a/runescape-client/src/main/java/class389.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("ne")
-public interface class389 {
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/Object;",
-		garbageValue = "-1572379722"
-	)
-	Object vmethod6837(int var1);
-}
diff --git a/runescape-client/src/main/java/class390.java b/runescape-client/src/main/java/class390.java
index d28c8b63e6..3154224e37 100644
--- a/runescape-client/src/main/java/class390.java
+++ b/runescape-client/src/main/java/class390.java
@@ -1,46 +1,12 @@
-import java.io.File;
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("oc")
-public class class390 {
-	@ObfuscatedName("y")
-	@Export("JagexCache_locationFile")
-	static File JagexCache_locationFile;
+@ObfuscatedName("on")
+public interface class390 {
 	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 1815237159
+	@ObfuscatedSignature(
+		descriptor = "(II)Ljava/lang/Object;",
+		garbageValue = "-898289717"
 	)
-	public final int field4219;
-	@ObfuscatedName("n")
-	public Object field4218;
-
-	public class390(int var1) {
-		this.field4219 = var1; // L: 8
-	} // L: 9
-
-	public class390(int var1, Object var2) {
-		this.field4219 = var1; // L: 12
-		this.field4218 = var2; // L: 13
-	} // L: 14
-
-	public int hashCode() {
-		return super.hashCode(); // L: 17
-	}
-
-	public boolean equals(Object var1) {
-		if (!(var1 instanceof class390)) { // L: 21
-			return false;
-		} else {
-			class390 var2 = (class390)var1; // L: 22
-			if (var2.field4218 == null && this.field4218 != null) { // L: 23
-				return false;
-			} else if (this.field4218 == null && var2.field4218 != null) { // L: 24
-				return false;
-			} else {
-				return var2.field4219 == this.field4219 && var2.field4218.equals(this.field4218); // L: 25
-			}
-		}
-	}
+	Object vmethod6893(int var1);
 }
diff --git a/runescape-client/src/main/java/class391.java b/runescape-client/src/main/java/class391.java
new file mode 100644
index 0000000000..27df20f919
--- /dev/null
+++ b/runescape-client/src/main/java/class391.java
@@ -0,0 +1,255 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+import net.runelite.mapping.ObfuscatedSignature;
+
+@ObfuscatedName("oo")
+public class class391 {
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -1496725553
+	)
+	public final int field4226;
+	@ObfuscatedName("e")
+	public Object field4227;
+
+	public class391(int var1) {
+		this.field4226 = var1; // L: 8
+	} // L: 9
+
+	public class391(int var1, Object var2) {
+		this.field4226 = var1; // L: 12
+		this.field4227 = var2; // L: 13
+	} // L: 14
+
+	public int hashCode() {
+		return super.hashCode(); // L: 17
+	}
+
+	public boolean equals(Object var1) {
+		if (!(var1 instanceof class391)) { // L: 21
+			return false;
+		} else {
+			class391 var2 = (class391)var1; // L: 22
+			if (var2.field4227 == null && this.field4227 != null) { // L: 23
+				return false;
+			} else if (this.field4227 == null && var2.field4227 != null) { // L: 24
+				return false;
+			} else {
+				return this.field4226 == var2.field4226 && var2.field4227.equals(this.field4227); // L: 25
+			}
+		}
+	}
+
+	@ObfuscatedName("ik")
+	@ObfuscatedSignature(
+		descriptor = "(IIIII)V",
+		garbageValue = "-857761179"
+	)
+	@Export("addSceneMenuOptions")
+	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+		if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 9003
+			class22.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 9004
+		}
+
+		long var4 = -1L; // L: 9007
+		long var6 = -1L; // L: 9008
+		int var8 = 0;
+
+		while (true) {
+			int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 9013
+			if (var8 >= var10) { // L: 9015
+				if (-1L != var4) { // L: 9162
+					var8 = (int)(var4 >>> 0 & 127L); // L: 9165
+					var10 = TextureProvider.method4272(var4); // L: 9168
+					Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 9169
+					Actor.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); // L: 9170
+				}
+
+				return; // L: 9172
+			}
+
+			long var27 = UrlRequest.method2516(var8); // L: 9016
+			if (var27 != var6) { // L: 9017
+				label328: {
+					var6 = var27; // L: 9018
+					long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9022
+					int var14 = (int)(var15 >>> 0 & 127L); // L: 9024
+					var14 = var14; // L: 9028
+					int var29 = TextureProvider.method4272(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9031
+					int var16 = var29; // L: 9033
+					long var19 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 9037
+					int var18 = (int)(var19 >>> 14 & 3L); // L: 9039
+					int var30 = Message.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 9046
+					int var20 = var30; // L: 9048
+					if (var18 == 2 && DevicePcmPlayerProvider.scene.getObjectFlags(SoundSystem.Client_plane, var14, var29, var27) >= 0) { // L: 9049 9050
+						ObjectComposition var21 = Tiles.getObjectDefinition(var30); // L: 9051
+						if (var21.transforms != null) { // L: 9052
+							var21 = var21.transform();
+						}
+
+						if (var21 == null) { // L: 9053
+							break label328;
+						}
+
+						if (Client.isItemSelected == 1) { // L: 9054
+							class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(65535) + var21.name, 1, var30, var14, var29); // L: 9055
+						} else if (Client.isSpellSelected) { // L: 9058
+							if ((LoginPacket.selectedSpellFlags & 4) == 4) { // L: 9059
+								class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(65535) + var21.name, 2, var30, var14, var29); // L: 9060
+							}
+						} else {
+							String[] var22 = var21.actions; // L: 9065
+							if (var22 != null) { // L: 9066
+								for (int var23 = 4; var23 >= 0; --var23) { // L: 9067
+									if (var22[var23] != null) { // L: 9068
+										short var24 = 0; // L: 9069
+										if (var23 == 0) { // L: 9070
+											var24 = 3;
+										}
+
+										if (var23 == 1) { // L: 9071
+											var24 = 4;
+										}
+
+										if (var23 == 2) { // L: 9072
+											var24 = 5;
+										}
+
+										if (var23 == 3) { // L: 9073
+											var24 = 6;
+										}
+
+										if (var23 == 4) { // L: 9074
+											var24 = 1001;
+										}
+
+										class22.insertMenuItemNoShift(var22[var23], SecureRandomFuture.colorStartTag(65535) + var21.name, var24, var20, var14, var16); // L: 9075
+									}
+								}
+							}
+
+							class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(65535) + var21.name, 1002, var21.id, var14, var16); // L: 9080
+						}
+					}
+
+					Player var25;
+					int var31;
+					NPC var32;
+					int var39;
+					int[] var40;
+					if (var18 == 1) { // L: 9085
+						NPC var35 = Client.npcs[var20]; // L: 9086
+						if (var35 == null) { // L: 9087
+							break label328;
+						}
+
+						if (var35.definition.size == 1 && (var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 9088
+							for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 9089
+								var32 = Client.npcs[Client.npcIndices[var31]]; // L: 9090
+								if (var32 != null && var32 != var35 && var32.definition.size == 1 && var32.x == var35.x && var35.y == var32.y) { // L: 9091
+									FontName.addNpcToMenu(var32.definition, Client.npcIndices[var31], var14, var16);
+								}
+							}
+
+							var31 = Players.Players_count; // L: 9093
+							var40 = Players.Players_indices; // L: 9094
+
+							for (var39 = 0; var39 < var31; ++var39) { // L: 9095
+								var25 = Client.players[var40[var39]]; // L: 9096
+								if (var25 != null && var35.x == var25.x && var25.y == var35.y) { // L: 9097
+									Actor.addPlayerToMenu(var25, var40[var39], var14, var16);
+								}
+							}
+						}
+
+						FontName.addNpcToMenu(var35.definition, var20, var14, var16); // L: 9100
+					}
+
+					if (var18 == 0) { // L: 9102
+						Player var36 = Client.players[var20]; // L: 9103
+						if (var36 == null) { // L: 9104
+							break label328;
+						}
+
+						if ((var36.x & 127) == 64 && (var36.y & 127) == 64) { // L: 9105
+							for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 9106
+								var32 = Client.npcs[Client.npcIndices[var31]]; // L: 9107
+								if (var32 != null && var32.definition.size == 1 && var36.x == var32.x && var32.y == var36.y) { // L: 9108
+									FontName.addNpcToMenu(var32.definition, Client.npcIndices[var31], var14, var16);
+								}
+							}
+
+							var31 = Players.Players_count; // L: 9110
+							var40 = Players.Players_indices; // L: 9111
+
+							for (var39 = 0; var39 < var31; ++var39) { // L: 9112
+								var25 = Client.players[var40[var39]]; // L: 9113
+								if (var25 != null && var36 != var25 && var36.x == var25.x && var25.y == var36.y) { // L: 9114
+									Actor.addPlayerToMenu(var25, var40[var39], var14, var16);
+								}
+							}
+						}
+
+						if (var20 != Client.combatTargetPlayerIndex) {
+							Actor.addPlayerToMenu(var36, var20, var14, var16); // L: 9117
+						} else {
+							var4 = var27; // L: 9118
+						}
+					}
+
+					if (var18 == 3) { // L: 9120
+						NodeDeque var38 = Client.groundItems[SoundSystem.Client_plane][var14][var16]; // L: 9121
+						if (var38 != null) { // L: 9122
+							for (TileItem var37 = (TileItem)var38.first(); var37 != null; var37 = (TileItem)var38.next()) { // L: 9123 9124 9157
+								ItemComposition var41 = class250.ItemDefinition_get(var37.id); // L: 9125
+								if (Client.isItemSelected == 1) { // L: 9126
+									class22.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var41.name, 16, var37.id, var14, var16); // L: 9127
+								} else if (Client.isSpellSelected) { // L: 9130
+									if ((LoginPacket.selectedSpellFlags & 1) == 1) { // L: 9131
+										class22.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + SecureRandomFuture.colorStartTag(16748608) + var41.name, 17, var37.id, var14, var16); // L: 9132
+									}
+								} else {
+									String[] var33 = var41.groundActions; // L: 9137
+
+									for (int var34 = 4; var34 >= 0; --var34) { // L: 9138
+										if (var33 != null && var33[var34] != null) { // L: 9139
+											byte var26 = 0; // L: 9140
+											if (var34 == 0) { // L: 9141
+												var26 = 18;
+											}
+
+											if (var34 == 1) { // L: 9142
+												var26 = 19;
+											}
+
+											if (var34 == 2) { // L: 9143
+												var26 = 20;
+											}
+
+											if (var34 == 3) { // L: 9144
+												var26 = 21;
+											}
+
+											if (var34 == 4) { // L: 9145
+												var26 = 22;
+											}
+
+											class22.insertMenuItemNoShift(var33[var34], SecureRandomFuture.colorStartTag(16748608) + var41.name, var26, var37.id, var14, var16); // L: 9146
+										} else if (var34 == 2) { // L: 9149
+											class22.insertMenuItemNoShift("Take", SecureRandomFuture.colorStartTag(16748608) + var41.name, 20, var37.id, var14, var16); // L: 9150
+										}
+									}
+
+									class22.insertMenuItemNoShift("Examine", SecureRandomFuture.colorStartTag(16748608) + var41.name, 1004, var37.id, var14, var16); // L: 9154
+								}
+							}
+						}
+					}
+				}
+			}
+
+			++var8; // L: 9009
+		}
+	}
+}
diff --git a/runescape-client/src/main/java/class396.java b/runescape-client/src/main/java/class396.java
deleted file mode 100644
index 0236418b97..0000000000
--- a/runescape-client/src/main/java/class396.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedGetter;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("ox")
-public class class396 {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -522791973
-	)
-	@Export("SpriteBuffer_spriteCount")
-	static int SpriteBuffer_spriteCount;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -1099363635
-	)
-	@Export("SpriteBuffer_spriteWidth")
-	static int SpriteBuffer_spriteWidth;
-	@ObfuscatedName("j")
-	@Export("SpriteBuffer_spriteWidths")
-	public static int[] SpriteBuffer_spriteWidths;
-	@ObfuscatedName("d")
-	@Export("SpriteBuffer_pixels")
-	public static byte[][] SpriteBuffer_pixels;
-}
diff --git a/runescape-client/src/main/java/class397.java b/runescape-client/src/main/java/class397.java
new file mode 100644
index 0000000000..d538c79750
--- /dev/null
+++ b/runescape-client/src/main/java/class397.java
@@ -0,0 +1,28 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.ObfuscatedGetter;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ol")
+public class class397 {
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 594316293
+	)
+	@Export("SpriteBuffer_spriteCount")
+	public static int SpriteBuffer_spriteCount;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = -770896369
+	)
+	@Export("SpriteBuffer_spriteWidth")
+	public static int SpriteBuffer_spriteWidth;
+	@ObfuscatedName("y")
+	@Export("SpriteBuffer_xOffsets")
+	public static int[] SpriteBuffer_xOffsets;
+	@ObfuscatedName("r")
+	@Export("SpriteBuffer_spritePalette")
+	public static int[] SpriteBuffer_spritePalette;
+	@ObfuscatedName("am")
+	@Export("hasFocus")
+	protected static boolean hasFocus;
+}
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
index 81ecd84f29..979ee91d22 100644
--- a/runescape-client/src/main/java/class4.java
+++ b/runescape-client/src/main/java/class4.java
@@ -3,132 +3,61 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("p")
+@ObfuscatedName("j")
 public class class4 extends class14 {
-	@ObfuscatedName("rk")
-	@ObfuscatedGetter(
-		intValue = -1261708709
-	)
-	static int field47;
-	@ObfuscatedName("mf")
-	@ObfuscatedGetter(
-		intValue = -2110888403
-	)
-	@Export("selectedSpellFlags")
-	static int selectedSpellFlags;
-	@ObfuscatedName("ng")
+	@ObfuscatedName("sg")
 	@ObfuscatedSignature(
-		descriptor = "[Lio;"
+		descriptor = "Lcn;"
 	)
-	static Widget[] field49;
-	@ObfuscatedName("v")
+	@Export("clientPreferences")
+	static ClientPreferences clientPreferences;
+	@ObfuscatedName("dd")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
+	)
+	@Export("archive5")
+	static Archive archive5;
+	@ObfuscatedName("eo")
 	@ObfuscatedGetter(
-		intValue = 82874555
+		intValue = -750894877
 	)
-	int field43;
-	@ObfuscatedName("n")
+	static int field38;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -1782449863
+	)
+	int field37;
+	@ObfuscatedName("e")
 	String field40;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class4(class2 var1) {
 		this.this$0 = var1; // L: 323
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	void vmethod276(Buffer var1) {
-		this.field43 = var1.readInt(); // L: 326
+	void vmethod363(Buffer var1) {
+		this.field37 = var1.readInt(); // L: 326
 		this.field40 = var1.readStringCp1252NullTerminated(); // L: 327
 	} // L: 328
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method115(this.field43, this.field40); // L: 331
+	void vmethod354(ClanSettings var1) {
+		var1.method138(this.field37, this.field40); // L: 331
 	} // L: 332
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(IIIII)V",
-		garbageValue = "-402074125"
-	)
-	@Export("itemContainerSetItem")
-	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39
-		if (var4 == null) { // L: 40
-			var4 = new ItemContainer(); // L: 41
-			ItemContainer.itemContainers.put(var4, (long)var0); // L: 42
-		}
-
-		if (var4.ids.length <= var1) { // L: 44
-			int[] var5 = new int[var1 + 1]; // L: 45
-			int[] var6 = new int[var1 + 1]; // L: 46
-
-			int var7;
-			for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47
-				var5[var7] = var4.ids[var7]; // L: 48
-				var6[var7] = var4.quantities[var7]; // L: 49
-			}
-
-			for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51
-				var5[var7] = -1; // L: 52
-				var6[var7] = 0; // L: 53
-			}
-
-			var4.ids = var5; // L: 55
-			var4.quantities = var6; // L: 56
-		}
-
-		var4.ids[var1] = var2; // L: 58
-		var4.quantities[var1] = var3; // L: 59
-	} // L: 60
-
-	@ObfuscatedName("kr")
-	@ObfuscatedSignature(
-		descriptor = "(S)V",
-		garbageValue = "-23226"
-	)
-	static final void method47() {
-		PacketBufferNode var0 = class21.getPacketBufferNode(ClientPacket.field2594, Client.packetWriter.isaacCipher); // L: 11030
-		Client.packetWriter.addNode(var0); // L: 11031
-
-		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 11032
-			if (var1.type == 0 || var1.type == 3) { // L: 11033
-				class43.closeInterface(var1, true);
-			}
-		}
-
-		if (Client.meslayerContinueWidget != null) { // L: 11035
-			WorldMapCacheName.invalidateWidget(Client.meslayerContinueWidget); // L: 11036
-			Client.meslayerContinueWidget = null; // L: 11037
-		}
-
-	} // L: 11039
-
-	@ObfuscatedName("lx")
-	@ObfuscatedSignature(
-		descriptor = "(IIIZI)V",
-		garbageValue = "1166427642"
-	)
-	public static void method50(int var0, int var1, int var2, boolean var3) {
-		PacketBufferNode var4 = class21.getPacketBufferNode(ClientPacket.field2657, Client.packetWriter.isaacCipher); // L: 11482
-		var4.packetBuffer.method6602(var1); // L: 11483
-		var4.packetBuffer.writeInt(var3 ? Client.field723 * -315190483 * 711341221 : 0); // L: 11484
-		var4.packetBuffer.writeByte(var2); // L: 11485
-		var4.packetBuffer.method6619(var0); // L: 11486
-		Client.packetWriter.addNode(var4); // L: 11487
-	} // L: 11488
 }
diff --git a/runescape-client/src/main/java/class402.java b/runescape-client/src/main/java/class402.java
deleted file mode 100644
index 510ec75e3f..0000000000
--- a/runescape-client/src/main/java/class402.java
+++ /dev/null
@@ -1,21 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("oo")
-public class class402 {
-	@ObfuscatedName("s")
-	static final int[] field4280;
-	@ObfuscatedName("u")
-	static final int[] field4279;
-
-	static {
-		field4280 = new int[2048]; // L: 13
-		field4279 = new int[2048]; // L: 14
-		double var0 = 0.0030679615757712823D; // L: 17
-
-		for (int var2 = 0; var2 < 2048; ++var2) { // L: 18
-			field4280[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); // L: 19
-			field4279[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); // L: 20
-		}
-
-	} // L: 22
-}
diff --git a/runescape-client/src/main/java/class403.java b/runescape-client/src/main/java/class403.java
new file mode 100644
index 0000000000..4ef3ef00a8
--- /dev/null
+++ b/runescape-client/src/main/java/class403.java
@@ -0,0 +1,21 @@
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("ow")
+public class class403 {
+	@ObfuscatedName("d")
+	static final int[] field4296;
+	@ObfuscatedName("z")
+	static final int[] field4298;
+
+	static {
+		field4296 = new int[2048]; // L: 13
+		field4298 = new int[2048]; // L: 14
+		double var0 = 0.0030679615757712823D; // L: 17
+
+		for (int var2 = 0; var2 < 2048; ++var2) { // L: 18
+			field4296[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19
+			field4298[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20
+		}
+
+	} // L: 22
+}
diff --git a/runescape-client/src/main/java/class404.java b/runescape-client/src/main/java/class404.java
deleted file mode 100644
index 11792bda8f..0000000000
--- a/runescape-client/src/main/java/class404.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("oa")
-public class class404 {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "Ljv;"
-	)
-	@Export("KitDefinition_archive")
-	static AbstractArchive KitDefinition_archive;
-}
diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java
index d823729b25..6a77e51833 100644
--- a/runescape-client/src/main/java/class42.java
+++ b/runescape-client/src/main/java/class42.java
@@ -3,32 +3,23 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import netscape.javascript.JSObject;
 
-@ObfuscatedName("ah")
+@ObfuscatedName("as")
 public class class42 {
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V",
-		garbageValue = "-2125796670"
+		garbageValue = "434210577"
 	)
-	public static void method420(Applet var0, String var1) throws Throwable {
+	public static void method525(Applet var0, String var1) throws Throwable {
 		JSObject.getWindow(var0).eval(var1); // L: 13
 	} // L: 14
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;",
-		garbageValue = "901657187"
+		garbageValue = "-1290742377"
 	)
-	public static Object method421(Applet var0, String var1) throws Throwable {
+	public static Object method521(Applet var0, String var1) throws Throwable {
 		return JSObject.getWindow(var0).call(var1, (Object[])null); // L: 17
 	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;S)Ljava/lang/Object;",
-		garbageValue = "-19478"
-	)
-	public static Object method422(Applet var0, String var1, Object[] var2) throws Throwable {
-		return JSObject.getWindow(var0).call(var1, var2); // L: 21
-	}
 }
diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java
index 404e30b1de..4027dcc4f3 100644
--- a/runescape-client/src/main/java/class43.java
+++ b/runescape-client/src/main/java/class43.java
@@ -1,356 +1,86 @@
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.util.Iterator;
 import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ao")
+@ObfuscatedName("au")
 public class class43 {
-	@ObfuscatedName("sx")
-	@ObfuscatedSignature(
-		descriptor = "Llh;"
-	)
-	@Export("masterDisk")
-	static ArchiveDisk masterDisk;
+	@ObfuscatedName("r")
+	static byte[][][] field307;
 
 	static {
 		ImageIO.setUseCache(false); // L: 12
 	} // L: 13
 
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(IIIB)Lcf;",
-		garbageValue = "-16"
-	)
-	@Export("getWorldMapScript")
-	static Script getWorldMapScript(int var0, int var1, int var2) {
-		int var3 = (var1 << 8) + var0; // L: 40
-		Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 45
-		Script var5;
-		if (var6 != null) { // L: 46
-			var5 = var6; // L: 47
-		} else {
-			String var7 = String.valueOf(var3);
-			int var8 = UserComparator5.archive12.getGroupId(var7);
-			if (var8 == -1) {
-				var5 = null;
-			} else {
-				label59: {
-					byte[] var9 = UserComparator5.archive12.takeFileFlat(var8); // L: 56
-					if (var9 != null) { // L: 57
-						if (var9.length <= 1) { // L: 58
-							var5 = null; // L: 59
-							break label59; // L: 60
-						}
-
-						var6 = UserList.newScript(var9); // L: 62
-						if (var6 != null) { // L: 63
-							Script.Script_cached.put(var6, (long)(var3 << 16)); // L: 64
-							var5 = var6; // L: 65
-							break label59; // L: 66
-						}
-					}
-
-					var5 = null; // L: 69
-				}
-			}
-		}
-
-		if (var5 != null) { // L: 72
-			return var5; // L: 73
-		} else {
-			int var13 = (-3 - var2 << 8) + var0; // L: 77
-			Script var15 = (Script)Script.Script_cached.get((long)(var13 << 16)); // L: 82
-			Script var14;
-			if (var15 != null) { // L: 83
-				var14 = var15; // L: 84
-			} else {
-				String var10 = String.valueOf(var13); // L: 87
-				int var11 = UserComparator5.archive12.getGroupId(var10); // L: 88
-				if (var11 == -1) { // L: 89
-					var14 = null; // L: 90
-				} else {
-					byte[] var12 = UserComparator5.archive12.takeFileFlat(var11); // L: 93
-					if (var12 != null) { // L: 94
-						if (var12.length <= 1) { // L: 95
-							var14 = null; // L: 96
-							return var14 != null ? var14 : null; // L: 109 112
-						}
-
-						var15 = UserList.newScript(var12); // L: 99
-						if (var15 != null) { // L: 100
-							Script.Script_cached.put(var15, (long)(var13 << 16)); // L: 101
-							var14 = var15; // L: 102
-							return var14 != null ? var14 : null;
-						}
-					}
-
-					var14 = null; // L: 106
-				}
-			}
-
-			return var14 != null ? var14 : null;
-		}
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "([BIIB)Ljava/lang/String;",
-		garbageValue = "100"
-	)
-	@Export("decodeStringCp1252")
-	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
-		char[] var3 = new char[var2]; // L: 141
-		int var4 = 0; // L: 142
-
-		for (int var5 = 0; var5 < var2; ++var5) { // L: 143
-			int var6 = var0[var5 + var1] & 255; // L: 144
-			if (var6 != 0) { // L: 145
-				if (var6 >= 128 && var6 < 160) {
-					char var7 = class301.cp1252AsciiExtension[var6 - 128];
-					if (var7 == 0) {
-						var7 = '?';
-					}
-
-					var6 = var7;
-				}
-
-				var3[var4++] = (char)var6;
-			}
-		}
-
-		return new String(var3, 0, var4);
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1726965771"
-	)
-	static void method437() {
-		Messages.Messages_channels.clear(); // L: 50
-		Messages.Messages_hashTable.clear(); // L: 51
-		Messages.Messages_queue.clear(); // L: 52
-		Messages.Messages_count = 0; // L: 53
-	} // L: 54
-
-	@ObfuscatedName("r")
+	@ObfuscatedName("as")
 	@ObfuscatedSignature(
 		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1427864151"
+		garbageValue = "1455356622"
 	)
-	static int method435(int var0, Script var1, boolean var2) {
-		Widget var3;
-		if (var0 >= 2000) { // L: 794
-			var0 -= 1000; // L: 795
-			var3 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 796
-		} else {
-			var3 = var2 ? class13.scriptDotWidget : Interpreter.scriptActiveWidget; // L: 798
-		}
-
-		WorldMapCacheName.invalidateWidget(var3); // L: 799
-		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 800
-			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 820
-				var3.modelType = 2; // L: 821
-				var3.modelId = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 822
-				return 1; // L: 823
-			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 825
-				var3.modelType = 3; // L: 826
-				var3.modelId = class93.localPlayer.appearance.getChatHeadId(); // L: 827
-				return 1; // L: 828
-			} else {
-				return 2; // L: 830
-			}
-		} else {
-			class44.Interpreter_intStackSize -= 2; // L: 801
-			int var4 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 802
-			int var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 803
-			var3.itemId = var4; // L: 804
-			var3.itemQuantity = var5; // L: 805
-			ItemComposition var6 = class260.ItemDefinition_get(var4); // L: 806
-			var3.modelAngleX = var6.xan2d; // L: 807
-			var3.modelAngleY = var6.yan2d; // L: 808
-			var3.modelAngleZ = var6.zan2d; // L: 809
-			var3.modelOffsetX = var6.offsetX2d; // L: 810
-			var3.modelOffsetY = var6.offsetY2d; // L: 811
-			var3.modelZoom = var6.zoom2d; // L: 812
-			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
-				var3.itemQuantityMode = 0; // L: 813
-			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) { // L: 814
-				var3.itemQuantityMode = 1;
-			} else {
-				var3.itemQuantityMode = 2; // L: 815
-			}
-
-			if (var3.field3013 > 0) { // L: 816
-				var3.modelZoom = var3.modelZoom * 32 / var3.field3013;
-			} else if (var3.rawWidth > 0) { // L: 817
-				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
-			}
-
-			return 1; // L: 818
-		}
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1591980574"
-	)
-	public static String method433(String var0) {
-		int var1 = var0.length(); // L: 146
-		char[] var2 = new char[var1]; // L: 147
-		byte var3 = 2; // L: 148
-
-		for (int var4 = 0; var4 < var1; ++var4) { // L: 149
-			char var5 = var0.charAt(var4); // L: 150
-			if (var3 == 0) { // L: 151
-				var5 = Character.toLowerCase(var5);
-			} else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 152
-				var5 = Username.method5877(var5);
-			}
-
-			if (Character.isLetter(var5)) { // L: 153
-				var3 = 0;
-			} else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 154
-				if (Character.isSpaceChar(var5)) { // L: 155
-					if (var3 != 2) { // L: 156
-						var3 = 1;
+	static int method527(int var0, Script var1, boolean var2) {
+		if (var0 != 6700 && var0 != 6702 && var0 != 6704 && var0 != 6706 && var0 != 6708) { // L: 4210
+			if (var0 != 6701 && var0 != 6703 && var0 != 6705 && var0 != 6707 && var0 != 6709) { // L: 4215
+				if (var0 == 6750) { // L: 4219
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4220
+					return 1; // L: 4221
+				} else if (var0 != 6751 && var0 != 6752 && var0 != 6753) { // L: 4223
+					if (var0 == 6754) { // L: 4227
+						int var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 4228
+						NPCComposition var4 = class248.getNpcDefinition(var3); // L: 4229
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var4 != null ? var4.name : ""; // L: 4230
+						return 1; // L: 4231
+					} else {
+						return 2; // L: 4233
 					}
 				} else {
-					var3 = 1; // L: 158
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4224
+					return 1; // L: 4225
 				}
 			} else {
-				var3 = 2;
+				--ChatChannel.Interpreter_intStackSize; // L: 4216
+				return 1; // L: 4217
 			}
-
-			var2[var4] = var5; // L: 159
-		}
-
-		return new String(var2); // L: 161
-	}
-
-	@ObfuscatedName("aj")
-	@ObfuscatedSignature(
-		descriptor = "(IS)I",
-		garbageValue = "323"
-	)
-	static int method436(int var0) {
-		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); // L: 3511
-	}
-
-	@ObfuscatedName("az")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-56748890"
-	)
-	@Export("getGcDuration")
-	protected static int getGcDuration() {
-		int var0 = 0; // L: 600
-		if (class124.garbageCollector == null || !class124.garbageCollector.isValid()) { // L: 601
-			try {
-				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 603
-
-				while (var1.hasNext()) {
-					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 604
-					if (var2.isValid()) { // L: 606
-						class124.garbageCollector = var2; // L: 607
-						GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 608
-						GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 609
-					}
-				}
-			} catch (Throwable var11) { // L: 614
-			}
-		}
-
-		if (class124.garbageCollector != null) { // L: 616
-			long var9 = ObjectComposition.currentTimeMillis(); // L: 617
-			long var3 = class124.garbageCollector.getCollectionTime(); // L: 618
-			if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 619
-				long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 620
-				long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 621
-				if (0L != var7) { // L: 622
-					var0 = (int)(100L * var5 / var7);
-				}
-			}
-
-			GameEngine.garbageCollectorLastCollectionTime = var3; // L: 624
-			GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 625
-		}
-
-		return var0; // L: 627
-	}
-
-	@ObfuscatedName("fc")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1248092260"
-	)
-	static int method440() {
-		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1498
-			int var0 = 0; // L: 1499
-
-			for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1500
-				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1501
-			}
-
-			return var0 * 10000 / Client.field916; // L: 1503
 		} else {
-			return 10000;
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 4211
+			--UserComparator9.Interpreter_stringStackSize; // L: 4212
+			return 1; // L: 4213
 		}
 	}
 
-	@ObfuscatedName("kx")
+	@ObfuscatedName("jo")
 	@ObfuscatedSignature(
-		descriptor = "(Lcu;ZI)V",
-		garbageValue = "-2095467414"
+		descriptor = "(Liv;IIB)V",
+		garbageValue = "39"
 	)
-	@Export("closeInterface")
-	static final void closeInterface(InterfaceParent var0, boolean var1) {
-		int var2 = var0.group; // L: 11061
-		int var3 = (int)var0.key; // L: 11062
-		var0.remove(); // L: 11063
-		if (var1 && var2 != -1 && Widget.Widget_loadedInterfaces[var2]) { // L: 11064 11065 11066
-			HealthBarUpdate.Widget_archive.clearFilesGroup(var2); // L: 11067
-			if (Widget.Widget_interfaceComponents[var2] != null) { // L: 11068
-				boolean var4 = true; // L: 11069
-
-				for (int var5 = 0; var5 < Widget.Widget_interfaceComponents[var2].length; ++var5) { // L: 11070
-					if (Widget.Widget_interfaceComponents[var2][var5] != null) { // L: 11071
-						if (Widget.Widget_interfaceComponents[var2][var5].type != 2) { // L: 11072
-							Widget.Widget_interfaceComponents[var2][var5] = null;
-						} else {
-							var4 = false; // L: 11073
-						}
-					}
-				}
-
-				if (var4) { // L: 11076
-					Widget.Widget_interfaceComponents[var2] = null;
-				}
-
-				Widget.Widget_loadedInterfaces[var2] = false; // L: 11077
-			}
+	@Export("alignWidgetPosition")
+	static void alignWidgetPosition(Widget var0, int var1, int var2) {
+		if (var0.xAlignment == 0) { // L: 9986
+			var0.x = var0.rawX;
+		} else if (var0.xAlignment == 1) { // L: 9987
+			var0.x = var0.rawX + (var1 - var0.width) / 2;
+		} else if (var0.xAlignment == 2) { // L: 9988
+			var0.x = var1 - var0.width - var0.rawX;
+		} else if (var0.xAlignment == 3) { // L: 9989
+			var0.x = var0.rawX * var1 >> 14;
+		} else if (var0.xAlignment == 4) { // L: 9990
+			var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14);
+		} else {
+			var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9991
 		}
 
-		for (IntegerNode var6 = (IntegerNode)Client.widgetFlags.first(); var6 != null; var6 = (IntegerNode)Client.widgetFlags.next()) { // L: 11080
-			if ((var6.key >> 48 & 65535L) == (long)var2) { // L: 11081
-				var6.remove(); // L: 11082
-			}
+		if (var0.yAlignment == 0) { // L: 9992
+			var0.y = var0.rawY;
+		} else if (var0.yAlignment == 1) { // L: 9993
+			var0.y = (var2 - var0.height) / 2 + var0.rawY;
+		} else if (var0.yAlignment == 2) { // L: 9994
+			var0.y = var2 - var0.height - var0.rawY;
+		} else if (var0.yAlignment == 3) {
+			var0.y = var2 * var0.rawY >> 14; // L: 9995
+		} else if (var0.yAlignment == 4) { // L: 9996
+			var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14);
+		} else {
+			var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9997
 		}
 
-		Widget var7 = Frames.getWidget(var3); // L: 11086
-		if (var7 != null) { // L: 11087
-			WorldMapCacheName.invalidateWidget(var7);
-		}
-
-		class7.method68(); // L: 11088
-		if (Client.rootInterface != -1) { // L: 11089
-			Login.runIntfCloseListeners(Client.rootInterface, 1);
-		}
-
-	} // L: 11090
+	} // L: 9998
 }
diff --git a/runescape-client/src/main/java/class44.java b/runescape-client/src/main/java/class44.java
index 262a626687..ab98277e1e 100644
--- a/runescape-client/src/main/java/class44.java
+++ b/runescape-client/src/main/java/class44.java
@@ -4,164 +4,78 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("aq")
+@ObfuscatedName("ay")
 public class class44 {
-	@ObfuscatedName("v")
-	@Export("applet")
-	public static Applet applet;
-	@ObfuscatedName("n")
-	public static String field318;
-	@ObfuscatedName("u")
+	@ObfuscatedName("ra")
 	@ObfuscatedGetter(
-		intValue = -26460885
+		intValue = 1478949061
 	)
-	@Export("Interpreter_intStackSize")
-	static int Interpreter_intStackSize;
+	static int field315;
+	@ObfuscatedName("f")
+	@Export("applet")
+	static Applet applet;
+	@ObfuscatedName("e")
+	static String field309;
+	@ObfuscatedName("z")
+	@ObfuscatedSignature(
+		descriptor = "Ljp;"
+	)
+	@Export("Widget_spritesArchive")
+	static AbstractArchive Widget_spritesArchive;
 
 	static {
 		applet = null; // L: 10
-		field318 = ""; // L: 11
+		field309 = ""; // L: 11
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "-1966582053"
+		descriptor = "(B)V",
+		garbageValue = "69"
 	)
-	@Export("colorStartTag")
-	static String colorStartTag(int var0) {
-		return "<col=" + Integer.toHexString(var0) + ">"; // L: 22
-	}
+	static void method532() {
+		WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 42
+	} // L: 43
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "277125318"
+		descriptor = "(IB)V",
+		garbageValue = "67"
 	)
-	@Export("changeWorldSelectSorting")
-	static void changeWorldSelectSorting(int var0, int var1) {
-		int[] var2 = new int[4]; // L: 63
-		int[] var3 = new int[4]; // L: 64
-		var2[0] = var0; // L: 65
-		var3[0] = var1; // L: 66
-		int var4 = 1; // L: 67
+	public static void method540(int var0) {
+		if (var0 != -1) { // L: 240
+			if (Widget.Widget_loadedInterfaces[var0]) { // L: 241
+				AttackOption.Widget_archive.clearFilesGroup(var0); // L: 242
+				if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] != null) { // L: 243
+					boolean var1 = true; // L: 244
 
-		for (int var5 = 0; var5 < 4; ++var5) { // L: 68
-			if (World.World_sortOption1[var5] != var0) { // L: 69
-				var2[var4] = World.World_sortOption1[var5]; // L: 70
-				var3[var4] = World.World_sortOption2[var5]; // L: 71
-				++var4; // L: 72
-			}
-		}
-
-		World.World_sortOption1 = var2; // L: 75
-		World.World_sortOption2 = var3; // L: 76
-		SoundCache.sortWorlds(Tiles.World_worlds, 0, Tiles.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77
-	} // L: 78
-
-	@ObfuscatedName("gi")
-	@ObfuscatedSignature(
-		descriptor = "(Lcy;I)V",
-		garbageValue = "1230539063"
-	)
-	static final void method449(Actor var0) {
-		var0.isWalking = false; // L: 3815
-		SequenceDefinition var1;
-		if (var0.movementSequence != -1) { // L: 3816
-			var1 = LoginScreenAnimation.SequenceDefinition_get(var0.movementSequence); // L: 3817
-			if (var1 != null && var1.frameIds != null) { // L: 3818
-				++var0.movementFrameCycle; // L: 3819
-				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 3820
-					var0.movementFrameCycle = 1; // L: 3821
-					++var0.movementFrame; // L: 3822
-					Decimator.method1074(var1, var0.movementFrame, var0.x, var0.y); // L: 3823
-				}
-
-				if (var0.movementFrame >= var1.frameIds.length) { // L: 3825
-					var0.movementFrameCycle = 0; // L: 3826
-					var0.movementFrame = 0; // L: 3827
-					Decimator.method1074(var1, var0.movementFrame, var0.x, var0.y); // L: 3828
-				}
-			} else {
-				var0.movementSequence = -1; // L: 3831
-			}
-		}
-
-		if (var0.spotAnimation != -1 && Client.cycle >= var0.field1287) { // L: 3833
-			if (var0.spotAnimationFrame < 0) { // L: 3834
-				var0.spotAnimationFrame = 0;
-			}
-
-			int var3 = VarcInt.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3835
-			if (var3 != -1) { // L: 3836
-				SequenceDefinition var2 = LoginScreenAnimation.SequenceDefinition_get(var3); // L: 3837
-				if (var2 != null && var2.frameIds != null) { // L: 3838
-					++var0.spotAnimationFrameCycle; // L: 3839
-					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 3840
-						var0.spotAnimationFrameCycle = 1; // L: 3841
-						++var0.spotAnimationFrame; // L: 3842
-						Decimator.method1074(var2, var0.spotAnimationFrame, var0.x, var0.y); // L: 3843
+					for (int var2 = 0; var2 < GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0].length; ++var2) { // L: 245
+						if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] != null) { // L: 246
+							if (GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2].type != 2) { // L: 247
+								GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0][var2] = null;
+							} else {
+								var1 = false; // L: 248
+							}
+						}
 					}
 
-					if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) { // L: 3845 3846
-						var0.spotAnimation = -1;
+					if (var1) {
+						GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0] = null; // L: 251
 					}
-				} else {
-					var0.spotAnimation = -1; // L: 3849
+
+					Widget.Widget_loadedInterfaces[var0] = false; // L: 252
 				}
-			} else {
-				var0.spotAnimation = -1; // L: 3851
 			}
 		}
+	} // L: 253
 
-		if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3853
-			var1 = LoginScreenAnimation.SequenceDefinition_get(var0.sequence); // L: 3854
-			if (var1.field1883 == 1 && var0.field1274 > 0 && var0.field1265 <= Client.cycle && var0.field1283 < Client.cycle) { // L: 3855 3856
-				var0.sequenceDelay = 1; // L: 3857
-				return; // L: 3858
-			}
-		}
-
-		if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3862
-			var1 = LoginScreenAnimation.SequenceDefinition_get(var0.sequence); // L: 3863
-			if (var1 != null && var1.frameIds != null) { // L: 3864
-				++var0.sequenceFrameCycle; // L: 3865
-				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 3866
-					var0.sequenceFrameCycle = 1; // L: 3867
-					++var0.sequenceFrame; // L: 3868
-					Decimator.method1074(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3869
-				}
-
-				if (var0.sequenceFrame >= var1.frameIds.length) { // L: 3871
-					var0.sequenceFrame -= var1.frameCount; // L: 3872
-					++var0.field1245; // L: 3873
-					if (var0.field1245 >= var1.field1888) { // L: 3874
-						var0.sequence = -1;
-					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { // L: 3875
-						Decimator.method1074(var1, var0.sequenceFrame, var0.x, var0.y); // L: 3876
-					} else {
-						var0.sequence = -1;
-					}
-				}
-
-				var0.isWalking = var1.field1882; // L: 3878
-			} else {
-				var0.sequence = -1; // L: 3880
-			}
-		}
-
-		if (var0.sequenceDelay > 0) { // L: 3882
-			--var0.sequenceDelay;
-		}
-
-	} // L: 3883
-
-	@ObfuscatedName("gh")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		descriptor = "(B)Z",
-		garbageValue = "4"
+		descriptor = "(Ljava/lang/String;I)I",
+		garbageValue = "-1279481562"
 	)
-	static boolean method451() {
-		return (Client.drawPlayerNames & 2) != 0; // L: 4426
+	@Export("stringCp1252NullTerminatedByteSize")
+	public static int stringCp1252NullTerminatedByteSize(String var0) {
+		return var0.length() + 1; // L: 119
 	}
 }
diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java
index cd76614614..efc29399da 100644
--- a/runescape-client/src/main/java/class5.java
+++ b/runescape-client/src/main/java/class5.java
@@ -3,137 +3,128 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("j")
+@ObfuscatedName("o")
 public class class5 extends class16 {
-	@ObfuscatedName("an")
-	@ObfuscatedGetter(
-		intValue = 1071759603
-	)
-	static int field53;
-	@ObfuscatedName("ez")
+	@ObfuscatedName("lw")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Liv;"
 	)
-	@Export("archive20")
-	static Archive archive20;
-	@ObfuscatedName("v")
+	static Widget field42;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -625073017
+		intValue = 835981453
 	)
-	int field56;
+	int field43;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Ls;"
 	)
 	final class19 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lx;)V"
+		descriptor = "(Ls;)V"
 	)
 	class5(class19 var1) {
 		this.this$0 = var1;
-		this.field56 = -1; // L: 81
-	} // L: 83
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "68071115"
-	)
-	void vmethod266(Buffer var1) {
-		this.field56 = var1.readUnsignedShort(); // L: 86
-		var1.readUnsignedByte(); // L: 87
-		if (var1.readUnsignedByte() != 255) { // L: 88
-			--var1.offset; // L: 89
-			var1.readLong(); // L: 90
-		}
-
-	} // L: 92
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ly;I)V",
-		garbageValue = "-1846892157"
-	)
-	void vmethod264(ClanChannel var1) {
-		var1.removeMember(this.field56); // L: 95
-	} // L: 96
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "1508723564"
-	)
-	@Export("addChatMessage")
-	static void addChatMessage(int var0, String var1, String var2, String var3) {
-		ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23
-		if (var4 == null) { // L: 24
-			var4 = new ChatChannel(); // L: 25
-			Messages.Messages_channels.put(var0, var4); // L: 26
-		}
-
-		Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28
-		Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29
-		Messages.Messages_queue.add(var5); // L: 30
-		Client.chatCycle = Client.cycleCntr; // L: 31
-	} // L: 32
+		this.field43 = -1;
+	}
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(IS)[B",
-		garbageValue = "3296"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "851460888"
 	)
-	@Export("ByteArrayPool_getArray")
-	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
-		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72
+	void vmethod331(Buffer var1) {
+		this.field43 = var1.readUnsignedShort(); // L: 86
+		var1.readUnsignedByte();
+		if (var1.readUnsignedByte() != 255) {
+			--var1.offset;
+			var1.readLong(); // L: 90
+		}
+
 	}
 
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Ly;I)V",
+		garbageValue = "-1362614343"
+	)
+	void vmethod332(ClanChannel var1) {
+		var1.removeMember(this.field43);
+	} // L: 96
+
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(IB)I",
-		garbageValue = "30"
+		descriptor = "(II)Z",
+		garbageValue = "2066845091"
 	)
-	public static int method58(int var0) {
-		return VarpDefinition.method2630(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 60
+	public static boolean method73(int var0) {
+		return (var0 >> 20 & 1) != 0; // L: 21
 	}
 
-	@ObfuscatedName("ih")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(IB)Z",
-		garbageValue = "113"
+		descriptor = "(II)I",
+		garbageValue = "-217249908"
 	)
-	static final boolean method51(int var0) {
-		if (var0 < 0) { // L: 7764
-			return false;
+	@Export("iLog")
+	public static int iLog(int var0) {
+		int var1 = 0; // L: 74
+		if (var0 < 0 || var0 >= 65536) { // L: 75
+			var0 >>>= 16; // L: 76
+			var1 += 16; // L: 77
+		}
+
+		if (var0 >= 256) { // L: 79
+			var0 >>>= 8; // L: 80
+			var1 += 8; // L: 81
+		}
+
+		if (var0 >= 16) { // L: 83
+			var0 >>>= 4; // L: 84
+			var1 += 4; // L: 85
+		}
+
+		if (var0 >= 4) { // L: 87
+			var0 >>>= 2; // L: 88
+			var1 += 2; // L: 89
+		}
+
+		if (var0 >= 1) { // L: 91
+			var0 >>>= 1; // L: 92
+			++var1; // L: 93
+		}
+
+		return var0 + var1; // L: 95
+	}
+
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "-72"
+	)
+	static int method72(int var0, Script var1, boolean var2) {
+		if (var0 == 6800) { // L: 4237
+			Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4238
+			return 1; // L: 4239
+		} else if (var0 != 6801 && var0 != 6802) { // L: 4241
+			if (var0 == 6850) { // L: 4245
+				Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 4246
+				return 1; // L: 4247
+			} else if (var0 != 6851 && var0 != 6852) { // L: 4249
+				if (var0 == 6853) { // L: 4253
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 4254
+					return 1; // L: 4255
+				} else {
+					return 2; // L: 4257
+				}
+			} else {
+				Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4250
+				return 1; // L: 4251
+			}
 		} else {
-			int var1 = Client.menuOpcodes[var0]; // L: 7765
-			if (var1 >= 2000) { // L: 7766
-				var1 -= 2000;
-			}
-
-			return var1 == 1007; // L: 7767
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 4242
+			return 1; // L: 4243
 		}
 	}
-
-	@ObfuscatedName("ik")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1850055815"
-	)
-	@Export("Widget_runOnTargetLeave")
-	static void Widget_runOnTargetLeave() {
-		if (Client.isSpellSelected) { // L: 8647
-			Widget var0 = ModeWhere.getWidgetChild(Decimator.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8648
-			if (var0 != null && var0.onTargetLeave != null) { // L: 8649
-				ScriptEvent var1 = new ScriptEvent(); // L: 8650
-				var1.widget = var0; // L: 8651
-				var1.args = var0.onTargetLeave; // L: 8652
-				PacketWriter.runScriptEvent(var1); // L: 8653
-			}
-
-			Client.field788 = -1; // L: 8655
-			Client.isSpellSelected = false; // L: 8656
-			WorldMapCacheName.invalidateWidget(var0); // L: 8657
-		}
-	} // L: 8658
 }
diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java
index 99b0b8cb69..7e9b371aa7 100644
--- a/runescape-client/src/main/java/class6.java
+++ b/runescape-client/src/main/java/class6.java
@@ -3,87 +3,209 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("r")
+@ObfuscatedName("m")
 public class class6 extends class14 {
-	@ObfuscatedName("bs")
-	static String field58;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -1126650753
+	@ObfuscatedName("ec")
+	@ObfuscatedSignature(
+		descriptor = "Ljf;"
 	)
-	int field60;
-	@ObfuscatedName("n")
+	@Export("archive18")
+	static Archive archive18;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 910283143
+		intValue = -753176319
 	)
-	int field59;
+	int field47;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 239857617
+	)
+	int field45;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class6(class2 var1) {
 		this.this$0 = var1; // L: 271
 	}
 
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
-	)
-	void vmethod276(Buffer var1) {
-		this.field60 = var1.readInt(); // L: 274
-		this.field59 = var1.readInt(); // L: 275
-	} // L: 276
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
-	)
-	void vmethod281(ClanSettings var1) {
-		var1.method157(this.field60, this.field59); // L: 279
-	} // L: 280
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(II)Lew;",
-		garbageValue = "1647125333"
-	)
-	@Export("WorldMapElement_get")
-	public static WorldMapElement WorldMapElement_get(int var0) {
-		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 62 63
-	}
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(ILjv;Ljava/lang/String;Ljava/lang/String;IZI)V",
-		garbageValue = "-908016568"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
 	)
-	public static void method60(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) {
-		int var6 = var1.getGroupId(var2); // L: 44
-		int var7 = var1.getFileId(var6, var3); // L: 45
-		Canvas.method395(var0, var1, var6, var7, var4, var5); // L: 46
-	} // L: 47
+	void vmethod363(Buffer var1) {
+		this.field47 = var1.readInt(); // L: 274
+		this.field45 = var1.readInt(); // L: 275
+	} // L: 276
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "-1691185672"
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
 	)
-	public static String method67(CharSequence var0) {
-		int var2 = var0.length(); // L: 166
-		char[] var3 = new char[var2]; // L: 168
+	void vmethod354(ClanSettings var1) {
+		var1.method188(this.field47, this.field45); // L: 279
+	} // L: 280
 
-		for (int var4 = 0; var4 < var2; ++var4) { // L: 169
-			var3[var4] = '*';
+	@ObfuscatedName("fw")
+	@ObfuscatedSignature(
+		descriptor = "(II)V",
+		garbageValue = "-719237513"
+	)
+	@Export("playSong")
+	static void playSong(int var0) {
+		if (var0 == -1 && !Client.field862) { // L: 3785
+			Decimator.method1169(); // L: 3786
+		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && class4.clientPreferences.musicVolume != 0 && !Client.field862) { // L: 3788
+			WorldMapIcon_1.method3300(2, DynamicObject.archive6, var0, 0, class4.clientPreferences.musicVolume, false); // L: 3789
 		}
 
-		String var1 = new String(var3); // L: 170
-		return var1; // L: 172
-	}
+		Client.currentTrackGroupId = var0; // L: 3791
+	} // L: 3792
+
+	@ObfuscatedName("kk")
+	@ObfuscatedSignature(
+		descriptor = "(IB)V",
+		garbageValue = "-28"
+	)
+	@Export("changeGameOptions")
+	static final void changeGameOptions(int var0) {
+		WorldMapID.method3717(); // L: 11144
+		Canvas.method495(); // L: 11145
+		int var1 = class1.VarpDefinition_get(var0).type; // L: 11146
+		if (var1 != 0) { // L: 11147
+			int var2 = Varps.Varps_main[var0]; // L: 11148
+			if (var1 == 1) { // L: 11149
+				if (var2 == 1) { // L: 11150
+					UserComparator10.method2568(0.9D);
+				}
+
+				if (var2 == 2) { // L: 11151
+					UserComparator10.method2568(0.8D);
+				}
+
+				if (var2 == 3) { // L: 11152
+					UserComparator10.method2568(0.7D);
+				}
+
+				if (var2 == 4) { // L: 11153
+					UserComparator10.method2568(0.6D);
+				}
+			}
+
+			if (var1 == 3) { // L: 11155
+				if (var2 == 0) { // L: 11156
+					class0.method0(255);
+				}
+
+				if (var2 == 1) { // L: 11157
+					class0.method0(192);
+				}
+
+				if (var2 == 2) { // L: 11158
+					class0.method0(128);
+				}
+
+				if (var2 == 3) { // L: 11159
+					class0.method0(64);
+				}
+
+				if (var2 == 4) { // L: 11160
+					class0.method0(0);
+				}
+			}
+
+			if (var1 == 4) { // L: 11162
+				if (var2 == 0) { // L: 11163
+					class226.updateSoundEffectVolume(127);
+				}
+
+				if (var2 == 1) { // L: 11164
+					class226.updateSoundEffectVolume(96);
+				}
+
+				if (var2 == 2) { // L: 11165
+					class226.updateSoundEffectVolume(64);
+				}
+
+				if (var2 == 3) { // L: 11166
+					class226.updateSoundEffectVolume(32);
+				}
+
+				if (var2 == 4) { // L: 11167
+					class226.updateSoundEffectVolume(0);
+				}
+			}
+
+			if (var1 == 5) { // L: 11169
+				Client.leftClickOpensMenu = var2;
+			}
+
+			if (var1 == 6) { // L: 11170
+				Client.chatEffects = var2;
+			}
+
+			if (var1 == 9) { // L: 11171
+				Client.field891 = var2;
+			}
+
+			if (var1 == 10) { // L: 11172
+				if (var2 == 0) { // L: 11173
+					NPCComposition.method2882(127);
+				}
+
+				if (var2 == 1) { // L: 11174
+					NPCComposition.method2882(96);
+				}
+
+				if (var2 == 2) { // L: 11175
+					NPCComposition.method2882(64);
+				}
+
+				if (var2 == 3) { // L: 11176
+					NPCComposition.method2882(32);
+				}
+
+				if (var2 == 4) { // L: 11177
+					NPCComposition.method2882(0);
+				}
+			}
+
+			if (var1 == 17) { // L: 11179
+				Client.followerIndex = var2 & 65535; // L: 11180
+			}
+
+			AttackOption[] var3;
+			if (var1 == 18) { // L: 11182
+				var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 11185
+				Client.playerAttackOption = (AttackOption)Clock.findEnumerated(var3, var2); // L: 11187
+				if (Client.playerAttackOption == null) { // L: 11188
+					Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+				}
+			}
+
+			if (var1 == 19) { // L: 11190
+				if (var2 == -1) { // L: 11191
+					Client.combatTargetPlayerIndex = -1;
+				} else {
+					Client.combatTargetPlayerIndex = var2 & 2047; // L: 11192
+				}
+			}
+
+			if (var1 == 22) { // L: 11194
+				var3 = new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden}; // L: 11197
+				Client.npcAttackOption = (AttackOption)Clock.findEnumerated(var3, var2); // L: 11199
+				if (Client.npcAttackOption == null) { // L: 11200
+					Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+				}
+			}
+
+		}
+	} // L: 11202
 }
diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java
index ab5b436e90..8e2959a8ec 100644
--- a/runescape-client/src/main/java/class69.java
+++ b/runescape-client/src/main/java/class69.java
@@ -3,39 +3,637 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bn")
+@ObfuscatedName("bo")
 public class class69 {
-	@ObfuscatedName("v")
+	@ObfuscatedName("qa")
 	@ObfuscatedSignature(
-		descriptor = "Lki;"
+		descriptor = "Loa;"
+	)
+	@Export("sceneMinimapSprite")
+	static SpritePixels sceneMinimapSprite;
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "Lkz;"
 	)
 	@Export("reflectionChecks")
 	static IterableNodeDeque reflectionChecks;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "Lgs;"
-	)
-	@Export("worldMapEvent")
-	static WorldMapEvent worldMapEvent;
-	@ObfuscatedName("bf")
-	@ObfuscatedSignature(
-		descriptor = "Lop;"
-	)
-	static IndexedSprite field597;
-	@ObfuscatedName("gh")
+	@ObfuscatedName("d")
+	public static short[][] field568;
+	@ObfuscatedName("hj")
 	@ObfuscatedGetter(
-		intValue = -1125497563
+		intValue = 370652147
 	)
-	static int field596;
+	@Export("cameraPitch")
+	static int cameraPitch;
 
 	static {
 		reflectionChecks = new IterableNodeDeque(); // L: 17
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(II)Lgd;",
-		garbageValue = "-910296846"
+		descriptor = "([BIII)Z",
+		garbageValue = "-22894005"
+	)
+	static final boolean method1222(byte[] var0, int var1, int var2) {
+		boolean var3 = true; // L: 138
+		Buffer var4 = new Buffer(var0); // L: 139
+		int var5 = -1; // L: 140
+
+		label71:
+		while (true) {
+			int var6 = var4.method6628(); // L: 142
+			if (var6 == 0) { // L: 143
+				return var3; // L: 174
+			}
+
+			var5 += var6; // L: 144
+			int var7 = 0; // L: 145
+			boolean var8 = false; // L: 146
+
+			while (true) {
+				int var9;
+				while (!var8) { // L: 148
+					var9 = var4.readUShortSmart(); // L: 154
+					if (var9 == 0) { // L: 155
+						continue label71;
+					}
+
+					var7 += var9 - 1; // L: 156
+					int var10 = var7 & 63; // L: 157
+					int var11 = var7 >> 6 & 63; // L: 158
+					int var12 = var4.readUnsignedByte() >> 2; // L: 159
+					int var13 = var11 + var1; // L: 160
+					int var14 = var10 + var2; // L: 161
+					if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 162
+						ObjectComposition var15 = Tiles.getObjectDefinition(var5); // L: 163
+						if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 164
+							if (!var15.needsModelFiles()) { // L: 165
+								++Client.field742; // L: 166
+								var3 = false; // L: 167
+							}
+
+							var8 = true; // L: 169
+						}
+					}
+				}
+
+				var9 = var4.readUShortSmart(); // L: 149
+				if (var9 == 0) { // L: 150
+					break;
+				}
+
+				var4.readUnsignedByte(); // L: 151
+			}
+		}
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "-109"
+	)
+	public static void method1224() {
+		VarpDefinition.VarpDefinition_cached.clear(); // L: 46
+	} // L: 47
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "83"
+	)
+	static void method1208() {
+		Messages.Messages_channels.clear(); // L: 50
+		Messages.Messages_hashTable.clear(); // L: 51
+		Messages.Messages_queue.clear(); // L: 52
+		Messages.Messages_count = 0; // L: 53
+	} // L: 54
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(Lgp;[Lfl;B)V",
+		garbageValue = "22"
+	)
+	static final void method1225(Scene var0, CollisionMap[] var1) {
+		int var2;
+		int var3;
+		int var4;
+		int var5;
+		for (var2 = 0; var2 < 4; ++var2) { // L: 461
+			for (var3 = 0; var3 < 104; ++var3) { // L: 462
+				for (var4 = 0; var4 < 104; ++var4) { // L: 463
+					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 464
+						var5 = var2; // L: 465
+						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 466
+							var5 = var2 - 1;
+						}
+
+						if (var5 >= 0) { // L: 467
+							var1[var5].setBlockedByFloor(var3, var4);
+						}
+					}
+				}
+			}
+		}
+
+		Tiles.field1108 += (int)(Math.random() * 5.0D) - 2; // L: 472
+		if (Tiles.field1108 < -8) { // L: 473
+			Tiles.field1108 = -8;
+		}
+
+		if (Tiles.field1108 > 8) { // L: 474
+			Tiles.field1108 = 8;
+		}
+
+		Tiles.field1109 += (int)(Math.random() * 5.0D) - 2; // L: 475
+		if (Tiles.field1109 < -16) { // L: 476
+			Tiles.field1109 = -16;
+		}
+
+		if (Tiles.field1109 > 16) { // L: 477
+			Tiles.field1109 = 16;
+		}
+
+		int var9;
+		int var10;
+		int var11;
+		int var12;
+		int var13;
+		int var14;
+		int var15;
+		int var16;
+		int[] var10000;
+		int var17;
+		int var18;
+		for (var2 = 0; var2 < 4; ++var2) { // L: 478
+			byte[][] var42 = class43.field307[var2]; // L: 479
+			var9 = (int)Math.sqrt(5100.0D); // L: 485
+			var10 = var9 * 768 >> 8; // L: 486
+
+			int var19;
+			int var20;
+			for (var11 = 1; var11 < 103; ++var11) { // L: 487
+				for (var12 = 1; var12 < 103; ++var12) { // L: 488
+					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 489
+					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 490
+					var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 491
+					var16 = (var13 << 8) / var15; // L: 492
+					var17 = 65536 / var15; // L: 493
+					var18 = (var14 << 8) / var15; // L: 494
+					var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; // L: 495
+					var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); // L: 496
+					NPC.field1328[var12][var11] = var19 - var20; // L: 497
+				}
+			}
+
+			for (var11 = 0; var11 < 104; ++var11) { // L: 500
+				class230.Tiles_hue[var11] = 0; // L: 501
+				Tiles.Tiles_saturation[var11] = 0; // L: 502
+				AbstractByteArrayCopier.Tiles_lightness[var11] = 0; // L: 503
+				WorldMapSectionType.Tiles_hueMultiplier[var11] = 0; // L: 504
+				Tiles.field1095[var11] = 0; // L: 505
+			}
+
+			for (var11 = -5; var11 < 109; ++var11) { // L: 507
+				for (var12 = 0; var12 < 104; ++var12) { // L: 508
+					var13 = var11 + 5; // L: 509
+					int var10002;
+					if (var13 >= 0 && var13 < 104) { // L: 510
+						var14 = AccessFile.field4098[var2][var13][var12] & 255; // L: 511
+						if (var14 > 0) { // L: 512
+							var16 = var14 - 1; // L: 514
+							FloorUnderlayDefinition var44 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 516
+							FloorUnderlayDefinition var46;
+							if (var44 != null) { // L: 517
+								var46 = var44; // L: 518
+							} else {
+								byte[] var45 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 521
+								var44 = new FloorUnderlayDefinition(); // L: 522
+								if (var45 != null) { // L: 523
+									var44.decode(new Buffer(var45), var16);
+								}
+
+								var44.postDecode(); // L: 524
+								FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var44, (long)var16); // L: 525
+								var46 = var44; // L: 526
+							}
+
+							var10000 = class230.Tiles_hue; // L: 529
+							var10000[var12] += var46.hue;
+							var10000 = Tiles.Tiles_saturation; // L: 530
+							var10000[var12] += var46.saturation;
+							var10000 = AbstractByteArrayCopier.Tiles_lightness; // L: 531
+							var10000[var12] += var46.lightness;
+							var10000 = WorldMapSectionType.Tiles_hueMultiplier; // L: 532
+							var10000[var12] += var46.hueMultiplier;
+							var10002 = Tiles.field1095[var12]++; // L: 533
+						}
+					}
+
+					var14 = var11 - 5; // L: 536
+					if (var14 >= 0 && var14 < 104) { // L: 537
+						var15 = AccessFile.field4098[var2][var14][var12] & 255; // L: 538
+						if (var15 > 0) { // L: 539
+							var17 = var15 - 1; // L: 541
+							FloorUnderlayDefinition var52 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); // L: 543
+							FloorUnderlayDefinition var48;
+							if (var52 != null) { // L: 544
+								var48 = var52; // L: 545
+							} else {
+								byte[] var47 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); // L: 548
+								var52 = new FloorUnderlayDefinition(); // L: 549
+								if (var47 != null) { // L: 550
+									var52.decode(new Buffer(var47), var17);
+								}
+
+								var52.postDecode(); // L: 551
+								FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var52, (long)var17); // L: 552
+								var48 = var52; // L: 553
+							}
+
+							var10000 = class230.Tiles_hue; // L: 556
+							var10000[var12] -= var48.hue;
+							var10000 = Tiles.Tiles_saturation; // L: 557
+							var10000[var12] -= var48.saturation;
+							var10000 = AbstractByteArrayCopier.Tiles_lightness; // L: 558
+							var10000[var12] -= var48.lightness;
+							var10000 = WorldMapSectionType.Tiles_hueMultiplier; // L: 559
+							var10000[var12] -= var48.hueMultiplier;
+							var10002 = Tiles.field1095[var12]--; // L: 560
+						}
+					}
+				}
+
+				if (var11 >= 1 && var11 < 103) { // L: 564
+					var12 = 0; // L: 565
+					var13 = 0; // L: 566
+					var14 = 0; // L: 567
+					var15 = 0; // L: 568
+					var16 = 0; // L: 569
+
+					for (var17 = -5; var17 < 109; ++var17) { // L: 570
+						var18 = var17 + 5; // L: 571
+						if (var18 >= 0 && var18 < 104) { // L: 572
+							var12 += class230.Tiles_hue[var18]; // L: 573
+							var13 += Tiles.Tiles_saturation[var18]; // L: 574
+							var14 += AbstractByteArrayCopier.Tiles_lightness[var18]; // L: 575
+							var15 += WorldMapSectionType.Tiles_hueMultiplier[var18]; // L: 576
+							var16 += Tiles.field1095[var18]; // L: 577
+						}
+
+						var19 = var17 - 5; // L: 579
+						if (var19 >= 0 && var19 < 104) { // L: 580
+							var12 -= class230.Tiles_hue[var19]; // L: 581
+							var13 -= Tiles.Tiles_saturation[var19]; // L: 582
+							var14 -= AbstractByteArrayCopier.Tiles_lightness[var19]; // L: 583
+							var15 -= WorldMapSectionType.Tiles_hueMultiplier[var19]; // L: 584
+							var16 -= Tiles.field1095[var19]; // L: 585
+						}
+
+						if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 587 588 589 590
+							if (var2 < Tiles.Tiles_minPlane) { // L: 593
+								Tiles.Tiles_minPlane = var2;
+							}
+
+							var20 = AccessFile.field4098[var2][var11][var17] & 255; // L: 594
+							int var21 = Tiles.field1111[var2][var11][var17] & 255; // L: 595
+							if (var20 > 0 || var21 > 0) { // L: 596
+								int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 597
+								int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 598
+								int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 599
+								int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 600
+								int var26 = NPC.field1328[var11][var17]; // L: 601
+								int var27 = NPC.field1328[var11 + 1][var17]; // L: 602
+								int var28 = NPC.field1328[var11 + 1][var17 + 1]; // L: 603
+								int var29 = NPC.field1328[var11][var17 + 1]; // L: 604
+								int var30 = -1; // L: 605
+								int var31 = -1; // L: 606
+								int var32;
+								int var33;
+								if (var20 > 0) { // L: 607
+									var32 = var12 * 256 / var15; // L: 608
+									var33 = var13 / var16; // L: 609
+									int var34 = var14 / var16; // L: 610
+									var30 = class125.hslToRgb(var32, var33, var34); // L: 611
+									var32 = var32 + Tiles.field1108 & 255; // L: 612
+									var34 += Tiles.field1109; // L: 613
+									if (var34 < 0) { // L: 614
+										var34 = 0;
+									} else if (var34 > 255) { // L: 615
+										var34 = 255;
+									}
+
+									var31 = class125.hslToRgb(var32, var33, var34); // L: 616
+								}
+
+								if (var2 > 0) { // L: 618
+									boolean var50 = true; // L: 619
+									if (var20 == 0 && class22.field186[var2][var11][var17] != 0) { // L: 620
+										var50 = false;
+									}
+
+									if (var21 > 0 && !WorldMapSectionType.method3677(var21 - 1).hideUnderlay) { // L: 621
+										var50 = false;
+									}
+
+									if (var50 && var23 == var22 && var24 == var22 && var22 == var25) { // L: 622 623
+										var10000 = Tiles.field1101[var2][var11];
+										var10000[var17] |= 2340;
+									}
+								}
+
+								var32 = 0; // L: 626
+								if (var31 != -1) { // L: 627
+									var32 = Rasterizer3D.Rasterizer3D_colorPalette[class378.method6550(var31, 96)];
+								}
+
+								if (var21 == 0) { // L: 628
+									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class378.method6550(var30, var26), class378.method6550(var30, var27), class378.method6550(var30, var28), class378.method6550(var30, var29), 0, 0, 0, 0, var32, 0); // L: 629
+								} else {
+									var33 = class22.field186[var2][var11][var17] + 1; // L: 632
+									byte var51 = class16.field132[var2][var11][var17]; // L: 633
+									FloorOverlayDefinition var35 = WorldMapSectionType.method3677(var21 - 1); // L: 634
+									int var36 = var35.texture; // L: 635
+									int var37;
+									int var38;
+									int var39;
+									int var40;
+									if (var36 >= 0) { // L: 638
+										var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 639
+										var37 = -1; // L: 640
+									} else if (var35.primaryRgb == 16711935) { // L: 643
+										var37 = -2; // L: 644
+										var36 = -1; // L: 645
+										var38 = -2; // L: 646
+									} else {
+										var37 = class125.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 649
+										var39 = var35.hue + Tiles.field1108 & 255; // L: 650
+										var40 = var35.lightness + Tiles.field1109; // L: 651
+										if (var40 < 0) { // L: 652
+											var40 = 0;
+										} else if (var40 > 255) { // L: 653
+											var40 = 255;
+										}
+
+										var38 = class125.hslToRgb(var39, var35.saturation, var40); // L: 654
+									}
+
+									var39 = 0; // L: 657
+									if (var38 != -2) { // L: 658
+										var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapID.method3716(var38, 96)];
+									}
+
+									if (var35.secondaryRgb != -1) { // L: 659
+										var40 = var35.secondaryHue + Tiles.field1108 & 255; // L: 660
+										int var41 = var35.secondaryLightness + Tiles.field1109; // L: 661
+										if (var41 < 0) { // L: 662
+											var41 = 0;
+										} else if (var41 > 255) { // L: 663
+											var41 = 255;
+										}
+
+										var38 = class125.hslToRgb(var40, var35.secondarySaturation, var41); // L: 664
+										var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapID.method3716(var38, 96)]; // L: 665
+									}
+
+									var0.addTile(var2, var11, var17, var33, var51, var36, var22, var23, var24, var25, class378.method6550(var30, var26), class378.method6550(var30, var27), class378.method6550(var30, var28), class378.method6550(var30, var29), WorldMapID.method3716(var37, var26), WorldMapID.method3716(var37, var27), WorldMapID.method3716(var37, var28), WorldMapID.method3716(var37, var29), var32, var39); // L: 667
+								}
+							}
+						}
+					}
+				}
+			}
+
+			for (var11 = 1; var11 < 103; ++var11) { // L: 674
+				for (var12 = 1; var12 < 103; ++var12) { // L: 675
+					if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 682
+						var17 = 0; // L: 683
+					} else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 686
+						var17 = var2 - 1; // L: 687
+					} else {
+						var17 = var2; // L: 690
+					}
+
+					var0.setTileMinPlane(var2, var12, var11, var17); // L: 692
+				}
+			}
+
+			AccessFile.field4098[var2] = null;
+			Tiles.field1111[var2] = null;
+			class22.field186[var2] = null;
+			class16.field132[var2] = null; // L: 698
+			class43.field307[var2] = null;
+		}
+
+		var0.method4067(-50, -10, -50);
+
+		for (var2 = 0; var2 < 104; ++var2) {
+			for (var3 = 0; var3 < 104; ++var3) { // L: 703
+				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
+					var0.setLinkBelow(var2, var3);
+				}
+			}
+		}
+
+		var2 = 1;
+		var3 = 2; // L: 708
+		var4 = 4; // L: 709
+
+		for (var5 = 0; var5 < 4; ++var5) { // L: 710
+			if (var5 > 0) { // L: 711
+				var2 <<= 3; // L: 712
+				var3 <<= 3; // L: 713
+				var4 <<= 3; // L: 714
+			}
+
+			for (int var6 = 0; var6 <= var5; ++var6) { // L: 716
+				for (int var7 = 0; var7 <= 104; ++var7) { // L: 717
+					for (int var8 = 0; var8 <= 104; ++var8) { // L: 718
+						short var49;
+						if ((Tiles.field1101[var6][var8][var7] & var2) != 0) { // L: 719
+							var9 = var7; // L: 720
+							var10 = var7; // L: 721
+							var11 = var6; // L: 722
+
+							for (var12 = var6; var9 > 0 && (Tiles.field1101[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 723 724
+							}
+
+							while (var10 < 104 && (Tiles.field1101[var6][var8][var10 + 1] & var2) != 0) { // L: 725
+								++var10;
+							}
+
+							label456:
+							while (var11 > 0) { // L: 726
+								for (var13 = var9; var13 <= var10; ++var13) { // L: 727
+									if ((Tiles.field1101[var11 - 1][var8][var13] & var2) == 0) {
+										break label456;
+									}
+								}
+
+								--var11; // L: 728
+							}
+
+							label445:
+							while (var12 < var5) { // L: 730
+								for (var13 = var9; var13 <= var10; ++var13) { // L: 731
+									if ((Tiles.field1101[var12 + 1][var8][var13] & var2) == 0) {
+										break label445;
+									}
+								}
+
+								++var12; // L: 732
+							}
+
+							var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 734
+							if (var13 >= 8) { // L: 735
+								var49 = 240; // L: 736
+								var15 = Tiles.Tiles_heights[var12][var8][var9] - var49; // L: 737
+								var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 738
+								Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 739
+
+								for (var17 = var11; var17 <= var12; ++var17) { // L: 740
+									for (var18 = var9; var18 <= var10; ++var18) { // L: 741
+										var10000 = Tiles.field1101[var17][var8];
+										var10000[var18] &= ~var2;
+									}
+								}
+							}
+						}
+
+						if ((Tiles.field1101[var6][var8][var7] & var3) != 0) { // L: 745
+							var9 = var8; // L: 746
+							var10 = var8; // L: 747
+							var11 = var6; // L: 748
+
+							for (var12 = var6; var9 > 0 && (Tiles.field1101[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 749 750
+							}
+
+							while (var10 < 104 && (Tiles.field1101[var6][var10 + 1][var7] & var3) != 0) { // L: 751
+								++var10;
+							}
+
+							label509:
+							while (var11 > 0) { // L: 752
+								for (var13 = var9; var13 <= var10; ++var13) { // L: 753
+									if ((Tiles.field1101[var11 - 1][var13][var7] & var3) == 0) {
+										break label509;
+									}
+								}
+
+								--var11; // L: 754
+							}
+
+							label498:
+							while (var12 < var5) { // L: 756
+								for (var13 = var9; var13 <= var10; ++var13) { // L: 757
+									if ((Tiles.field1101[var12 + 1][var13][var7] & var3) == 0) {
+										break label498;
+									}
+								}
+
+								++var12; // L: 758
+							}
+
+							var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 760
+							if (var13 >= 8) { // L: 761
+								var49 = 240; // L: 762
+								var15 = Tiles.Tiles_heights[var12][var9][var7] - var49; // L: 763
+								var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 764
+								Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 765
+
+								for (var17 = var11; var17 <= var12; ++var17) { // L: 766
+									for (var18 = var9; var18 <= var10; ++var18) { // L: 767
+										var10000 = Tiles.field1101[var17][var18];
+										var10000[var7] &= ~var3;
+									}
+								}
+							}
+						}
+
+						if ((Tiles.field1101[var6][var8][var7] & var4) != 0) { // L: 771
+							var9 = var8; // L: 772
+							var10 = var8; // L: 773
+							var11 = var7; // L: 774
+
+							for (var12 = var7; var11 > 0 && (Tiles.field1101[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 775 776
+							}
+
+							while (var12 < 104 && (Tiles.field1101[var6][var8][var12 + 1] & var4) != 0) { // L: 777
+								++var12;
+							}
+
+							label562:
+							while (var9 > 0) { // L: 778
+								for (var13 = var11; var13 <= var12; ++var13) { // L: 779
+									if ((Tiles.field1101[var6][var9 - 1][var13] & var4) == 0) {
+										break label562;
+									}
+								}
+
+								--var9; // L: 780
+							}
+
+							label551:
+							while (var10 < 104) { // L: 782
+								for (var13 = var11; var13 <= var12; ++var13) { // L: 783
+									if ((Tiles.field1101[var6][var10 + 1][var13] & var4) == 0) {
+										break label551;
+									}
+								}
+
+								++var10; // L: 784
+							}
+
+							if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 786
+								var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 787
+								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 788
+
+								for (var14 = var9; var14 <= var10; ++var14) { // L: 789
+									for (var15 = var11; var15 <= var12; ++var15) { // L: 790
+										var10000 = Tiles.field1101[var6][var14];
+										var10000[var15] &= ~var4;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+	} // L: 798
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		descriptor = "(ZI)V",
+		garbageValue = "457904488"
+	)
+	@Export("Login_promptCredentials")
+	static void Login_promptCredentials(boolean var0) {
+		Login.Login_response1 = ""; // L: 693
+		Login.Login_response2 = "Enter your username/email & password."; // L: 694
+		Login.Login_response3 = ""; // L: 695
+		Login.loginIndex = 2; // L: 696
+		if (var0) { // L: 697
+			Login.Login_password = "";
+		}
+
+		if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 699
+			if (class4.clientPreferences.rememberedUsername != null) { // L: 700
+				Login.Login_username = class4.clientPreferences.rememberedUsername; // L: 701
+				Client.Login_isUsernameRemembered = true; // L: 702
+			} else {
+				Client.Login_isUsernameRemembered = false; // L: 704
+			}
+		}
+
+		GameObject.method4433(); // L: 706
+	} // L: 707
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(IB)Lgi;",
+		garbageValue = "42"
 	)
 	@Export("getFrames")
 	static Frames getFrames(int var0) {
@@ -43,90 +641,12 @@ public class class69 {
 		if (var1 != null) { // L: 182
 			return var1;
 		} else {
-			AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; // L: 184
-			AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; // L: 185
-			boolean var5 = true; // L: 187
-			int[] var6 = var3.getGroupFileIds(var0); // L: 188
-
-			for (int var7 = 0; var7 < var6.length; ++var7) { // L: 189
-				byte[] var8 = var3.getFile(var0, var6[var7]); // L: 190
-				if (var8 == null) { // L: 191
-					var5 = false; // L: 192
-				} else {
-					int var9 = (var8[0] & 255) << 8 | var8[1] & 255; // L: 195
-					byte[] var10 = var4.getFile(var9, 0); // L: 198
-					if (var10 == null) { // L: 199
-						var5 = false;
-					}
-				}
+			var1 = class15.method240(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); // L: 183
+			if (var1 != null) { // L: 184
+				SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0);
 			}
 
-			Frames var2;
-			if (!var5) { // L: 201
-				var2 = null; // L: 202
-			} else {
-				try {
-					var2 = new Frames(var3, var4, var0, false); // L: 206
-				} catch (Exception var12) { // L: 208
-					var2 = null; // L: 209
-				}
-			}
-
-			if (var2 != null) { // L: 213
-				SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
-			}
-
-			return var2; // L: 214
+			return var1; // L: 185
 		}
 	}
-
-	@ObfuscatedName("fd")
-	@ObfuscatedSignature(
-		descriptor = "(Lio;III)V",
-		garbageValue = "1981003125"
-	)
-	@Export("checkIfMinimapClicked")
-	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
-		if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3420
-			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !Client.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3421
-				SpriteMask var3 = var0.getSpriteMask(true); // L: 3422
-				if (var3 == null) { // L: 3423
-					return;
-				}
-
-				int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3424
-				int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3425
-				if (var3.contains(var4, var5)) { // L: 3426
-					var4 -= var3.width / 2; // L: 3427
-					var5 -= var3.height / 2; // L: 3428
-					int var6 = Client.camAngleY & 2047; // L: 3429
-					int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3430
-					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3431
-					int var9 = var8 * var4 + var5 * var7 >> 11; // L: 3432
-					int var10 = var5 * var8 - var7 * var4 >> 11; // L: 3433
-					int var11 = var9 + class93.localPlayer.x >> 7; // L: 3434
-					int var12 = class93.localPlayer.y - var10 >> 7; // L: 3435
-					PacketBufferNode var13 = class21.getPacketBufferNode(ClientPacket.field2589, Client.packetWriter.isaacCipher); // L: 3437
-					var13.packetBuffer.writeByte(18); // L: 3438
-					var13.packetBuffer.method6584(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3439
-					var13.packetBuffer.writeShort(var12 + SoundSystem.baseY); // L: 3440
-					var13.packetBuffer.writeShort(var11 + VertexNormal.baseX); // L: 3441
-					var13.packetBuffer.writeByte(var4); // L: 3442
-					var13.packetBuffer.writeByte(var5); // L: 3443
-					var13.packetBuffer.writeShort(Client.camAngleY); // L: 3444
-					var13.packetBuffer.writeByte(57); // L: 3445
-					var13.packetBuffer.writeByte(0); // L: 3446
-					var13.packetBuffer.writeByte(0); // L: 3447
-					var13.packetBuffer.writeByte(89); // L: 3448
-					var13.packetBuffer.writeShort(class93.localPlayer.x); // L: 3449
-					var13.packetBuffer.writeShort(class93.localPlayer.y); // L: 3450
-					var13.packetBuffer.writeByte(63); // L: 3451
-					Client.packetWriter.addNode(var13); // L: 3452
-					Client.destinationX = var11; // L: 3453
-					Client.destinationY = var12; // L: 3454
-				}
-			}
-
-		}
-	} // L: 3457
 }
diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java
index 6079c43947..a890d66ee4 100644
--- a/runescape-client/src/main/java/class7.java
+++ b/runescape-client/src/main/java/class7.java
@@ -1,248 +1,204 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("b")
+@ObfuscatedName("r")
 public class class7 extends class16 {
-	@ObfuscatedName("v")
-	String field64;
-	@ObfuscatedName("n")
-	byte field65;
+	@ObfuscatedName("gz")
+	@Export("xteaKeys")
+	static int[][] xteaKeys;
 	@ObfuscatedName("f")
-	byte field66;
+	String field52;
+	@ObfuscatedName("e")
+	byte field55;
+	@ObfuscatedName("v")
+	byte field53;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lx;"
+		descriptor = "Ls;"
 	)
 	final class19 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lx;)V"
+		descriptor = "(Ls;)V"
 	)
 	class7(class19 var1) {
 		this.this$0 = var1; // L: 154
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "68071115"
+		descriptor = "(Lnt;I)V",
+		garbageValue = "851460888"
 	)
-	void vmethod266(Buffer var1) {
-		this.field64 = var1.readStringCp1252NullTerminatedOrNull(); // L: 157
-		if (this.field64 != null) { // L: 158
+	void vmethod331(Buffer var1) {
+		this.field52 = var1.readStringCp1252NullTerminatedOrNull(); // L: 157
+		if (this.field52 != null) { // L: 158
 			var1.readUnsignedByte(); // L: 159
-			this.field65 = var1.readByte(); // L: 160
-			this.field66 = var1.readByte(); // L: 161
+			this.field55 = var1.readByte(); // L: 160
+			this.field53 = var1.readByte(); // L: 161
 		}
 
 	} // L: 163
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(Ly;I)V",
-		garbageValue = "-1846892157"
+		garbageValue = "-1362614343"
 	)
-	void vmethod264(ClanChannel var1) {
-		var1.name = this.field64; // L: 166
-		if (this.field64 != null) { // L: 167
-			var1.field32 = this.field65; // L: 168
-			var1.field26 = this.field66; // L: 169
+	void vmethod332(ClanChannel var1) {
+		var1.name = this.field52; // L: 166
+		if (this.field52 != null) { // L: 167
+			var1.field27 = this.field55; // L: 168
+			var1.field28 = this.field53; // L: 169
 		}
 
 	} // L: 171
 
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lns;I)V",
+		garbageValue = "653378140"
+	)
+	@Export("updatePlayer")
+	static final void updatePlayer(PacketBuffer var0) {
+		var0.importIndex(); // L: 37
+		int var1 = Client.localPlayerIndex; // L: 38
+		Player var2 = class262.localPlayer = Client.players[var1] = new Player(); // L: 39
+		var2.index = var1; // L: 40
+		int var3 = var0.readBits(30); // L: 41
+		byte var4 = (byte)(var3 >> 28); // L: 42
+		int var5 = var3 >> 14 & 16383; // L: 43
+		int var6 = var3 & 16383; // L: 44
+		var2.pathX[0] = var5 - class15.baseX; // L: 45
+		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46
+		var2.pathY[0] = var6 - WorldMapSprite.baseY; // L: 47
+		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48
+		SoundSystem.Client_plane = var2.plane = var4; // L: 49
+		if (Players.field1362[var1] != null) { // L: 50
+			var2.read(Players.field1362[var1]);
+		}
+
+		Players.Players_count = 0; // L: 51
+		Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52
+		Players.field1372[var1] = 0; // L: 53
+		Players.Players_emptyIdxCount = 0; // L: 54
+
+		for (int var7 = 1; var7 < 2048; ++var7) { // L: 55
+			if (var7 != var1) { // L: 56
+				int var8 = var0.readBits(18); // L: 57
+				int var9 = var8 >> 16; // L: 58
+				int var10 = var8 >> 8 & 597; // L: 59
+				int var11 = var8 & 597; // L: 60
+				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61
+				Players.Players_orientations[var7] = 0; // L: 62
+				Players.Players_targetIndices[var7] = -1; // L: 63
+				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64
+				Players.field1372[var7] = 0; // L: 65
+			}
+		}
+
+		var0.exportIndex(); // L: 67
+	} // L: 68
+
 	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(IIII)Loh;",
-		garbageValue = "-1133094232"
-	)
-	static SpritePixels method76(int var0, int var1, int var2) {
-		DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; // L: 38
-		long var4 = (long)(var2 << 16 | var0 << 8 | var1); // L: 41
-		return (SpritePixels)var3.get(var4); // L: 43
-	}
-
-	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
 		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1498995212"
+		garbageValue = "609615234"
 	)
-	static int method74(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3425
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getWindowedMode(); // L: 3426
-			return 1; // L: 3427
+	static int method88(int var0, Script var1, boolean var2) {
+		if (var0 < 1000) { // L: 432
+			return MouseHandler.method718(var0, var1, var2);
+		} else if (var0 < 1100) { // L: 433
+			return Client.method1745(var0, var1, var2);
+		} else if (var0 < 1200) { // L: 434
+			return InvDefinition.method2699(var0, var1, var2);
+		} else if (var0 < 1300) { // L: 435
+			return BufferedSink.method5990(var0, var1, var2);
+		} else if (var0 < 1400) { // L: 436
+			return ObjectSound.method1889(var0, var1, var2);
+		} else if (var0 < 1500) { // L: 437
+			return Renderable.method4250(var0, var1, var2);
+		} else if (var0 < 1600) { // L: 438
+			return TaskHandler.method2626(var0, var1, var2);
+		} else if (var0 < 1700) { // L: 439
+			return ClanChannelMember.method106(var0, var1, var2);
+		} else if (var0 < 1800) { // L: 440
+			return Decimator.method1162(var0, var1, var2);
+		} else if (var0 < 1900) { // L: 441
+			return WorldMapRegion.method3472(var0, var1, var2);
+		} else if (var0 < 2000) { // L: 442
+			return WorldMapLabel.method3715(var0, var1, var2);
+		} else if (var0 < 2100) { // L: 443
+			return Client.method1745(var0, var1, var2);
+		} else if (var0 < 2200) { // L: 444
+			return InvDefinition.method2699(var0, var1, var2);
+		} else if (var0 < 2300) { // L: 445
+			return BufferedSink.method5990(var0, var1, var2);
+		} else if (var0 < 2400) { // L: 446
+			return ObjectSound.method1889(var0, var1, var2);
+		} else if (var0 < 2500) {
+			return Renderable.method4250(var0, var1, var2); // L: 447
+		} else if (var0 < 2600) { // L: 448
+			return NetCache.method5178(var0, var1, var2);
+		} else if (var0 < 2700) { // L: 449
+			return Player.method2235(var0, var1, var2);
+		} else if (var0 < 2800) { // L: 450
+			return MouseHandler.method747(var0, var1, var2);
+		} else if (var0 < 2900) { // L: 451
+			return StructComposition.method2972(var0, var1, var2);
+		} else if (var0 < 3000) { // L: 452
+			return WorldMapLabel.method3715(var0, var1, var2);
+		} else if (var0 < 3200) { // L: 453
+			return class82.method2031(var0, var1, var2);
+		} else if (var0 < 3300) { // L: 454
+			return StudioGame.method4983(var0, var1, var2);
+		} else if (var0 < 3400) { // L: 455
+			return class267.method4991(var0, var1, var2);
+		} else if (var0 < 3500) { // L: 456
+			return class18.method262(var0, var1, var2);
+		} else if (var0 < 3600) { // L: 457
+			return MilliClock.method2685(var0, var1, var2);
+		} else if (var0 < 3700) { // L: 458
+			return LoginScreenAnimation.method2314(var0, var1, var2);
+		} else if (var0 < 3800) { // L: 459
+			return WorldMapData_0.method3267(var0, var1, var2);
+		} else if (var0 < 3900) { // L: 460
+			return class32.method386(var0, var1, var2);
+		} else if (var0 < 4000) { // L: 461
+			return class281.method5204(var0, var1, var2);
+		} else if (var0 < 4100) { // L: 462
+			return NPCComposition.method2857(var0, var1, var2);
+		} else if (var0 < 4200) {
+			return SoundCache.method929(var0, var1, var2); // L: 463
+		} else if (var0 < 4300) { // L: 464
+			return class375.method6531(var0, var1, var2);
+		} else if (var0 < 5100) { // L: 465
+			return class25.method336(var0, var1, var2);
+		} else if (var0 < 5400) { // L: 466
+			return WorldMapSectionType.method3668(var0, var1, var2);
+		} else if (var0 < 5600) { // L: 467
+			return LoginScreenAnimation.method2285(var0, var1, var2);
+		} else if (var0 < 5700) { // L: 468
+			return UserComparator6.method2585(var0, var1, var2);
+		} else if (var0 < 6300) { // L: 469
+			return class19.method276(var0, var1, var2);
+		} else if (var0 < 6600) { // L: 470
+			return class8.method102(var0, var1, var2);
+		} else if (var0 < 6700) { // L: 471
+			return ModeWhere.method5283(var0, var1, var2);
+		} else if (var0 < 6800) { // L: 472
+			return class43.method527(var0, var1, var2);
+		} else if (var0 < 6900) { // L: 473
+			return class5.method72(var0, var1, var2);
+		} else if (var0 < 7000) { // L: 474
+			return UserComparator4.method2529(var0, var1, var2);
+		} else if (var0 < 7100) { // L: 475
+			return class269.method4996(var0, var1, var2);
+		} else if (var0 < 7200) { // L: 476
+			return WorldMapScaleHandler.method3857(var0, var1, var2);
 		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3429
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3430
-				if (var3 == 1 || var3 == 2) { // L: 3431
-					CollisionMap.setWindowedMode(var3);
-				}
-
-				return 1; // L: 3432
-			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3434
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = ObjectComposition.clientPreferences.windowMode; // L: 3435
-				return 1; // L: 3436
-			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3438
-				if (var0 == 5310) { // L: 3446
-					--class44.Interpreter_intStackSize; // L: 3447
-					return 1; // L: 3448
-				} else if (var0 == 5350) { // L: 3450
-					Interpreter.Interpreter_stringStackSize -= 2; // L: 3451
-					--class44.Interpreter_intStackSize; // L: 3452
-					return 1; // L: 3453
-				} else if (var0 == 5351) { // L: 3455
-					--Interpreter.Interpreter_stringStackSize; // L: 3456
-					return 1; // L: 3457
-				} else {
-					return 2; // L: 3459
-				}
-			} else {
-				var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3439
-				if (var3 == 1 || var3 == 2) { // L: 3440
-					ObjectComposition.clientPreferences.windowMode = var3; // L: 3441
-					TileItem.savePreferences(); // L: 3442
-				}
-
-				return 1; // L: 3444
-			}
+			return var0 < 7300 ? PcmPlayer.method898(var0, var1, var2) : 2; // L: 477 478
 		}
 	}
-
-	@ObfuscatedName("fq")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "57"
-	)
-	@Export("logOut")
-	static final void logOut() {
-		Client.packetWriter.close(); // L: 2605
-		FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 2608
-		class265.method4848(); // L: 2610
-		class135.method2601(); // L: 2611
-		class24.method259(); // L: 2612
-		NPCComposition.NpcDefinition_cached.clear(); // L: 2614
-		NPCComposition.NpcDefinition_cachedModels.clear(); // L: 2615
-		SceneTilePaint.method4259(); // L: 2617
-		SecureRandomCallable.method2055(); // L: 2618
-		SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2620
-		SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2621
-		HealthBarUpdate.method2197(); // L: 2623
-		VarpDefinition.VarpDefinition_cached.clear(); // L: 2625
-		GrandExchangeOfferOwnWorldComparator.field634.method6433(); // L: 2627
-		ViewportMouse.HitSplatDefinition_cachedSprites.method6433(); // L: 2628
-		UserComparator6.method2485(); // L: 2629
-		KeyHandler.method378(); // L: 2630
-		StructComposition.StructDefinition_cached.clear(); // L: 2632
-		FileSystem.method2548(); // L: 2634
-		WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2636
-		ChatChannel.method2015(); // L: 2638
-		Widget.Widget_cachedSprites.clear(); // L: 2640
-		Widget.Widget_cachedModels.clear(); // L: 2641
-		Widget.Widget_cachedFonts.clear(); // L: 2642
-		Widget.Widget_cachedSpriteMasks.clear(); // L: 2643
-		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2645
-		Script.Script_cached.clear(); // L: 2646
-		NetCache.archive0.clearFiles(); // L: 2647
-		class27.archive1.clearFiles(); // L: 2648
-		ClanChannel.archive3.clearFiles(); // L: 2649
-		class32.archive4.clearFiles(); // L: 2650
-		class247.archive5.clearFiles(); // L: 2651
-		UrlRequest.archive6.clearFiles(); // L: 2652
-		Decimator.archive7.clearFiles(); // L: 2653
-		GrandExchangeOfferAgeComparator.archive8.clearFiles(); // L: 2654
-		CollisionMap.archive9.clearFiles(); // L: 2655
-		SoundCache.archive10.clearFiles(); // L: 2656
-		WorldMapManager.archive11.clearFiles(); // L: 2657
-		UserComparator5.archive12.clearFiles(); // L: 2658
-		AbstractSocket.scene.clear(); // L: 2660
-
-		for (int var0 = 0; var0 < 4; ++var0) { // L: 2661
-			Client.collisionMaps[var0].clear();
-		}
-
-		System.gc(); // L: 2662
-		class159.method3192(2); // L: 2663
-		Client.currentTrackGroupId = -1; // L: 2664
-		Client.field881 = false; // L: 2665
-		WorldMapSprite.method3631(); // L: 2666
-		class12.updateGameState(10); // L: 2667
-	} // L: 2668
-
-	@ObfuscatedName("fk")
-	@ObfuscatedSignature(
-		descriptor = "(Lcy;II)V",
-		garbageValue = "-354829421"
-	)
-	@Export("updateActorSequence")
-	static final void updateActorSequence(Actor var0, int var1) {
-		if (var0.field1265 >= Client.cycle) { // L: 3611
-			int var2 = Math.max(1, var0.field1265 - Client.cycle); // L: 3612
-			int var3 = var0.field1239 * 64 + var0.field1278 * 128; // L: 3613
-			int var4 = var0.field1239 * 64 + var0.field1280 * 128; // L: 3614
-			var0.x += (var3 - var0.x) / var2; // L: 3615
-			var0.y += (var4 - var0.y) / var2; // L: 3616
-			var0.field1294 = 0; // L: 3617
-			var0.orientation = var0.field1284; // L: 3618
-		} else if (var0.field1283 >= Client.cycle) { // L: 3620
-			class2.method21(var0);
-		} else {
-			InterfaceParent.method2083(var0); // L: 3621
-		}
-
-		if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3622
-			var0.sequence = -1; // L: 3623
-			var0.spotAnimation = -1; // L: 3624
-			var0.field1265 = 0; // L: 3625
-			var0.field1283 = 0; // L: 3626
-			var0.x = var0.field1239 * 64 + var0.pathX[0] * 128; // L: 3627
-			var0.y = var0.pathY[0] * 128 + var0.field1239 * 64; // L: 3628
-			var0.method2171(); // L: 3629
-		}
-
-		if (class93.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3631 3632
-			var0.sequence = -1; // L: 3633
-			var0.spotAnimation = -1; // L: 3634
-			var0.field1265 = 0; // L: 3635
-			var0.field1283 = 0; // L: 3636
-			var0.x = var0.field1239 * 64 + var0.pathX[0] * 128; // L: 3637
-			var0.y = var0.pathY[0] * 128 + var0.field1239 * 64; // L: 3638
-			var0.method2171(); // L: 3639
-		}
-
-		Strings.method4850(var0); // L: 3642
-		class44.method449(var0); // L: 3643
-	} // L: 3644
-
-	@ObfuscatedName("id")
-	@ObfuscatedSignature(
-		descriptor = "(B)V",
-		garbageValue = "1"
-	)
-	static void method68() {
-		for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 8823
-			int var2 = Client.menuOpcodes[var0]; // L: 8825
-			boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30; // L: 8827
-			if (var1) { // L: 8829
-				if (var0 < Client.menuOptionsCount - 1) { // L: 8830
-					for (int var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) { // L: 8831
-						Client.menuActions[var3] = Client.menuActions[var3 + 1]; // L: 8832
-						Client.menuTargets[var3] = Client.menuTargets[var3 + 1]; // L: 8833
-						Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1]; // L: 8834
-						Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1]; // L: 8835
-						Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1]; // L: 8836
-						Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1]; // L: 8837
-						Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1]; // L: 8838
-					}
-				}
-
-				--var0; // L: 8841
-				--Client.menuOptionsCount; // L: 8842
-			}
-		}
-
-		class15.method196(); // L: 8845
-	} // L: 8846
 }
diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java
index 4c0badb232..62c205aa2c 100644
--- a/runescape-client/src/main/java/class8.java
+++ b/runescape-client/src/main/java/class8.java
@@ -2,106 +2,350 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("d")
+@ObfuscatedName("h")
 public class class8 extends class14 {
-	@ObfuscatedName("o")
-	public static boolean field75;
-	@ObfuscatedName("dx")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive2")
-	static Archive archive2;
-	@ObfuscatedName("ed")
-	@ObfuscatedSignature(
-		descriptor = "Ljp;"
-	)
-	@Export("archive17")
-	static Archive archive17;
-	@ObfuscatedName("v")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = 5988895091532737889L
+		longValue = 2367979421742745425L
 	)
-	long field77;
-	@ObfuscatedName("n")
-	String field71;
+	long field59;
+	@ObfuscatedName("e")
+	String field60;
 	// $FF: synthetic field
 	@ObfuscatedSignature(
-		descriptor = "Lf;"
+		descriptor = "Lv;"
 	)
 	final class2 this$0;
 
 	@ObfuscatedSignature(
-		descriptor = "(Lf;)V"
+		descriptor = "(Lv;)V"
 	)
 	class8(class2 var1) {
 		this.this$0 = var1;
-		this.field77 = -1L; // L: 74
-		this.field71 = null; // L: 75
+		this.field59 = -1L; // L: 74
+		this.field60 = null; // L: 75
 	} // L: 77
 
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		descriptor = "(Lnt;I)V",
+		garbageValue = "73833784"
+	)
+	void vmethod363(Buffer var1) {
+		if (var1.readUnsignedByte() != 255) { // L: 80
+			--var1.offset; // L: 81
+			this.field59 = var1.readLong();
+		}
+
+		this.field60 = var1.readStringCp1252NullTerminatedOrNull();
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		descriptor = "(Lb;I)V",
+		garbageValue = "1885623446"
+	)
+	void vmethod354(ClanSettings var1) {
+		var1.method126(this.field59, this.field60, 0);
+	}
+
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Lnd;I)V",
-		garbageValue = "-1281352827"
+		descriptor = "(II)I",
+		garbageValue = "-128382641"
 	)
-	void vmethod276(Buffer var1) {
-		if (var1.readUnsignedByte() != 255) { // L: 80
-			--var1.offset; // L: 81
-			this.field77 = var1.readLong(); // L: 82
-		}
+	public static int method104(int var0) {
+		return var0 >> 17 & 7; // L: 17
+	}
 
-		this.field71 = var1.readStringCp1252NullTerminatedOrNull(); // L: 84
-	} // L: 85
-
-	@ObfuscatedName("n")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(Ll;B)V",
-		garbageValue = "29"
+		descriptor = "(Ljava/lang/CharSequence;IZI)I",
+		garbageValue = "1957308272"
 	)
-	void vmethod281(ClanSettings var1) {
-		var1.method103(this.field77, this.field71, 0); // L: 88
-	} // L: 89
+	static int method105(CharSequence var0, int var1, boolean var2) {
+		if (var1 >= 2 && var1 <= 36) { // L: 84
+			boolean var3 = false; // L: 85
+			boolean var4 = false; // L: 86
+			int var5 = 0; // L: 87
+			int var6 = var0.length(); // L: 88
 
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZB)I",
-		garbageValue = "-51"
-	)
-	static int method82(int var0, Script var1, boolean var2) {
-		if (var0 == 7100) { // L: 4262
-			++class44.Interpreter_intStackSize; // L: 4263
-			return 1; // L: 4264
-		} else if (var0 == 7101) { // L: 4266
-			Interpreter.Interpreter_stringStackSize += 2; // L: 4267
-			return 1; // L: 4268
-		} else if (var0 != 7102 && var0 != 7103 && var0 != 7104 && var0 != 7105 && var0 != 7109) { // L: 4270
-			if (var0 == 7106) { // L: 4274
-				++class44.Interpreter_intStackSize; // L: 4275
-				return 1; // L: 4276
-			} else if (var0 == 7107) { // L: 4278
-				++class44.Interpreter_intStackSize; // L: 4279
-				return 1; // L: 4280
-			} else if (var0 == 7108) { // L: 4282
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapIcon_1.method3235() ? 1 : 0; // L: 4283
-				return 1; // L: 4284
+			for (int var7 = 0; var7 < var6; ++var7) { // L: 89
+				char var8 = var0.charAt(var7); // L: 90
+				if (var7 == 0) { // L: 91
+					if (var8 == '-') { // L: 92
+						var3 = true; // L: 93
+						continue;
+					}
+
+					if (var8 == '+') { // L: 96
+						continue;
+					}
+				}
+
+				int var10;
+				if (var8 >= '0' && var8 <= '9') { // L: 98
+					var10 = var8 - '0';
+				} else if (var8 >= 'A' && var8 <= 'Z') { // L: 99
+					var10 = var8 - '7';
+				} else {
+					if (var8 < 'a' || var8 > 'z') { // L: 100
+						throw new NumberFormatException(); // L: 101
+					}
+
+					var10 = var8 - 'W';
+				}
+
+				if (var10 >= var1) { // L: 102
+					throw new NumberFormatException();
+				}
+
+				if (var3) { // L: 103
+					var10 = -var10;
+				}
+
+				int var9 = var10 + var5 * var1; // L: 104
+				if (var9 / var1 != var5) { // L: 105
+					throw new NumberFormatException();
+				}
+
+				var5 = var9; // L: 106
+				var4 = true; // L: 107
+			}
+
+			if (!var4) { // L: 109
+				throw new NumberFormatException();
 			} else {
-				return 2; // L: 4286
+				return var5; // L: 110
 			}
 		} else {
-			++class44.Interpreter_intStackSize; // L: 4271
-			return 1; // L: 4272
+			throw new IllegalArgumentException("" + var1);
 		}
 	}
 
-	@ObfuscatedName("jp")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "-1387423967"
+		descriptor = "(B)Z",
+		garbageValue = "-39"
 	)
-	@Export("getTapToDrop")
-	static boolean getTapToDrop() {
-		return Client.tapToDrop; // L: 10176
+	static final boolean method103() {
+		return ViewportMouse.ViewportMouse_isInViewport; // L: 82
 	}
+
+	@ObfuscatedName("aj")
+	@ObfuscatedSignature(
+		descriptor = "(ILcf;ZI)I",
+		garbageValue = "1054679248"
+	)
+	static int method102(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3643
+			Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = FaceNormal.loadWorlds() ? 1 : 0; // L: 3644
+			return 1; // L: 3645
+		} else {
+			World var9;
+			if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3647
+				var9 = DevicePcmPlayerProvider.worldListStart(); // L: 3648
+				if (var9 != null) { // L: 3649
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.id; // L: 3650
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.properties; // L: 3651
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3652
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.location; // L: 3653
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.population; // L: 3654
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.host; // L: 3655
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3658
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3659
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3660
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3661
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3662
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3663
+				}
+
+				return 1; // L: 3665
+			} else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3667
+				var9 = Client.getNextWorldListWorld(); // L: 3668
+				if (var9 != null) { // L: 3669
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.id; // L: 3670
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.properties; // L: 3671
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.activity; // L: 3672
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.location; // L: 3673
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var9.population; // L: 3674
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var9.host; // L: 3675
+				} else {
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3678
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3679
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3680
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3681
+					Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3682
+					Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3683
+				}
+
+				return 1; // L: 3685
+			} else {
+				int var3;
+				World var7;
+				int var8;
+				if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3687
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3688
+					var7 = null; // L: 3689
+
+					for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3690
+						if (var3 == World.World_worlds[var8].id) { // L: 3691
+							var7 = World.World_worlds[var8]; // L: 3692
+							break;
+						}
+					}
+
+					if (var7 != null) { // L: 3696
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.id; // L: 3697
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.properties; // L: 3698
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.activity; // L: 3699
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.location; // L: 3700
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.population; // L: 3701
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.host; // L: 3702
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3705
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3706
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3707
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3708
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3709
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3710
+					}
+
+					return 1; // L: 3712
+				} else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3714
+					ChatChannel.Interpreter_intStackSize -= 4; // L: 3715
+					var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3716
+					boolean var10 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1] == 1; // L: 3717
+					var8 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 3718
+					boolean var6 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 3] == 1; // L: 3719
+					WorldMapSectionType.sortWorldList(var3, var10, var8, var6); // L: 3720
+					return 1; // L: 3721
+				} else if (var0 != 6511) { // L: 3723
+					if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3744
+						Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 3745
+						return 1; // L: 3746
+					} else {
+						int var4;
+						ParamComposition var5;
+						if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3748
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3749
+							var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3750
+							var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3751
+							var5 = UserComparator10.getParamDefinition(var4); // L: 3752
+							if (var5.isString()) { // L: 3753
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class248.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3754
+							} else {
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class248.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3757
+							}
+
+							return 1; // L: 3759
+						} else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3761
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3762
+							var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3763
+							var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3764
+							var5 = UserComparator10.getParamDefinition(var4); // L: 3765
+							if (var5.isString()) { // L: 3766
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = Tiles.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3767
+							} else {
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Tiles.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3770
+							}
+
+							return 1; // L: 3772
+						} else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3774
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3775
+							var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3776
+							var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3777
+							var5 = UserComparator10.getParamDefinition(var4); // L: 3778
+							if (var5.isString()) { // L: 3779
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = class250.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3780
+							} else {
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class250.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3783
+							}
+
+							return 1; // L: 3785
+						} else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3787
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 3788
+							var3 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 3789
+							var4 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 3790
+							var5 = UserComparator10.getParamDefinition(var4); // L: 3791
+							if (var5.isString()) { // L: 3792
+								Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = UserComparator10.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3793
+							} else {
+								Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = UserComparator10.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3796
+							}
+
+							return 1; // L: 3798
+						} else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3800
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3801
+							return 1; // L: 3802
+						} else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3804
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3805
+							return 1; // L: 3806
+						} else if (var0 == 6520) { // L: 3808
+							return 1; // L: 3809
+						} else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3811
+							return 1; // L: 3812
+						} else if (var0 == 6522) { // L: 3814
+							--UserComparator9.Interpreter_stringStackSize; // L: 3815
+							--ChatChannel.Interpreter_intStackSize; // L: 3816
+							return 1; // L: 3817
+						} else if (var0 == 6523) { // L: 3819
+							--UserComparator9.Interpreter_stringStackSize; // L: 3820
+							--ChatChannel.Interpreter_intStackSize; // L: 3821
+							return 1; // L: 3822
+						} else if (var0 == ScriptOpcodes.MOBILE_BATTERYLEVEL) { // L: 3824
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3825
+							return 1; // L: 3826
+						} else if (var0 == ScriptOpcodes.MOBILE_BATTERYCHARGING) { // L: 3828
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 3829
+							return 1; // L: 3830
+						} else if (var0 == ScriptOpcodes.MOBILE_WIFIAVAILABLE) { // L: 3832
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 1; // L: 3833
+							return 1; // L: 3834
+						} else if (var0 == 6527) { // L: 3836
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.field625; // L: 3837
+							return 1; // L: 3838
+						} else {
+							return 2; // L: 3840
+						}
+					}
+				} else {
+					var3 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 3724
+					if (var3 >= 0 && var3 < World.World_count) { // L: 3725
+						var7 = World.World_worlds[var3]; // L: 3726
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.id; // L: 3727
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.properties; // L: 3728
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.activity; // L: 3729
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.location; // L: 3730
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = var7.population; // L: 3731
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = var7.host; // L: 3732
+					} else {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = -1; // L: 3735
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3736
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3737
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3738
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 3739
+						Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 3740
+					}
+
+					return 1; // L: 3742
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("jv")
+	@ObfuscatedSignature(
+		descriptor = "(III)V",
+		garbageValue = "1771393574"
+	)
+	@Export("runIntfCloseListeners")
+	static final void runIntfCloseListeners(int var0, int var1) {
+		if (class20.loadInterface(var0)) { // L: 10864
+			JagexCache.runComponentCloseListeners(GrandExchangeOfferOwnWorldComparator.Widget_interfaceComponents[var0], var1); // L: 10865
+		}
+	} // L: 10866
 }
diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java
index 9946abe188..a18bac9861 100644
--- a/runescape-client/src/main/java/class80.java
+++ b/runescape-client/src/main/java/class80.java
@@ -1,221 +1,73 @@
 import java.math.BigInteger;
-import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cv")
+@ObfuscatedName("cq")
 public class class80 {
-	@ObfuscatedName("p")
-	static final BigInteger field1006;
+	@ObfuscatedName("tl")
+	@ObfuscatedSignature(
+		descriptor = "Lme;"
+	)
+	@Export("worldMap")
+	static WorldMap worldMap;
 	@ObfuscatedName("j")
-	static final BigInteger field1007;
-	@ObfuscatedName("er")
-	@Export("worldHost")
-	static String worldHost;
+	static final BigInteger field983;
+	@ObfuscatedName("o")
+	static final BigInteger field984;
 
 	static {
-		field1006 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20
-		field1007 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21
+		field983 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
+		field984 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
 	}
 
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(IZS)Ljava/lang/String;",
-		garbageValue = "7104"
-	)
-	@Export("intToString")
-	public static String intToString(int var0, boolean var1) {
-		return var1 && var0 >= 0 ? Script.method1998(var0, 10, var1) : Integer.toString(var0); // L: 101 102
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1650201726"
-	)
-	public static final void method1906() {
-		ViewportMouse.ViewportMouse_isInViewport = false; // L: 103
-		ViewportMouse.ViewportMouse_entityCount = 0; // L: 104
-	} // L: 105
-
-	@ObfuscatedName("ad")
-	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "1607858695"
-	)
-	static int method1902(int var0, Script var1, boolean var2) {
-		String var3;
-		int var9;
-		if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2959
-			var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2960
-			var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2961
-			Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2962
-			return 1; // L: 2963
-		} else {
-			String var4;
-			if (var0 == ScriptOpcodes.APPEND) { // L: 2965
-				Interpreter.Interpreter_stringStackSize -= 2; // L: 2966
-				var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2967
-				var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2968
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2969
-				return 1; // L: 2970
-			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2972
-				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2973
-				var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2974
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + intToString(var9, true); // L: 2975
-				return 1; // L: 2976
-			} else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2978
-				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 2979
-				Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2980
-				return 1; // L: 2981
+	@ObfuscatedName("f")
+	@Export("base37DecodeLong")
+	public static String base37DecodeLong(long var0) {
+		if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16
+			if (0L == var0 % 37L) { // L: 17
+				return null;
 			} else {
-				int var6;
-				int var10;
-				if (var0 == ScriptOpcodes.FROMDATE) { // L: 2983
-					var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 2984
-					long var13 = 86400000L * ((long)var10 + 11745L); // L: 2985
-					Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2986
-					var6 = Interpreter.Interpreter_calendar.get(5); // L: 2987
-					int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2988
-					int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2989
-					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2990
-					return 1; // L: 2991
-				} else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2993
-					if (var0 == ScriptOpcodes.TOSTRING) { // L: 3001
-						var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3002
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 3003
-						return 1; // L: 3004
-					} else if (var0 == ScriptOpcodes.COMPARE) { // L: 3006
-						Interpreter.Interpreter_stringStackSize -= 2; // L: 3007
-						Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator10.method2474(Calendar.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class378.clientLanguage)); // L: 3008
-						return 1; // L: 3009
-					} else {
-						int var5;
-						byte[] var11;
-						Font var12;
-						if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 3011
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3012
-							class44.Interpreter_intStackSize -= 2; // L: 3013
-							var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3014
-							var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3015
-							var11 = Decimator.archive13.takeFile(var5, 0); // L: 3016
-							var12 = new Font(var11); // L: 3017
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 3018
-							return 1; // L: 3019
-						} else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 3021
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3022
-							class44.Interpreter_intStackSize -= 2; // L: 3023
-							var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3024
-							var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3025
-							var11 = Decimator.archive13.takeFile(var5, 0); // L: 3026
-							var12 = new Font(var11); // L: 3027
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 3028
-							return 1; // L: 3029
-						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 3031
-							Interpreter.Interpreter_stringStackSize -= 2; // L: 3032
-							var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3033
-							var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3034
-							if (Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize] == 1) { // L: 3035
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
-							} else {
-								Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4; // L: 3036
-							}
+				int var2 = 0; // L: 18
 
-							return 1; // L: 3037
-						} else if (var0 == ScriptOpcodes.ESCAPE) { // L: 3039
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3040
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 3041
-							return 1; // L: 3042
-						} else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 3044
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3045
-							var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3046
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 3047
-							return 1; // L: 3048
-						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 3050
-							var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3051
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = class245.isCharPrintable((char)var10) ? 1 : 0; // L: 3052
-							return 1; // L: 3053
-						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 3055
-							var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3056
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Login.isAlphaNumeric((char)var10) ? 1 : 0; // L: 3057
-							return 1; // L: 3058
-						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 3060
-							var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3061
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = WorldMapElement.isCharAlphabetic((char)var10) ? 1 : 0; // L: 3062
-							return 1; // L: 3063
-						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 3065
-							var10 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3066
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = UserComparator10.isDigit((char)var10) ? 1 : 0; // L: 3067
-							return 1; // L: 3068
-						} else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 3070
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3071
-							if (var3 != null) { // L: 3072
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.length();
-							} else {
-								Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 3073
-							}
-
-							return 1; // L: 3074
-						} else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 3076
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3077
-							class44.Interpreter_intStackSize -= 2; // L: 3078
-							var9 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize]; // L: 3079
-							var5 = Interpreter.Interpreter_intStack[class44.Interpreter_intStackSize + 1]; // L: 3080
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 3081
-							return 1; // L: 3082
-						} else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 3084
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3085
-							StringBuilder var15 = new StringBuilder(var3.length()); // L: 3086
-							boolean var16 = false; // L: 3087
-
-							for (var6 = 0; var6 < var3.length(); ++var6) { // L: 3088
-								char var7 = var3.charAt(var6); // L: 3089
-								if (var7 == '<') { // L: 3090
-									var16 = true;
-								} else if (var7 == '>') { // L: 3091
-									var16 = false;
-								} else if (!var16) { // L: 3092
-									var15.append(var7);
-								}
-							}
-
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.toString(); // L: 3094
-							return 1; // L: 3095
-						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 3097
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3098
-							var9 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3099
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 3100
-							return 1; // L: 3101
-						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 3103
-							Interpreter.Interpreter_stringStackSize -= 2; // L: 3104
-							var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 3105
-							var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 3106
-							var5 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 3107
-							Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 3108
-							return 1; // L: 3109
-						} else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 3111
-							var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 3112
-							Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 3113
-							return 1; // L: 3114
-						} else {
-							return 2; // L: 3116
-						}
-					}
-				} else {
-					Interpreter.Interpreter_stringStackSize -= 2; // L: 2994
-					var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; // L: 2995
-					var4 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; // L: 2996
-					if (class93.localPlayer.appearance != null && class93.localPlayer.appearance.isFemale) { // L: 2997
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4;
-					} else {
-						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; // L: 2998
-					}
-
-					return 1; // L: 2999
+				for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22
+					++var2; // L: 21
 				}
+
+				StringBuilder var5;
+				char var8;
+				for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { // L: 24 25 34
+					long var6 = var0; // L: 26
+					var0 /= 37L; // L: 27
+					var8 = class306.base37Table[(int)(var6 - 37L * var0)]; // L: 28
+					if (var8 == '_') { // L: 29
+						int var9 = var5.length() - 1; // L: 30
+						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31
+						var8 = 160; // L: 32
+					}
+				}
+
+				var5.reverse(); // L: 36
+				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37
+				return var5.toString(); // L: 38
 			}
+		} else {
+			return null;
+		}
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		descriptor = "(II)I",
+		garbageValue = "133291597"
+	)
+	@Export("Messages_getLastChatID")
+	static int Messages_getLastChatID(int var0) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 82
+		if (var1 == null) { // L: 83
+			return -1;
+		} else {
+			return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 84 85
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/class82.java b/runescape-client/src/main/java/class82.java
index f90e7f9859..9875feff82 100644
--- a/runescape-client/src/main/java/class82.java
+++ b/runescape-client/src/main/java/class82.java
@@ -1,87 +1,397 @@
-import java.io.File;
-import java.io.IOException;
 import java.math.BigInteger;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ci")
+@ObfuscatedName("cc")
 public class class82 {
-	@ObfuscatedName("v")
-	static final BigInteger field1018;
-	@ObfuscatedName("n")
-	static final BigInteger field1017;
-	@ObfuscatedName("ge")
-	@Export("regionMapArchives")
-	static byte[][] regionMapArchives;
-	@ObfuscatedName("nb")
+	@ObfuscatedName("f")
+	static final BigInteger field1000;
+	@ObfuscatedName("e")
+	static final BigInteger field996;
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = -1942533771
+		intValue = -1114873797
 	)
-	static int field1020;
+	static int field999;
 
 	static {
-		field1018 = new BigInteger("10001", 16); // L: 6
-		field1017 = new BigInteger("88d2b28e43dc7be8f2376826a6d810274f07f489daf46f3fc0a40ad847e6c852b10e6939d9252721d4fb8501cf1348cdabec4165b62bd8aa0dbe6ed0394524dfe2cdce9287df5cbedb0d33bc1d9df71cb2e5c67a5d05fa058b182a192ad83fa80b8ff245b45500dce1f746b9a14db36d711c889f35183243d5805cd875580975", 16); // L: 7
+		field1000 = new BigInteger("10001", 16); // L: 6
+		field996 = new BigInteger("8dc6a1a83bbb640252f3f8edaa19da8f7ef11de714d12d808467f1e9d80d457a089db79c00e6a7fd1a413a29a10b5e31f3f81b773f9d3de5b509aa3b4c6aae73b449122c91af25cff56ecc0f2c688f36a0fea3a8856adec0b7e11b2ecacc1f766e1e89462aa2839db7c7d469e5816d2ef676ec87a7e70f3fdb76b0f86d9f34a7", 16); // L: 7
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "([BI)Lfd;",
-		garbageValue = "775453768"
+		descriptor = "(ILcf;ZB)I",
+		garbageValue = "0"
 	)
-	static WorldMapSprite method1909(byte[] var0) {
-		return var0 == null ? new WorldMapSprite() : new WorldMapSprite(ParamComposition.convertJpgToSprite(var0).pixels); // L: 19 20
-	}
+	static int method2031(int var0, Script var1, boolean var2) {
+		String var7;
+		if (var0 == ScriptOpcodes.MES) { // L: 1411
+			var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1412
+			UserComparator10.addGameMessage(0, "", var7); // L: 1413
+			return 1; // L: 1414
+		} else if (var0 == ScriptOpcodes.ANIM) {
+			ChatChannel.Interpreter_intStackSize -= 2; // L: 1417
+			World.performPlayerAnimation(class262.localPlayer, Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize], Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]); // L: 1418
+			return 1; // L: 1419
+		} else if (var0 == ScriptOpcodes.IF_CLOSE) {
+			if (!Interpreter.field951) { // L: 1422
+				Interpreter.field963 = true; // L: 1423
+			}
 
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lnm;",
-		garbageValue = "2134853227"
-	)
-	@Export("getPreferencesFile")
-	public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
-		File var3 = new File(class12.cacheDir, "preferences" + var0 + ".dat"); // L: 166
-		if (var3.exists()) { // L: 167
-			try {
-				AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 169
-				return var10; // L: 170
-			} catch (IOException var9) { // L: 172
+			return 1; // L: 1425
+		} else {
+			int var16;
+			if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
+				var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1428
+				var16 = 0; // L: 1429
+				if (Varps.isNumber(var7)) { // L: 1430
+					var16 = FontName.method6335(var7);
+				}
+
+				PacketBufferNode var14 = InterfaceParent.getPacketBufferNode(ClientPacket.field2664, Client.packetWriter.isaacCipher); // L: 1432
+				var14.packetBuffer.writeInt(var16); // L: 1433
+				Client.packetWriter.addNode(var14); // L: 1434
+				return 1; // L: 1435
+			} else {
+				PacketBufferNode var12;
+				if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
+					var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1438
+					var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2582, Client.packetWriter.isaacCipher); // L: 1440
+					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1441
+					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1442
+					Client.packetWriter.addNode(var12); // L: 1443
+					return 1; // L: 1444
+				} else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
+					var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1447
+					var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2610, Client.packetWriter.isaacCipher); // L: 1449
+					var12.packetBuffer.writeByte(var7.length() + 1); // L: 1450
+					var12.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1451
+					Client.packetWriter.addNode(var12); // L: 1452
+					return 1; // L: 1453
+				} else {
+					String var4;
+					int var10;
+					if (var0 == ScriptOpcodes.OPPLAYER) {
+						var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1456
+						var4 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1457
+						FriendsList.method5711(var10, var4); // L: 1458
+						return 1; // L: 1459
+					} else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
+						ChatChannel.Interpreter_intStackSize -= 3; // L: 1462
+						var10 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1463
+						var16 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1464
+						int var9 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 2]; // L: 1465
+						Widget var15 = WorldMapData_1.getWidget(var9); // L: 1466
+						ItemLayer.clickWidget(var15, var10, var16); // L: 1467
+						return 1; // L: 1468
+					} else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 1471
+						var10 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1472
+						var16 = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1473
+						Widget var13 = var2 ? UserComparator5.scriptDotWidget : User.scriptActiveWidget; // L: 1474
+						ItemLayer.clickWidget(var13, var10, var16); // L: 1475
+						return 1; // L: 1476
+					} else if (var0 == ScriptOpcodes.MOUSECAM) {
+						UserComparator3.mouseCam = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1479
+						return 1; // L: 1480
+					} else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.roofsHidden ? 1 : 0; // L: 1483
+						return 1; // L: 1484
+					} else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
+						class4.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1487
+						Actor.savePreferences(); // L: 1488
+						return 1; // L: 1489
+					} else if (var0 == ScriptOpcodes.OPENURL) {
+						var7 = Interpreter.Interpreter_stringStack[--UserComparator9.Interpreter_stringStackSize]; // L: 1492
+						boolean var8 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1493
+						AttackOption.openURL(var7, var8, false); // L: 1494
+						return 1; // L: 1495
+					} else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
+						var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1498
+						var12 = InterfaceParent.getPacketBufferNode(ClientPacket.field2622, Client.packetWriter.isaacCipher); // L: 1500
+						var12.packetBuffer.writeShort(var10); // L: 1501
+						Client.packetWriter.addNode(var12); // L: 1502
+						return 1; // L: 1503
+					} else if (var0 == ScriptOpcodes.BUG_REPORT) {
+						var10 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1506
+						UserComparator9.Interpreter_stringStackSize -= 2; // L: 1507
+						var4 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize]; // L: 1508
+						String var5 = Interpreter.Interpreter_stringStack[UserComparator9.Interpreter_stringStackSize + 1]; // L: 1509
+						if (var4.length() > 500) { // L: 1510
+							return 1;
+						} else if (var5.length() > 500) { // L: 1511
+							return 1;
+						} else {
+							PacketBufferNode var6 = InterfaceParent.getPacketBufferNode(ClientPacket.field2651, Client.packetWriter.isaacCipher); // L: 1512
+							var6.packetBuffer.writeShort(1 + class44.stringCp1252NullTerminatedByteSize(var4) + class44.stringCp1252NullTerminatedByteSize(var5)); // L: 1513
+							var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1514
+							var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1515
+							var6.packetBuffer.method6640(var10); // L: 1516
+							Client.packetWriter.addNode(var6); // L: 1517
+							return 1; // L: 1518
+						}
+					} else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
+						Client.shiftClickDrop = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1521
+						return 1; // L: 1522
+					} else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
+						Client.showMouseOverText = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1525
+						return 1; // L: 1526
+					} else if (var0 == ScriptOpcodes.RENDERSELF) {
+						Client.renderSelf = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1529
+						return 1; // L: 1530
+					} else if (var0 == 3120) {
+						if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1533
+							Client.drawPlayerNames |= 1;
+						} else {
+							Client.drawPlayerNames &= -2; // L: 1534
+						}
+
+						return 1; // L: 1535
+					} else if (var0 == 3121) {
+						if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1538
+							Client.drawPlayerNames |= 2;
+						} else {
+							Client.drawPlayerNames &= -3; // L: 1539
+						}
+
+						return 1; // L: 1540
+					} else if (var0 == 3122) {
+						if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1543
+							Client.drawPlayerNames |= 4;
+						} else {
+							Client.drawPlayerNames &= -5; // L: 1544
+						}
+
+						return 1; // L: 1545
+					} else if (var0 == 3123) {
+						if (Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1) { // L: 1548
+							Client.drawPlayerNames |= 8;
+						} else {
+							Client.drawPlayerNames &= -9; // L: 1549
+						}
+
+						return 1; // L: 1550
+					} else if (var0 == 3124) {
+						Client.drawPlayerNames = 0; // L: 1553
+						return 1; // L: 1554
+					} else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
+						Client.showMouseCross = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1557
+						return 1; // L: 1558
+					} else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
+						Client.showLoadingMessages = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1561
+						return 1; // L: 1562
+					} else if (var0 == ScriptOpcodes.SETTAPTODROP) {
+						Fonts.setTapToDrop(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1); // L: 1565
+						return 1; // L: 1566
+					} else if (var0 == ScriptOpcodes.GETTAPTODROP) {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = PendingSpawn.getTapToDrop() ? 1 : 0; // L: 1569
+						return 1; // L: 1570
+					} else if (var0 == 3129) {
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 1573
+						Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize]; // L: 1574
+						Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[ChatChannel.Interpreter_intStackSize + 1]; // L: 1575
+						return 1; // L: 1576
+					} else if (var0 == 3130) {
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 1579
+						return 1; // L: 1580
+					} else if (var0 == 3131) {
+						--ChatChannel.Interpreter_intStackSize; // L: 1583
+						return 1; // L: 1584
+					} else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = AttackOption.canvasWidth; // L: 1587
+						Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class0.canvasHeight; // L: 1588
+						return 1; // L: 1589
+					} else if (var0 == ScriptOpcodes.MOBILE_SETFPS) {
+						--ChatChannel.Interpreter_intStackSize; // L: 1592
+						return 1; // L: 1593
+					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) {
+						return 1; // L: 1596
+					} else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) {
+						ChatChannel.Interpreter_intStackSize -= 2; // L: 1599
+						return 1; // L: 1600
+					} else if (var0 == 3136) {
+						Client.field784 = 3; // L: 1603
+						Client.field694 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1604
+						return 1; // L: 1605
+					} else if (var0 == 3137) {
+						Client.field784 = 2; // L: 1608
+						Client.field694 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize]; // L: 1609
+						return 1; // L: 1610
+					} else if (var0 == 3138) {
+						Client.field784 = 0; // L: 1613
+						return 1; // L: 1614
+					} else if (var0 == 3139) {
+						Client.field784 = 1; // L: 1617
+						return 1; // L: 1618
+					} else if (var0 == 3140) {
+						Client.field784 = 3; // L: 1621
+						Client.field694 = var2 ? UserComparator5.scriptDotWidget.id * -464746545 * 363798319 : User.scriptActiveWidget.id * -464746545 * 363798319; // L: 1622
+						return 1; // L: 1623
+					} else {
+						boolean var11;
+						if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
+							var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1626
+							class4.clientPreferences.hideUsername = var11; // L: 1627
+							Actor.savePreferences(); // L: 1628
+							return 1; // L: 1629
+						} else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.hideUsername ? 1 : 0; // L: 1632
+							return 1; // L: 1633
+						} else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
+							var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1636
+							Client.Login_isUsernameRemembered = var11; // L: 1637
+							if (!var11) { // L: 1638
+								class4.clientPreferences.rememberedUsername = ""; // L: 1639
+								Actor.savePreferences(); // L: 1640
+							}
+
+							return 1; // L: 1642
+						} else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1645
+							return 1; // L: 1646
+						} else if (var0 == ScriptOpcodes.SHOW_IOS_REVIEW) {
+							return 1; // L: 1649
+						} else if (var0 == 3146) {
+							var11 = Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize] == 1; // L: 1652
+							if (var11 == class4.clientPreferences.titleMusicDisabled) { // L: 1653
+								class4.clientPreferences.titleMusicDisabled = !var11; // L: 1654
+								Actor.savePreferences(); // L: 1655
+							}
+
+							return 1; // L: 1657
+						} else if (var0 == 3147) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = class4.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1660
+							return 1; // L: 1661
+						} else if (var0 == 3148) {
+							return 1; // L: 1664
+						} else if (var0 == 3149) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1667
+							return 1; // L: 1668
+						} else if (var0 == 3150) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1671
+							return 1; // L: 1672
+						} else if (var0 == 3151) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1675
+							return 1; // L: 1676
+						} else if (var0 == 3152) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1679
+							return 1; // L: 1680
+						} else if (var0 == 3153) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1683
+							return 1; // L: 1684
+						} else if (var0 == 3154) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = FontName.method6329(); // L: 1687
+							return 1; // L: 1688
+						} else if (var0 == 3155) {
+							--UserComparator9.Interpreter_stringStackSize; // L: 1691
+							return 1; // L: 1692
+						} else if (var0 == 3156) {
+							return 1; // L: 1695
+						} else if (var0 == 3157) {
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 1698
+							return 1; // L: 1699
+						} else if (var0 == 3158) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1702
+							return 1; // L: 1703
+						} else if (var0 == 3159) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1706
+							return 1; // L: 1707
+						} else if (var0 == 3160) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1710
+							return 1; // L: 1711
+						} else if (var0 == 3161) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1714
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1715
+							return 1; // L: 1716
+						} else if (var0 == 3162) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1719
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1720
+							return 1; // L: 1721
+						} else if (var0 == 3163) {
+							--UserComparator9.Interpreter_stringStackSize; // L: 1724
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1725
+							return 1; // L: 1726
+						} else if (var0 == 3164) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1729
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1730
+							return 1; // L: 1731
+						} else if (var0 == 3165) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1734
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1735
+							return 1; // L: 1736
+						} else if (var0 == 3166) {
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 1739
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1740
+							return 1; // L: 1741
+						} else if (var0 == 3167) {
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 1744
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1745
+							return 1; // L: 1746
+						} else if (var0 == 3168) {
+							ChatChannel.Interpreter_intStackSize -= 2; // L: 1749
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1750
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1751
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1752
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1753
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1754
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1755
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1756
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1757
+							Interpreter.Interpreter_stringStack[++UserComparator9.Interpreter_stringStackSize - 1] = ""; // L: 1758
+							return 1; // L: 1759
+						} else if (var0 == 3169) {
+							return 1; // L: 1762
+						} else if (var0 == 3170) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1765
+							return 1; // L: 1766
+						} else if (var0 == 3171) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1769
+							return 1; // L: 1770
+						} else if (var0 == 3172) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1773
+							return 1; // L: 1774
+						} else if (var0 == 3173) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1777
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1778
+							return 1; // L: 1779
+						} else if (var0 == 3174) {
+							--ChatChannel.Interpreter_intStackSize; // L: 1782
+							return 1; // L: 1783
+						} else if (var0 == 3175) {
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 0; // L: 1786
+							return 1; // L: 1787
+						} else if (var0 == 3176) {
+							return 1; // L: 1790
+						} else if (var0 == 3177) {
+							return 1; // L: 1793
+						} else if (var0 == 3178) {
+							--UserComparator9.Interpreter_stringStackSize; // L: 1796
+							return 1; // L: 1797
+						} else if (var0 == 3179) {
+							return 1; // L: 1800
+						} else if (var0 == 3180) {
+							--UserComparator9.Interpreter_stringStackSize; // L: 1803
+							return 1; // L: 1804
+						} else if (var0 == 3181) {
+							var10 = 100 - Math.min(Math.max(Interpreter.Interpreter_intStack[--ChatChannel.Interpreter_intStackSize], 0), 100); // L: 1807
+							UserComparator10.method2568((double)(0.5F + (float)var10 / 200.0F)); // L: 1808
+							return 1; // L: 1809
+						} else if (var0 == 3182) {
+							float var3 = 200.0F * ((float)class4.clientPreferences.field1312 - 0.5F); // L: 1812
+							Interpreter.Interpreter_intStack[++ChatChannel.Interpreter_intStackSize - 1] = 100 - Math.round(var3); // L: 1813
+							return 1; // L: 1814
+						} else if (var0 != 3183 && var0 != 3184) {
+							return 2; // L: 1820
+						} else {
+							--ChatChannel.Interpreter_intStackSize; // L: 1817
+							return 1; // L: 1818
+						}
+					}
+				}
 			}
 		}
-
-		String var4 = ""; // L: 174
-		if (UserComparator10.cacheGamebuild == 33) { // L: 175
-			var4 = "_rc";
-		} else if (UserComparator10.cacheGamebuild == 34) { // L: 176
-			var4 = "_wip";
-		}
-
-		File var5 = new File(class22.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 177
-		AccessFile var6;
-		if (!var2 && var5.exists()) { // L: 178
-			try {
-				var6 = new AccessFile(var5, "rw", 10000L); // L: 180
-				return var6; // L: 181
-			} catch (IOException var8) { // L: 183
-			}
-		}
-
-		try {
-			var6 = new AccessFile(var3, "rw", 10000L); // L: 186
-			return var6; // L: 187
-		} catch (IOException var7) { // L: 189
-			throw new RuntimeException(); // L: 190
-		}
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-409366221"
-	)
-	public static int method1908(CharSequence var0) {
-		return class24.method260(var0, 10, true); // L: 67
 	}
 }
diff --git a/runescape-client/src/main/java/class93.java b/runescape-client/src/main/java/class93.java
index d91f14c87c..bae3fe83b8 100644
--- a/runescape-client/src/main/java/class93.java
+++ b/runescape-client/src/main/java/class93.java
@@ -1,64 +1,116 @@
-import net.runelite.mapping.Export;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("cc")
+@ObfuscatedName("ct")
 public class class93 {
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "[Lnf;"
-	)
-	@Export("JagexCache_idxFiles")
-	public static BufferedFile[] JagexCache_idxFiles;
-	@ObfuscatedName("kr")
-	@ObfuscatedSignature(
-		descriptor = "Lce;"
-	)
-	@Export("localPlayer")
-	static Player localPlayer;
+	@ObfuscatedName("f")
+	public static final int method2186(double var0, double var2, double var4) {
+		double var6 = var4; // L: 9
+		double var8 = var4; // L: 10
+		double var10 = var4; // L: 11
+		if (var2 != 0.0D) { // L: 12
+			double var12;
+			if (var4 < 0.5D) { // L: 14
+				var12 = (1.0D + var2) * var4;
+			} else {
+				var12 = var2 + var4 - var2 * var4; // L: 15
+			}
 
-	@ObfuscatedName("d")
-	@Export("Entity_unpackID")
-	public static int Entity_unpackID(long var0) {
-		return (int)(var0 >>> 17 & 4294967295L); // L: 85
+			double var14 = var4 * 2.0D - var12; // L: 16
+			double var16 = 0.3333333333333333D + var0; // L: 17
+			if (var16 > 1.0D) { // L: 18
+				--var16;
+			}
+
+			double var20 = var0 - 0.3333333333333333D; // L: 20
+			if (var20 < 0.0D) { // L: 21
+				++var20;
+			}
+
+			if (6.0D * var16 < 1.0D) { // L: 22
+				var6 = var14 + var16 * 6.0D * (var12 - var14);
+			} else if (2.0D * var16 < 1.0D) { // L: 23
+				var6 = var12;
+			} else if (3.0D * var16 < 2.0D) { // L: 24
+				var6 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var16);
+			} else {
+				var6 = var14; // L: 25
+			}
+
+			if (var0 * 6.0D < 1.0D) { // L: 26
+				var8 = var14 + (var12 - var14) * 6.0D * var0;
+			} else if (2.0D * var0 < 1.0D) { // L: 27
+				var8 = var12;
+			} else if (var0 * 3.0D < 2.0D) {
+				var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; // L: 28
+			} else {
+				var8 = var14; // L: 29
+			}
+
+			if (var20 * 6.0D < 1.0D) { // L: 30
+				var10 = var14 + (var12 - var14) * 6.0D * var20;
+			} else if (var20 * 2.0D < 1.0D) { // L: 31
+				var10 = var12;
+			} else if (var20 * 3.0D < 2.0D) { // L: 32
+				var10 = 6.0D * (0.6666666666666666D - var20) * (var12 - var14) + var14;
+			} else {
+				var10 = var14; // L: 33
+			}
+		}
+
+		int var22 = (int)(256.0D * var6); // L: 35
+		int var13 = (int)(var8 * 256.0D); // L: 36
+		int var23 = (int)(var10 * 256.0D); // L: 37
+		int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38
+		return var15; // L: 39
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(ILcf;ZI)I",
-		garbageValue = "992004750"
+		descriptor = "(Lda;III)Lbq;",
+		garbageValue = "225550567"
 	)
-	static int method2080(int var0, Script var1, boolean var2) {
-		Widget var5;
-		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1350
-			var5 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1351
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.itemId; // L: 1352
-			return 1; // L: 1353
-		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1355
-			var5 = Frames.getWidget(Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]); // L: 1356
-			if (var5.itemId != -1) { // L: 1357
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = var5.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1358
+	public static final PcmPlayer method2187(TaskHandler var0, int var1, int var2) {
+		if (class341.field3921 == 0) { // L: 49
+			throw new IllegalStateException();
+		} else if (var1 >= 0 && var1 < 2) { // L: 50
+			if (var2 < 256) { // L: 51
+				var2 = 256;
 			}
 
-			return 1; // L: 1359
-		} else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1361
-			int var3 = Interpreter.Interpreter_intStack[--class44.Interpreter_intStackSize]; // L: 1362
-			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1363
-			if (var4 != null) { // L: 1364
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 1;
-			} else {
-				Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = 0; // L: 1365
-			}
+			try {
+				PcmPlayer var3 = FontName.pcmPlayerProvider.player(); // L: 53
+				var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 54
+				var3.field403 = var2; // L: 55
+				var3.init(); // L: 56
+				var3.capacity = (var2 & -1024) + 1024; // L: 57
+				if (var3.capacity > 16384) { // L: 58
+					var3.capacity = 16384;
+				}
 
-			return 1; // L: 1366
-		} else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1368
-			Interpreter.Interpreter_intStack[++class44.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1369
-			return 1; // L: 1370
+				var3.open(var3.capacity); // L: 59
+				if (UserComparator1.field4220 > 0 && Login.soundSystem == null) { // L: 60
+					Login.soundSystem = new SoundSystem(); // L: 61
+					PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 62
+					PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(Login.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 63
+				}
+
+				if (Login.soundSystem != null) { // L: 65
+					if (Login.soundSystem.players[var1] != null) { // L: 66
+						throw new IllegalArgumentException();
+					}
+
+					Login.soundSystem.players[var1] = var3; // L: 67
+				}
+
+				return var3; // L: 69
+			} catch (Throwable var4) { // L: 71
+				return new PcmPlayer(); // L: 72
+			}
 		} else {
-			return 2; // L: 1372
+			throw new IllegalArgumentException();
 		}
 	}
 }
diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
index b715069a54..4f42fbf3bf 100644
--- a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
+++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
@@ -33,6 +33,8 @@ public class ScriptOpcodes {
 	public static final int GET_VARC_STRING = 49;
 	public static final int SET_VARC_STRING = 50;
 	public static final int SWITCH = 60;
+	public static final int GET_VARCLANSETTING = 74;
+	public static final int GET_VARCLAN = 76;
 	public static final int CC_CREATE = 100;
 	public static final int CC_DELETE = 101;
 	public static final int CC_DELETEALL = 102;
@@ -66,7 +68,6 @@ public class ScriptOpcodes {
 	public static final int CC_SETSCROLLSIZE = 1120;
 	public static final int CC_RESUME_PAUSEBUTTON = 1121;
 	public static final int CC_SETFILLCOLOUR = 1123;
-	public static final int CC_SETFILLMODE = 1125;
 	public static final int CC_SETLINEDIRECTION = 1126;
 	public static final int CC_SETMODELTRANSPARENT = 1127;
 	public static final int CC_SETOBJECT = 1200;
@@ -114,6 +115,8 @@ public class ScriptOpcodes {
 	public static final int CC_SETONSUBCHANGE = 1424;
 	public static final int CC_SETONSTOCKTRANSMIT = 1425;
 	public static final int CC_SETONRESIZE = 1427;
+	public static final int CC_SETONCLANSETTINGSTRANSMIT = 1428;
+	public static final int CC_SETONCLANCHANNELTRANSMIT = 1429;
 	public static final int CC_GETX = 1500;
 	public static final int CC_GETY = 1501;
 	public static final int CC_GETWIDTH = 1502;
@@ -129,11 +132,9 @@ public class ScriptOpcodes {
 	public static final int CC_GETMODELANGLE_X = 1606;
 	public static final int CC_GETMODELANGLE_Z = 1607;
 	public static final int CC_GETMODELANGLE_Y = 1608;
-	public static final int CC_GETTRANSTOP = 1609;
-	public static final int CC_GETTRANSBOT = 1610;
+	public static final int CC_GETTRANS = 1609;
 	public static final int CC_GETCOLOUR = 1611;
 	public static final int CC_GETFILLCOLOUR = 1612;
-	public static final int CC_GETFILLMODE = 1613;
 	public static final int CC_GETMODELTRANSPARENT = 1614;
 	public static final int CC_GETINVOBJECT = 1700;
 	public static final int CC_GETINVCOUNT = 1701;
@@ -142,10 +143,12 @@ public class ScriptOpcodes {
 	public static final int CC_GETOP = 1801;
 	public static final int CC_GETOPBASE = 1802;
 	public static final int CC_CALLONRESIZE = 1927;
+	public static final int CC_TRIGGEROP = 1928;
 	public static final int IF_SETPOSITION = 2000;
 	public static final int IF_SETSIZE = 2001;
 	public static final int IF_SETHIDE = 2003;
 	public static final int IF_SETNOCLICKTHROUGH = 2005;
+	public static final int IF_SETNOSCROLLTHROUGH = 2006;
 	public static final int IF_SETSCROLLPOS = 2100;
 	public static final int IF_SETCOLOUR = 2101;
 	public static final int IF_SETFILL = 2102;
@@ -169,9 +172,8 @@ public class ScriptOpcodes {
 	public static final int IF_SETSCROLLSIZE = 2120;
 	public static final int IF_RESUME_PAUSEBUTTON = 2121;
 	public static final int IF_SETFILLCOLOUR = 2123;
-	public static final int IF_SETTRANSBOT = 2124;
-	public static final int IF_SETFILLMODE = 2125;
 	public static final int IF_SETLINEDIRECTION = 2126;
+	public static final int IF_SETMODELTRANSPARENT = 2127;
 	public static final int IF_SETOBJECT = 2200;
 	public static final int IF_SETNPCHEAD = 2201;
 	public static final int IF_SETPLAYERHEAD_SELF = 2202;
@@ -217,6 +219,8 @@ public class ScriptOpcodes {
 	public static final int IF_SETONSUBCHANGE = 2424;
 	public static final int IF_SETONSTOCKTRANSMIT = 2425;
 	public static final int IF_SETONRESIZE = 2427;
+	public static final int IF_SETONCLANSETTINGSTRANSMIT = 2428;
+	public static final int IF_SETONCLANCHANNELTRANSMIT = 2429;
 	public static final int IF_GETX = 2500;
 	public static final int IF_GETY = 2501;
 	public static final int IF_GETWIDTH = 2502;
@@ -232,11 +236,9 @@ public class ScriptOpcodes {
 	public static final int IF_GETMODELANGLE_X = 2606;
 	public static final int IF_GETMODELANGLE_Z = 2607;
 	public static final int IF_GETMODELANGLE_Y = 2608;
-	public static final int IF_GETTRANSTOP = 2609;
-	public static final int IF_GETTRANSBOT = 2610;
+	public static final int IF_GETTRANS = 2609;
 	public static final int IF_GETCOLOUR = 2611;
 	public static final int IF_GETFILLCOLOUR = 2612;
-	public static final int IF_GETFILLMODE = 2613;
 	public static final int IF_GETMODELTRANSPARENT = 2614;
 	public static final int IF_GETINVOBJECT = 2700;
 	public static final int IF_GETINVCOUNT = 2701;
@@ -246,6 +248,7 @@ public class ScriptOpcodes {
 	public static final int IF_GETOP = 2801;
 	public static final int IF_GETOPBASE = 2802;
 	public static final int IF_CALLONRESIZE = 2927;
+	public static final int IF_TRIGGEROP = 2928;
 	public static final int MES = 3100;
 	public static final int ANIM = 3101;
 	public static final int IF_CLOSE = 3103;
@@ -268,7 +271,6 @@ public class ScriptOpcodes {
 	public static final int SETSHOWLOADINGMESSAGES = 3126;
 	public static final int SETTAPTODROP = 3127;
 	public static final int GETTAPTODROP = 3128;
-	public static final int SETOCULUSORBSPEED = 3129;
 	public static final int GETCANVASSIZE = 3132;
 	public static final int MOBILE_SETFPS = 3133;
 	public static final int MOBILE_OPENSTORE = 3134;
@@ -277,8 +279,7 @@ public class ScriptOpcodes {
 	public static final int GETHIDEUSERNAME = 3142;
 	public static final int SETREMEMBERUSERNAME = 3143;
 	public static final int GETREMEMBERUSERNAME = 3144;
-	public static final int SETTITLEMUSICENABLED = 3146;
-	public static final int GETTITLEMUSICENABLED = 3147;
+	public static final int SHOW_IOS_REVIEW = 3145;
 	public static final int SOUND_SYNTH = 3200;
 	public static final int SOUND_SONG = 3201;
 	public static final int SOUND_JINGLE = 3202;
@@ -336,6 +337,41 @@ public class ScriptOpcodes {
 	public static final int CLAN_GETCHATOWNERNAME = 3625;
 	public static final int CLAN_ISFRIEND = 3626;
 	public static final int CLAN_ISIGNORE = 3627;
+	public static final int ACTIVECLANSETTINGS_FIND_LISTENED = 3800;
+	public static final int ACTIVECLANSETTINGS_FIND_AFFINED = 3801;
+	public static final int ACTIVECLANSETTINGS_GETCLANNAME = 3802;
+	public static final int ACTIVECLANSETTINGS_GETALLOWUNAFFINED = 3803;
+	public static final int ACTIVECLANSETTINGS_GETRANKTALK = 3804;
+	public static final int ACTIVECLANSETTINGS_GETRANKKICK = 3805;
+	public static final int ACTIVECLANSETTINGS_GETRANKLOOTSHARE = 3806;
+	public static final int ACTIVECLANSETTINGS_GETCOINSHARE = 3807;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDCOUNT = 3809;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDDISPLAYNAME = 3810;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDRANK = 3811;
+	public static final int ACTIVECLANSETTINGS_GETBANNEDCOUNT = 3812;
+	public static final int ACTIVECLANSETTINGS_GETBANNEDDISPLAYNAME = 3813;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDEXTRAINFO = 3814;
+	public static final int ACTIVECLANSETTINGS_GETCURRENTOWNER_SLOT = 3815;
+	public static final int ACTIVECLANSETTINGS_GETREPLACEMENTOWNER_SLOT = 3816;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDSLOT = 3817;
+	public static final int ACTIVECLANSETTINGS_GETSORTEDAFFINEDSLOT = 3818;
+	public static final int AFFINEDCLANSETTINGS_ADDBANNED_FROMCHANNEL = 3819;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDJOINRUNEDAY = 3820;
+	public static final int AFFINEDCLANSETTINGS_SETMUTED_FROMCHANNEL = 3821;
+	public static final int ACTIVECLANSETTINGS_GETAFFINEDMUTED = 3822;
+	public static final int ACTIVECLANCHANNEL_FIND_LISTENED = 3850;
+	public static final int ACTIVECLANCHANNEL_FIND_AFFINED = 3851;
+	public static final int ACTIVECLANCHANNEL_GETCLANNAME = 3852;
+	public static final int ACTIVECLANCHANNEL_GETRANKKICK = 3853;
+	public static final int ACTIVECLANCHANNEL_GETRANKTALK = 3854;
+	public static final int ACTIVECLANCHANNEL_GETUSERCOUNT = 3855;
+	public static final int ACTIVECLANCHANNEL_GETUSERDISPLAYNAME = 3856;
+	public static final int ACTIVECLANCHANNEL_GETUSERRANK = 3857;
+	public static final int ACTIVECLANCHANNEL_GETUSERWORLD = 3858;
+	public static final int ACTIVECLANCHANNEL_KICKUSER = 3859;
+	public static final int ACTIVECLANCHANNEL_GETUSERSLOT = 3860;
+	public static final int ACTIVECLANCHANNEL_GETSORTEDUSERSLOT = 3861;
+	public static final int CLANPROFILE_FIND = 3890;
 	public static final int STOCKMARKET_GETOFFERTYPE = 3903;
 	public static final int STOCKMARKET_GETOFFERITEM = 3904;
 	public static final int STOCKMARKET_GETOFFERPRICE = 3905;
@@ -376,6 +412,11 @@ public class ScriptOpcodes {
 	public static final int AND = 4014;
 	public static final int OR = 4015;
 	public static final int SCALE = 4018;
+	public static final int BITCOUNT = 4025;
+	public static final int TOGGLEBIT = 4026;
+	public static final int SETBIT_RANGE = 4027;
+	public static final int CLEARBIT_RANGE = 4028;
+	public static final int GETBIT_RANGE = 4029;
 	public static final int APPEND_NUM = 4100;
 	public static final int APPEND = 4101;
 	public static final int APPEND_SIGNNUM = 4102;
@@ -398,7 +439,6 @@ public class ScriptOpcodes {
 	public static final int REMOVETAGS = 4119;
 	public static final int STRING_INDEXOF_CHAR = 4120;
 	public static final int STRING_INDEXOF_STRING = 4121;
-	public static final int UPPERCASE = 4122;
 	public static final int OC_NAME = 4200;
 	public static final int OC_OP = 4201;
 	public static final int OC_IOP = 4202;
@@ -420,6 +460,7 @@ public class ScriptOpcodes {
 	public static final int CHAT_GETFILTER_PRIVATE = 5005;
 	public static final int CHAT_SENDPUBLIC = 5008;
 	public static final int CHAT_SENDPRIVATE = 5009;
+	public static final int CHAT_SENDCLAN = 5010;
 	public static final int CHAT_PLAYERNAME = 5015;
 	public static final int CHAT_GETFILTER_TRADE = 5016;
 	public static final int CHAT_GETHISTORYLENGTH = 5017;
@@ -428,7 +469,7 @@ public class ScriptOpcodes {
 	public static final int DOCHEAT = 5020;
 	public static final int CHAT_SETMESSAGEFILTER = 5021;
 	public static final int CHAT_GETMESSAGEFILTER = 5022;
-	public static final int DEBUGMES = 5023;
+	public static final int WRITECONSOLE = 5023;
 	public static final int GETWINDOWMODE = 5306;
 	public static final int SETWINDOWMODE = 5307;
 	public static final int GETDEFAULTWINDOWMODE = 5308;
@@ -450,7 +491,6 @@ public class ScriptOpcodes {
 	public static final int WORLDLIST_NEXT = 6502;
 	public static final int WORLDLIST_SPECIFIC = 6506;
 	public static final int WORLDLIST_SORT = 6507;
-	public static final int GETWORLDINFO = 6511;
 	public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
 	public static final int NC_PARAM = 6513;
 	public static final int LC_PARAM = 6514;
@@ -459,9 +499,9 @@ public class ScriptOpcodes {
 	public static final int ON_MOBILE = 6518;
 	public static final int CLIENTTYPE = 6519;
 	public static final int MOBILE_KEYBOARDHIDE = 6521;
-	public static final int BATTERYLEVEL = 6524;
-	public static final int BATTERYCHARGING = 6525;
-	public static final int WIFIAVAILABLE = 6526;
+	public static final int MOBILE_BATTERYLEVEL = 6524;
+	public static final int MOBILE_BATTERYCHARGING = 6525;
+	public static final int MOBILE_WIFIAVAILABLE = 6526;
 	public static final int WORLDMAP_GETMAPNAME = 6601;
 	public static final int WORLDMAP_SETMAP = 6602;
 	public static final int WORLDMAP_GETZOOM = 6603;