project: uwu (197)

2021-06-16 11:24:56 +01:00
parent 6278fd9835
commit fbbafc7285
437 changed files with 52595 additions and 52141 deletions
--- a/runescape-client/src/main/java/AbstractArchive.java
+++ b/runescape-client/src/main/java/AbstractArchive.java
--- 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);
 }
--- 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
 }
--- 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() {
--- 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
 	}
 }
--- 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;

--- 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) {
--- 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
+	}
 }
--- 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
 }
--- 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
 }
--- 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
 }
--- 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
 			}

 		}
--- 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
 }
--- 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
 	}
 }
--- 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
 }
--- 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
--- 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
 }
--- 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
 	}
 }
--- 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
 	}
 }
--- 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
--- 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
--- 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
+	}
 }
--- 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
-		}
-	}
 }
--- 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
+		}
+	}
 }
--- 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
 }
--- 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
 }
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -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
-	}
 }
--- 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
 }
--- 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
 }
--- 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
 }
--- 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;

--- 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
 }
--- 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
 }
--- 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
+			}
+		}
+	}
 }
--- 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
 }
--- 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
 }
--- 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
 }
--- 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
 }
--- a/runescape-client/src/main/java/ClanSettings.java
+++ b/runescape-client/src/main/java/ClanSettings.java
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -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
+	}
 }
--- 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
 }
--- 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
 }
--- 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
 }
--- 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
+	}
 }
--- 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) {
--- 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
--- 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
 }
--- 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() {
--- 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
 }
--- 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
 }
--- 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
--- 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
--- 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() {
--- 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
 }
--- 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
 }
--- 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();
--- 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
 }
--- 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
 		}
 	}
 }
--- 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
 }
--- 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
 	}
 }
--- 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
 }
--- 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
 }
--- 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
 	}
 }
--- 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
--- 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
 }
--- 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
 }
--- 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
 }
--- 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
+		}
+	}
 }
--- 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
 }
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
--- 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
 }
--- 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
 }
--- 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 {
--- 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
 		}
 	}
 }
--- a/runescape-client/src/main/java/GameEngine.java
+++ b/runescape-client/src/main/java/GameEngine.java
--- 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
 }
--- 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
 }
--- 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
+	}
 }
--- 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
--- 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
 }
--- 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
+			}
+		}
+	}
 }
--- 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
 }
--- 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) {
--- 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
+	}
 }
--- 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
 }
--- 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
 			}
 		}
 	}
--- 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
 }
--- 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
 	}
 }
--- 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);
 		}
 	}
 }
--- 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
+	}
 }
--- 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
 	}
 }
--- 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
 	}
 }
--- 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
 }
--- 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
-		}
-	}
 }
--- 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
 }
--- 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
--- 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
 }
--- a/Show More
+++ b/Show More