Merge pull request #2135 from Lucwousin/rev187

rev187

buildSrc/src/main/kotlin/Dependencies.kt

@@ -27,11 +27,11 @@ const val kotlinVersion = "1.3.50"
 
 object ProjectVersions {
     const val launcherVersion = "2.0.4"
-    const val rlVersion = "1.5.43-SNAPSHOT"
+    const val rlVersion = "1.5.44-SNAPSHOT"
 
-    const val openosrsVersion = "2.1.17.0-SNAPSHOT"
+    const val openosrsVersion = "2.1.18-SNAPSHOT"
 
-    const val rsversion = 186
+    const val rsversion = 187
     const val cacheversion = 165
 }
 

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

@@ -2,43 +2,49 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gp")
+@ObfuscatedName("gu")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		signature = "Lln;"
-	)
-	@Export("leftTitleSprite")
-	static Sprite leftTitleSprite;
-
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(S)[B",
+		signature = "(I)[B",
-		garbageValue = "18982"
+		garbageValue = "-112018699"
 	)
 	@Export("get")
-	abstract byte[] get();
+	public abstract byte[] get();
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BB)V",
-		garbageValue = "-1436271820"
+		garbageValue = "33"
 	)
 	@Export("set")
 	public abstract void set(byte[] var1);
 
-	@ObfuscatedName("kg")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		signature = "(Lhl;B)Z",
+		signature = "(ILcu;ZB)I",
-		garbageValue = "-78"
+		garbageValue = "-27"
 	)
-	@Export("isComponentHidden")
+	static int method3937(int var0, Script var1, boolean var2) {
-	static boolean isComponentHidden(Widget var0) {
+		if (var0 == ScriptOpcodes.SOUND_SYNTH) {
-		return var0.isHidden;
+			class188.Interpreter_intStackSize -= 3;
+			class268.queueSoundEffect(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2]);
+			return 1;
+		} else if (var0 == ScriptOpcodes.SOUND_SONG) {
+			WorldMapSprite.playSong(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
+			return 1;
+		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
+			class188.Interpreter_intStackSize -= 2;
+			ScriptFrame.playSoundJingle(Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]);
+			return 1;
+		} else {
+			return 2;
+		}
 	}
 }

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("kr")
+@ObfuscatedName("kn")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "[Llm;"
+		signature = "[Lli;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("n")
+	@ObfuscatedName("s")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("d")
+	@ObfuscatedName("n")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("s")
+	@ObfuscatedName("u")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("t")
+	@ObfuscatedName("z")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("m")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.readMetrics(var1);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@Export("readMetrics")
 	void readMetrics(byte[] var1) {
 		this.advances = new int[256];
@@ -193,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 				if (var13 != 32 && var13 != 160) {
 					for (var8 = 0; var8 < 256; ++var8) {
 						if (var8 != 32 && var8 != 160) {
-							this.kerning[var8 + (var13 << 8)] = (byte)method5442(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5388(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("x")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}
 
-		return this.advances[Skills.charToByteCp1252(var1) & 255];
+		return this.advances[NetSocket.charToByteCp1252(var1) & 255];
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("a")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) {
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var7.equals("gt")) {
 								if (var7.startsWith("img=")) {
 									try {
-										int var8 = SoundCache.parseInt(var7.substring(4));
+										int var8 = ArchiveDiskActionHandler.parseInt(var7.substring(4));
 										var4 += AbstractFont_modIconSprites[var8].width;
 										var3 = -1;
 									} catch (Exception var10) {
@@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 					}
 
 					if (var2 == -1) {
-						var4 += this.advances[(char)(Skills.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(NetSocket.charToByteCp1252(var6) & 255)];
 						if (this.kerning != null && var3 != -1) {
 							var4 += this.kerning[var6 + (var3 << 8)];
 						}
@@ -270,7 +270,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) {
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							var11 = '>';
 						} else if (var16.startsWith("img=")) {
 							try {
-								int var17 = SoundCache.parseInt(var16.substring(4));
+								int var17 = ArchiveDiskActionHandler.parseInt(var16.substring(4));
 								var4 += AbstractFont_modIconSprites[var17].width;
 								var11 = 0;
 							} catch (Exception var20) {
@@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("o")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@Export("draw")
 	public void draw(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("j")
 	@Export("drawAlpha")
 	public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("n")
 	@Export("drawRightAligned")
 	public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("u")
 	@Export("drawCentered")
 	public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
 		if (var1 != null) {
@@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("z")
 	@Export("drawLines")
 	public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		if (var1 == null) {
@@ -495,7 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("m")
 	@Export("drawCenteredWave2")
 	public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("aa")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) {
@@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ad")
+	@ObfuscatedName("av")
 	@Export("drawRandomAlphaAndSpacing")
 	public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("aw")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,38 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}
 
-	@ObfuscatedName("ai")
+	@ObfuscatedName("as")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
-			int var2;
-			String var3;
 			if (var1.startsWith("col=")) {
-				var3 = var1.substring(4);
+				AbstractFont_color = VerticalAlignment.method4326(var1.substring(4), 16);
-				var2 = UserComparator8.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_color = var2;
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) {
-				var3 = var1.substring(4);
+				AbstractFont_strike = VerticalAlignment.method4326(var1.substring(4), 16);
-				var2 = UserComparator8.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_strike = var2;
 			} else if (var1.equals("str")) {
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) {
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) {
-				var3 = var1.substring(2);
+				AbstractFont_underline = VerticalAlignment.method4326(var1.substring(2), 16);
-				var2 = UserComparator8.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_underline = var2;
 			} else if (var1.equals("u")) {
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) {
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) {
-				var3 = var1.substring(5);
+				AbstractFont_shadow = VerticalAlignment.method4326(var1.substring(5), 16);
-				var2 = UserComparator8.parseIntCustomRadix(var3, 16, true);
-				AbstractFont_shadow = var2;
 			} else if (var1.equals("shad")) {
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) {
@@ -621,12 +611,12 @@ public abstract class AbstractFont extends Rasterizer2D {
 			} else if (var1.equals("br")) {
 				this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
 			}
-		} catch (Exception var5) {
+		} catch (Exception var3) {
 		}
 
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ak")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -649,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -658,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var6 = 0; var6 < var1.length(); ++var6) {
 			if (var1.charAt(var6) != 0) {
-				char var7 = (char)(Skills.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(NetSocket.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -672,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) {
 								if (var8.startsWith("img=")) {
 									try {
-										var9 = SoundCache.parseInt(var8.substring(4));
+										var9 = ArchiveDiskActionHandler.parseInt(var8.substring(4));
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9];
 										var10.drawAt(var2, var3 + this.ascent - var10.height);
 										var2 += var10.width;
@@ -738,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ah")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -748,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		for (int var9 = 0; var9 < var1.length(); ++var9) {
 			if (var1.charAt(var9) != 0) {
-				char var10 = (char)(Skills.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(NetSocket.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -777,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}
 
 										++var8;
-										var14 = SoundCache.parseInt(var11.substring(4));
+										var14 = ArchiveDiskActionHandler.parseInt(var11.substring(4));
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14];
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
 										var2 += var15.width;
@@ -856,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
-	static int method5442(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	static int method5388(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
 		int var7 = var2[var5];
 		int var8 = var7 + var4[var5];
 		int var9 = var2[var6];
@@ -892,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13;
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("l")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length();
@@ -921,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aq")
 	@Export("AbstractFont_drawGlyph")
 	static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -963,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ao")
 	@Export("AbstractFont_placeGlyph")
 	static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2);
@@ -1011,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("an")
 	@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;

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("lp")
+@ObfuscatedName("lk")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1041400109
+		intValue = -2051103705
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -854439651
+		intValue = 705915003
 	)
 	@Export("height")
 	public int height;
@@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "0"
+		garbageValue = "1570881200"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(IIIIB)V",
-		garbageValue = "-787999204"
+		garbageValue = "-116"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(I)V",
-		garbageValue = "-30907"
+		garbageValue = "1390931728"
 	)
 	@Export("apply")
 	public final void apply() {

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

@@ -4,56 +4,56 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kn")
+@ObfuscatedName("ky")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-29"
+		garbageValue = "-647274291"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "27"
+		garbageValue = "2115277231"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-53"
+		garbageValue = "-972484659"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-1591428004"
+		garbageValue = "497635177"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "([BIIB)I",
+		signature = "([BIII)I",
-		garbageValue = "29"
+		garbageValue = "-1642271193"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-543253817"
+		garbageValue = "-340382115"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;

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

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("jq")
+@ObfuscatedName("jm")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;I)V",
+		signature = "(Ljava/util/Comparator;B)V",
-		garbageValue = "314545919"
+		garbageValue = "1"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Ljr;Ljr;B)I",
+		signature = "(Ljy;Ljy;I)I",
-		garbageValue = "14"
+		garbageValue = "-1667132208"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -42,4 +42,78 @@ public abstract class AbstractUserComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(II)Liw;",
+		garbageValue = "928288295"
+	)
+	@Export("getNpcDefinition")
+	public static NPCDefinition getNpcDefinition(int var0) {
+		NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
+			var1 = new NPCDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("gw")
+	@ObfuscatedSignature(
+		signature = "(Lha;IIB)V",
+		garbageValue = "-91"
+	)
+	@Export("checkIfMinimapClicked")
+	static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
+		if (Client.minimapState == 0 || Client.minimapState == 3) {
+			if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !NetFileRequest.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
+				SpriteMask var3 = var0.getSpriteMask(true);
+				if (var3 == null) {
+					return;
+				}
+
+				int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
+				int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
+				if (var3.contains(var4, var5)) {
+					var4 -= var3.width / 2;
+					var5 -= var3.height / 2;
+					int var6 = Client.camAngleY & 2047;
+					int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
+					int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
+					int var9 = var8 * var4 + var5 * var7 >> 11;
+					int var10 = var5 * var8 - var4 * var7 >> 11;
+					int var11 = var9 + Message.localPlayer.x >> 7;
+					int var12 = Message.localPlayer.y - var10 >> 7;
+					PacketBufferNode var13 = class2.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher);
+					var13.packetBuffer.writeByte(18);
+					var13.packetBuffer.method5696(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+					var13.packetBuffer.writeShort(MusicPatchPcmStream.baseX * 64 + var11);
+					var13.packetBuffer.writeIntME(ScriptEvent.baseY * 64 + var12);
+					var13.packetBuffer.writeByte(var4);
+					var13.packetBuffer.writeByte(var5);
+					var13.packetBuffer.writeShort(Client.camAngleY);
+					var13.packetBuffer.writeByte(57);
+					var13.packetBuffer.writeByte(0);
+					var13.packetBuffer.writeByte(0);
+					var13.packetBuffer.writeByte(89);
+					var13.packetBuffer.writeShort(Message.localPlayer.x);
+					var13.packetBuffer.writeShort(Message.localPlayer.y);
+					var13.packetBuffer.writeByte(63);
+					Client.packetWriter.addNode(var13);
+					Client.destinationX = var11;
+					Client.destinationY = var12;
+				}
+			}
+
+		}
+	}
 }

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

@@ -3,102 +3,90 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("aa")
+@ObfuscatedName("ao")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("qk")
+	@ObfuscatedName("bl")
-	@ObfuscatedGetter(
-		intValue = 1263704437
-	)
-	static int field299;
-	@ObfuscatedName("as")
-	@Export("client")
 	@ObfuscatedSignature(
-		signature = "Lclient;"
+		signature = "Lhq;"
 	)
-	static Client client;
+	static StudioGame field284;
-	@ObfuscatedName("ey")
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		signature = "Lij;"
+		signature = "[Lli;"
 	)
-	@Export("archive17")
+	@Export("worldSelectFlagSprites")
-	static Archive archive17;
+	static IndexedSprite[] worldSelectFlagSprites;
-	@ObfuscatedName("ef")
+	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = 821874025
-	)
-	static int field292;
-	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Lhx;"
+		signature = "Lht;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lhx;"
+		signature = "Lht;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 148025221
+		intValue = 130683095
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 316665889
+		intValue = -170696787
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		signature = "(Lhx;Lhx;)V"
+		signature = "(Lht;Lht;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-871583687"
+		garbageValue = "63"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Lam;",
+		signature = "(I)Law;",
-		garbageValue = "969160497"
+		garbageValue = "-1801186977"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-55298135"
+		garbageValue = "-2033351231"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-51"
+		garbageValue = "1873129621"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
+		signature = "(III)Z",
-		garbageValue = "34"
+		garbageValue = "-1038278508"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -109,38 +97,37 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "1140208309"
+		garbageValue = "3"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
+		signature = "(III)Z",
-		garbageValue = "75"
+		garbageValue = "-2033564740"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = Varcs.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement());
 			int var4 = this.getSubWidth();
 			int var5 = this.getSubHeight();
 			switch(var3.horizontalAlignment.value) {
 			case 0:
-				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
+				if (var1 <= this.screenX - var4 || var1 > this.screenX) {
-					break;
+					return false;
 				}
-
+				break;
-				return false;
 			case 1:
-				if (var1 > this.screenX - var4 && var1 <= this.screenX) {
+				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
 					break;
 				}
 
@@ -153,7 +140,7 @@ public abstract class AbstractWorldMapIcon {
 
 			switch(var3.verticalAlignment.value) {
 			case 0:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
 					return false;
 				}
 				break;
@@ -163,7 +150,7 @@ public abstract class AbstractWorldMapIcon {
 				}
 				break;
 			case 2:
-				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
 					return false;
 				}
 			}
@@ -172,10 +159,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("av")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "-1821247860"
+		garbageValue = "501002350"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -189,83 +176,421 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lhf;Lhf;ZB)V",
+		signature = "([BI)V",
-		garbageValue = "28"
+		garbageValue = "-1395894499"
 	)
-	public static void method625(AbstractArchive var0, AbstractArchive var1, boolean var2) {
+	@Export("SpriteBuffer_decode")
-		ObjectDefinition.ObjectDefinition_archive = var0;
+	static void SpriteBuffer_decode(byte[] var0) {
-		ObjectDefinition.ObjectDefinition_modelsArchive = var1;
+		Buffer var1 = new Buffer(var0);
-		ObjectDefinition.ObjectDefinition_isLowDetail = var2;
+		var1.offset = var0.length - 2;
+		class325.SpriteBuffer_spriteCount = var1.readUnsignedShort();
+		class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount];
+		class325.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount];
+		UserComparator1.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount];
+		class325.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount];
+		class290.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][];
+		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8;
+		class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort();
+		class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort();
+		int var2 = (var1.readUnsignedByte() & 255) + 1;
+
+		int var3;
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			class325.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			UserComparator1.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort();
+		}
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			class325.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort();
+		}
+
+		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3;
+		class268.SpriteBuffer_spritePalette = new int[var2];
+
+		for (var3 = 1; var3 < var2; ++var3) {
+			class268.SpriteBuffer_spritePalette[var3] = var1.readMedium();
+			if (class268.SpriteBuffer_spritePalette[var3] == 0) {
+				class268.SpriteBuffer_spritePalette[var3] = 1;
+			}
+		}
+
+		var1.offset = 0;
+
+		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			int var4 = UserComparator1.SpriteBuffer_spriteWidths[var3];
+			int var5 = class325.SpriteBuffer_spriteHeights[var3];
+			int var6 = var4 * var5;
+			byte[] var7 = new byte[var6];
+			class290.SpriteBuffer_pixels[var3] = var7;
+			int var8 = var1.readUnsignedByte();
+			int var9;
+			if (var8 == 0) {
+				for (var9 = 0; var9 < var6; ++var9) {
+					var7[var9] = var1.readByte();
+				}
+			} else if (var8 == 1) {
+				for (var9 = 0; var9 < var4; ++var9) {
+					for (int var10 = 0; var10 < var5; ++var10) {
+						var7[var9 + var10 * var4] = var1.readByte();
+					}
+				}
+			}
+		}
+
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("fp")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(ZI)V",
-		garbageValue = "1"
+		garbageValue = "294564457"
 	)
-	static void method623() {
+	static final void method612(boolean var0) {
-		Messages.Messages_channels.clear();
+		if (var0) {
-		Messages.Messages_hashTable.clear();
+			Client.field743 = Login.field1178 ? class160.field1984 : class160.field1986;
-		Messages.Messages_queue.clear();
-		Messages.Messages_count = 0;
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "(ILci;ZI)I",
-		garbageValue = "1136599608"
-	)
-	static int method618(int var0, Script var1, boolean var2) {
-		Widget var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-		if (var0 == ScriptOpcodes.IF_GETSCROLLX) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollX;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLY) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollY;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTEXT) {
-			Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.text;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollWidth;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.scrollHeight;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelZoom;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleX;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleZ;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelAngleY;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyTop;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.transparencyBot;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETCOLOUR) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.color2;
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETFILLMODE) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
-			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
-			return 1;
 		} else {
-			return 2;
+			Client.field743 = Interpreter.clientPreferences.parameters.containsKey(UrlRequester.method3299(Login.Login_username)) ? class160.field1988 : class160.field1985;
+		}
+
+	}
+
+	@ObfuscatedName("hw")
+	@ObfuscatedSignature(
+		signature = "(Lfi;I)V",
+		garbageValue = "-432214243"
+	)
+	static final void method614(class179 var0) {
+		PacketBuffer var1 = Client.packetWriter.packetBuffer;
+		int var2;
+		int var3;
+		int var4;
+		int var5;
+		int var6;
+		int var7;
+		int var8;
+		int var9;
+		if (class179.field2293 == var0) {
+			var2 = var1.method5628();
+			var3 = (var2 >> 4 & 7) + class3.field7;
+			var4 = (var2 & 7) + PlayerAppearance.field2520;
+			var5 = var1.method5723();
+			var6 = var1.readUnsignedByte();
+			var7 = var6 >> 2;
+			var8 = var6 & 3;
+			var9 = Client.field689[var7];
+			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+				class65.updatePendingSpawn(UrlRequest.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1);
+			}
+
+		} else if (class179.field2290 == var0) {
+			var2 = var1.method5582();
+			var3 = var1.method5723();
+			var4 = var1.readUnsignedByte();
+			var5 = (var4 >> 4 & 7) + class3.field7;
+			var6 = (var4 & 7) + PlayerAppearance.field2520;
+			var7 = var1.method5675();
+			if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+				var5 = var5 * 128 + 64;
+				var6 = var6 * 128 + 64;
+				GraphicsObject var43 = new GraphicsObject(var2, UrlRequest.Client_plane, var5, var6, ScriptEvent.getTileHeight(var5, var6, UrlRequest.Client_plane) - var7, var3, Client.cycle);
+				Client.graphicsObjects.addFirst(var43);
+			}
+
+		} else {
+			TileItem var32;
+			if (class179.field2295 == var0) {
+				var2 = var1.method5582();
+				var3 = var1.method5583();
+				var4 = var1.readUnsignedByte();
+				var5 = (var4 >> 4 & 7) + class3.field7;
+				var6 = (var4 & 7) + PlayerAppearance.field2520;
+				if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+					var32 = new TileItem();
+					var32.id = var2;
+					var32.quantity = var3;
+					if (Client.groundItems[UrlRequest.Client_plane][var5][var6] == null) {
+						Client.groundItems[UrlRequest.Client_plane][var5][var6] = new NodeDeque();
+					}
+
+					Client.groundItems[UrlRequest.Client_plane][var5][var6].addFirst(var32);
+					Skills.updateItemPile(var5, var6);
+				}
+
+			} else {
+				int var10;
+				if (class179.field2297 == var0) {
+					var2 = var1.method5723();
+					var3 = var1.method5675();
+					var4 = var1.method5572();
+					var5 = (var4 >> 4 & 7) + class3.field7;
+					var6 = (var4 & 7) + PlayerAppearance.field2520;
+					var7 = var1.method5675();
+					var8 = var7 >> 4 & 15;
+					var9 = var7 & 7;
+					if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+						var10 = var8 + 1;
+						if (Message.localPlayer.pathX[0] >= var5 - var10 && Message.localPlayer.pathX[0] <= var5 + var10 && Message.localPlayer.pathY[0] >= var6 - var10 && Message.localPlayer.pathY[0] <= var10 + var6 && Client.areaSoundEffectVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) {
+							Client.soundEffectIds[Client.soundEffectCount] = var2;
+							Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9;
+							Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3;
+							Client.soundEffects[Client.soundEffectCount] = null;
+							Client.soundLocations[Client.soundEffectCount] = var8 + (var6 << 8) + (var5 << 16);
+							++Client.soundEffectCount;
+						}
+					}
+				}
+
+				int var14;
+				int var39;
+				if (class179.field2289 == var0) {
+					var2 = var1.readUnsignedByte();
+					var3 = var1.method5675() * 4;
+					var4 = var1.method5723();
+					byte var38 = var1.method5577();
+					var6 = var1.method5723();
+					var7 = var1.method5572();
+					var8 = (var7 >> 4 & 7) + class3.field7;
+					var9 = (var7 & 7) + PlayerAppearance.field2520;
+					var10 = var1.method5584();
+					var39 = var1.method5675();
+					int var40 = var1.method5583();
+					int var41 = var1.method5572() * 4;
+					byte var42 = var1.method5577();
+					var14 = var42 + var8;
+					var5 = var38 + var9;
+					if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104 && var14 >= 0 && var5 >= 0 && var14 < 104 && var5 < 104 && var6 != 65535) {
+						var8 = var8 * 128 + 64;
+						var9 = var9 * 128 + 64;
+						var14 = var14 * 128 + 64;
+						var5 = var5 * 128 + 64;
+						Projectile var15 = new Projectile(var6, UrlRequest.Client_plane, var8, var9, ScriptEvent.getTileHeight(var8, var9, UrlRequest.Client_plane) - var3, var40 + Client.cycle, var4 + Client.cycle, var2, var39, var10, var41);
+						var15.setDestination(var14, var5, ScriptEvent.getTileHeight(var14, var5, UrlRequest.Client_plane) - var41, var40 + Client.cycle);
+						Client.projectiles.addFirst(var15);
+					}
+
+				} else if (class179.field2296 == var0) {
+					var2 = var1.method5572();
+					var3 = var2 >> 2;
+					var4 = var2 & 3;
+					var5 = Client.field689[var3];
+					var6 = var1.readUnsignedByte();
+					var7 = (var6 >> 4 & 7) + class3.field7;
+					var8 = (var6 & 7) + PlayerAppearance.field2520;
+					if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
+						class65.updatePendingSpawn(UrlRequest.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1);
+					}
+
+				} else if (class179.field2294 == var0) {
+					var2 = var1.method5583();
+					var3 = var1.method5582();
+					var4 = var1.method5723();
+					var5 = var1.method5675();
+					var6 = (var5 >> 4 & 7) + class3.field7;
+					var7 = (var5 & 7) + PlayerAppearance.field2520;
+					if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
+						NodeDeque var31 = Client.groundItems[UrlRequest.Client_plane][var6][var7];
+						if (var31 != null) {
+							for (TileItem var33 = (TileItem)var31.last(); var33 != null; var33 = (TileItem)var31.previous()) {
+								if ((var3 & 32767) == var33.id && var4 == var33.quantity) {
+									var33.quantity = var2;
+									break;
+								}
+							}
+
+							Skills.updateItemPile(var6, var7);
+						}
+					}
+
+				} else if (class179.field2291 == var0) {
+					var2 = var1.method5628();
+					var3 = (var2 >> 4 & 7) + class3.field7;
+					var4 = (var2 & 7) + PlayerAppearance.field2520;
+					var5 = var1.method5582();
+					if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+						NodeDeque var34 = Client.groundItems[UrlRequest.Client_plane][var3][var4];
+						if (var34 != null) {
+							for (var32 = (TileItem)var34.last(); var32 != null; var32 = (TileItem)var34.previous()) {
+								if ((var5 & 32767) == var32.id) {
+									var32.remove();
+									break;
+								}
+							}
+
+							if (var34.last() == null) {
+								Client.groundItems[UrlRequest.Client_plane][var3][var4] = null;
+							}
+
+							Skills.updateItemPile(var3, var4);
+						}
+					}
+
+				} else if (class179.field2292 == var0) {
+					var2 = var1.method5675();
+					var3 = (var2 >> 4 & 7) + class3.field7;
+					var4 = (var2 & 7) + PlayerAppearance.field2520;
+					var5 = var1.method5572();
+					var6 = var5 >> 2;
+					var7 = var5 & 3;
+					var8 = Client.field689[var6];
+					var9 = var1.method5582();
+					if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) {
+						if (var8 == 0) {
+							BoundaryObject var35 = class14.scene.method3112(UrlRequest.Client_plane, var3, var4);
+							if (var35 != null) {
+								var39 = class2.Entity_unpackID(var35.tag);
+								if (var6 == 2) {
+									var35.entity1 = new DynamicObject(var39, 2, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity1);
+									var35.entity2 = new DynamicObject(var39, 2, var7 + 1 & 3, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity2);
+								} else {
+									var35.entity1 = new DynamicObject(var39, var6, var7, UrlRequest.Client_plane, var3, var4, var9, false, var35.entity1);
+								}
+							}
+						}
+
+						if (var8 == 1) {
+							WallDecoration var44 = class14.scene.method3113(UrlRequest.Client_plane, var3, var4);
+							if (var44 != null) {
+								var39 = class2.Entity_unpackID(var44.tag);
+								if (var6 != 4 && var6 != 5) {
+									if (var6 == 6) {
+										var44.entity1 = new DynamicObject(var39, 4, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1);
+									} else if (var6 == 7) {
+										var44.entity1 = new DynamicObject(var39, 4, (var7 + 2 & 3) + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1);
+									} else if (var6 == 8) {
+										var44.entity1 = new DynamicObject(var39, 4, var7 + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1);
+										var44.entity2 = new DynamicObject(var39, 4, (var7 + 2 & 3) + 4, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity2);
+									}
+								} else {
+									var44.entity1 = new DynamicObject(var39, 4, var7, UrlRequest.Client_plane, var3, var4, var9, false, var44.entity1);
+								}
+							}
+						}
+
+						if (var8 == 2) {
+							GameObject var45 = class14.scene.method3114(UrlRequest.Client_plane, var3, var4);
+							if (var6 == 11) {
+								var6 = 10;
+							}
+
+							if (var45 != null) {
+								var45.entity = new DynamicObject(class2.Entity_unpackID(var45.tag), var6, var7, UrlRequest.Client_plane, var3, var4, var9, false, var45.entity);
+							}
+						}
+
+						if (var8 == 3) {
+							FloorDecoration var46 = class14.scene.getFloorDecoration(UrlRequest.Client_plane, var3, var4);
+							if (var46 != null) {
+								var46.entity = new DynamicObject(class2.Entity_unpackID(var46.tag), 22, var7, UrlRequest.Client_plane, var3, var4, var9, false, var46.entity);
+							}
+						}
+					}
+
+				} else {
+					if (class179.field2298 == var0) {
+						byte var37 = var1.readByte();
+						var3 = var1.method5583();
+						var4 = var1.method5675();
+						var5 = (var4 >> 4 & 7) + class3.field7;
+						var6 = (var4 & 7) + PlayerAppearance.field2520;
+						var7 = var1.method5572();
+						var8 = var7 >> 2;
+						var9 = var7 & 3;
+						var10 = Client.field689[var8];
+						byte var11 = var1.readByte();
+						byte var12 = var1.method5576();
+						byte var13 = var1.method5575();
+						var14 = var1.readUnsignedShort();
+						int var36 = var1.method5582();
+						int var16 = var1.readUnsignedShort();
+						Player var17;
+						if (var36 == Client.localPlayerIndex) {
+							var17 = Message.localPlayer;
+						} else {
+							var17 = Client.players[var36];
+						}
+
+						if (var17 != null) {
+							ObjectDefinition var18 = Coord.getObjectDefinition(var16);
+							int var19;
+							int var20;
+							if (var9 != 1 && var9 != 3) {
+								var19 = var18.sizeX;
+								var20 = var18.sizeY;
+							} else {
+								var19 = var18.sizeY;
+								var20 = var18.sizeX;
+							}
+
+							int var21 = var5 + (var19 >> 1);
+							int var22 = var5 + (var19 + 1 >> 1);
+							int var23 = var6 + (var20 >> 1);
+							int var24 = var6 + (var20 + 1 >> 1);
+							int[][] var25 = Tiles.Tiles_heights[UrlRequest.Client_plane];
+							int var26 = var25[var22][var24] + var25[var21][var23] + var25[var22][var23] + var25[var21][var24] >> 2;
+							int var27 = (var5 << 7) + (var19 << 6);
+							int var28 = (var6 << 7) + (var20 << 6);
+							Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28);
+							if (var29 != null) {
+								class65.updatePendingSpawn(UrlRequest.Client_plane, var5, var6, var10, -1, 0, 0, var3 + 1, var14 + 1);
+								var17.animationCycleStart = var3 + Client.cycle;
+								var17.animationCycleEnd = var14 + Client.cycle;
+								var17.model0 = var29;
+								var17.field601 = var5 * 128 + var19 * 64;
+								var17.field603 = var6 * 128 + var20 * 64;
+								var17.tileHeight2 = var26;
+								byte var30;
+								if (var13 > var11) {
+									var30 = var13;
+									var13 = var11;
+									var11 = var30;
+								}
+
+								if (var37 > var12) {
+									var30 = var37;
+									var37 = var12;
+									var12 = var30;
+								}
+
+								var17.field605 = var13 + var5;
+								var17.field607 = var5 + var11;
+								var17.field606 = var37 + var6;
+								var17.field608 = var6 + var12;
+							}
+						}
+					}
+
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("is")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		garbageValue = "-1072362060"
+	)
+	@Export("insertMenuItem")
+	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		if (!Client.isMenuOpen) {
+			if (Client.menuOptionsCount < 500) {
+				Client.menuActions[Client.menuOptionsCount] = var0;
+				Client.menuTargets[Client.menuOptionsCount] = var1;
+				Client.menuOpcodes[Client.menuOptionsCount] = var2;
+				Client.menuIdentifiers[Client.menuOptionsCount] = var3;
+				Client.menuArguments1[Client.menuOptionsCount] = var4;
+				Client.menuArguments2[Client.menuOptionsCount] = var5;
+				Client.menuShiftClick[Client.menuOptionsCount] = var6;
+				++Client.menuOptionsCount;
+			}
+
 		}
 	}
 }

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

@@ -9,21 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("md")
+@ObfuscatedName("mk")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = -1982697081356352199L
+		longValue = -2099605315629278245L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		longValue = 797587694615508853L
+		longValue = 9136921121469373871L
 	)
 	@Export("offset")
 	long offset;
@@ -49,17 +49,17 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "2100291593"
+		garbageValue = "87"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
@@ -73,20 +73,20 @@ public final class AccessFile {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-108"
+		garbageValue = "-1441194559"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(ZI)V",
+		signature = "(ZS)V",
-		garbageValue = "-687857713"
+		garbageValue = "180"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)J",
-		garbageValue = "-266154110"
+		garbageValue = "-1766264538"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-309112442"
+		garbageValue = "1663251439"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {

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

@@ -3,334 +3,321 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bt")
+@ObfuscatedName("bv")
 @Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("el")
+	@ObfuscatedName("as")
-	@ObfuscatedSignature(
-		signature = "Lku;"
-	)
-	@Export("spriteIds")
-	static GraphicsDefaults spriteIds;
-	@ObfuscatedName("mh")
 	@ObfuscatedGetter(
-		intValue = 1998357535
+		intValue = 274195699
-	)
-	@Export("selectedSpellFlags")
-	static int selectedSpellFlags;
-	@ObfuscatedName("ai")
-	@ObfuscatedGetter(
-		intValue = 1951571129
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1702454117
+		intValue = 1601699261
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1278261801
+		intValue = -1309373011
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ah")
 	@Export("isWalking")
 	boolean isWalking;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 401053777
+		intValue = 511883639
 	)
-	int field938;
+	int field925;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1537825747
+		intValue = -1397421297
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 1548693687
+		intValue = -218556909
 	)
 	@Export("readySequence")
 	int readySequence;
 	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = 2043182385
+		intValue = -1204927265
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("av")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -1529323687
+		intValue = -824766843
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = -1702834689
+		intValue = -1263337971
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1195328729
+		intValue = -1033895093
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -551716323
+		intValue = 1049050611
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("at")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -588172397
+		intValue = -1372236963
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
 	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1934964713
+		intValue = -1324653627
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ad")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("aj")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ax")
-	boolean field950;
+	boolean field937;
-	@ObfuscatedName("al")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -2071391287
+		intValue = -171465493
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -1854297981
+		intValue = -1280129029
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ap")
 	@ObfuscatedGetter(
-		intValue = -2046431957
+		intValue = -373599431
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("as")
+	@ObfuscatedName("am")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ab")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bj")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bg")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bw")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bk")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bl")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljl;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 2135432751
+		intValue = -842697287
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bx")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = 1522685125
+		intValue = -2004895213
 	)
-	int field965;
+	int field960;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -1971794141
+		intValue = -1753452087
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = -1163192511
+		intValue = 25834883
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("by")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = -705488337
+		intValue = -143174307
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bo")
 	@ObfuscatedGetter(
-		intValue = 980221
+		intValue = 382239063
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = 1531052871
+		intValue = -226786267
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 2086339795
+		intValue = 175494277
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = 863905413
+		intValue = 62784213
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = -217068217
+		intValue = 1890920221
 	)
-	int field971;
+	int field958;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bh")
 	@ObfuscatedGetter(
-		intValue = -1431332559
+		intValue = 185005207
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = -446541561
+		intValue = 1786856989
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -1428986091
+		intValue = -327769151
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
+	@ObfuscatedName("be")
+	@ObfuscatedGetter(
+		intValue = -1796469609
+	)
+	int field943;
+	@ObfuscatedName("bd")
+	@ObfuscatedGetter(
+		intValue = 1623110031
+	)
+	int field963;
+	@ObfuscatedName("bf")
+	@ObfuscatedGetter(
+		intValue = -909355861
+	)
+	int field921;
+	@ObfuscatedName("bi")
+	@ObfuscatedGetter(
+		intValue = -1912574851
+	)
+	int field965;
+	@ObfuscatedName("br")
+	@ObfuscatedGetter(
+		intValue = 503419835
+	)
+	int field966;
+	@ObfuscatedName("bt")
+	@ObfuscatedGetter(
+		intValue = 625634807
+	)
+	int field929;
 	@ObfuscatedName("bp")
 	@ObfuscatedGetter(
-		intValue = 1351668501
+		intValue = -202999541
 	)
-	int field975;
+	int field950;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("co")
 	@ObfuscatedGetter(
-		intValue = 639610433
+		intValue = 1681195499
 	)
-	int field996;
+	int field969;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("cp")
 	@ObfuscatedGetter(
-		intValue = 817107681
+		intValue = 819823007
 	)
-	int field946;
+	int field970;
-	@ObfuscatedName("bz")
-	@ObfuscatedGetter(
-		intValue = 810384445
-	)
-	int field978;
-	@ObfuscatedName("bc")
-	@ObfuscatedGetter(
-		intValue = 40503997
-	)
-	int field979;
-	@ObfuscatedName("bh")
-	@ObfuscatedGetter(
-		intValue = 1623463931
-	)
-	int field980;
-	@ObfuscatedName("bk")
-	@ObfuscatedGetter(
-		intValue = -950690973
-	)
-	int field934;
-	@ObfuscatedName("cm")
-	@ObfuscatedGetter(
-		intValue = 1712532071
-	)
-	int field982;
 	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 1620214811
+		intValue = 1293515615
-	)
-	int field983;
-	@ObfuscatedName("cv")
-	@ObfuscatedGetter(
-		intValue = 1481734065
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cj")
 	@ObfuscatedGetter(
-		intValue = 1455392247
+		intValue = -958995757
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("cq")
 	@ObfuscatedGetter(
-		intValue = -27617279
+		intValue = -839837513
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cb")
 	@ObfuscatedGetter(
-		intValue = 1781093081
+		intValue = -1474803963
 	)
-	int field987;
+	int field974;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cf")
 	@ObfuscatedGetter(
-		intValue = 860658493
+		intValue = 1709100513
 	)
-	int field988;
+	int field968;
-	@ObfuscatedName("cr")
+	@ObfuscatedName("cs")
 	@ObfuscatedGetter(
-		intValue = 469579589
+		intValue = 905332161
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("ch")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("ca")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cn")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cx")
 	@ObfuscatedGetter(
-		intValue = 1598784809
+		intValue = 426432369
 	)
-	int field976;
+	int field980;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = 559009223
+		intValue = -1929716187
 	)
-	int field994;
+	int field926;
 
 	Actor() {
 		this.isWalking = false;
-		this.field938 = 1;
+		this.field925 = 1;
 		this.readySequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -340,7 +327,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field950 = false;
+		this.field937 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -353,7 +340,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field965 = -1;
+		this.field960 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -361,46 +348,46 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field971 = 0;
+		this.field958 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field987 = 0;
+		this.field974 = 0;
-		this.field988 = 32;
+		this.field968 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field976 = 0;
+		this.field980 = 0;
-		this.field994 = 0;
+		this.field926 = 0;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(S)Z",
-		garbageValue = "-968027489"
+		garbageValue = "3163"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-2082426618"
+		garbageValue = "-52"
 	)
-	final void method1759() {
+	final void method1742() {
 		this.pathLength = 0;
-		this.field994 = 0;
+		this.field926 = 0;
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "-666824571"
+		garbageValue = "2136221861"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -420,9 +407,9 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = class42.method811(var1);
+			HitSplatDefinition var12 = MusicPatchNode.method3815(var1);
-			var10 = var12.field3347;
+			var10 = var12.field3299;
-			var11 = var12.field3338;
+			var11 = var12.field3298;
 		}
 
 		int var14;
@@ -478,76 +465,61 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "1706369606"
+		garbageValue = "1083208214"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
+		HealthBarDefinition var7 = class32.method548(var1);
-		HealthBarDefinition var7;
+		HealthBar var8 = null;
-		if (var8 != null) {
+		HealthBar var9 = null;
-			var7 = var8;
+		int var10 = var7.int2;
-		} else {
+		int var11 = 0;
-			byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1);
-			var8 = new HealthBarDefinition();
-			if (var9 != null) {
-				var8.decode(new Buffer(var9));
-			}
 
-			HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1);
+		HealthBar var12;
-			var7 = var8;
+		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) {
-		}
+			++var11;
-
+			if (var12.definition.field3249 == var7.field3249) {
-		var8 = var7;
+				var12.put(var2 + var4, var5, var6, var3);
-		HealthBar var14 = null;
-		HealthBar var10 = null;
-		int var11 = var7.int2;
-		int var12 = 0;
-
-		HealthBar var13;
-		for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
-			++var12;
-			if (var13.definition.field3294 == var8.field3294) {
-				var13.put(var2 + var4, var5, var6, var3);
 				return;
 			}
 
-			if (var13.definition.int1 <= var8.int1) {
+			if (var12.definition.int1 <= var7.int1) {
-				var14 = var13;
+				var8 = var12;
 			}
 
-			if (var13.definition.int2 > var11) {
+			if (var12.definition.int2 > var10) {
-				var10 = var13;
+				var9 = var12;
-				var11 = var13.definition.int2;
+				var10 = var12.definition.int2;
 			}
 		}
 
-		if (var10 != null || var12 < 4) {
+		if (var9 != null || var11 < 4) {
-			var13 = new HealthBar(var8);
+			var12 = new HealthBar(var7);
-			if (var14 == null) {
+			if (var8 == null) {
-				this.healthBars.addLast(var13);
+				this.healthBars.addLast(var12);
 			} else {
-				IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14);
+				IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8);
 			}
 
-			var13.put(var2 + var4, var5, var6, var3);
+			var12.put(var2 + var4, var5, var6, var3);
-			if (var12 >= 4) {
+			if (var11 >= 4) {
-				var10.remove();
+				var9.remove();
 			}
 
 		}
 	}
 
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-1031768324"
+		garbageValue = "-982043878"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = class42.method810(var1);
+		HealthBarDefinition var2 = class32.method548(var1);
 
 		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) {
 			if (var2 == var3.definition) {
@@ -558,194 +530,38 @@ public abstract class Actor extends Entity {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)J",
+		signature = "(S)V",
-		garbageValue = "1807317311"
+		garbageValue = "277"
 	)
-	static long method1773(CharSequence var0) {
+	public static void method1755() {
-		long var1 = 0L;
+		GZipDecompressor.midiPcmStream.clear();
-		int var3 = var0.length();
+		class197.field2392 = 1;
-
+		Coord.musicTrackArchive = null;
-		for (int var4 = 0; var4 < var3; ++var4) {
-			var1 *= 37L;
-			char var5 = var0.charAt(var4);
-			if (var5 >= 'A' && var5 <= 'Z') {
-				var1 += (long)(var5 + 1 - 65);
-			} else if (var5 >= 'a' && var5 <= 'z') {
-				var1 += (long)(var5 + 1 - 97);
-			} else if (var5 >= '0' && var5 <= '9') {
-				var1 += (long)(var5 + 27 - 48);
-			}
-
-			if (var1 >= 177917621779460413L) {
-				break;
-			}
-		}
-
-		while (0L == var1 % 37L && 0L != var1) {
-			var1 /= 37L;
-		}
-
-		return var1;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(ILci;ZB)I",
+		signature = "(I)V",
-		garbageValue = "-13"
+		garbageValue = "540632011"
 	)
-	static int method1774(int var0, Script var1, boolean var2) {
+	public static void method1756() {
-		Widget var3;
+		VarpDefinition.VarpDefinition_cached.clear();
-		if (var0 >= 2000) {
-			var0 -= 1000;
-			var3 = Language.getWidget(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? Interpreter.field1090 : class188.field2352;
-		}
-
-		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
-			if (Interpreter.field1095 >= 10) {
-				throw new RuntimeException();
-			} else if (var3.onResize == null) {
-				return 0;
-			} else {
-				ScriptEvent var4 = new ScriptEvent();
-				var4.widget = var3;
-				var4.args = var3.onResize;
-				var4.field577 = Interpreter.field1095 + 1;
-				Client.scriptEvents.addFirst(var4);
-				return 1;
-			}
-		} else {
-			return 2;
-		}
 	}
 
-	@ObfuscatedName("hs")
+	@ObfuscatedName("ih")
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIB)V",
+		signature = "(I)V",
-		garbageValue = "-99"
+		garbageValue = "276036566"
 	)
-	@Export("addPendingSpawnToScene")
+	@Export("addCancelMenuEntry")
-	static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+	static void addCancelMenuEntry() {
-		if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
+		WorldMapData_1.method708();
-			if (Client.isLowDetail && var0 != ClientPacket.Client_plane) {
+		Client.menuActions[0] = "Cancel";
-				return;
+		Client.menuTargets[0] = "";
-			}
+		Client.menuOpcodes[0] = 1006;
-
+		Client.menuShiftClick[0] = false;
-			long var7 = 0L;
+		Client.menuOptionsCount = 1;
-			boolean var9 = true;
-			boolean var10 = false;
-			boolean var11 = false;
-			if (var1 == 0) {
-				var7 = class2.scene.getBoundaryObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 1) {
-				var7 = class2.scene.getWallDecorationTag(var0, var2, var3);
-			}
-
-			if (var1 == 2) {
-				var7 = class2.scene.getGameObjectTag(var0, var2, var3);
-			}
-
-			if (var1 == 3) {
-				var7 = class2.scene.getFloorDecorationTag(var0, var2, var3);
-			}
-
-			int var12;
-			if (var7 != 0L) {
-				var12 = class2.scene.getObjectFlags(var0, var2, var3, var7);
-				int var14 = ItemContainer.Entity_unpackID(var7);
-				int var15 = var12 & 31;
-				int var16 = var12 >> 6 & 3;
-				ObjectDefinition var13;
-				if (var1 == 0) {
-					class2.scene.removeBoundaryObject(var0, var2, var3);
-					var13 = Occluder.getObjectDefinition(var14);
-					if (var13.interactType != 0) {
-						Client.collisionMaps[var0].method3598(var2, var3, var15, var16, var13.boolean1);
-					}
-				}
-
-				if (var1 == 1) {
-					class2.scene.removeWallDecoration(var0, var2, var3);
-				}
-
-				if (var1 == 2) {
-					class2.scene.removeGameObject(var0, var2, var3);
-					var13 = Occluder.getObjectDefinition(var14);
-					if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) {
-						return;
-					}
-
-					if (var13.interactType != 0) {
-						Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1);
-					}
-				}
-
-				if (var1 == 3) {
-					class2.scene.removeFloorDecoration(var0, var2, var3);
-					var13 = Occluder.getObjectDefinition(var14);
-					if (var13.interactType == 1) {
-						Client.collisionMaps[var0].method3601(var2, var3);
-					}
-				}
-			}
-
-			if (var4 >= 0) {
-				var12 = var0;
-				if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-					var12 = var0 + 1;
-				}
-
-				MenuAction.method2088(var0, var12, var2, var3, var4, var5, var6, class2.scene, Client.collisionMaps[var0]);
-			}
-		}
-
-	}
-
-	@ObfuscatedName("im")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "0"
-	)
-	@Export("Widget_runOnTargetLeave")
-	static void Widget_runOnTargetLeave() {
-		if (Client.isSpellSelected) {
-			Widget var0 = UserComparator3.getWidgetChild(WorldMapAreaData.selectedSpellWidget, Client.selectedSpellChildIndex);
-			if (var0 != null && var0.onTargetLeave != null) {
-				ScriptEvent var1 = new ScriptEvent();
-				var1.widget = var0;
-				var1.args = var0.onTargetLeave;
-				WorldMapLabel.runScriptEvent(var1);
-			}
-
-			Client.isSpellSelected = false;
-			ScriptEvent.invalidateWidget(var0);
-		}
-	}
-
-	@ObfuscatedName("jg")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "3"
-	)
-	static final void method1756() {
-		PacketBufferNode var0 = ModelData0.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher);
-		Client.packetWriter.addNode(var0);
-
-		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
-			if (var1.type == 0 || var1.type == 3) {
-				class43.closeInterface(var1, true);
-			}
-		}
-
-		if (Client.meslayerContinueWidget != null) {
-			ScriptEvent.invalidateWidget(Client.meslayerContinueWidget);
-			Client.meslayerContinueWidget = null;
-		}
-
 	}
 }

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("dg")
+@ObfuscatedName("dj")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("u")
-	static int[] field1634;
 	@ObfuscatedName("f")
-	static int[] field1626;
+	static int[] field1615;
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
-	static int[] field1627;
+	static int[] field1614;
-	@ObfuscatedName("g")
+	@ObfuscatedName("y")
-	static int[] field1631;
+	static int[] field1611;
-	@ObfuscatedName("z")
+	@ObfuscatedName("w")
+	static int[] field1616;
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lec;"
+		signature = "Lek;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field1634 = new int[500];
+		field1615 = new int[500];
-		field1626 = new int[500];
+		field1614 = new int[500];
-		field1627 = new int[500];
+		field1611 = new int[500];
-		field1631 = new int[500];
+		field1616 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		signature = "([BLec;)V"
+		signature = "([BLek;)V"
 	)
 	Animation(byte[] var1, Skeleton var2) {
 		this.skeleton = null;
@@ -69,38 +69,38 @@ public class Animation {
 				if (this.skeleton.transformTypes[var8] != 0) {
 					for (int var10 = var8 - 1; var10 > var6; --var10) {
 						if (this.skeleton.transformTypes[var10] == 0) {
-							field1634[var7] = var10;
+							field1615[var7] = var10;
-							field1626[var7] = 0;
+							field1614[var7] = 0;
-							field1627[var7] = 0;
+							field1611[var7] = 0;
-							field1631[var7] = 0;
+							field1616[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field1634[var7] = var8;
+				field1615[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field1626[var7] = var4.readShortSmart();
+					field1614[var7] = var4.readShortSmart();
 				} else {
-					field1626[var7] = var11;
+					field1614[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field1627[var7] = var4.readShortSmart();
+					field1611[var7] = var4.readShortSmart();
 				} else {
-					field1627[var7] = var11;
+					field1611[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field1631[var7] = var4.readShortSmart();
+					field1616[var7] = var4.readShortSmart();
 				} else {
-					field1631[var7] = var11;
+					field1616[var7] = var11;
 				}
 
 				var6 = var8;
@@ -121,10 +121,10 @@ public class Animation {
 			this.transformZs = new int[var7];
 
 			for (var8 = 0; var8 < var7; ++var8) {
-				this.transformSkeletonLabels[var8] = field1634[var8];
+				this.transformSkeletonLabels[var8] = field1615[var8];
-				this.transformXs[var8] = field1626[var8];
+				this.transformXs[var8] = field1614[var8];
-				this.transformYs[var8] = field1627[var8];
+				this.transformYs[var8] = field1611[var8];
-				this.transformZs[var8] = field1631[var8];
+				this.transformZs[var8] = field1616[var8];
 			}
 
 		}

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

@@ -5,78 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ij")
+@ObfuscatedName("if")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("am")
+	@ObfuscatedName("aw")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lke;"
+		signature = "Lkg;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lke;"
+		signature = "Lkg;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -485019115
+		intValue = -1842467633
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
-	volatile boolean field3158;
+	volatile boolean field3130;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
-	boolean field3163;
+	boolean field3131;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("av")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -811032565
+		intValue = -1109025613
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -714735647
+		intValue = -1689263625
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1499508755
+		intValue = 756827345
 	)
-	int field3168;
+	int field3128;
 
 	static {
 		Archive_crc = new CRC32();
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lke;Lke;IZZZ)V"
+		signature = "(Lkg;Lkg;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3158 = false;
+		this.field3130 = false;
-		this.field3163 = false;
+		this.field3131 = false;
-		this.field3168 = -1;
+		this.field3128 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3163 = var6;
+		this.field3131 = var6;
-		WorldMapIcon_0.method224(this, this.index);
+		class48.method862(this, this.index);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-64779180"
+		garbageValue = "236985177"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
@@ -89,116 +89,96 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IS)I",
-		garbageValue = "-1387572162"
+		garbageValue = "6161"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		if (super.groups[var1] != null) {
 			return 100;
-		} else if (this.validGroups[var1]) {
-			return 100;
 		} else {
-			int var3 = this.index;
+			return this.validGroups[var1] ? 100 : Clock.method3489(this.index, var1);
-			long var4 = (long)((var3 << 16) + var1);
-			int var2;
-			if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var4) {
-				var2 = class32.NetCache_responseArchiveBuffer.offset * 99 / (class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
-			} else {
-				var2 = 0;
-			}
-
-			return var2;
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "130067407"
+		garbageValue = "1606315041"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			PlayerType.method4210(var1, this.archiveDisk, this);
+			class30.method543(var1, this.archiveDisk, this);
 		} else {
-			ClientPreferences.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			class226.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
 		}
 
 	}
 
-	@ObfuscatedName("dw")
-	@ObfuscatedSignature(
-		signature = "(B)Z",
-		garbageValue = "0"
-	)
-	public boolean method4345() {
-		return this.field3158;
-	}
-
 	@ObfuscatedName("de")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(B)Z",
-		garbageValue = "-77"
+		garbageValue = "-47"
+	)
+	public boolean method4246() {
+		return this.field3130;
+	}
+
+	@ObfuscatedName("df")
+	@ObfuscatedSignature(
+		signature = "(I)I",
+		garbageValue = "1662836587"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3158) {
+		if (this.field3130) {
 			return 100;
 		} else if (super.groups != null) {
 			return 99;
 		} else {
-			int var2 = this.index;
+			int var1 = Clock.method3489(255, this.index);
-			long var3 = (long)(var2 + 16711680);
-			int var1;
-			if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var3) {
-				var1 = class32.NetCache_responseArchiveBuffer.offset * 99 / (class32.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
-			} else {
-				var1 = 0;
-			}
-
-			int var5 = var1;
 			if (var1 >= 100) {
-				var5 = 99;
+				var1 = 99;
 			}
 
-			return var5;
+			return var1;
 		}
 	}
 
-	@ObfuscatedName("dx")
+	@ObfuscatedName("di")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-1360359241"
+		garbageValue = "-190190944"
 	)
 	@Export("loadIndex")
-	void loadIndex(int var1, int var2) {
+	public void loadIndex(int var1, int var2) {
 		this.indexCrc = var1;
 		this.indexVersion = var2;
 		if (this.masterDisk != null) {
-			PlayerType.method4210(this.index, this.masterDisk, this);
+			class30.method543(this.index, this.masterDisk, this);
 		} else {
-			ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+			class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}
 
 	}
 
-	@ObfuscatedName("dc")
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
 		signature = "(I[BZZI)V",
-		garbageValue = "1341522635"
+		garbageValue = "-1214934891"
 	)
 	@Export("write")
-	void write(int var1, byte[] var2, boolean var3, boolean var4) {
+	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3158) {
+			if (this.field3130) {
 				throw new RuntimeException();
 			}
 
 			if (this.masterDisk != null) {
-				TileItem.method2144(this.index, var2, this.masterDisk);
+				ByteArrayPool.method5805(this.index, var2, this.masterDisk);
 			}
 
 			this.decodeIndex(var2);
@@ -207,7 +187,7 @@ public class Archive extends AbstractArchive {
 			var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8);
 			var2[var2.length - 1] = (byte)super.groupVersions[var1];
 			if (this.archiveDisk != null) {
-				TileItem.method2144(var1, var2, this.archiveDisk);
+				ByteArrayPool.method5805(var1, var2, this.archiveDisk);
 				this.validGroups[var1] = true;
 			}
 
@@ -230,21 +210,21 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("dk")
+	@ObfuscatedName("dg")
 	@ObfuscatedSignature(
-		signature = "(Lke;I[BZB)V",
+		signature = "(Lkg;I[BZI)V",
-		garbageValue = "45"
+		garbageValue = "-1566911980"
 	)
 	@Export("load")
 	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3158) {
+			if (this.field3130) {
 				throw new RuntimeException();
 			}
 
 			if (var3 == null) {
-				ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
@@ -252,11 +232,11 @@ public class Archive extends AbstractArchive {
 			Archive_crc.update(var3, 0, var3.length);
 			var5 = (int)Archive_crc.getValue();
 			if (var5 != this.indexCrc) {
-				ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
-			Buffer var11 = new Buffer(class226.decompressBytes(var3));
+			Buffer var11 = new Buffer(Skills.decompressBytes(var3));
 			int var12 = var11.readUnsignedByte();
 			if (var12 != 5 && var12 != 6) {
 				throw new RuntimeException(var12 + "," + this.index + "," + var2);
@@ -268,21 +248,21 @@ public class Archive extends AbstractArchive {
 			}
 
 			if (var8 != this.indexVersion) {
-				ClientPreferences.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
 			this.decodeIndex(var3);
 			this.loadAllLocal();
 		} else {
-			if (!var4 && var2 == this.field3168) {
+			if (!var4 && var2 == this.field3128) {
-				this.field3158 = true;
+				this.field3130 = true;
 			}
 
 			if (var3 == null || var3.length <= 2) {
 				this.validGroups[var2] = false;
-				if (this.field3163 || var4) {
+				if (this.field3131 || var4) {
-					ClientPreferences.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -294,8 +274,8 @@ public class Archive extends AbstractArchive {
 			int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
 			if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) {
 				this.validGroups[var2] = false;
-				if (this.field3163 || var4) {
+				if (this.field3131 || var4) {
-					ClientPreferences.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -321,10 +301,10 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("dj")
+	@ObfuscatedName("dh")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1169710133"
+		garbageValue = "-1822102759"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -336,46 +316,46 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3158 = true;
+			this.field3130 = true;
 		} else {
-			this.field3168 = -1;
+			this.field3128 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
-					class40.method780(var1, this.archiveDisk, this);
+					WorldMapLabelSize.method186(var1, this.archiveDisk, this);
-					this.field3168 = var1;
+					this.field3128 = var1;
 				}
 			}
 
-			if (this.field3168 == -1) {
+			if (this.field3128 == -1) {
-				this.field3158 = true;
+				this.field3130 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("dp")
+	@ObfuscatedName("dl")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "2065580050"
+		garbageValue = "1057662007"
 	)
-	public boolean method4354(int var1) {
+	public boolean method4266(int var1) {
 		return this.validGroups[var1];
 	}
 
-	@ObfuscatedName("di")
+	@ObfuscatedName("da")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "581589057"
+		garbageValue = "693879570"
 	)
-	public boolean method4355(int var1) {
+	public boolean method4275(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("dn")
+	@ObfuscatedName("dp")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1792861334"
+		garbageValue = "-576778169"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -397,4 +377,34 @@ public class Archive extends AbstractArchive {
 			return var3;
 		}
 	}
+
+	@ObfuscatedName("gh")
+	@ObfuscatedSignature(
+		signature = "(ZB)V",
+		garbageValue = "0"
+	)
+	@Export("addNpcsToScene")
+	static final void addNpcsToScene(boolean var0) {
+		for (int var1 = 0; var1 < Client.npcCount; ++var1) {
+			NPC var2 = Client.npcs[Client.npcIndices[var1]];
+			if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) {
+				int var3 = var2.x >> 7;
+				int var4 = var2.y >> 7;
+				if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
+					if (var2.field925 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
+						if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
+							continue;
+						}
+
+						Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount;
+					}
+
+					long var5 = KeyHandler.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
+					var2.playerCycle = Client.cycle;
+					class14.scene.drawEntity(UrlRequest.Client_plane, var2.x, var2.y, ScriptEvent.getTileHeight(var2.field925 * 64 - 64 + var2.x, var2.field925 * 64 - 64 + var2.y, UrlRequest.Client_plane), var2.field925 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking);
+				}
+			}
+		}
+
+	}
 }

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

@@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ke")
+@ObfuscatedName("kg")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "Lmb;"
-	)
-	@Export("datFile")
-	BufferedFile datFile;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "Lmb;"
-	)
-	@Export("idxFile")
-	BufferedFile idxFile;
-	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 417377451
+		intValue = 77454403
 	)
 	@Export("archive")
 	int archive;
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "Lmy;"
+	)
+	@Export("datFile")
+	BufferedFile datFile;
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		signature = "Lmy;"
+	)
+	@Export("idxFile")
+	BufferedFile idxFile;
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1640009955
+		intValue = 1304769843
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -42,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(ILmb;Lmb;I)V"
+		signature = "(ILmy;Lmy;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null;
@@ -54,10 +54,10 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(II)[B",
+		signature = "(IB)[B",
-		garbageValue = "-2146892586"
+		garbageValue = "-19"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -112,14 +112,14 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 8;
-								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
+								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
 								var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
 								var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
 								var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
 								var12 = ArchiveDisk_buffer[7] & 255;
 							}
 
-							if (var9 != var1 || var10 != var7 || var12 != this.archive) {
+							if (var9 != var1 || var7 != var10 || var12 != this.archive) {
 								var10000 = null;
 								return (byte[])var10000;
 							}
@@ -129,7 +129,7 @@ public final class ArchiveDisk {
 								return (byte[])var10000;
 							}
 
-							int var14 = var8 + var13;
+							int var14 = var13 + var8;
 
 							for (int var15 = var13; var15 < var14; ++var15) {
 								var5[var6++] = ArchiveDisk_buffer[var15];
@@ -148,10 +148,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I[BII)Z",
-		garbageValue = "-847322953"
+		garbageValue = "1696997019"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -169,10 +169,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I[BIZB)Z",
+		signature = "(I[BIZI)Z",
-		garbageValue = "127"
+		garbageValue = "957483155"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -217,7 +217,7 @@ public final class ArchiveDisk {
 							int var9 = 0;
 							int var10;
 							if (var4) {
-								this.datFile.seek(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								int var11;
 								int var12;
 								if (var1 > 65535) {
@@ -262,7 +262,7 @@ public final class ArchiveDisk {
 									++var9;
 								}
 
-								if (var6 == var9) {
+								if (var9 == var6) {
 									++var9;
 								}
 							}
@@ -282,7 +282,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[7] = (byte)(var9 >> 8);
 								ArchiveDisk_buffer[8] = (byte)var9;
 								ArchiveDisk_buffer[9] = (byte)this.archive;
-								this.datFile.seek(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								this.datFile.write(ArchiveDisk_buffer, 0, 10);
 								var10 = var3 - var7;
 								if (var10 > 510) {
@@ -304,7 +304,7 @@ public final class ArchiveDisk {
 								ArchiveDisk_buffer[5] = (byte)(var9 >> 8);
 								ArchiveDisk_buffer[6] = (byte)var9;
 								ArchiveDisk_buffer[7] = (byte)this.archive;
-								this.datFile.seek(520L * (long)var6);
+								this.datFile.seek((long)var6 * 520L);
 								this.datFile.write(ArchiveDisk_buffer, 0, 8);
 								var10 = var3 - var7;
 								if (var10 > 512) {
@@ -333,4 +333,24 @@ public final class ArchiveDisk {
 	public String toString() {
 		return "" + this.archive;
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(I)[Lcf;",
+		garbageValue = "2092727218"
+	)
+	static AttackOption[] method5908() {
+		return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick};
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Lhz;Ljava/lang/String;Ljava/lang/String;I)Lko;",
+		garbageValue = "-378013703"
+	)
+	public static Font method5909(AbstractArchive var0, AbstractArchive var1, String var2, String var3) {
+		int var4 = var0.getGroupId(var2);
+		int var5 = var0.getFileId(var4, var3);
+		return class14.method160(var0, var1, var4, var5);
+	}
 }

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

@@ -1,30 +1,31 @@
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ho")
+@ObfuscatedName("hr")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 168002015
+		intValue = -867682367
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("data")
 	byte[] data;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Lke;"
+		signature = "Lkg;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lij;"
+		signature = "Lif;"
 	)
 	@Export("archive")
 	Archive archive;
@@ -32,29 +33,14 @@ public class ArchiveDiskAction extends Node {
 	ArchiveDiskAction() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "([BILjava/lang/CharSequence;I)I",
+		signature = "(Ljava/awt/Component;I)V",
-		garbageValue = "-1806066306"
+		garbageValue = "2084975828"
 	)
-	public static int method4229(byte[] var0, int var1, CharSequence var2) {
+	static void method4120(Component var0) {
-		int var3 = var2.length();
+		var0.removeKeyListener(KeyHandler.KeyHandler_instance);
-		int var4 = var1;
+		var0.removeFocusListener(KeyHandler.KeyHandler_instance);
-
+		KeyHandler.field373 = -1;
-		for (int var5 = 0; var5 < var3; ++var5) {
-			char var6 = var2.charAt(var5);
-			if (var6 <= 127) {
-				var0[var4++] = (byte)var6;
-			} else if (var6 <= 2047) {
-				var0[var4++] = (byte)(192 | var6 >> 6);
-				var0[var4++] = (byte)(128 | var6 & '?');
-			} else {
-				var0[var4++] = (byte)(224 | var6 >> '\f');
-				var0[var4++] = (byte)(128 | var6 >> 6 & 63);
-				var0[var4++] = (byte)(128 | var6 & '?');
-			}
-		}
-
-		return var4 - var1;
 	}
 }

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

@@ -4,37 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ic")
+@ObfuscatedName("ih")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Ljd;"
+		signature = "Ljs;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
 	static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Ljd;"
+		signature = "Ljs;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
 	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1217750145
+		intValue = 509614069
 	)
-	public static int field3155;
+	static int field3120;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("ArchiveDiskActionHandler_lock")
-	public static Object ArchiveDiskActionHandler_lock;
+	static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("ArchiveDiskActionHandler_thread")
 	static Thread ArchiveDiskActionHandler_thread;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3155 = 0;
+		field3120 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -63,162 +63,39 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3155 <= 1) {
+						if (field3120 <= 1) {
-							field3155 = 0;
+							field3120 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3155 = 600;
+						field3120 = 600;
 					}
 				} else {
-					long var8 = 99L;
+					ServerBuild.method4111(100L);
-
-					try {
-						Thread.sleep(var8);
-					} catch (InterruptedException var15) {
-					}
-
-					try {
-						Thread.sleep(1L);
-					} catch (InterruptedException var14) {
-					}
-
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3155 <= 1) {
+						if (field3120 <= 1) {
-							field3155 = 0;
+							field3120 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3155;
+						--field3120;
 					}
 				}
 			}
-		} catch (Exception var17) {
+		} catch (Exception var13) {
-			Calendar.RunException_sendStackTrace((String)null, var17);
+			DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var13);
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgc;I)I",
+		signature = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "-1277174237"
+		garbageValue = "139365615"
 	)
-	@Export("compareStrings")
+	@Export("parseInt")
-	public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) {
+	public static int parseInt(CharSequence var0) {
-		int var3 = var0.length();
+		return TriBool.parseIntCustomRadix(var0, 10, true);
-		int var4 = var1.length();
-		int var5 = 0;
-		int var6 = 0;
-		byte var7 = 0;
-		byte var8 = 0;
-
-		while (var5 - var7 < var3 || var6 - var8 < var4) {
-			if (var5 - var7 >= var3) {
-				return -1;
-			}
-
-			if (var6 - var8 >= var4) {
-				return 1;
-			}
-
-			char var9;
-			if (var7 != 0) {
-				var9 = (char)var7;
-				boolean var14 = false;
-			} else {
-				var9 = var0.charAt(var5++);
-			}
-
-			char var10;
-			if (var8 != 0) {
-				var10 = (char)var8;
-				boolean var15 = false;
-			} else {
-				var10 = var1.charAt(var6++);
-			}
-
-			byte var11;
-			if (var9 == 198) {
-				var11 = 69;
-			} else if (var9 == 230) {
-				var11 = 101;
-			} else if (var9 == 223) {
-				var11 = 115;
-			} else if (var9 == 338) {
-				var11 = 69;
-			} else if (var9 == 339) {
-				var11 = 101;
-			} else {
-				var11 = 0;
-			}
-
-			var7 = var11;
-			byte var12;
-			if (var10 == 198) {
-				var12 = 69;
-			} else if (var10 == 230) {
-				var12 = 101;
-			} else if (var10 == 223) {
-				var12 = 115;
-			} else if (var10 == 338) {
-				var12 = 69;
-			} else if (var10 == 339) {
-				var12 = 101;
-			} else {
-				var12 = 0;
-			}
-
-			var8 = var12;
-			var9 = PacketWriter.standardizeChar(var9, var2);
-			var10 = PacketWriter.standardizeChar(var10, var2);
-			if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
-				var9 = Character.toLowerCase(var9);
-				var10 = Character.toLowerCase(var10);
-				if (var9 != var10) {
-					return StudioGame.lowercaseChar(var9, var2) - StudioGame.lowercaseChar(var10, var2);
-				}
-			}
-		}
-
-		int var16 = Math.min(var3, var4);
-
-		int var17;
-		char var20;
-		for (var17 = 0; var17 < var16; ++var17) {
-			if (var2 == Language.Language_FR) {
-				var5 = var3 - 1 - var17;
-				var6 = var4 - 1 - var17;
-			} else {
-				var6 = var17;
-				var5 = var17;
-			}
-
-			char var18 = var0.charAt(var5);
-			var20 = var1.charAt(var6);
-			if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
-				var18 = Character.toLowerCase(var18);
-				var20 = Character.toLowerCase(var20);
-				if (var20 != var18) {
-					return StudioGame.lowercaseChar(var18, var2) - StudioGame.lowercaseChar(var20, var2);
-				}
-			}
-		}
-
-		var17 = var3 - var4;
-		if (var17 != 0) {
-			return var17;
-		} else {
-			for (int var19 = 0; var19 < var16; ++var19) {
-				var20 = var0.charAt(var19);
-				char var13 = var1.charAt(var19);
-				if (var20 != var13) {
-					return StudioGame.lowercaseChar(var20, var2) - StudioGame.lowercaseChar(var13, var2);
-				}
-			}
-
-			return 0;
-		}
 	}
 }

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

@@ -1,38 +1,39 @@
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bj")
+@ObfuscatedName("bx")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("y")
+	@ObfuscatedName("a")
-	public static short[][] field533;
+	static int[][] field512;
-	@ObfuscatedName("k")
+	@ObfuscatedName("i")
-	@Export("musicTrackBoolean")
-	public static boolean musicTrackBoolean;
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lij;"
+		signature = "Lif;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1292831283
+		intValue = 1214838645
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -95708581
+		intValue = -2093675437
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		signature = "(Lij;Ljava/lang/String;)V"
+		signature = "(Lif;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -40,17 +41,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1362696328"
+		garbageValue = "-1163747631"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4355(var1) || this.archive.method4354(var1)) {
+			if (!this.archive.method4275(var1) || this.archive.method4266(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -58,21 +59,39 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)[Lik;",
+		signature = "(B)J",
-		garbageValue = "141715201"
+		garbageValue = "-2"
 	)
-	static VerticalAlignment[] method1177() {
+	static long method1156() {
-		return new VerticalAlignment[]{VerticalAlignment.field3200, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3201};
+		try {
-	}
+			URL var0 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws");
+			URLConnection var1 = var0.openConnection();
+			var1.setRequestProperty("connection", "close");
+			var1.setDoInput(true);
+			var1.setDoOutput(true);
+			var1.setConnectTimeout(5000);
+			OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream());
+			var2.write("data1=req");
+			var2.flush();
+			InputStream var3 = var1.getInputStream();
+			Buffer var4 = new Buffer(new byte[1000]);
 
-	@ObfuscatedName("u")
+			do {
-	@ObfuscatedSignature(
+				int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset);
-		signature = "(B)V",
+				if (var5 == -1) {
-		garbageValue = "-84"
+					var4.offset = 0;
-	)
+					long var7 = var4.readLong();
-	public static void method1178() {
+					return var7;
-		class96.reflectionChecks = new IterableNodeDeque();
+				}
+
+				var4.offset += var5;
+			} while(var4.offset < 1000);
+
+			return 0L;
+		} catch (Exception var9) {
+			return 0L;
+		}
 	}
 }

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

@@ -4,55 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("co")
+@ObfuscatedName("cf")
 @Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lco;"
+		signature = "Lcf;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lco;"
+		signature = "Lcf;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Lco;"
+		signature = "Lcf;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lco;"
+		signature = "Lcf;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("ox")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lcj;"
+		signature = "[Lmy;"
 	)
-	@Export("varcs")
+	@Export("JagexCache_idxFiles")
-	static Varcs varcs;
+	public static BufferedFile[] JagexCache_idxFiles;
-	@ObfuscatedName("fr")
+	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "Lky;"
-	)
-	@Export("fontPlain11")
-	static Font fontPlain11;
-	@ObfuscatedName("gt")
-	@ObfuscatedSignature(
-		signature = "[Lln;"
-	)
-	@Export("mapMarkerSprites")
-	static Sprite[] mapMarkerSprites;
-	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 2079114159
+		intValue = 478106921
+	)
+	@Export("canvasHeight")
+	public static int canvasHeight;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -201450723
 	)
 	@Export("id")
 	final int id;
@@ -61,43 +55,63 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "7"
+		garbageValue = "-57"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(III)I",
+		signature = "(II)I",
-		garbageValue = "-573010380"
+		garbageValue = "-1189493177"
 	)
-	static int method2098(int var0, int var1) {
+	@Export("Messages_getLastChatID")
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+	static int Messages_getLastChatID(int var0) {
-		if (var2 == null) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
+		if (var1 == null) {
 			return -1;
 		} else {
-			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
+			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
 		}
 	}
 
-	@ObfuscatedName("fq")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(Lha;I[B[BI)V",
-		garbageValue = "-940191492"
+		garbageValue = "304370962"
 	)
-	@Export("playSong")
+	@Export("Widget_setKey")
-	static void playSong(int var0) {
+	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
-		if (var0 == -1 && !Client.field742) {
+		if (var0.field2626 == null) {
-			TileItemPile.method2811();
+			if (var2 == null) {
-		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field742) {
+				return;
-			World.method1819(2, AbstractWorldMapData.archive6, var0, 0, Client.musicVolume, false);
+			}
+
+			var0.field2626 = new byte[11][];
+			var0.field2629 = new byte[11][];
+			var0.field2631 = new int[11];
+			var0.field2670 = new int[11];
 		}
 
-		Client.currentTrackGroupId = var0;
+		var0.field2626[var1] = var2;
+		if (var2 != null) {
+			var0.field2625 = true;
+		} else {
+			var0.field2625 = false;
+
+			for (int var4 = 0; var4 < var0.field2626.length; ++var4) {
+				if (var0.field2626[var4] != null) {
+					var0.field2625 = true;
+					break;
+				}
+			}
+		}
+
+		var0.field2629[var1] = var3;
 	}
 }

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

@@ -6,151 +6,151 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("dh")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
-	static float[][] field1474;
+	static float[][] field1445;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
-	static float field1478;
+	static float field1447;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
-	int[][][] field1473;
+	int[][][] field1450;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
-	int[][][] field1475;
+	int[][][] field1443;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
-	int[] field1471;
+	int[] field1444;
 
 	static {
-		field1474 = new float[2][8];
+		field1445 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field1473 = new int[2][2][4];
+		this.field1450 = new int[2][2][4];
-		this.field1475 = new int[2][2][4];
+		this.field1443 = new int[2][2][4];
-		this.field1471 = new int[2];
+		this.field1444 = new int[2];
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
-	float method2728(int var1, int var2, float var3) {
+	float method2710(int var1, int var2, float var3) {
-		float var4 = (float)this.field1475[var1][0][var2] + var3 * (float)(this.field1475[var1][1][var2] - this.field1475[var1][0][var2]);
+		float var4 = (float)this.field1443[var1][0][var2] + var3 * (float)(this.field1443[var1][1][var2] - this.field1443[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
-	float method2725(int var1, int var2, float var3) {
+	float method2700(int var1, int var2, float var3) {
-		float var4 = (float)this.field1473[var1][0][var2] + var3 * (float)(this.field1473[var1][1][var2] - this.field1473[var1][0][var2]);
+		float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1471[0] + (float)(this.field1471[1] - this.field1471[0]) * var2;
+			var3 = (float)this.field1444[0] + (float)(this.field1444[1] - this.field1444[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1478 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			field1447 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1478 * 65536.0F);
+			forwardMultiplier = (int)(field1447 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method2728(var1, 0, var2);
+			var3 = this.method2710(var1, 0, var2);
-			field1474[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2725(var1, 0, var2));
+			field1445[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, 0, var2));
-			field1474[var1][1] = var3 * var3;
+			field1445[var1][1] = var3 * var3;
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method2728(var1, var4, var2);
+				var3 = this.method2710(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2725(var1, var4, var2));
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, var4, var2));
 				float var6 = var3 * var3;
-				field1474[var1][var4 * 2 + 1] = field1474[var1][var4 * 2 - 1] * var6;
+				field1445[var1][var4 * 2 + 1] = field1445[var1][var4 * 2 - 1] * var6;
-				field1474[var1][var4 * 2] = field1474[var1][var4 * 2 - 1] * var5 + field1474[var1][var4 * 2 - 2] * var6;
+				field1445[var1][var4 * 2] = field1445[var1][var4 * 2 - 1] * var5 + field1445[var1][var4 * 2 - 2] * var6;
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field1474[var1];
+					var10000 = field1445[var1];
-					var10000[var7] += field1474[var1][var7 - 1] * var5 + field1474[var1][var7 - 2] * var6;
+					var10000[var7] += field1445[var1][var7 - 1] * var5 + field1445[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field1474[var1];
+				var10000 = field1445[var1];
-				var10000[1] += field1474[var1][0] * var5 + var6;
+				var10000[1] += field1445[var1][0] * var5 + var6;
-				var10000 = field1474[var1];
+				var10000 = field1445[var1];
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field1474[0];
+					var10000 = field1445[0];
-					var10000[var4] *= field1478;
+					var10000[var4] *= field1447;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field1474[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1445[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2;
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lkg;Ldx;)V"
+		signature = "(Lkq;Ldo;)V"
 	)
-	final void method2729(Buffer var1, SoundEnvelope var2) {
+	final void method2713(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field1471[0] = var1.readUnsignedShort();
+			this.field1444[0] = var1.readUnsignedShort();
-			this.field1471[1] = var1.readUnsignedShort();
+			this.field1444[1] = var1.readUnsignedShort();
 			int var4 = var1.readUnsignedByte();
 
 			int var5;
 			int var6;
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
-					this.field1473[var5][0][var6] = var1.readUnsignedShort();
+					this.field1450[var5][0][var6] = var1.readUnsignedShort();
-					this.field1475[var5][0][var6] = var1.readUnsignedShort();
+					this.field1443[var5][0][var6] = var1.readUnsignedShort();
 				}
 			}
 
 			for (var5 = 0; var5 < 2; ++var5) {
 				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
 					if ((var4 & 1 << var5 * 4 << var6) != 0) {
-						this.field1473[var5][1][var6] = var1.readUnsignedShort();
+						this.field1450[var5][1][var6] = var1.readUnsignedShort();
-						this.field1475[var5][1][var6] = var1.readUnsignedShort();
+						this.field1443[var5][1][var6] = var1.readUnsignedShort();
 					} else {
-						this.field1473[var5][1][var6] = this.field1473[var5][0][var6];
+						this.field1450[var5][1][var6] = this.field1450[var5][0][var6];
-						this.field1475[var5][1][var6] = this.field1475[var5][0][var6];
+						this.field1443[var5][1][var6] = this.field1443[var5][0][var6];
 					}
 				}
 			}
 
-			if (var4 != 0 || this.field1471[1] != this.field1471[0]) {
+			if (var4 != 0 || this.field1444[1] != this.field1444[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var7 = this.field1471;
+			int[] var7 = this.field1444;
-			this.field1471[1] = 0;
+			this.field1444[1] = 0;
 			var7[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);

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

@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kq")
+@ObfuscatedName("kp")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lko;"
+		signature = "Lkv;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("BZip2Decompressor_decompress")
 	public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
 		synchronized(BZip2Decompressor_state) {
@@ -29,7 +29,7 @@ public final class BZip2Decompressor {
 			BZip2Decompressor_state.bsLive = 0;
 			BZip2Decompressor_state.bsBuff = 0;
 			BZip2Decompressor_state.nextBit_unused = 0;
-			BZip2Decompressor_state.field3742 = 0;
+			BZip2Decompressor_state.field3726 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lko;)V"
+		signature = "(Lkv;)V"
 	)
-	static void method5895(BZip2State var0) {
+	static void method5816(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = FillMode.BZip2Decompressor_block;
+		int[] var6 = SoundSystem.BZip2Decompressor_block;
-		int var7 = var0.field3738;
+		int var7 = var0.field3733;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3756 + 1;
+		int var12 = var0.field3742 + 1;
 
 		label61:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field3742;
+		int var13 = var0.field3726;
-		var0.field3742 += var10 - var10;
+		var0.field3726 += var10 - var10;
-		if (var0.field3742 < var13) {
+		if (var0.field3726 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		FillMode.BZip2Decompressor_block = var6;
+		SoundSystem.BZip2Decompressor_block = var6;
-		var0.field3738 = var7;
+		var0.field3733 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lko;)V"
+		signature = "(Lkv;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -193,8 +193,8 @@ public final class BZip2Decompressor {
 		int[] var24 = null;
 		int[] var25 = null;
 		var0.blockSize100k = 1410065408;
-		if (FillMode.BZip2Decompressor_block == null) {
+		if (SoundSystem.BZip2Decompressor_block == null) {
-			FillMode.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
+			SoundSystem.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
 		}
 
 		boolean var26 = true;
@@ -430,7 +430,7 @@ public final class BZip2Decompressor {
 							}
 
 							var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++;
-							FillMode.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							SoundSystem.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
 							++var47;
 							if (var45 == 0) {
 								++var43;
@@ -489,7 +489,7 @@ public final class BZip2Decompressor {
 							var10000 = var0.unzftab;
 
 							for (var10000[var1 & 255] += var48; var48 > 0; --var48) {
-								FillMode.BZip2Decompressor_block[var47] = var1 & 255;
+								SoundSystem.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(FillMode.BZip2Decompressor_block[var36] & 255);
+						var1 = (byte)(SoundSystem.BZip2Decompressor_block[var36] & 255);
-						var10000 = FillMode.BZip2Decompressor_block;
+						var10000 = SoundSystem.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field3738 = FillMode.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3738 = FillMode.BZip2Decompressor_block[var0.field3738];
+					var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.field3733];
-					var0.su_ch2 = (byte)(var0.field3738 & 255);
+					var0.su_ch2 = (byte)(var0.field3733 & 255);
-					var0.field3738 >>= 8;
+					var0.field3733 >>= 8;
 					++var0.nblocks_used;
-					var0.field3756 = var47;
+					var0.field3742 = var47;
-					method5895(var0);
+					method5816(var0);
-					if (var0.field3756 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					if (var0.field3742 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lko;)B"
+		signature = "(Lkv;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lko;)B"
+		signature = "(Lkv;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(ILko;)I"
+		signature = "(ILkv;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Lko;)V"
+		signature = "(Lkv;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("BZip2Decompressor_createHuffmanTables")
 	static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) {
 		int var7 = 0;

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

@@ -4,167 +4,167 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ko")
+@ObfuscatedName("kv")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("u")
-	final int field3731;
 	@ObfuscatedName("f")
-	final int field3720;
+	final int field3721;
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
-	final int field3733;
+	final int field3728;
-	@ObfuscatedName("g")
+	@ObfuscatedName("y")
+	final int field3716;
+	@ObfuscatedName("w")
 	final int field3722;
-	@ObfuscatedName("z")
-	final int field3723;
 	@ObfuscatedName("p")
-	final int field3724;
+	final int field3735;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
+	final int field3719;
+	@ObfuscatedName("e")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2112153425
+		intValue = -117705425
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -604029507
+		intValue = 808052371
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 101751211
+		intValue = 862638407
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1229248277
+		intValue = 982229001
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 1913236213
+		intValue = -1677667273
 	)
-	int field3742;
+	int field3726;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("n")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -975314591
+		intValue = -320144157
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 843438185
+		intValue = 720575069
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1790725095
+		intValue = 846973035
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2072280064
+		intValue = 1197540352
 	)
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("d")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -233574369
+		intValue = 184664593
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("s")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 396288217
+		intValue = -1391220013
 	)
-	int field3738;
+	int field3733;
-	@ObfuscatedName("t")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = -1359010819
+		intValue = -1996939641
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("m")
+	@ObfuscatedName("h")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -197163901
+		intValue = 903678455
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1651646591
+		intValue = -1381794175
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("av")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("am")
+	@ObfuscatedName("aw")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("as")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ak")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("au")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("ah")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aq")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ao")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("an")
 	@Export("base")
 	int[][] base;
 	@ObfuscatedName("ar")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("av")
+	@ObfuscatedName("az")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@ObfuscatedGetter(
-		intValue = -1771574853
+		intValue = 871538763
 	)
-	int field3756;
+	int field3742;
 
 	BZip2State() {
-		this.field3731 = 4096;
+		this.field3721 = 4096;
-		this.field3720 = 16;
+		this.field3728 = 16;
-		this.field3733 = 258;
+		this.field3716 = 258;
 		this.field3722 = 6;
-		this.field3723 = 50;
+		this.field3735 = 50;
-		this.field3724 = 18002;
+		this.field3719 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -183,15 +183,18 @@ public final class BZip2State {
 		this.minLens = new int[6];
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lhf;Ljava/lang/String;Ljava/lang/String;I)Llm;",
+		signature = "(IIB)Lha;",
-		garbageValue = "-972225948"
+		garbageValue = "119"
 	)
-	@Export("SpriteBuffer_getIndexedSpriteByName")
+	@Export("getWidgetChild")
-	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+	public static Widget getWidgetChild(int var0, int var1) {
-		int var3 = var0.getGroupId(var1);
+		Widget var2 = Tile.getWidget(var0);
-		int var4 = var0.getFileId(var3, var2);
+		if (var1 == -1) {
-		return UserComparator6.method3491(var0, var3, var4);
+			return var2;
+		} else {
+			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
+		}
 	}
 }

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

@@ -3,68 +3,67 @@ 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("eu")
+@ObfuscatedName("er")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("q")
+	@ObfuscatedName("c")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -37914995
+		signature = "Lhz;"
 	)
-	@Export("canvasWidth")
+	@Export("Widget_spritesArchive")
-	public static int canvasWidth;
+	static AbstractArchive Widget_spritesArchive;
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1092947403
+		intValue = -1534521391
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1863121231
+		intValue = -1718210699
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 523556867
+		intValue = -1666415467
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -470947197
+		intValue = -211420525
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 113063737
+		intValue = 951647449
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lep;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lep;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		longValue = 667705109801803207L
+		longValue = 3162324910013074859L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1624595735
+		intValue = -1096622413
 	)
 	@Export("flags")
 	int flags;
@@ -74,245 +73,31 @@ public final class BoundaryObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(IB)I",
-		garbageValue = "17"
-	)
-	public static int method3312(int var0) {
-		var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765);
-		var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459);
-		var0 = var0 + (var0 >>> 4) & 252645135;
-		var0 += var0 >>> 8;
-		var0 += var0 >>> 16;
-		return var0 & 255;
-	}
-
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;II[BII)I",
+		signature = "(IB)V",
-		garbageValue = "549909361"
+		garbageValue = "-13"
 	)
-	@Export("encodeStringCp1252")
+	public static void method3273(int var0) {
-	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
+		class197.field2392 = 1;
-		int var5 = var2 - var1;
+		Coord.musicTrackArchive = null;
-
+		class16.musicTrackGroupId = -1;
-		for (int var6 = 0; var6 < var5; ++var6) {
+		GrandExchangeOffer.musicTrackFileId = -1;
-			char var7 = var0.charAt(var6 + var1);
+		class197.musicTrackVolume = 0;
-			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
+		WorldMapDecoration.musicTrackBoolean = false;
-				var3[var6 + var4] = (byte)var7;
+		ParamDefinition.field3275 = var0;
-			} else if (var7 == 8364) {
-				var3[var6 + var4] = -128;
-			} else if (var7 == 8218) {
-				var3[var6 + var4] = -126;
-			} else if (var7 == 402) {
-				var3[var6 + var4] = -125;
-			} else if (var7 == 8222) {
-				var3[var6 + var4] = -124;
-			} else if (var7 == 8230) {
-				var3[var6 + var4] = -123;
-			} else if (var7 == 8224) {
-				var3[var6 + var4] = -122;
-			} else if (var7 == 8225) {
-				var3[var6 + var4] = -121;
-			} else if (var7 == 710) {
-				var3[var6 + var4] = -120;
-			} else if (var7 == 8240) {
-				var3[var6 + var4] = -119;
-			} else if (var7 == 352) {
-				var3[var6 + var4] = -118;
-			} else if (var7 == 8249) {
-				var3[var6 + var4] = -117;
-			} else if (var7 == 338) {
-				var3[var6 + var4] = -116;
-			} else if (var7 == 381) {
-				var3[var6 + var4] = -114;
-			} else if (var7 == 8216) {
-				var3[var6 + var4] = -111;
-			} else if (var7 == 8217) {
-				var3[var6 + var4] = -110;
-			} else if (var7 == 8220) {
-				var3[var6 + var4] = -109;
-			} else if (var7 == 8221) {
-				var3[var6 + var4] = -108;
-			} else if (var7 == 8226) {
-				var3[var6 + var4] = -107;
-			} else if (var7 == 8211) {
-				var3[var6 + var4] = -106;
-			} else if (var7 == 8212) {
-				var3[var6 + var4] = -105;
-			} else if (var7 == 732) {
-				var3[var6 + var4] = -104;
-			} else if (var7 == 8482) {
-				var3[var6 + var4] = -103;
-			} else if (var7 == 353) {
-				var3[var6 + var4] = -102;
-			} else if (var7 == 8250) {
-				var3[var6 + var4] = -101;
-			} else if (var7 == 339) {
-				var3[var6 + var4] = -100;
-			} else if (var7 == 382) {
-				var3[var6 + var4] = -98;
-			} else if (var7 == 376) {
-				var3[var6 + var4] = -97;
-			} else {
-				var3[var6 + var4] = 63;
-			}
-		}
-
-		return var5;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(Ljava/lang/String;II)V",
-		garbageValue = "-1"
+		garbageValue = "-318547131"
 	)
-	public static void method3311() {
+	static final void method3274(String var0, int var1) {
-		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
+		PacketBufferNode var2 = class2.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher);
-	}
+		var2.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0) + 1);
-
+		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
-	@ObfuscatedName("ao")
+		var2.packetBuffer.method5696(var1);
-	@ObfuscatedSignature(
+		Client.packetWriter.addNode(var2);
-		signature = "(ILci;ZB)I",
-		garbageValue = "0"
-	)
-	static int method3313(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		if (var0 == ScriptOpcodes.ADD) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 + var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SUB) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 - var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.MULTIPLY) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 * var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.DIV) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 / var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOM) {
-			var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
-			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOMINC) {
-			var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
-			return 1;
-		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 5;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			int var5 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2];
-			int var6 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 3];
-			int var7 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 4];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
-			return 1;
-		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SETBIT) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 | 1 << var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CLEARBIT) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
-			return 1;
-		} else if (var0 == ScriptOpcodes.TESTBIT) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
-			return 1;
-		} else if (var0 == ScriptOpcodes.MOD) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 % var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.POW) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.INVPOW) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-				return 1;
-			} else {
-				switch(var4) {
-				case 0:
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
-					break;
-				case 1:
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3;
-					break;
-				case 2:
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
-					break;
-				case 3:
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
-					break;
-				case 4:
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
-					break;
-				default:
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
-				}
-
-				return 1;
-			}
-		} else if (var0 == ScriptOpcodes.AND) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 & var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.OR) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3 | var4;
-			return 1;
-		} else if (var0 == ScriptOpcodes.SCALE) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 3;
-			long var9 = (long)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-			long var11 = (long)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-			long var13 = (long)Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 2];
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11);
-			return 1;
-		} else {
-			return 2;
-		}
 	}
 }

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("lw")
+@ObfuscatedName("lh")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -460052355
+		intValue = -136751855
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -2012134471
+		intValue = 1318120515
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -295033527
+		intValue = -388222223
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 168990255
+		intValue = 1704369811
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +41,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "2660177"
+		garbageValue = "-535694945"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +52,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "-2094067134"
+		garbageValue = "69"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,22 +63,22 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Llw;Llw;I)V",
+		signature = "(Llh;Llh;I)V",
-		garbageValue = "-1378813027"
+		garbageValue = "871538763"
 	)
-	public void method6069(Bounds var1, Bounds var2) {
+	public void method5997(Bounds var1, Bounds var2) {
-		this.method6070(var1, var2);
+		this.method6005(var1, var2);
-		this.method6071(var1, var2);
+		this.method5999(var1, var2);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Llw;Llw;B)V",
+		signature = "(Llh;Llh;I)V",
-		garbageValue = "6"
+		garbageValue = "-541537742"
 	)
-	void method6070(Bounds var1, Bounds var2) {
+	void method6005(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
@@ -86,8 +86,8 @@ public class Bounds {
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method6086() > var1.method6086()) {
+		if (var2.method6000() > var1.method6000()) {
-			var2.highX -= var2.method6086() - var1.method6086();
+			var2.highX -= var2.method6000() - var1.method6000();
 		}
 
 		if (var2.highX < 0) {
@@ -96,12 +96,12 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Llw;Llw;B)V",
+		signature = "(Llh;Llh;B)V",
-		garbageValue = "72"
+		garbageValue = "-89"
 	)
-	void method6071(Bounds var1, Bounds var2) {
+	void method5999(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
@@ -109,8 +109,8 @@ public class Bounds {
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method6085() > var1.method6085()) {
+		if (var2.method5994() > var1.method5994()) {
-			var2.highY -= var2.method6085() - var1.method6085();
+			var2.highY -= var2.method5994() - var1.method5994();
 		}
 
 		if (var2.highY < 0) {
@@ -119,21 +119,21 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "(S)I",
-		garbageValue = "-14495"
-	)
-	int method6086() {
-		return this.highX + this.lowX;
-	}
-
-	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1630571197"
+		garbageValue = "1022454109"
 	)
-	int method6085() {
+	int method6000() {
+		return this.lowX + this.highX;
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "(B)I",
+		garbageValue = "1"
+	)
+	int method5994() {
 		return this.highY + this.lowY;
 	}
 

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

@@ -1,3 +1,5 @@
+import java.io.IOException;
+import java.net.Socket;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -7,21 +9,21 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("jt")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1985676249
+		intValue = 945410251
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1502929201
+		intValue = 509966379
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -588738279
+		intValue = -1815065489
 	)
 	@Export("rank")
 	public int rank;
@@ -30,10 +32,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		signature = "(IIS)V",
+		signature = "(III)V",
-		garbageValue = "13296"
+		garbageValue = "-309378639"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -41,36 +43,101 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1862219925"
+		garbageValue = "-1803035811"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("bj")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-127464442"
+		garbageValue = "-1364700600"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "595265698"
+		garbageValue = "1663251439"
 	)
-	static void method5251() {
+	public static String method5214(String var0) {
-		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+		int var1 = var0.length();
-			Login.currentLoginField = 1;
+		char[] var2 = new char[var1];
-		} else {
+		byte var3 = 2;
-			Login.currentLoginField = 0;
+
+		for (int var4 = 0; var4 < var1; ++var4) {
+			char var5 = var0.charAt(var4);
+			if (var3 == 0) {
+				var5 = Character.toLowerCase(var5);
+			} else if (var3 == 2 || Character.isUpperCase(var5)) {
+				var5 = ScriptFrame.method1110(var5);
+			}
+
+			if (Character.isLetter(var5)) {
+				var3 = 0;
+			} else if (var5 != '.' && var5 != '?' && var5 != '!') {
+				if (Character.isSpaceChar(var5)) {
+					if (var3 != 2) {
+						var3 = 1;
+					}
+				} else {
+					var3 = 1;
+				}
+			} else {
+				var3 = 2;
+			}
+
+			var2[var4] = var5;
+		}
+
+		return new String(var2);
+	}
+
+	@ObfuscatedName("an")
+	@ObfuscatedSignature(
+		signature = "(Ljava/net/Socket;III)Lky;",
+		garbageValue = "62058076"
+	)
+	public static AbstractSocket method5215(Socket var0, int var1, int var2) throws IOException {
+		return new BufferedNetSocket(var0, var1, var2);
+	}
+
+	@ObfuscatedName("kt")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-16"
+	)
+	static void method5211() {
+		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) {
+			int var1 = var0.group;
+			if (MusicPatch.loadInterface(var1)) {
+				boolean var2 = true;
+				Widget[] var3 = UserComparator7.Widget_interfaceComponents[var1];
+
+				int var4;
+				for (var4 = 0; var4 < var3.length; ++var4) {
+					if (var3[var4] != null) {
+						var2 = var3[var4].isIf3;
+						break;
+					}
+				}
+
+				if (!var2) {
+					var4 = (int)var0.key;
+					Widget var5 = Tile.getWidget(var4);
+					if (var5 != null) {
+						LoginPacket.invalidateWidget(var5);
+					}
+				}
+			}
 		}
 
 	}

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

@@ -1,27 +1,13 @@
+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("fj")
+@ObfuscatedName("ed")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("rm")
+	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -773868241
-	)
-	static int field1998;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "Lfp;"
-	)
-	@Export("clock")
-	protected static Clock clock;
-	@ObfuscatedName("gd")
-	@Export("regionMapArchiveIds")
-	static int[] regionMapArchiveIds;
-	@ObfuscatedName("u")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -29,10 +15,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ljt;Ljt;I)I",
+		signature = "(Ljt;Ljt;B)I",
-		garbageValue = "-525022889"
+		garbageValue = "70"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -47,16 +33,98 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lhf;Lhf;Lhf;Lgz;I)Z",
+		signature = "(ZB)V",
-		garbageValue = "-2130405669"
+		garbageValue = "-2"
 	)
-	public static boolean method3483(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
+	public static void method3362(boolean var0) {
-		class197.musicPatchesArchive = var0;
+		if (class297.NetCache_socket != null) {
-		class197.musicSamplesArchive = var1;
+			try {
-		class197.soundEffectsArchive = var2;
+				Buffer var1 = new Buffer(4);
-		FaceNormal.midiPcmStream = var3;
+				var1.writeByte(var0 ? 2 : 3);
-		return true;
+				var1.writeMedium(0);
+				class297.NetCache_socket.write(var1.array, 0, 4);
+			} catch (IOException var4) {
+				try {
+					class297.NetCache_socket.close();
+				} catch (Exception var3) {
+				}
+
+				++NetCache.NetCache_ioExceptions;
+				class297.NetCache_socket = null;
+			}
+
+		}
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Lhz;I)Z",
+		garbageValue = "-1979792654"
+	)
+	public static boolean method3363(AbstractArchive var0, AbstractArchive var1) {
+		WorldMapElement.WorldMapElement_archive = var1;
+		if (!var0.isFullyLoaded()) {
+			return false;
+		} else {
+			class180.WorldMapElement_count = var0.getGroupFileCount(35);
+			WorldMapElement.WorldMapElement_cached = new WorldMapElement[class180.WorldMapElement_count];
+
+			for (int var2 = 0; var2 < class180.WorldMapElement_count; ++var2) {
+				byte[] var3 = var0.takeFile(35, var2);
+				WorldMapElement.WorldMapElement_cached[var2] = new WorldMapElement(var2);
+				if (var3 != null) {
+					WorldMapElement.WorldMapElement_cached[var2].decode(new Buffer(var3));
+					WorldMapElement.WorldMapElement_cached[var2].method4360();
+				}
+			}
+
+			return true;
+		}
+	}
+
+	@ObfuscatedName("gd")
+	@ObfuscatedSignature(
+		signature = "(Lbn;III)V",
+		garbageValue = "-49955773"
+	)
+	@Export("performPlayerAnimation")
+	static void performPlayerAnimation(Player var0, int var1, int var2) {
+		if (var0.sequence == var1 && var1 != -1) {
+			int var3 = WorldMapSection0.SequenceDefinition_get(var1).field3495;
+			if (var3 == 1) {
+				var0.sequenceFrame = 0;
+				var0.sequenceFrameCycle = 0;
+				var0.sequenceDelay = var2;
+				var0.field958 = 0;
+			}
+
+			if (var3 == 2) {
+				var0.field958 = 0;
+			}
+		} else if (var1 == -1 || var0.sequence == -1 || WorldMapSection0.SequenceDefinition_get(var1).field3492 >= WorldMapSection0.SequenceDefinition_get(var0.sequence).field3492) {
+			var0.sequence = var1;
+			var0.sequenceFrame = 0;
+			var0.sequenceFrameCycle = 0;
+			var0.sequenceDelay = var2;
+			var0.field958 = 0;
+			var0.field926 = var0.pathLength;
+		}
+
+	}
+
+	@ObfuscatedName("jg")
+	@ObfuscatedSignature(
+		signature = "(IB)V",
+		garbageValue = "73"
+	)
+	static void method3361(int var0) {
+		LoginType.tempMenuAction = new MenuAction();
+		LoginType.tempMenuAction.param0 = Client.menuArguments1[var0];
+		LoginType.tempMenuAction.param1 = Client.menuArguments2[var0];
+		LoginType.tempMenuAction.opcode = Client.menuOpcodes[var0];
+		LoginType.tempMenuAction.identifier = Client.menuIdentifiers[var0];
+		LoginType.tempMenuAction.action = Client.menuActions[var0];
 	}
 }

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("mb")
+@ObfuscatedName("my")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lmd;"
+		signature = "Lmk;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		longValue = 4441824273806734931L
+		longValue = -5118577974640492239L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 2129478493
+		intValue = 999715569
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = -8796048585263914235L
+		longValue = -7430138866634347913L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -585871581
+		intValue = 1565373677
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		longValue = -2340341034582279311L
+		longValue = -5354612076530734833L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = -5942828629537241469L
+		longValue = -2323016013084465375L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = 2651922969862605519L
+		longValue = 4889558715252805571L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = 9216989625367163093L
+		longValue = 7555588731094843747L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		signature = "(Lmd;II)V"
+		signature = "(Lmk;II)V"
 	)
 	public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
 		this.readBufferOffset = -1L;
@@ -84,10 +84,10 @@ public class BufferedFile {
 		this.offset = 0L;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-394540595"
+		garbageValue = "1595800163"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(B)J",
-		garbageValue = "-30"
+		garbageValue = "91"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BB)V",
-		garbageValue = "-2037969367"
+		garbageValue = "-24"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "2058467153"
+		garbageValue = "61"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -137,7 +137,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) {
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3);
 				this.offset += (long)var3;
 				return;
@@ -146,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset;
 			int var7 = var3;
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset));
 				if (var8 > var3) {
 					var8 = var3;
@@ -184,7 +184,7 @@ public class BufferedFile {
 				this.offset += (long)var8;
 			}
 
-			if (this.writeBufferOffset != -1L) {
+			if (-1L != this.writeBufferOffset) {
 				if (this.writeBufferOffset > this.offset && var3 > 0) {
 					var8 = var2 + (int)(this.writeBufferOffset - this.offset);
 					if (var8 > var3 + var2) {
@@ -200,16 +200,16 @@ public class BufferedFile {
 
 				long var13 = -1L;
 				long var10 = -1L;
-				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) {
+				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) {
 					var13 = this.writeBufferOffset;
 				} else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) {
 					var13 = var4;
 				}
 
-				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) {
+				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) {
-					var10 = this.writeBufferOffset + (long)this.writeBufferLength;
+					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
-				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) {
+				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
-					var10 = var4 + (long)var7;
+					var10 = (long)var7 + var4;
 				}
 
 				if (var13 > -1L && var10 > var13) {
@@ -231,10 +231,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1188509289"
+		garbageValue = "1578743019"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -261,23 +261,23 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "([BIIS)V",
+		signature = "([BIII)V",
-		garbageValue = "13009"
+		garbageValue = "732073067"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		try {
-			if ((long)var3 + this.offset > this.length) {
+			if (this.offset + (long)var3 > this.length) {
-				this.length = this.offset + (long)var3;
+				this.length = (long)var3 + this.offset;
 			}
 
 			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) {
 				this.flush();
 			}
 
-			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) {
+			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) {
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset));
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4);
 				this.offset += (long)var4;
@@ -289,7 +289,7 @@ public class BufferedFile {
 
 			if (var3 <= this.writeBuffer.length) {
 				if (var3 > 0) {
-					if (-1L == this.writeBufferOffset) {
+					if (this.writeBufferOffset == -1L) {
 						this.writeBufferOffset = this.offset;
 					}
 
@@ -301,7 +301,7 @@ public class BufferedFile {
 
 				}
 			} else {
-				if (this.offset != this.fileOffset) {
+				if (this.fileOffset != this.offset) {
 					this.accessFile.seek(this.offset);
 					this.fileOffset = this.offset;
 				}
@@ -320,10 +320,10 @@ public class BufferedFile {
 					var9 = this.readBufferOffset;
 				}
 
-				if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) {
+				if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) {
 					var6 = this.offset + (long)var3;
 				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) {
-					var6 = (long)this.readBufferLength + this.readBufferOffset;
+					var6 = this.readBufferOffset + (long)this.readBufferLength;
 				}
 
 				if (var9 > -1L && var6 > var9) {
@@ -339,10 +339,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "0"
+		garbageValue = "-37"
 	)
 	@Export("flush")
 	void flush() throws IOException {
@@ -353,23 +353,23 @@ public class BufferedFile {
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength);
-			this.fileOffset += (long)(this.writeBufferLength * -520660853) * -585871581L;
+			this.fileOffset += 1565373677L * (long)(this.writeBufferLength * -466302747);
 			if (this.fileOffset > this.fileLength) {
 				this.fileLength = this.fileOffset;
 			}
 
 			long var1 = -1L;
 			long var3 = -1L;
-			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) {
 				var1 = this.writeBufferOffset;
 			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) {
 				var1 = this.readBufferOffset;
 			}
 
-			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) {
-				var3 = (long)this.writeBufferLength + this.writeBufferOffset;
+				var3 = this.writeBufferOffset + (long)this.writeBufferLength;
-			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) {
+			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) {
-				var3 = this.readBufferOffset + (long)this.readBufferLength;
+				var3 = (long)this.readBufferLength + this.readBufferOffset;
 			}
 
 			if (var1 > -1L && var3 > var1) {

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

@@ -5,19 +5,25 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ki")
+@ObfuscatedName("kw")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("u")
+	@ObfuscatedName("fr")
+	@ObfuscatedSignature(
+		signature = "Leo;"
+	)
+	@Export("urlRequester")
+	static UrlRequester urlRequester;
+	@ObfuscatedName("f")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lkt;"
+		signature = "Lkx;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "Lkb;"
 	)
@@ -34,10 +40,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-29"
+		garbageValue = "-647274291"
 	)
 	@Export("close")
 	public void close() {
@@ -51,50 +57,50 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "27"
+		garbageValue = "2115277231"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-53"
+		garbageValue = "-972484659"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-1591428004"
+		garbageValue = "497635177"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "([BIIB)I",
+		signature = "([BIII)I",
-		garbageValue = "29"
+		garbageValue = "-1642271193"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-543253817"
+		garbageValue = "-340382115"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {

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

@@ -9,37 +9,37 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("kb")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 904264235
+		intValue = 1559219719
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -566617461
+		intValue = -196208499
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -217387211
+		intValue = 1767380433
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("closed")
 	boolean closed;
 
@@ -54,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1508887687"
+		garbageValue = "649877335"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -79,10 +79,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "-22"
+		garbageValue = "-1804311851"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -119,10 +119,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1435553079"
+		garbageValue = "1910014350"
 	)
 	@Export("close")
 	void close() {
@@ -197,4 +197,162 @@ public class BufferedSink implements Runnable {
 		} while(!this.isClosed());
 
 	}
+
+	@ObfuscatedName("kr")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "1908686960"
+	)
+	@Export("changeGameOptions")
+	static final void changeGameOptions(int var0) {
+		Buddy.method5211();
+		MouseRecorder.method1187();
+		int var1 = UserComparator8.VarpDefinition_get(var0).type;
+		if (var1 != 0) {
+			int var2 = Varps.Varps_main[var0];
+			if (var1 == 1) {
+				if (var2 == 1) {
+					Rasterizer3D.Rasterizer3D_setBrightness(0.9D);
+					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D);
+				}
+
+				if (var2 == 2) {
+					Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
+					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D);
+				}
+
+				if (var2 == 3) {
+					Rasterizer3D.Rasterizer3D_setBrightness(0.7D);
+					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D);
+				}
+
+				if (var2 == 4) {
+					Rasterizer3D.Rasterizer3D_setBrightness(0.6D);
+					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D);
+				}
+
+				NetSocket.method3525();
+			}
+
+			if (var1 == 3) {
+				short var3 = 0;
+				if (var2 == 0) {
+					var3 = 255;
+				}
+
+				if (var2 == 1) {
+					var3 = 192;
+				}
+
+				if (var2 == 2) {
+					var3 = 128;
+				}
+
+				if (var2 == 3) {
+					var3 = 64;
+				}
+
+				if (var2 == 4) {
+					var3 = 0;
+				}
+
+				if (var3 != Client.musicVolume) {
+					if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) {
+						class173.playMusicTrack(GrandExchangeOfferWorldComparator.archive6, Client.currentTrackGroupId, 0, var3, false);
+						Client.field767 = false;
+					} else if (var3 == 0) {
+						Actor.method1755();
+						Client.field767 = false;
+					} else {
+						TextureProvider.method2796(var3);
+					}
+
+					Client.musicVolume = var3;
+				}
+			}
+
+			if (var1 == 4) {
+				if (var2 == 0) {
+					Client.soundEffectVolume = 127;
+				}
+
+				if (var2 == 1) {
+					Client.soundEffectVolume = 96;
+				}
+
+				if (var2 == 2) {
+					Client.soundEffectVolume = 64;
+				}
+
+				if (var2 == 3) {
+					Client.soundEffectVolume = 32;
+				}
+
+				if (var2 == 4) {
+					Client.soundEffectVolume = 0;
+				}
+			}
+
+			if (var1 == 5) {
+				Client.leftClickOpensMenu = var2;
+			}
+
+			if (var1 == 6) {
+				Client.chatEffects = var2;
+			}
+
+			if (var1 == 9) {
+				Client.field901 = var2;
+			}
+
+			if (var1 == 10) {
+				if (var2 == 0) {
+					Client.areaSoundEffectVolume = 127;
+				}
+
+				if (var2 == 1) {
+					Client.areaSoundEffectVolume = 96;
+				}
+
+				if (var2 == 2) {
+					Client.areaSoundEffectVolume = 64;
+				}
+
+				if (var2 == 3) {
+					Client.areaSoundEffectVolume = 32;
+				}
+
+				if (var2 == 4) {
+					Client.areaSoundEffectVolume = 0;
+				}
+			}
+
+			if (var1 == 17) {
+				Client.followerIndex = var2 & 65535;
+			}
+
+			if (var1 == 18) {
+				Client.playerAttackOption = (AttackOption)DynamicObject.findEnumerated(ArchiveDisk.method5908(), var2);
+				if (Client.playerAttackOption == null) {
+					Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+				}
+			}
+
+			if (var1 == 19) {
+				if (var2 == -1) {
+					Client.combatTargetPlayerIndex = -1;
+				} else {
+					Client.combatTargetPlayerIndex = var2 & 2047;
+				}
+			}
+
+			if (var1 == 22) {
+				Client.npcAttackOption = (AttackOption)DynamicObject.findEnumerated(ArchiveDisk.method5908(), var2);
+				if (Client.npcAttackOption == null) {
+					Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+				}
+			}
+
+		}
+	}
 }

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("kt")
+@ObfuscatedName("kx")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -290674023
+		intValue = 608753777
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1886229969
+		intValue = 1571350283
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1533965281
+		intValue = -1626755739
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("exception")
 	IOException exception;
 
@@ -52,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(IB)Z",
+		signature = "(II)Z",
-		garbageValue = "-1"
+		garbageValue = "2103445622"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(S)I",
-		garbageValue = "71"
+		garbageValue = "8192"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,10 +110,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-245742191"
+		garbageValue = "54"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
@@ -133,10 +133,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "4492631"
+		garbageValue = "1982977111"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "34"
+		garbageValue = "-103"
 	)
 	@Export("close")
 	void close() {
@@ -243,4 +243,15 @@ public class BufferedSource implements Runnable {
 			}
 		}
 	}
+
+	@ObfuscatedName("fv")
+	@ObfuscatedSignature(
+		signature = "(Lif;Ljava/lang/String;I)V",
+		garbageValue = "502005158"
+	)
+	static void method5925(Archive var0, String var1) {
+		ArchiveLoader var2 = new ArchiveLoader(var0, var1);
+		Client.archiveLoaders.add(var2);
+		Client.field629 += var2.groupCount;
+	}
 }

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("ff")
+@ObfuscatedName("gn")
 @Implements("ByteArrayNode")
 public class ByteArrayNode extends Node {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("byteArray")
 	public byte[] byteArray;
 

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

@@ -4,37 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kv")
+@ObfuscatedName("kj")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 153239603
+		intValue = -210161975
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -433125971
+		intValue = 1380698397
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1031778889
+		intValue = 750629749
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
+	@Export("ByteArrayPool_alternativeSizes")
+	static int[] ByteArrayPool_alternativeSizes;
+	@ObfuscatedName("a")
 	@Export("ByteArrayPool_arrays")
 	static byte[][][] ByteArrayPool_arrays;
 
@@ -48,9 +51,36 @@ public class ByteArrayPool {
 	}
 
 	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(I[BLkg;B)V",
+		garbageValue = "107"
+	)
+	static void method5805(int var0, byte[] var1, ArchiveDisk var2) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction();
+		var3.type = 0;
+		var3.key = (long)var0;
+		var3.data = var1;
+		var3.archiveDisk = var2;
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
+		}
+
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+			if (ArchiveDiskActionHandler.field3120 == 0) {
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
+				ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
+			}
+
+			ArchiveDiskActionHandler.field3120 = 600;
+		}
+	}
+
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(IZI)[B",
-		garbageValue = "-2110348593"
+		garbageValue = "877934718"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -83,13 +113,13 @@ public class ByteArrayPool {
 		}
 
 		if (ByteArrayPool_arrays != null) {
-			for (int var4 = 0; var4 < WorldMapSprite.ByteArrayPool_alternativeSizes.length; ++var4) {
+			for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) {
-				if (WorldMapSprite.ByteArrayPool_alternativeSizes[var4] != var0) {
+				if (ByteArrayPool_alternativeSizes[var4] != var0) {
-					if (var0 < WorldMapSprite.ByteArrayPool_alternativeSizes[var4]) {
+					if (var0 < ByteArrayPool_alternativeSizes[var4]) {
 					}
-				} else if (class216.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+				} else if (Interpreter.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
-					byte[] var3 = ByteArrayPool_arrays[var4][--class216.ByteArrayPool_altSizeArrayCounts[var4]];
+					byte[] var3 = ByteArrayPool_arrays[var4][--Interpreter.ByteArrayPool_altSizeArrayCounts[var4]];
-					ByteArrayPool_arrays[var4][class216.ByteArrayPool_altSizeArrayCounts[var4]] = null;
+					ByteArrayPool_arrays[var4][Interpreter.ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}

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

@@ -1,23 +1,39 @@
-import java.io.DataInputStream;
-import java.net.URL;
 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("gf")
+@ObfuscatedName("hd")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("u")
+	@ObfuscatedName("pb")
+	@ObfuscatedSignature(
+		signature = "Ljq;"
+	)
+	@Export("clanChat")
+	static ClanChat clanChat;
+	@ObfuscatedName("pv")
+	@ObfuscatedSignature(
+		signature = "Lku;"
+	)
+	@Export("privateChatMode")
+	static PrivateChatMode privateChatMode;
+	@ObfuscatedName("f")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
 	static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("DAYS_OF_THE_WEEK")
 	static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("Calendar_calendar")
 	static java.util.Calendar Calendar_calendar;
+	@ObfuscatedName("bc")
+	@ObfuscatedSignature(
+		signature = "[Lls;"
+	)
+	@Export("worldSelectBackSprites")
+	static Sprite[] worldSelectBackSprites;
 
 	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"}};
@@ -26,46 +42,39 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V",
+		signature = "(Lkq;Llc;B)Llc;",
-		garbageValue = "1722882053"
+		garbageValue = "-33"
 	)
-	@Export("RunException_sendStackTrace")
+	@Export("readStringIntParameters")
-	public static void RunException_sendStackTrace(String var0, Throwable var1) {
+	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
-		if (var1 != null) {
+		int var2 = var0.readUnsignedByte();
-			var1.printStackTrace();
+		int var3;
-		} else {
+		if (var1 == null) {
-			try {
+			int var4 = var2 - 1;
-				String var2 = "";
+			var4 |= var4 >>> 1;
-				if (var1 != null) {
+			var4 |= var4 >>> 2;
-					var2 = SpriteMask.method4035(var1);
+			var4 |= var4 >>> 4;
-				}
+			var4 |= var4 >>> 8;
+			var4 |= var4 >>> 16;
+			var3 = var4 + 1;
+			var1 = new IterableNodeHashTable(var3);
+		}
 
-				if (var0 != null) {
+		for (var3 = 0; var3 < var2; ++var3) {
-					if (var1 != null) {
+			boolean var7 = var0.readUnsignedByte() == 1;
-						var2 = var2 + " | ";
+			int var5 = var0.readMedium();
-					}
+			Object var6;
-
+			if (var7) {
-					var2 = var2 + var0;
+				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
-				}
+			} else {
-
+				var6 = new IntegerNode(var0.readInt());
-				System.out.println("Error: " + var2);
-				var2 = var2.replace(':', '.');
-				var2 = var2.replace('@', '_');
-				var2 = var2.replace('&', '_');
-				var2 = var2.replace('#', '_');
-				if (RunException.RunException_applet == null) {
-					return;
-				}
-
-				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2);
-				DataInputStream var4 = new DataInputStream(var3.openStream());
-				var4.read();
-				var4.close();
-			} catch (Exception var5) {
 			}
 
+			var1.put((Node)var6, (long)var5);
 		}
+
+		return var1;
 	}
 }

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

@@ -1,20 +1,23 @@
 import java.awt.Component;
 import java.awt.Graphics;
-import java.net.URL;
-import java.util.LinkedHashMap;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ax")
+@ObfuscatedName("af")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("ek")
+	@ObfuscatedName("qn")
-	@Export("worldHost")
+	@ObfuscatedGetter(
-	static String worldHost;
+		intValue = 739574061
-	@ObfuscatedName("u")
+	)
+	static int field397;
+	@ObfuscatedName("gk")
+	@Export("xteaKeys")
+	static int[][] xteaKeys;
+	@ObfuscatedName("f")
 	@Export("component")
 	Component component;
 
@@ -30,158 +33,68 @@ public final class Canvas extends java.awt.Canvas {
 		this.component.paint(var1);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(IIIIB)V",
-		garbageValue = "-1452894334"
-	)
-	@Export("loadWorlds")
-	static boolean loadWorlds() {
-		try {
-			if (GrandExchangeOfferOwnWorldComparator.World_request == null) {
-				GrandExchangeOfferOwnWorldComparator.World_request = SpriteMask.urlRequester.request(new URL(WallDecoration.field1914));
-			} else if (GrandExchangeOfferOwnWorldComparator.World_request.isDone()) {
-				byte[] var0 = GrandExchangeOfferOwnWorldComparator.World_request.getResponse();
-				Buffer var1 = new Buffer(var0);
-				var1.readInt();
-				World.World_count = var1.readUnsignedShort();
-				Skills.World_worlds = new World[World.World_count];
-
-				World var3;
-				for (int var2 = 0; var2 < World.World_count; var3.index = var2++) {
-					var3 = Skills.World_worlds[var2] = new World();
-					var3.id = var1.readUnsignedShort();
-					var3.properties = var1.readInt();
-					var3.host = var1.readStringCp1252NullTerminated();
-					var3.activity = var1.readStringCp1252NullTerminated();
-					var3.location = var1.readUnsignedByte();
-					var3.population = var1.readShort();
-				}
-
-				Clock.sortWorlds(Skills.World_worlds, 0, Skills.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
-				GrandExchangeOfferOwnWorldComparator.World_request = null;
-				return true;
-			}
-		} catch (Exception var4) {
-			var4.printStackTrace();
-			GrandExchangeOfferOwnWorldComparator.World_request = null;
-		}
-
-		return false;
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(II)Ler;",
-		garbageValue = "-1118777455"
-	)
-	@Export("getFrames")
-	static Frames getFrames(int var0) {
-		Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive;
-			AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive;
-			boolean var5 = true;
-			int[] var6 = var3.getGroupFileIds(var0);
-
-			for (int var7 = 0; var7 < var6.length; ++var7) {
-				byte[] var8 = var3.getFile(var0, var6[var7]);
-				if (var8 == null) {
-					var5 = false;
-				} else {
-					int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
-					byte[] var10 = var4.getFile(var9, 0);
-					if (var10 == null) {
-						var5 = false;
-					}
-				}
-			}
-
-			Frames var2;
-			if (!var5) {
-				var2 = null;
-			} else {
-				try {
-					var2 = new Frames(var3, var4, var0, false);
-				} catch (Exception var12) {
-					var2 = null;
-				}
-			}
-
-			if (var2 != null) {
-				SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0);
-			}
-
-			return var2;
-		}
-	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		signature = "(ILci;ZB)I",
 		garbageValue = "-7"
 	)
-	static int method873(int var0, Script var1, boolean var2) {
+	@Export("itemContainerSetItem")
-		Widget var3 = var2 ? Interpreter.field1090 : class188.field2352;
+	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-		if (var0 == ScriptOpcodes.CC_GETX) {
+		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.x;
+		if (var4 == null) {
-			return 1;
+			var4 = new ItemContainer();
-		} else if (var0 == ScriptOpcodes.CC_GETY) {
+			ItemContainer.itemContainers.put(var4, (long)var0);
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.y;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.width;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.height;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHIDE) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETLAYER) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.parentId;
-			return 1;
-		} else {
-			return 2;
 		}
-	}
 
-	@ObfuscatedName("ap")
+		if (var4.ids.length <= var1) {
-	@ObfuscatedSignature(
+			int[] var5 = new int[var1 + 1];
-		signature = "(ILhx;ZB)V",
+			int[] var6 = new int[var1 + 1];
-		garbageValue = "0"
-	)
-	static void method871(int var0, Coord var1, boolean var2) {
-		WorldMapArea var3 = Clock.getWorldMap().getMapArea(var0);
-		int var4 = class215.localPlayer.plane;
-		int var5 = class51.baseX * 64 + (class215.localPlayer.x >> 7);
-		int var6 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7);
-		Coord var7 = new Coord(var4, var5, var6);
-		Clock.getWorldMap().method6453(var3, var7, var1, var2);
-	}
 
-	@ObfuscatedName("fo")
+			int var7;
-	@ObfuscatedSignature(
+			for (var7 = 0; var7 < var4.ids.length; ++var7) {
-		signature = "(ZB)V",
+				var5[var7] = var4.ids[var7];
-		garbageValue = "-90"
+				var6[var7] = var4.quantities[var7];
-	)
-	static final void method872(boolean var0) {
-		if (var0) {
-			Client.field680 = Login.field1196 ? class160.field2008 : class160.field2005;
-		} else {
-			LinkedHashMap var1 = UserComparator10.clientPreferences.parameters;
-			String var3 = Login.Login_username;
-			int var4 = var3.length();
-			int var5 = 0;
-
-			for (int var6 = 0; var6 < var4; ++var6) {
-				var5 = (var5 << 5) - var5 + var3.charAt(var6);
 			}
 
-			Client.field680 = var1.containsKey(var5) ? class160.field2009 : class160.field2006;
+			for (var7 = var4.ids.length; var7 < var1; ++var7) {
+				var5[var7] = -1;
+				var6[var7] = 0;
+			}
+
+			var4.ids = var5;
+			var4.quantities = var6;
 		}
 
+		var4.ids[var1] = var2;
+		var4.quantities[var1] = var3;
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)Lli;",
+		garbageValue = "-1768952191"
+	)
+	@Export("SpriteBuffer_getIndexedSpriteByName")
+	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1);
+		int var4 = var0.getFileId(var3, var2);
+		IndexedSprite var5;
+		if (!HitSplatDefinition.method4586(var0, var3, var4)) {
+			var5 = null;
+		} else {
+			var5 = WorldMapDecoration.method327();
+		}
+
+		return var5;
+	}
+
+	@ObfuscatedName("ey")
+	@ObfuscatedSignature(
+		signature = "(I)Lld;",
+		garbageValue = "-228805350"
+	)
+	@Export("getWorldMap")
+	static WorldMap getWorldMap() {
+		return GrandExchangeEvent.worldMap;
 	}
 }

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

@@ -4,18 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cs")
+@ObfuscatedName("ct")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("f")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "[Lba;"
+		signature = "Lcz;"
+	)
+	@Export("pcmPlayerProvider")
+	static class97 pcmPlayerProvider;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "[Lbs;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -2111791625
+		intValue = 510013085
 	)
 	@Export("count")
 	int count;
@@ -24,10 +30,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lba;",
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbs;",
-		garbageValue = "1583297440"
+		garbageValue = "481031645"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -55,41 +61,94 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)Lba;",
+		signature = "(II)Lbs;",
-		garbageValue = "-6"
+		garbageValue = "-2132499563"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "0"
+		garbageValue = "134905957"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
 
-	@ObfuscatedName("ll")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-1059026202"
+		garbageValue = "1959752215"
 	)
-	static void method2274() {
+	static String method2269(int var0) {
-		if (InvDefinition.field3210 != null) {
+		return "<img=" + var0 + ">";
-			Client.field863 = Client.cycle;
+	}
-			InvDefinition.field3210.method4403();
 
-			for (int var0 = 0; var0 < Client.players.length; ++var0) {
+	@ObfuscatedName("i")
-				if (Client.players[var0] != null) {
+	@ObfuscatedSignature(
-					InvDefinition.field3210.method4406(class51.baseX * 64 + (Client.players[var0].x >> 7), VarcInt.baseY * 64 + (Client.players[var0].y >> 7));
+		signature = "(III)V",
-				}
+		garbageValue = "-2136093779"
-			}
+	)
+	public static void method2259(int var0, int var1) {
+		VarbitDefinition var2 = UserComparator9.method3319(var0);
+		int var3 = var2.baseVar;
+		int var4 = var2.startBit;
+		int var5 = var2.endBit;
+		int var6 = Varps.Varps_masks[var5 - var4];
+		if (var1 < 0 || var1 > var6) {
+			var1 = 0;
+		}
+
+		var6 <<= var4;
+		Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6;
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "(B)Lbe;",
+		garbageValue = "90"
+	)
+	@Export("worldListStart")
+	static World worldListStart() {
+		World.World_listCount = 0;
+		return Friend.getNextWorldListWorld();
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "([BI)Lko;",
+		garbageValue = "65535"
+	)
+	static Font method2270(byte[] var0) {
+		if (var0 == null) {
+			return null;
+		} else {
+			Font var1 = new Font(var0, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, UserComparator1.SpriteBuffer_spriteWidths, class325.SpriteBuffer_spriteHeights, class268.SpriteBuffer_spritePalette, class290.SpriteBuffer_pixels);
+			Message.method1223();
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("ac")
+	@ObfuscatedSignature(
+		signature = "(Ldl;B)V",
+		garbageValue = "21"
+	)
+	@Export("PcmStream_disable")
+	static final void PcmStream_disable(PcmStream var0) {
+		var0.active = false;
+		if (var0.sound != null) {
+			var0.sound.position = 0;
+		}
+
+		for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
+			PcmStream_disable(var1);
 		}
 
 	}

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

@@ -4,104 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jg")
+@ObfuscatedName("jq")
 @Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "Ljv;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 591163035
+		intValue = 208405129
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1630154821
+		intValue = -1142922895
 	)
-	int field3639;
+	int field3614;
 
 	@ObfuscatedSignature(
-		signature = "(Llg;Ljv;)V"
+		signature = "(Lll;Ljv;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3639 = 1;
+		this.field3614 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)Ljr;",
+		signature = "(B)Ljy;",
-		garbageValue = "-1592540968"
+		garbageValue = "68"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)[Ljr;",
+		signature = "(IB)[Ljy;",
-		garbageValue = "-122"
+		garbageValue = "32"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1093647998"
+		garbageValue = "505839882"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = GrandExchangeOfferTotalQuantityComparator.method97(var1);
+		String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1));
+		if (var3 == null) {
+			var3 = "";
+		}
+
+		this.name = var3;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "77"
+		garbageValue = "1040645085"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = GrandExchangeOfferTotalQuantityComparator.method97(var1);
+		String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1));
+		if (var3 == null) {
+			var3 = "";
+		}
+
+		this.owner = var3;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I)V",
+		signature = "(Lkq;I)V",
-		garbageValue = "2029148344"
+		garbageValue = "171385473"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		this.readName(SpriteMask.method4038(var2));
+		this.readName(WorldMapIcon_0.method201(var2));
 		this.minKick = var1.readByte();
 		int var4 = var1.readUnsignedByte();
 		if (var4 != 255) {
@@ -110,7 +120,7 @@ public class ClanChat extends UserList {
 			for (int var5 = 0; var5 < var4; ++var5) {
 				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
 				int var7 = var1.readUnsignedShort();
-				var6.set(var7, ++this.field3639 - 1);
+				var6.set(var7, ++this.field3614 - 1);
 				var6.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
 				this.isLocalPlayer(var6);
@@ -119,12 +129,12 @@ public class ClanChat extends UserList {
 		}
 	}
 
-	@ObfuscatedName("cr")
+	@ObfuscatedName("ct")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I)V",
+		signature = "(Lkq;I)V",
-		garbageValue = "1670981116"
+		garbageValue = "-1031148737"
 	)
-	public final void method5329(Buffer var1) {
+	public final void method5262(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -154,17 +164,17 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3639 - 1);
+			var6.set(var3, ++this.field3614 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
 
 	}
 
-	@ObfuscatedName("ck")
+	@ObfuscatedName("cr")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "327438402"
+		garbageValue = "-1039852282"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -174,10 +184,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("cb")
+	@ObfuscatedName("cy")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "83"
+		garbageValue = "32"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -187,10 +197,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cz")
 	@ObfuscatedSignature(
-		signature = "(Ljs;I)V",
+		signature = "(Ljd;I)V",
-		garbageValue = "-2081381015"
+		garbageValue = "667645943"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {

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

@@ -1,20 +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("js")
+@ObfuscatedName("jd")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("u")
+	@ObfuscatedName("ex")
+	@ObfuscatedGetter(
+		intValue = -1283772433
+	)
+	static int field3566;
+	@ObfuscatedName("fm")
+	@ObfuscatedGetter(
+		intValue = 1387790873
+	)
+	static int field3567;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lja;"
+		signature = "Ljf;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lja;"
+		signature = "Ljf;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -24,20 +35,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-186118944"
+		garbageValue = "1521819508"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1867763200"
+		garbageValue = "2007555671"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -48,30 +59,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "1"
+		garbageValue = "-1569748469"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = VertexNormal.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = Message.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(S)V",
-		garbageValue = "1"
+		garbageValue = "3103"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1504737045"
+		garbageValue = "-732818208"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -82,13 +93,40 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1422306006"
+		garbageValue = "-1631625166"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = VertexNormal.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = Message.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+	}
+
+	@ObfuscatedName("jp")
+	@ObfuscatedSignature(
+		signature = "(IIIIII)V",
+		garbageValue = "2022495737"
+	)
+	@Export("drawScrollBar")
+	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+		class60.scrollBarSprites[0].drawAt(var0, var1);
+		class60.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field691);
+		int var5 = var3 * (var3 - 32) / var4;
+		if (var5 < 8) {
+			var5 = 8;
+		}
+
+		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field692);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field694);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field694);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field694);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field694);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field693);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field693);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field693);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field693);
 	}
 }

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

@@ -7,36 +7,46 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bs")
+@ObfuscatedName("bf")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("u")
+	@ObfuscatedName("qu")
+	@ObfuscatedSignature(
+		signature = "Ldr;"
+	)
+	@Export("decimator")
+	static Decimator decimator;
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1145191991
+		intValue = 1642477041
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("jz")
-	static String field1052;
+	@ObfuscatedSignature(
-	@ObfuscatedName("b")
+		signature = "Lha;"
+	)
+	@Export("dragInventoryWidget")
+	static Widget dragInventoryWidget;
+	@ObfuscatedName("y")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1051174515
+		intValue = -732780625
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -49,11 +59,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1856(true);
+		this.method1835(true);
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkg;)V"
+		signature = "(Lkq;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -93,26 +103,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1856(true);
+				this.method1835(true);
 			}
 		} else {
-			this.method1856(true);
+			this.method1835(true);
 		}
 
 	}
 
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "1503707935"
-	)
-	void method1856(boolean var1) {
-	}
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)Lkg;",
+		signature = "(ZS)V",
-		garbageValue = "-650033927"
+		garbageValue = "-15246"
+	)
+	void method1835(boolean var1) {
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(I)Lkq;",
+		garbageValue = "458366092"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -134,51 +144,4 @@ public class ClientPreferences {
 		var1.writeBoolean(this.hideUsername);
 		return var1;
 	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(Lij;IIIBZI)V",
-		garbageValue = "-4346330"
-	)
-	@Export("requestNetFile")
-	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
-		long var6 = (long)((var1 << 16) + var2);
-		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
-		if (var8 == null) {
-			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
-			if (var8 == null) {
-				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
-				if (var8 != null) {
-					if (var5) {
-						var8.removeDual();
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
-						--NetCache.NetCache_pendingWritesCount;
-						++NetCache.NetCache_pendingPriorityWritesCount;
-					}
-
-				} else {
-					if (!var5) {
-						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
-						if (var8 != null) {
-							return;
-						}
-					}
-
-					var8 = new NetFileRequest();
-					var8.archive = var0;
-					var8.crc = var3;
-					var8.padding = var4;
-					if (var5) {
-						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
-						++NetCache.NetCache_pendingPriorityWritesCount;
-					} else {
-						NetCache.NetCache_pendingWritesQueue.addFirst(var8);
-						NetCache.NetCache_pendingWrites.put(var8, var6);
-						++NetCache.NetCache_pendingWritesCount;
-					}
-
-				}
-			}
-		}
-	}
 }

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

@@ -3,161 +3,57 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fp")
+@ObfuscatedName("fc")
 @Implements("Clock")
 public abstract class Clock {
 	Clock() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-26166053"
+		garbageValue = "4"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IIB)I",
+		signature = "(III)I",
-		garbageValue = "6"
+		garbageValue = "670539248"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "([Lbp;II[I[II)V",
+		signature = "(III)I",
-		garbageValue = "-767358668"
+		garbageValue = "90199453"
 	)
-	@Export("sortWorlds")
+	static int method3489(int var0, int var1) {
-	static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) {
+		long var2 = (long)((var0 << 16) + var1);
-		if (var1 < var2) {
+		return PrivateChatMode.NetCache_currentResponse != null && PrivateChatMode.NetCache_currentResponse.key == var2 ? NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - PrivateChatMode.NetCache_currentResponse.padding) + 1 : 0;
-			int var5 = var1 - 1;
+	}
-			int var6 = var2 + 1;
-			int var7 = (var2 + var1) / 2;
-			World var8 = var0[var7];
-			var0[var7] = var0[var1];
-			var0[var1] = var8;
 
-			while (var5 < var6) {
+	@ObfuscatedName("kk")
-				boolean var9 = true;
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1974720745"
+	)
+	static final void method3488() {
+		PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
+		Client.packetWriter.addNode(var0);
 
-				int var10;
+		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
-				int var11;
+			if (var1.type == 0 || var1.type == 3) {
-				int var12;
+				VarpDefinition.closeInterface(var1, true);
-				do {
-					--var6;
-
-					for (var10 = 0; var10 < 4; ++var10) {
-						if (var3[var10] == 2) {
-							var11 = var0[var6].index;
-							var12 = var8.index;
-						} else if (var3[var10] == 1) {
-							var11 = var0[var6].population;
-							var12 = var8.population;
-							if (var11 == -1 && var4[var10] == 1) {
-								var11 = 2001;
-							}
-
-							if (var12 == -1 && var4[var10] == 1) {
-								var12 = 2001;
-							}
-						} else if (var3[var10] == 3) {
-							var11 = var0[var6].isMembersOnly() ? 1 : 0;
-							var12 = var8.isMembersOnly() ? 1 : 0;
-						} else {
-							var11 = var0[var6].id;
-							var12 = var8.id;
-						}
-
-						if (var12 != var11) {
-							if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
-								var9 = false;
-							}
-							break;
-						}
-
-						if (var10 == 3) {
-							var9 = false;
-						}
-					}
-				} while(var9);
-
-				var9 = true;
-
-				do {
-					++var5;
-
-					for (var10 = 0; var10 < 4; ++var10) {
-						if (var3[var10] == 2) {
-							var11 = var0[var5].index;
-							var12 = var8.index;
-						} else if (var3[var10] == 1) {
-							var11 = var0[var5].population;
-							var12 = var8.population;
-							if (var11 == -1 && var4[var10] == 1) {
-								var11 = 2001;
-							}
-
-							if (var12 == -1 && var4[var10] == 1) {
-								var12 = 2001;
-							}
-						} else if (var3[var10] == 3) {
-							var11 = var0[var5].isMembersOnly() ? 1 : 0;
-							var12 = var8.isMembersOnly() ? 1 : 0;
-						} else {
-							var11 = var0[var5].id;
-							var12 = var8.id;
-						}
-
-						if (var11 != var12) {
-							if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
-								var9 = false;
-							}
-							break;
-						}
-
-						if (var10 == 3) {
-							var9 = false;
-						}
-					}
-				} while(var9);
-
-				if (var5 < var6) {
-					World var13 = var0[var5];
-					var0[var5] = var0[var6];
-					var0[var6] = var13;
-				}
 			}
+		}
 
-			sortWorlds(var0, var1, var6, var3, var4);
+		if (Client.meslayerContinueWidget != null) {
-			sortWorlds(var0, var6 + 1, var2, var3, var4);
+			LoginPacket.invalidateWidget(Client.meslayerContinueWidget);
+			Client.meslayerContinueWidget = null;
 		}
 
 	}
-
-	@ObfuscatedName("ex")
-	@ObfuscatedSignature(
-		signature = "(I)Llo;",
-		garbageValue = "-40760681"
-	)
-	@Export("getWorldMap")
-	static WorldMap getWorldMap() {
-		return WorldMapRegion.worldMap;
-	}
-
-	@ObfuscatedName("kc")
-	@ObfuscatedSignature(
-		signature = "(IIIZI)V",
-		garbageValue = "744755226"
-	)
-	public static void method3555(int var0, int var1, int var2, boolean var3) {
-		PacketBufferNode var4 = ModelData0.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher);
-		var4.packetBuffer.writeIntME(var2);
-		var4.packetBuffer.writeShortLE(var1);
-		var4.packetBuffer.method5648(var3 ? Client.field748 : 0);
-		var4.packetBuffer.writeShortLE(var0);
-		Client.packetWriter.addNode(var4);
-	}
 }

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

@@ -1,42 +1,43 @@
+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("fh")
+@ObfuscatedName("fp")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("ff")
+	@ObfuscatedName("d")
+	public static short[][] field2066;
+	@ObfuscatedName("ev")
+	@Export("worldHost")
+	static String worldHost;
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -580865105
+		intValue = -733536729
-	)
-	static int field2086;
-	@ObfuscatedName("ak")
-	@ObfuscatedGetter(
-		intValue = -1403306953
 	)
 	@Export("xInset")
-	int xInset;
+	public int xInset;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -111839057
+		intValue = -572637509
 	)
 	@Export("yInset")
-	int yInset;
+	public int yInset;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = 1867472401
+		intValue = 1390386939
 	)
 	@Export("xSize")
 	int xSize;
 	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = 1884371115
+		intValue = -1658785195
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("av")
+	@ObfuscatedName("az")
 	@Export("flags")
 	public int[][] flags;
 
@@ -49,10 +50,10 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "621832318"
+		garbageValue = "-734218208"
 	)
 	@Export("clear")
 	public void clear() {
@@ -68,12 +69,12 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(IIIIZB)V",
-		garbageValue = "61"
+		garbageValue = "1"
 	)
-	public void method3614(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3552(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -220,10 +221,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
+		signature = "(IIIIZI)V",
-		garbageValue = "6"
+		garbageValue = "-629817472"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -247,10 +248,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "0"
+		garbageValue = "-1485831416"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -260,10 +261,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "-82"
+		garbageValue = "1736221922"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -273,10 +274,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(IIII)V",
-		garbageValue = "-144108327"
+		garbageValue = "677755057"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -284,12 +285,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
+		signature = "(IIIIZB)V",
-		garbageValue = "350468397"
+		garbageValue = "-90"
 	)
-	public void method3598(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3534(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -436,10 +437,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(IIIIIZI)V",
-		garbageValue = "-1764798116"
+		garbageValue = "1274501460"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -469,10 +470,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(IIII)V",
+		signature = "(IIIB)V",
-		garbageValue = "-1534832380"
+		garbageValue = "114"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -480,73 +481,102 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "1031605578"
+		garbageValue = "55211859"
 	)
-	public void method3601(int var1, int var2) {
+	public void method3535(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
 
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "([Lgy;II)Lgy;",
-		garbageValue = "-356918192"
-	)
-	@Export("findEnumerated")
-	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-		Enumerated[] var2 = var0;
-
-		for (int var3 = 0; var3 < var2.length; ++var3) {
-			Enumerated var4 = var2[var3];
-			if (var1 == var4.rsOrdinal()) {
-				return var4;
-			}
-		}
-
-		return null;
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(Lhf;Lhf;I)V",
-		garbageValue = "1646323129"
-	)
-	public static void method3615(AbstractArchive var0, AbstractArchive var1) {
-		class14.KitDefinition_archive = var0;
-		KitDefinition.KitDefinition_modelsArchive = var1;
-		KitDefinition.KitDefinition_fileCount = class14.KitDefinition_archive.getGroupFileCount(3);
-	}
-
 	@ObfuscatedName("y")
-	@ObfuscatedSignature(
+	@Export("base37DecodeLong")
-		signature = "(II)I",
+	public static String base37DecodeLong(long var0) {
-		garbageValue = "-1773174519"
+		if (var0 > 0L && var0 < 6582952005840035281L) {
-	)
+			if (var0 % 37L == 0L) {
-	@Export("Messages_getLastChatID")
+				return null;
-	static int Messages_getLastChatID(int var0) {
+			} else {
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
+				int var2 = 0;
-		if (var1 == null) {
+
-			return -1;
+				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
+					++var2;
+				}
+
+				StringBuilder var5;
+				char var8;
+				for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) {
+					long var6 = var0;
+					var0 /= 37L;
+					var8 = class288.base37Table[(int)(var6 - 37L * var0)];
+					if (var8 == '_') {
+						int var9 = var5.length() - 1;
+						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9)));
+						var8 = 160;
+					}
+				}
+
+				var5.reverse();
+				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0)));
+				return var5.toString();
+			}
 		} else {
-			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
+			return null;
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IS)I",
-		garbageValue = "746775715"
+		garbageValue = "1536"
 	)
-	public static final void method3628(int var0, int var1) {
+	public static int method3555(int var0) {
-		ViewportMouse.ViewportMouse_x = var0;
+		return class268.method5012(ViewportMouse.ViewportMouse_entityTags[var0]);
-		ViewportMouse.ViewportMouse_y = var1;
+	}
-		ViewportMouse.ViewportMouse_isInViewport = true;
+
-		ViewportMouse.ViewportMouse_entityCount = 0;
+	@ObfuscatedName("a")
-		ViewportMouse.ViewportMouse_false0 = false;
+	@ObfuscatedSignature(
+		signature = "(IIII)I",
+		garbageValue = "-1858221764"
+	)
+	static final int method3530(int var0, int var1, int var2) {
+		int var3 = var0 / var2;
+		int var4 = var0 & var2 - 1;
+		int var5 = var1 / var2;
+		int var6 = var1 & var2 - 1;
+		int var7 = class32.method551(var3, var5);
+		int var8 = class32.method551(var3 + 1, var5);
+		int var9 = class32.method551(var3, var5 + 1);
+		int var10 = class32.method551(var3 + 1, var5 + 1);
+		int var11 = class13.method150(var7, var8, var4, var2);
+		int var12 = class13.method150(var9, var10, var4, var2);
+		return class13.method150(var11, var12, var6, var2);
+	}
+
+	@ObfuscatedName("hs")
+	@ObfuscatedSignature(
+		signature = "(ZI)V",
+		garbageValue = "1164715285"
+	)
+	static final void method3557(boolean var0) {
+		WorldMapLabel.playPcmPlayers();
+		++Client.packetWriter.pendingWrites;
+		if (Client.packetWriter.pendingWrites >= 50 || var0) {
+			Client.packetWriter.pendingWrites = 0;
+			if (!Client.field677 && Client.packetWriter.getSocket() != null) {
+				PacketBufferNode var1 = class2.getPacketBufferNode(ClientPacket.field2182, Client.packetWriter.isaacCipher);
+				Client.packetWriter.addNode(var1);
+
+				try {
+					Client.packetWriter.flush();
+				} catch (IOException var3) {
+					Client.field677 = true;
+				}
+			}
+
+		}
 	}
 }

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

@@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hx")
+@ObfuscatedName("ht")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("c")
+	@ObfuscatedName("b")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 556251855
+		signature = "Lhz;"
 	)
-	@Export("graphicsTickTimeIdx")
+	@Export("musicTrackArchive")
-	static int graphicsTickTimeIdx;
+	public static AbstractArchive musicTrackArchive;
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1348059781
+		intValue = 84466269
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1294830225
+		intValue = 468184679
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 358494981
+		intValue = -387366221
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		signature = "(Lhx;)V"
+		signature = "(Lht;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -58,20 +58,20 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-633329475"
+		garbageValue = "-72"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lhx;I)Z",
+		signature = "(Lht;I)Z",
-		garbageValue = "1606698981"
+		garbageValue = "1703593953"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -84,16 +84,24 @@ public class Coord {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "-38"
+		garbageValue = "32"
 	)
 	@Export("toString")
 	String toString(String var1) {
 		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63);
 	}
 
+	public int hashCode() {
+		return this.packed();
+	}
+
+	public String toString() {
+		return this.toString(",");
+	}
+
 	public boolean equals(Object var1) {
 		if (this == var1) {
 			return true;
@@ -102,11 +110,32 @@ public class Coord {
 		}
 	}
 
-	public int hashCode() {
+	@ObfuscatedName("f")
-		return this.packed();
+	@ObfuscatedSignature(
-	}
+		signature = "(IB)Lig;",
+		garbageValue = "1"
+	)
+	@Export("getObjectDefinition")
+	public static ObjectDefinition getObjectDefinition(int var0) {
+		ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0);
+			var1 = new ObjectDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
 
-	public String toString() {
+			var1.postDecode();
-		return this.toString(",");
+			if (var1.isSolid) {
+				var1.interactType = 0;
+				var1.boolean1 = false;
+			}
+
+			ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
 	}
 }

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

@@ -3,97 +3,72 @@ 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("dn")
+@ObfuscatedName("dr")
 @Implements("Decimator")
 public class Decimator {
 	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "Llm;"
-	)
-	@Export("logoSprite")
-	static IndexedSprite logoSprite;
-	@ObfuscatedName("hh")
 	@ObfuscatedGetter(
-		intValue = -1979391885
+		intValue = -2103215085
-	)
-	@Export("cameraYaw")
-	static int cameraYaw;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 169220929
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1367353289
+		intValue = 643968559
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) {
-			int var4 = var1;
+			int var3 = class179.method3580(var1, var2);
-			int var5 = var2;
+			var1 /= var3;
-			if (var2 > var1) {
+			var2 /= var3;
-				var4 = var2;
-				var5 = var1;
-			}
-
-			while (var5 != 0) {
-				int var6 = var4 % var5;
-				var4 = var5;
-				var5 = var6;
-			}
-
-			var1 /= var4;
-			var2 /= var4;
 			this.inputRate = var1;
 			this.outputRate = var2;
 			this.table = new int[var1][14];
 
-			for (int var7 = 0; var7 < var1; ++var7) {
+			for (int var4 = 0; var4 < var1; ++var4) {
-				int[] var8 = this.table[var7];
+				int[] var5 = this.table[var4];
-				double var9 = (double)var7 / (double)var1 + 6.0D;
+				double var6 = 6.0D + (double)var4 / (double)var1;
-				int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
+				int var8 = (int)Math.floor(var6 - 7.0D + 1.0D);
-				if (var11 < 0) {
+				if (var8 < 0) {
-					var11 = 0;
+					var8 = 0;
 				}
 
-				int var12 = (int)Math.ceil(var9 + 7.0D);
+				int var9 = (int)Math.ceil(7.0D + var6);
-				if (var12 > 14) {
+				if (var9 > 14) {
-					var12 = 14;
+					var9 = 14;
 				}
 
-				for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
+				for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) {
-					double var15 = 3.141592653589793D * ((double)var11 - var9);
+					double var12 = ((double)var8 - var6) * 3.141592653589793D;
-					double var17 = var13;
+					double var14 = var10;
-					if (var15 < -1.0E-4D || var15 > 1.0E-4D) {
+					if (var12 < -1.0E-4D || var12 > 1.0E-4D) {
-						var17 = var13 * (Math.sin(var15) / var15);
+						var14 = var10 * (Math.sin(var12) / var12);
 					}
 
-					var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
+					var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6));
-					var8[var11] = (int)Math.floor(65536.0D * var17 + 0.5D);
+					var5[var8] = (int)Math.floor(var14 * 65536.0D + 0.5D);
 				}
 			}
 
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "([BI)[B",
-		garbageValue = "-1845568783"
+		garbageValue = "-1964001548"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
 		if (this.table != null) {
-			int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14;
+			int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14;
 			int[] var3 = new int[var2];
 			int var4 = 0;
 			int var5 = 0;
@@ -105,7 +80,7 @@ public class Decimator {
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var4 + var9] += var8[var9] * var7;
+					var3[var9 + var4] += var8[var9] * var7;
 				}
 
 				var5 += this.outputRate;
@@ -131,57 +106,31 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "1828348822"
+		garbageValue = "-1093845583"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate);
+			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate);
 		}
 
 		return var1;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-925934558"
+		garbageValue = "1063686920"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
+			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6;
 		}
 
 		return var1;
 	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "(ILci;ZI)I",
-		garbageValue = "1172796739"
-	)
-	static int method2564(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? Interpreter.field1090 : class188.field2352;
-		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.itemId;
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) {
-			if (var3.itemId != -1) {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-			}
-
-			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETID) {
-			Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var3.childIndex;
-			return 1;
-		} else {
-			return 2;
-		}
-	}
 }

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

@@ -1,29 +1,168 @@
+import java.io.File;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kd")
+@ObfuscatedName("kz")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Lkd;"
-	)
-	static final DefaultsGroup field3797;
 	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "Lkz;"
+	)
+	static final DefaultsGroup field3796;
+	@ObfuscatedName("w")
+	@Export("JagexCache_locationFile")
+	static File JagexCache_locationFile;
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -757733349
+		intValue = 154892097
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3797 = new DefaultsGroup(3);
+		field3796 = new DefaultsGroup(3);
 	}
 
 	DefaultsGroup(int var1) {
 		this.group = var1;
 	}
+
+	@ObfuscatedName("ii")
+	@ObfuscatedSignature(
+		signature = "(Liw;IIII)V",
+		garbageValue = "-2125986282"
+	)
+	@Export("addNpcToMenu")
+	static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
+		if (Client.menuOptionsCount < 400) {
+			if (var0.transforms != null) {
+				var0 = var0.transform();
+			}
+
+			if (var0 != null) {
+				if (var0.isInteractable) {
+					if (!var0.isFollower || Client.followerIndex == var1) {
+						String var4 = var0.name;
+						int var7;
+						int var8;
+						if (var0.combatLevel != 0) {
+							var7 = var0.combatLevel;
+							var8 = Message.localPlayer.combatLevel;
+							int var9 = var8 - var7;
+							String var6;
+							if (var9 < -9) {
+								var6 = NPC.colorStartTag(16711680);
+							} else if (var9 < -6) {
+								var6 = NPC.colorStartTag(16723968);
+							} else if (var9 < -3) {
+								var6 = NPC.colorStartTag(16740352);
+							} else if (var9 < 0) {
+								var6 = NPC.colorStartTag(16756736);
+							} else if (var9 > 9) {
+								var6 = NPC.colorStartTag(65280);
+							} else if (var9 > 6) {
+								var6 = NPC.colorStartTag(4259584);
+							} else if (var9 > 3) {
+								var6 = NPC.colorStartTag(8453888);
+							} else if (var9 > 0) {
+								var6 = NPC.colorStartTag(12648192);
+							} else {
+								var6 = NPC.colorStartTag(16776960);
+							}
+
+							var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
+						}
+
+						if (var0.isFollower && Client.followerOpsLowPriority) {
+							class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+						}
+
+						if (Client.isItemSelected == 1) {
+							class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16776960) + var4, 7, var1, var2, var3);
+						} else if (Client.isSpellSelected) {
+							if ((ReflectionCheck.selectedSpellFlags & 2) == 2) {
+								class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16776960) + var4, 8, var1, var2, var3);
+							}
+						} else {
+							int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
+							String[] var11 = var0.actions;
+							if (var11 != null) {
+								for (var7 = 4; var7 >= 0; --var7) {
+									if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) {
+										var8 = 0;
+										if (var7 == 0) {
+											var8 = var10 + 9;
+										}
+
+										if (var7 == 1) {
+											var8 = var10 + 10;
+										}
+
+										if (var7 == 2) {
+											var8 = var10 + 11;
+										}
+
+										if (var7 == 3) {
+											var8 = var10 + 12;
+										}
+
+										if (var7 == 4) {
+											var8 = var10 + 13;
+										}
+
+										class1.insertMenuItemNoShift(var11[var7], NPC.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+									}
+								}
+							}
+
+							if (var11 != null) {
+								for (var7 = 4; var7 >= 0; --var7) {
+									if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) {
+										short var12 = 0;
+										if (Client.npcAttackOption != AttackOption.AttackOption_hidden) {
+											if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Message.localPlayer.combatLevel) {
+												var12 = 2000;
+											}
+
+											var8 = 0;
+											if (var7 == 0) {
+												var8 = var12 + 9;
+											}
+
+											if (var7 == 1) {
+												var8 = var12 + 10;
+											}
+
+											if (var7 == 2) {
+												var8 = var12 + 11;
+											}
+
+											if (var7 == 3) {
+												var8 = var12 + 12;
+											}
+
+											if (var7 == 4) {
+												var8 = var12 + 13;
+											}
+
+											class1.insertMenuItemNoShift(var11[var7], NPC.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+										}
+									}
+								}
+							}
+
+							if (!var0.isFollower || !Client.followerOpsLowPriority) {
+								class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+							}
+						}
+
+					}
+				}
+			}
+		}
+	}
 }

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("eo")
+@ObfuscatedName("fe")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llc;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Ljz;"
+		signature = "Lji;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lex;"
+		signature = "Lem;"
 	)
-	class146 field1960;
+	class155 field1978;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,7 +42,7 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -73,16 +73,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lev;)V"
+		signature = "(Lff;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -94,7 +94,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
@@ -113,8 +113,8 @@ public final class DemotingHashTable {
 				}
 
 				this.removeWrapper(var5);
-				if (this.field1960 != null) {
+				if (this.field1978 != null) {
-					this.field1960.method3382(var5.get());
+					this.field1978.method3386(var5.get());
 				}
 			}
 
@@ -125,7 +125,7 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
@@ -146,7 +146,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

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

@@ -1,3 +1,5 @@
+import java.io.DataInputStream;
+import java.net.URL;
 import java.util.Random;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
@@ -5,38 +7,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("li")
+@ObfuscatedName("lb")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -628926999
+		intValue = 2108856267
 	)
 	int field3897;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 1090209519
-	)
-	int field3899;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1137197967
+		intValue = -526176171
 	)
-	int field3900;
+	int field3896;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = -1221750841
+	)
+	int field3899;
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(B)Llj;",
+		signature = "(B)Llx;",
-		garbageValue = "-40"
+		garbageValue = "-83"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (WorldMapIcon_0.field131.startsWith("win")) {
+		if (class81.field1129.startsWith("win")) {
 			var1 = 1;
-		} else if (WorldMapIcon_0.field131.startsWith("mac")) {
+		} else if (class81.field1129.startsWith("mac")) {
 			var1 = 2;
-		} else if (WorldMapIcon_0.field131.startsWith("linux")) {
+		} else if (class81.field1129.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -134,7 +136,7 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6345(var5);
+		this.method6317(var5);
 		Runtime.getRuntime();
 		int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
 		int var11;
@@ -152,55 +154,98 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3897, this.field3899, this.field3900, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
+		return new PlatformInfo(var1, var24, var7, var8, this.field3897, this.field3896, this.field3899, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-51"
+		garbageValue = "-1"
 	)
-	void method6345(String var1) {
+	void method6317(String var1) {
 		if (var1.startsWith("1.")) {
-			this.method6349(var1);
+			this.method6316(var1);
 		} else {
-			this.method6343(var1);
+			this.method6324(var1);
 		}
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-907450519"
+		garbageValue = "50"
 	)
-	void method6349(String var1) {
+	void method6316(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
 			this.field3897 = Integer.parseInt(var2[1]);
 			var2 = var2[2].split("_");
-			this.field3899 = Integer.parseInt(var2[0]);
+			this.field3896 = Integer.parseInt(var2[0]);
-			this.field3900 = Integer.parseInt(var2[1]);
+			this.field3899 = Integer.parseInt(var2[1]);
 		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-342949877"
+		garbageValue = "1412850976"
 	)
-	void method6343(String var1) {
+	void method6324(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
 			this.field3897 = Integer.parseInt(var2[0]);
-			this.field3899 = Integer.parseInt(var2[1]);
+			this.field3896 = Integer.parseInt(var2[1]);
-			this.field3900 = Integer.parseInt(var2[2]);
+			this.field3899 = Integer.parseInt(var2[2]);
 		} catch (Exception var4) {
 		}
 
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/Throwable;B)V",
+		garbageValue = "0"
+	)
+	@Export("RunException_sendStackTrace")
+	public static void RunException_sendStackTrace(String var0, Throwable var1) {
+		if (var1 != null) {
+			var1.printStackTrace();
+		} else {
+			try {
+				String var2 = "";
+				if (var1 != null) {
+					var2 = GrandExchangeOfferUnitPriceComparator.method124(var1);
+				}
+
+				if (var0 != null) {
+					if (var1 != null) {
+						var2 = var2 + " | ";
+					}
+
+					var2 = var2 + var0;
+				}
+
+				System.out.println("Error: " + var2);
+				var2 = var2.replace(':', '.');
+				var2 = var2.replace('@', '_');
+				var2 = var2.replace('&', '_');
+				var2 = var2.replace('#', '_');
+				if (RunException.RunException_applet == null) {
+					return;
+				}
+
+				URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2);
+				DataInputStream var4 = new DataInputStream(var3.openStream());
+				var4.read();
+				var4.close();
+			} catch (Exception var5) {
+			}
+
+		}
+	}
 }

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

@@ -9,54 +9,54 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("as")
+@ObfuscatedName("ai")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 447959355
+		intValue = 828002731
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "347893346"
+		garbageValue = "15"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)Messages.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)(DirectByteArrayCopier.field2490 * -168449264), 16, SoundCache.PcmPlayer_stereo ? 2 : 1, true, false);
-		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
+		this.byteSamples = new byte[256 << (SoundCache.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "25"
+		garbageValue = "797185937"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
 		try {
-			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
+			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SoundCache.PcmPlayer_stereo ? 2 : 1));
 			this.line = (SourceDataLine)AudioSystem.getLine(var2);
 			this.line.open();
 			this.line.start();
 			this.capacity2 = var1;
 		} catch (LineUnavailableException var5) {
-			if (BoundaryObject.method3312(var1) != 1) {
+			if (ScriptFrame.method1109(var1) != 1) {
 				int var4 = var1 - 1;
 				var4 |= var4 >>> 1;
 				var4 |= var4 >>> 2;
@@ -72,21 +72,21 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "80"
+		garbageValue = "2013132005"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
+		return this.capacity2 - (this.line.available() >> (SoundCache.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
-		if (PcmPlayer.PcmPlayer_stereo) {
+		if (SoundCache.PcmPlayer_stereo) {
 			var1 <<= 1;
 		}
 
@@ -103,10 +103,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(S)V",
-		garbageValue = "-1441503616"
+		garbageValue = "390"
 	)
 	@Export("close")
 	protected void close() {
@@ -117,10 +117,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "45"
+		garbageValue = "1127195595"
 	)
 	@Export("discard")
 	protected void discard() {

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

@@ -2,47 +2,226 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("al")
+@ObfuscatedName("ax")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements class99 {
+public class DevicePcmPlayerProvider implements class97 {
-	@ObfuscatedName("jx")
+	@ObfuscatedName("aq")
-	@ObfuscatedSignature(
+	static String field391;
-		signature = "Lhl;"
-	)
-	@Export("dragInventoryWidget")
-	static Widget dragInventoryWidget;
 
 	DevicePcmPlayerProvider() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)Lde;",
+		signature = "(I)Lcw;",
-		garbageValue = "2104968763"
+		garbageValue = "479224621"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}
 
-	@ObfuscatedName("fz")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(Lhz;Lhz;ZII)V",
-		garbageValue = "2048125775"
+		garbageValue = "808644232"
 	)
-	@Export("forceDisconnect")
+	static void method841(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-	static final void forceDisconnect(int var0) {
+		if (Login.field1173) {
-		class40.logOut();
+			if (var3 == 4) {
-		switch(var0) {
+				Login.loginIndex = 4;
-		case 1:
+			}
-			Login.loginIndex = 24;
+
-			PacketWriter.setLoginResponseString("", "You were disconnected from the server.", "");
+		} else {
-			break;
+			Login.loginIndex = var3;
-		case 2:
+			Rasterizer2D.Rasterizer2D_clear();
-			Login.loginIndex = 24;
+			byte[] var4 = var0.takeFileByNames("title.jpg", "");
-			PacketWriter.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", "");
+			UrlRequest.leftTitleSprite = GrandExchangeOfferTotalQuantityComparator.convertJpgToSprite(var4);
+			ScriptFrame.rightTitleSprite = UrlRequest.leftTitleSprite.mirrorHorizontally();
+			if ((Client.worldProperties & 536870912) != 0) {
+				Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
+			} else if ((Client.worldProperties & 1073741824) != 0) {
+				Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", "");
+			} else {
+				Login.logoSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
+			}
+
+			Login.titleboxSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
+			Login.titlebuttonSprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
+			Login.runesSprite = class195.method3667(var1, "runes", "");
+			class30.title_muteSprite = class195.method3667(var1, "title_mute", "");
+			class218.options_buttons_0Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
+			GrandExchangeOffer.field64 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
+			Login.options_buttons_2Sprite = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
+			Login.field1162 = Canvas.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
+			IgnoreList.field3579 = class218.options_buttons_0Sprite.subWidth;
+			MenuAction.field1133 = class218.options_buttons_0Sprite.subHeight;
+			StructDefinition.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite);
+			if (var2) {
+				Login.Login_username = "";
+				Login.Login_password = "";
+			}
+
+			class266.field3517 = 0;
+			class80.otp = "";
+			Login.field1178 = true;
+			Login.worldSelectOpen = false;
+			if (!Interpreter.clientPreferences.titleMusicDisabled) {
+				WorldMapCacheName.method616(2, GrandExchangeOfferWorldComparator.archive6, "scape main", "", 255, false);
+			} else {
+				BoundaryObject.method3273(2);
+			}
+
+			BuddyRankComparator.method3362(false);
+			Login.field1173 = true;
+			Login.xPadding = (GrandExchangeOfferTotalQuantityComparator.canvasWidth - 765) / 2;
+			Login.loginBoxX = Login.xPadding + 202;
+			Script.loginBoxCenter = Login.loginBoxX + 180;
+			UrlRequest.leftTitleSprite.drawAt(Login.xPadding, 0);
+			ScriptFrame.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+			Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18);
+		}
+	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Lhz;Lhz;Lhz;B)V",
+		garbageValue = "0"
+	)
+	public static void method842(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
+		FriendLoginUpdate.Widget_archive = var0;
+		Widget.Widget_modelsArchive = var1;
+		BoundaryObject.Widget_spritesArchive = var2;
+		MilliClock.Widget_fontsArchive = var3;
+		UserComparator7.Widget_interfaceComponents = new Widget[FriendLoginUpdate.Widget_archive.getGroupCount()][];
+		Widget.Widget_loadedInterfaces = new boolean[FriendLoginUpdate.Widget_archive.getGroupCount()];
+	}
+
+	@ObfuscatedName("ak")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZI)I",
+		garbageValue = "1220009444"
+	)
+	static int method840(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		int var6;
+		if (var0 == ScriptOpcodes.ENUM_STRING) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			EnumDefinition var5 = World.getEnum(var3);
+			if (var5.outputType != 's') {
+			}
+
+			for (var6 = 0; var6 < var5.outputCount; ++var6) {
+				if (var4 == var5.keys[var6]) {
+					Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.strVals[var6];
+					var5 = null;
+					break;
+				}
+			}
+
+			if (var5 != null) {
+				Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var5.defaultStr;
+			}
+
+			return 1;
+		} else if (var0 != ScriptOpcodes.ENUM) {
+			if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) {
+				var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+				EnumDefinition var10 = World.getEnum(var3);
+				Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var10.size();
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			class188.Interpreter_intStackSize -= 4;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			int var9 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2];
+			var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3];
+			EnumDefinition var7 = World.getEnum(var9);
+			if (var3 == var7.inputType && var4 == var7.outputType) {
+				for (int var8 = 0; var8 < var7.outputCount; ++var8) {
+					if (var6 == var7.keys[var8]) {
+						if (var4 == 115) {
+							Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var7.strVals[var8];
+						} else {
+							Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.intVals[var8];
+						}
+
+						var7 = null;
+						break;
+					}
+				}
+
+				if (var7 != null) {
+					if (var4 == 115) {
+						Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var7.defaultStr;
+					} else {
+						Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var7.defaultInt;
+					}
+				}
+
+				return 1;
+			} else {
+				if (var4 == 115) {
+					Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = "null";
+				} else {
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			}
+		}
+	}
+
+	@ObfuscatedName("iv")
+	@ObfuscatedSignature(
+		signature = "(IIIIIIB)V",
+		garbageValue = "89"
+	)
+	static final void method839(int var0, int var1, int var2, int var3, int var4, int var5) {
+		int var6 = var2 - var0;
+		int var7 = var3 - var1;
+		int var8 = var6 >= 0 ? var6 : -var6;
+		int var9 = var7 >= 0 ? var7 : -var7;
+		int var10 = var8;
+		if (var8 < var9) {
+			var10 = var9;
 		}
 
+		if (var10 != 0) {
+			int var11 = (var6 << 16) / var10;
+			int var12 = (var7 << 16) / var10;
+			if (var12 <= var11) {
+				var11 = -var11;
+			} else {
+				var12 = -var12;
+			}
+
+			int var13 = var5 * var12 >> 17;
+			int var14 = var5 * var12 + 1 >> 17;
+			int var15 = var5 * var11 >> 17;
+			int var16 = var5 * var11 + 1 >> 17;
+			var0 -= Rasterizer2D.Rasterizer2D_xClipStart;
+			var1 -= Rasterizer2D.Rasterizer2D_yClipStart;
+			int var17 = var0 + var13;
+			int var18 = var0 - var14;
+			int var19 = var0 + var6 - var14;
+			int var20 = var0 + var13 + var6;
+			int var21 = var15 + var1;
+			int var22 = var1 - var16;
+			int var23 = var7 + var1 - var16;
+			int var24 = var7 + var15 + var1;
+			Rasterizer3D.method3078(var17, var18, var19);
+			Rasterizer3D.method3008(var21, var22, var23, var17, var18, var19, var4);
+			Rasterizer3D.method3078(var17, var19, var20);
+			Rasterizer3D.method3008(var21, var23, var24, var17, var19, var20, var4);
+		}
 	}
 }

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

@@ -1,45 +1,39 @@
 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("gu")
+@ObfuscatedName("he")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("az")
+	@ObfuscatedName("p")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Llp;"
+		intValue = 1433331089
 	)
-	@Export("rasterProvider")
+	public static int field2490;
-	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("f")
-	@ObfuscatedName("dr")
-	@ObfuscatedSignature(
-		signature = "Lij;"
-	)
-	@Export("archive5")
-	static Archive archive5;
-	@ObfuscatedName("u")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(S)[B",
+		signature = "(I)[B",
-		garbageValue = "18982"
+		garbageValue = "-112018699"
 	)
 	@Export("get")
-	byte[] get() {
+	public byte[] get() {
 		byte[] var1 = new byte[this.directBuffer.capacity()];
 		this.directBuffer.position(0);
 		this.directBuffer.get(var1);
 		return var1;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "([BB)V",
-		garbageValue = "-1436271820"
+		garbageValue = "33"
 	)
 	@Export("set")
 	public void set(byte[] var1) {
@@ -48,18 +42,12 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		this.directBuffer.put(var1);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(CI)Z",
+		signature = "(Lhz;B)V",
-		garbageValue = "-1809076627"
+		garbageValue = "7"
 	)
-	static boolean method4010(char var0) {
+	public static void method3940(AbstractArchive var0) {
-		for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) {
+		class286.EnumDefinition_archive = var0;
-			if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) {
-				return true;
-			}
-		}
-
-		return false;
 	}
 }

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("ep")
+@ObfuscatedName("fd")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("isSoft")
 	boolean isSoft() {
 		return false;

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

@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fn")
+@ObfuscatedName("gw")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("ci")
+	@ObfuscatedName("cu")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cu")
+	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
-		signature = "Lfn;"
+		signature = "Lgw;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("ct")
 	@ObfuscatedSignature(
-		signature = "Lfn;"
+		signature = "Lgw;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cz")
 	@Export("removeDual")
 	public void removeDual() {
 		if (this.nextDual != null) {

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

@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iw")
+@ObfuscatedName("in")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lfn;"
+		signature = "Lgw;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lfn;)V"
+		signature = "(Lgw;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lfn;)V"
+		signature = "(Lgw;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "()Lfn;"
+		signature = "()Lgw;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -4,72 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cu")
+@ObfuscatedName("cg")
 @Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "Lbv;"
-	)
-	@Export("loginScreenRunesAnimation")
-	static LoginScreenAnimation loginScreenRunesAnimation;
-	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -679887147
+		intValue = -95317183
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 431933847
+		intValue = 1520992013
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -68495843
+		intValue = 1128540715
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1644974197
+		intValue = 1824445575
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 707207003
+		intValue = -1187953645
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1196896887
+		intValue = -589129473
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Liv;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 672363513
+		intValue = 1848001731
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1683729561
+		intValue = 22641631
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLee;)V"
+		signature = "(IIIIIIIZLep;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -79,12 +73,12 @@ public class DynamicObject extends Entity {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var7);
+			this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field3533 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field3495 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
-				if (var10.sequenceDefinition == this.sequenceDefinition) {
+				if (this.sequenceDefinition == var10.sequenceDefinition) {
 					this.frame = var10.frame;
 					this.cycleStart = var10.cycleStart;
 					return;
@@ -99,10 +93,10 @@ public class DynamicObject extends Entity {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Ldf;",
+		signature = "(I)Ldw;",
-		garbageValue = "-174129419"
+		garbageValue = "822221372"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -132,7 +126,7 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectDefinition var12 = Occluder.getObjectDefinition(this.id);
+		ObjectDefinition var12 = Coord.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -155,131 +149,76 @@ public class DynamicObject extends Entity {
 			int var6 = (var3 >> 1) + this.y;
 			int var7 = (var3 + 1 >> 1) + this.y;
 			int[][] var8 = Tiles.Tiles_heights[this.plane];
-			int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2;
+			int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2;
 			int var10 = (this.x << 7) + (var2 << 6);
 			int var11 = (this.y << 7) + (var3 << 6);
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "([Lgz;II)Lgz;",
-		garbageValue = "1357680514"
+		garbageValue = "2071189465"
 	)
-	public static void method2263(int var0) {
+	@Export("findEnumerated")
-		if (var0 != -1) {
+	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-			if (Widget.Widget_loadedInterfaces[var0]) {
+		Enumerated[] var2 = var0;
-				InvDefinition.Widget_archive.clearFilesGroup(var0);
-				if (FloorDecoration.Widget_interfaceComponents[var0] != null) {
-					boolean var1 = true;
 
-					for (int var2 = 0; var2 < FloorDecoration.Widget_interfaceComponents[var0].length; ++var2) {
+		for (int var3 = 0; var3 < var2.length; ++var3) {
-						if (FloorDecoration.Widget_interfaceComponents[var0][var2] != null) {
+			Enumerated var4 = var2[var3];
-							if (FloorDecoration.Widget_interfaceComponents[var0][var2].type != 2) {
+			if (var1 == var4.rsOrdinal()) {
-								FloorDecoration.Widget_interfaceComponents[var0][var2] = null;
+				return var4;
-							} else {
+			}
-								var1 = false;
+		}
-							}
+
+		return null;
+	}
+
+	@ObfuscatedName("jr")
+	@ObfuscatedSignature(
+		signature = "([Lha;II)V",
+		garbageValue = "-794395559"
+	)
+	@Export("runComponentCloseListeners")
+	static final void runComponentCloseListeners(Widget[] var0, int var1) {
+		for (int var2 = 0; var2 < var0.length; ++var2) {
+			Widget var3 = var0[var2];
+			if (var3 != null) {
+				if (var3.type == 0) {
+					if (var3.children != null) {
+						runComponentCloseListeners(var3.children, var1);
+					}
+
+					InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
+					if (var4 != null) {
+						ItemContainer.runIntfCloseListeners(var4.group, var1);
+					}
+				}
+
+				ScriptEvent var5;
+				if (var1 == 0 && var3.onDialogAbort != null) {
+					var5 = new ScriptEvent();
+					var5.widget = var3;
+					var5.args = var3.onDialogAbort;
+					Client.runScriptEvent(var5);
+				}
+
+				if (var1 == 1 && var3.onSubChange != null) {
+					if (var3.childIndex >= 0) {
+						Widget var6 = Tile.getWidget(var3.id);
+						if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) {
+							continue;
 						}
 					}
 
-					if (var1) {
+					var5 = new ScriptEvent();
-						FloorDecoration.Widget_interfaceComponents[var0] = null;
+					var5.widget = var3;
-					}
+					var5.args = var3.onSubChange;
-
+					Client.runScriptEvent(var5);
-					Widget.Widget_loadedInterfaces[var0] = false;
 				}
 			}
 		}
-	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "514266465"
-	)
-	public static void method2259() {
-		KitDefinition.KitDefinition_cached.clear();
-	}
-
-	@ObfuscatedName("hw")
-	@ObfuscatedSignature(
-		signature = "(ZLkj;B)V",
-		garbageValue = "4"
-	)
-	static final void method2262(boolean var0, PacketBuffer var1) {
-		while (true) {
-			if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
-				int var2 = var1.readBits(15);
-				if (var2 != 32767) {
-					boolean var3 = false;
-					if (Client.npcs[var2] == null) {
-						Client.npcs[var2] = new NPC();
-						var3 = true;
-					}
-
-					NPC var4 = Client.npcs[var2];
-					Client.npcIndices[++Client.npcCount - 1] = var2;
-					var4.npcCycle = Client.cycle;
-					int var5 = Client.defaultRotations[var1.readBits(3)];
-					if (var3) {
-						var4.orientation = var4.rotation = var5;
-					}
-
-					int var6 = var1.readBits(1);
-					var4.definition = VarcInt.getNpcDefinition(var1.readBits(14));
-					int var7;
-					if (var0) {
-						var7 = var1.readBits(8);
-						if (var7 > 127) {
-							var7 -= 256;
-						}
-					} else {
-						var7 = var1.readBits(5);
-						if (var7 > 15) {
-							var7 -= 32;
-						}
-					}
-
-					int var8;
-					if (var0) {
-						var8 = var1.readBits(8);
-						if (var8 > 127) {
-							var8 -= 256;
-						}
-					} else {
-						var8 = var1.readBits(5);
-						if (var8 > 15) {
-							var8 -= 32;
-						}
-					}
-
-					int var9 = var1.readBits(1);
-					if (var9 == 1) {
-						Client.field688[++Client.field687 - 1] = var2;
-					}
-
-					var4.field938 = var4.definition.size;
-					var4.field988 = var4.definition.rotation;
-					if (var4.field988 == 0) {
-						var4.rotation = 0;
-					}
-
-					var4.walkSequence = var4.definition.walkSequence;
-					var4.walkBackSequence = var4.definition.walkBackSequence;
-					var4.walkLeftSequence = var4.definition.walkLeftSequence;
-					var4.walkRightSequence = var4.definition.walkRightSequence;
-					var4.readySequence = var4.definition.readySequence;
-					var4.turnLeftSequence = var4.definition.turnLeftSequence;
-					var4.turnRightSequence = var4.definition.turnRightSequence;
-					var4.method2059(class215.localPlayer.pathX[0] + var7, class215.localPlayer.pathY[0] + var8, var6 == 1);
-					continue;
-				}
-			}
-
-			var1.exportIndex();
-			return;
-		}
 	}
 }

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

@@ -4,12 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ee")
+@ObfuscatedName("ep")
 @Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("cq")
+	@ObfuscatedName("ce")
 	@ObfuscatedGetter(
-		intValue = -254761411
+		intValue = -294742571
 	)
 	@Export("height")
 	public int height;
@@ -18,10 +18,10 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Ldf;",
+		signature = "(I)Ldw;",
-		garbageValue = "-174129419"
+		garbageValue = "822221372"
 	)
 	@Export("getModel")
 	protected Model getModel() {
@@ -38,69 +38,4 @@ public abstract class Entity extends DualNode {
 		}
 
 	}
-
-	@ObfuscatedName("iz")
-	@ObfuscatedSignature(
-		signature = "(Lbg;IIIB)V",
-		garbageValue = "40"
-	)
-	@Export("addPlayerToMenu")
-	static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-		if (class215.localPlayer != var0) {
-			if (Client.menuOptionsCount < 400) {
-				String var4;
-				if (var0.skillLevel == 0) {
-					var4 = var0.actions[0] + var0.username + var0.actions[1] + GrandExchangeOfferWorldComparator.method77(var0.combatLevel, class215.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
-				} else {
-					var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
-				}
-
-				int var5;
-				if (Client.isItemSelected == 1) {
-					WorldMapSprite.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class222.colorStartTag(16777215) + var4, 14, var1, var2, var3);
-				} else if (Client.isSpellSelected) {
-					if ((Actor.selectedSpellFlags & 8) == 8) {
-						WorldMapSprite.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class222.colorStartTag(16777215) + var4, 15, var1, var2, var3);
-					}
-				} else {
-					for (var5 = 7; var5 >= 0; --var5) {
-						if (Client.playerMenuActions[var5] != null) {
-							short var6 = 0;
-							if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) {
-								if (AttackOption.AttackOption_hidden == Client.playerAttackOption) {
-									continue;
-								}
-
-								if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class215.localPlayer.combatLevel) {
-									var6 = 2000;
-								}
-
-								if (class215.localPlayer.team != 0 && var0.team != 0) {
-									if (var0.team == class215.localPlayer.team) {
-										var6 = 2000;
-									} else {
-										var6 = 0;
-									}
-								}
-							} else if (Client.playerOptionsPriorities[var5]) {
-								var6 = 2000;
-							}
-
-							boolean var7 = false;
-							int var8 = Client.playerMenuOpcodes[var5] + var6;
-							WorldMapSprite.insertMenuItemNoShift(Client.playerMenuActions[var5], class222.colorStartTag(16777215) + var4, var8, var1, var2, var3);
-						}
-					}
-				}
-
-				for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
-					if (Client.menuOpcodes[var5] == 23) {
-						Client.menuTargets[var5] = class222.colorStartTag(16777215) + var4;
-						break;
-					}
-				}
-
-			}
-		}
-	}
 }

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

@@ -4,49 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("in")
+@ObfuscatedName("ik")
 @Implements("EnumDefinition")
 public class EnumDefinition extends DualNode {
-	@ObfuscatedName("u")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Leb;"
-	)
-	@Export("EnumDefinition_archive")
-	static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "Lef;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -687974969
+		intValue = 1935496033
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1462437727
+		intValue = 2015380105
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -59,10 +53,10 @@ public class EnumDefinition extends DualNode {
 		this.outputCount = 0;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I)V",
+		signature = "(Lkq;I)V",
-		garbageValue = "-858026130"
+		garbageValue = "-1351538350"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -76,10 +70,10 @@ public class EnumDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lkg;II)V",
+		signature = "(Lkq;II)V",
-		garbageValue = "248753838"
+		garbageValue = "789591005"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -116,377 +110,13 @@ public class EnumDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1646358574"
+		garbageValue = "-1025007031"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount;
 	}
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		signature = "(IIIIIILel;Lfh;I)V",
-		garbageValue = "1647105288"
-	)
-	static final void method4656(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
-			if (var0 < Tiles.Tiles_minPlane) {
-				Tiles.Tiles_minPlane = var0;
-			}
-
-			ObjectDefinition var8 = Occluder.getObjectDefinition(var3);
-			int var9;
-			int var10;
-			if (var4 != 1 && var4 != 3) {
-				var9 = var8.sizeX;
-				var10 = var8.sizeY;
-			} else {
-				var9 = var8.sizeY;
-				var10 = var8.sizeX;
-			}
-
-			int var11;
-			int var12;
-			if (var9 + var1 <= 104) {
-				var11 = (var9 >> 1) + var1;
-				var12 = (var9 + 1 >> 1) + var1;
-			} else {
-				var11 = var1;
-				var12 = var1 + 1;
-			}
-
-			int var13;
-			int var14;
-			if (var10 + var2 <= 104) {
-				var13 = (var10 >> 1) + var2;
-				var14 = var2 + (var10 + 1 >> 1);
-			} else {
-				var13 = var2;
-				var14 = var2 + 1;
-			}
-
-			int[][] var15 = Tiles.Tiles_heights[var0];
-			int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2;
-			int var17 = (var1 << 7) + (var9 << 6);
-			int var18 = (var2 << 7) + (var10 << 6);
-			long var19 = MouseHandler.calculateTag(var1, var2, 2, var8.int1 == 0, var3);
-			int var21 = var5 + (var4 << 6);
-			if (var8.int3 == 1) {
-				var21 += 256;
-			}
-
-			if (var8.hasSound()) {
-				WorldMapData_1.method737(var0, var1, var2, var8, var4);
-			}
-
-			Object var22;
-			if (var5 == 22) {
-				if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
-					if (var8.animationId == -1 && var8.transforms == null) {
-						var22 = var8.getEntity(22, var4, var15, var17, var16, var18);
-					} else {
-						var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-					}
-
-					var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var22, var19, var21);
-					if (var8.interactType == 1 && var7 != null) {
-						var7.setBlockedByFloorDec(var1, var2);
-					}
-
-				}
-			} else {
-				int var23;
-				if (var5 != 10 && var5 != 11) {
-					int[] var10000;
-					if (var5 >= 12) {
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var22 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-						} else {
-							var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.method3242(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21);
-						if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
-							var10000 = WorldMapLabel.field233[var0][var1];
-							var10000[var2] |= 2340;
-						}
-
-						if (var8.interactType != 0 && var7 != null) {
-							var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-						}
-
-					} else if (var5 == 0) {
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var22 = var8.getEntity(0, var4, var15, var17, var16, var18);
-						} else {
-							var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field505[var4], 0, var19, var21);
-						if (var4 == 0) {
-							if (var8.clipped) {
-								class51.field423[var0][var1][var2] = 50;
-								class51.field423[var0][var1][var2 + 1] = 50;
-							}
-
-							if (var8.modelClipped) {
-								var10000 = WorldMapLabel.field233[var0][var1];
-								var10000[var2] |= 585;
-							}
-						} else if (var4 == 1) {
-							if (var8.clipped) {
-								class51.field423[var0][var1][var2 + 1] = 50;
-								class51.field423[var0][var1 + 1][var2 + 1] = 50;
-							}
-
-							if (var8.modelClipped) {
-								var10000 = WorldMapLabel.field233[var0][var1];
-								var10000[var2 + 1] |= 1170;
-							}
-						} else if (var4 == 2) {
-							if (var8.clipped) {
-								class51.field423[var0][var1 + 1][var2] = 50;
-								class51.field423[var0][var1 + 1][var2 + 1] = 50;
-							}
-
-							if (var8.modelClipped) {
-								var10000 = WorldMapLabel.field233[var0][var1 + 1];
-								var10000[var2] |= 585;
-							}
-						} else if (var4 == 3) {
-							if (var8.clipped) {
-								class51.field423[var0][var1][var2] = 50;
-								class51.field423[var0][var1 + 1][var2] = 50;
-							}
-
-							if (var8.modelClipped) {
-								var10000 = WorldMapLabel.field233[var0][var1];
-								var10000[var2] |= 1170;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) {
-							var7.method3614(var1, var2, var5, var4, var8.boolean1);
-						}
-
-						if (var8.int2 != 16) {
-							var6.method3124(var0, var1, var2, var8.int2);
-						}
-
-					} else if (var5 == 1) {
-						if (var8.animationId == -1 && var8.transforms == null) {
-							var22 = var8.getEntity(1, var4, var15, var17, var16, var18);
-						} else {
-							var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-						}
-
-						var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field506[var4], 0, var19, var21);
-						if (var8.clipped) {
-							if (var4 == 0) {
-								class51.field423[var0][var1][var2 + 1] = 50;
-							} else if (var4 == 1) {
-								class51.field423[var0][var1 + 1][var2 + 1] = 50;
-							} else if (var4 == 2) {
-								class51.field423[var0][var1 + 1][var2] = 50;
-							} else if (var4 == 3) {
-								class51.field423[var0][var1][var2] = 50;
-							}
-						}
-
-						if (var8.interactType != 0 && var7 != null) {
-							var7.method3614(var1, var2, var5, var4, var8.boolean1);
-						}
-
-					} else {
-						int var28;
-						if (var5 == 2) {
-							var28 = var4 + 1 & 3;
-							Object var29;
-							Object var30;
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18);
-								var30 = var8.getEntity(2, var28, var15, var17, var16, var18);
-							} else {
-								var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-								var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field505[var4], Tiles.field505[var28], var19, var21);
-							if (var8.modelClipped) {
-								if (var4 == 0) {
-									var10000 = WorldMapLabel.field233[var0][var1];
-									var10000[var2] |= 585;
-									var10000 = WorldMapLabel.field233[var0][var1];
-									var10000[1 + var2] |= 1170;
-								} else if (var4 == 1) {
-									var10000 = WorldMapLabel.field233[var0][var1];
-									var10000[var2 + 1] |= 1170;
-									var10000 = WorldMapLabel.field233[var0][var1 + 1];
-									var10000[var2] |= 585;
-								} else if (var4 == 2) {
-									var10000 = WorldMapLabel.field233[var0][var1 + 1];
-									var10000[var2] |= 585;
-									var10000 = WorldMapLabel.field233[var0][var1];
-									var10000[var2] |= 1170;
-								} else if (var4 == 3) {
-									var10000 = WorldMapLabel.field233[var0][var1];
-									var10000[var2] |= 1170;
-									var10000 = WorldMapLabel.field233[var0][var1];
-									var10000[var2] |= 585;
-								}
-							}
-
-							if (var8.interactType != 0 && var7 != null) {
-								var7.method3614(var1, var2, var5, var4, var8.boolean1);
-							}
-
-							if (var8.int2 != 16) {
-								var6.method3124(var0, var1, var2, var8.int2);
-							}
-
-						} else if (var5 == 3) {
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var22 = var8.getEntity(3, var4, var15, var17, var16, var18);
-							} else {
-								var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field506[var4], 0, var19, var21);
-							if (var8.clipped) {
-								if (var4 == 0) {
-									class51.field423[var0][var1][var2 + 1] = 50;
-								} else if (var4 == 1) {
-									class51.field423[var0][var1 + 1][var2 + 1] = 50;
-								} else if (var4 == 2) {
-									class51.field423[var0][var1 + 1][var2] = 50;
-								} else if (var4 == 3) {
-									class51.field423[var0][var1][var2] = 50;
-								}
-							}
-
-							if (var8.interactType != 0 && var7 != null) {
-								var7.method3614(var1, var2, var5, var4, var8.boolean1);
-							}
-
-						} else if (var5 == 9) {
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var22 = var8.getEntity(var5, var4, var15, var17, var16, var18);
-							} else {
-								var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.method3242(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21);
-							if (var8.interactType != 0 && var7 != null) {
-								var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-							}
-
-							if (var8.int2 != 16) {
-								var6.method3124(var0, var1, var2, var8.int2);
-							}
-
-						} else if (var5 == 4) {
-							if (var8.animationId == -1 && var8.transforms == null) {
-								var22 = var8.getEntity(4, var4, var15, var17, var16, var18);
-							} else {
-								var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-							}
-
-							var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field505[var4], 0, 0, 0, var19, var21);
-						} else {
-							long var31;
-							Object var33;
-							if (var5 == 5) {
-								var28 = 16;
-								var31 = var6.getBoundaryObjectTag(var0, var1, var2);
-								if (var31 != 0L) {
-									var28 = Occluder.getObjectDefinition(ItemContainer.Entity_unpackID(var31)).int2;
-								}
-
-								if (var8.animationId == -1 && var8.transforms == null) {
-									var33 = var8.getEntity(4, var4, var15, var17, var16, var18);
-								} else {
-									var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field505[var4], 0, var28 * Tiles.field507[var4], var28 * Tiles.field508[var4], var19, var21);
-							} else if (var5 == 6) {
-								var28 = 8;
-								var31 = var6.getBoundaryObjectTag(var0, var1, var2);
-								if (0L != var31) {
-									var28 = Occluder.getObjectDefinition(ItemContainer.Entity_unpackID(var31)).int2 / 2;
-								}
-
-								if (var8.animationId == -1 && var8.transforms == null) {
-									var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
-								} else {
-									var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field513[var4], var19, var21);
-							} else if (var5 == 7) {
-								var23 = var4 + 2 & 3;
-								if (var8.animationId == -1 && var8.transforms == null) {
-									var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
-								} else {
-									var22 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, 256, var23, 0, 0, var19, var21);
-							} else if (var5 == 8) {
-								var28 = 8;
-								var31 = var6.getBoundaryObjectTag(var0, var1, var2);
-								if (var31 != 0L) {
-									var28 = Occluder.getObjectDefinition(ItemContainer.Entity_unpackID(var31)).int2 / 2;
-								}
-
-								int var27 = var4 + 2 & 3;
-								Object var26;
-								if (var8.animationId == -1 && var8.transforms == null) {
-									var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
-									var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18);
-								} else {
-									var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-									var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-								}
-
-								var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field513[var4], var19, var21);
-							}
-						}
-					}
-				} else {
-					if (var8.animationId == -1 && var8.transforms == null) {
-						var22 = var8.getEntity(10, var4, var15, var17, var16, var18);
-					} else {
-						var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-					}
-
-					if (var22 != null && var6.method3242(var0, var1, var2, var16, var9, var10, (Entity)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
-						var23 = 15;
-						if (var22 instanceof Model) {
-							var23 = ((Model)var22).method2907() / 4;
-							if (var23 > 30) {
-								var23 = 30;
-							}
-						}
-
-						for (int var24 = 0; var24 <= var9; ++var24) {
-							for (int var25 = 0; var25 <= var10; ++var25) {
-								if (var23 > class51.field423[var0][var24 + var1][var25 + var2]) {
-									class51.field423[var0][var24 + var1][var25 + var2] = (byte)var23;
-								}
-							}
-						}
-					}
-
-					if (var8.interactType != 0 && var7 != null) {
-						var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
-					}
-
-				}
-			}
-		}
-	}
 }

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("gy")
+@ObfuscatedName("gz")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "7"
+		garbageValue = "-57"
 	)
 	@Export("rsOrdinal")
 	int rsOrdinal();

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

@@ -3,35 +3,35 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ef")
+@ObfuscatedName("eb")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Lfn;"
-	)
-	DualNode field1949;
 	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "Lgw;"
+	)
+	DualNode field1974;
+	@ObfuscatedName("i")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Llb;"
+		signature = "Llc;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ljz;"
+		signature = "Lji;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field1949 = new DualNode();
+		this.field1974 = new DualNode();
 		this.deque = new IterableDualNodeQueue();
 		this.capacity = var1;
 		this.remainingCapacity = var1;
@@ -43,9 +43,9 @@ public final class EvictingDualNodeHashTable {
 		this.hashTable = new IterableNodeHashTable(var2);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(J)Lfn;"
+		signature = "(J)Lgw;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lfn;J)V"
+		signature = "(Lgw;J)V"
 	)
 	@Export("put")
 	public void put(DualNode var1, long var2) {
@@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable {
 			DualNode var4 = this.deque.removeLast();
 			var4.remove();
 			var4.removeDual();
-			if (var4 == this.field1949) {
+			if (var4 == this.field1974) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1949 = new DualNode();
+		this.field1974 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

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

@@ -2,32 +2,25 @@ 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("ea")
+@ObfuscatedName("es")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("g")
+	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "Lgz;"
-	)
-	@Export("midiPcmStream")
-	public static MidiPcmStream midiPcmStream;
-	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -133317529
+		intValue = 2144913037
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -328773159
+		intValue = 2071532839
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -138913585
+		intValue = 1947716121
 	)
 	@Export("z")
 	int z;

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

@@ -1,20 +1,15 @@
-import java.io.File;
 import java.util.Hashtable;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fr")
+@ObfuscatedName("fg")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("u")
-	@Export("FileSystem_hasPermissions")
-	public static boolean FileSystem_hasPermissions;
 	@ObfuscatedName("f")
-	@Export("FileSystem_cacheDir")
+	@Export("FileSystem_hasPermissions")
-	public static File FileSystem_cacheDir;
+	static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
 
@@ -22,209 +17,4 @@ public class FileSystem {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "-585871581"
-	)
-	@Export("getVarbit")
-	public static int getVarbit(int var0) {
-		VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
-		VarbitDefinition var1;
-		if (var2 != null) {
-			var1 = var2;
-		} else {
-			byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0);
-			var2 = new VarbitDefinition();
-			if (var7 != null) {
-				var2.decode(new Buffer(var7));
-			}
-
-			VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0);
-			var1 = var2;
-		}
-
-		int var3 = var1.baseVar;
-		int var4 = var1.startBit;
-		int var5 = var1.endBit;
-		int var6 = Varps.Varps_masks[var5 - var4];
-		return Varps.Varps_main[var3] >> var4 & var6;
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "(IIIIIIB)I",
-		garbageValue = "46"
-	)
-	public static int method3549(int var0, int var1, int var2, int var3, int var4, int var5) {
-		if ((var5 & 1) == 1) {
-			int var6 = var3;
-			var3 = var4;
-			var4 = var6;
-		}
-
-		var2 &= 3;
-		if (var2 == 0) {
-			return var1;
-		} else if (var2 == 1) {
-			return 7 - var0 - (var3 - 1);
-		} else {
-			return var2 == 2 ? 7 - var1 - (var4 - 1) : var0;
-		}
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "([BIIIIIIILel;[Lfh;I)V",
-		garbageValue = "1216246502"
-	)
-	static final void method3552(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);
-		int var11 = -1;
-
-		while (true) {
-			int var12 = var10.method5710();
-			if (var12 == 0) {
-				return;
-			}
-
-			var11 += var12;
-			int var13 = 0;
-
-			while (true) {
-				int var14 = var10.readUShortSmart();
-				if (var14 == 0) {
-					break;
-				}
-
-				var13 += var14 - 1;
-				int var15 = var13 & 63;
-				int var16 = var13 >> 6 & 63;
-				int var17 = var13 >> 12;
-				int var18 = var10.readUnsignedByte();
-				int var19 = var18 >> 2;
-				int var20 = var18 & 3;
-				if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
-					ObjectDefinition var21 = Occluder.getObjectDefinition(var11);
-					int var22 = var2 + PacketWriter.method2292(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
-					int var23 = var3 + method3549(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
-					if (var22 > 0 && var23 > 0 && var22 < 103 && var23 < 103) {
-						int var24 = var1;
-						if ((Tiles.Tiles_renderFlags[1][var22][var23] & 2) == 2) {
-							var24 = var1 - 1;
-						}
-
-						CollisionMap var25 = null;
-						if (var24 >= 0) {
-							var25 = var9[var24];
-						}
-
-						EnumDefinition.method4656(var1, var22, var23, var11, var20 + var7 & 3, var19, var8, var25);
-					}
-				}
-			}
-		}
-	}
-
-	@ObfuscatedName("ac")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "1410165290"
-	)
-	static int method3551(int var0) {
-		return (int)((Math.log((double)var0) / Interpreter.field1082 - 7.0D) * 256.0D);
-	}
-
-	@ObfuscatedName("fp")
-	@ObfuscatedSignature(
-		signature = "(IIII)V",
-		garbageValue = "-782793212"
-	)
-	@Export("queueSoundEffect")
-	static void queueSoundEffect(int var0, int var1, int var2) {
-		if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
-			Client.soundEffectIds[Client.soundEffectCount] = var0;
-			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
-			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
-			Client.soundEffects[Client.soundEffectCount] = null;
-			Client.soundLocations[Client.soundEffectCount] = 0;
-			++Client.soundEffectCount;
-		}
-
-	}
-
-	@ObfuscatedName("gb")
-	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
-		garbageValue = "444981203"
-	)
-	@Export("setViewportShape")
-	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
-		if (var2 < 1) {
-			var2 = 1;
-		}
-
-		if (var3 < 1) {
-			var3 = 1;
-		}
-
-		int var5 = var3 - 334;
-		int var6;
-		if (var5 < 0) {
-			var6 = Client.field880;
-		} else if (var5 >= 100) {
-			var6 = Client.field893;
-		} else {
-			var6 = (Client.field893 - Client.field880) * var5 / 100 + Client.field880;
-		}
-
-		int var7 = var3 * var6 * 512 / (var2 * 334);
-		int var8;
-		int var9;
-		short var10;
-		if (var7 < Client.field785) {
-			var10 = Client.field785;
-			var6 = var10 * var2 * 334 / (var3 * 512);
-			if (var6 > Client.field897) {
-				var6 = Client.field897;
-				var8 = var3 * var6 * 512 / (var10 * 334);
-				var9 = (var2 - var8) / 2;
-				if (var4) {
-					Rasterizer2D.Rasterizer2D_resetClip();
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
-				}
-
-				var0 += var9;
-				var2 -= var9 * 2;
-			}
-		} else if (var7 > Client.field679) {
-			var10 = Client.field679;
-			var6 = var10 * var2 * 334 / (var3 * 512);
-			if (var6 < Client.field896) {
-				var6 = Client.field896;
-				var8 = var10 * var2 * 334 / (var6 * 512);
-				var9 = (var3 - var8) / 2;
-				if (var4) {
-					Rasterizer2D.Rasterizer2D_resetClip();
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
-					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
-				}
-
-				var1 += var9;
-				var3 -= var9 * 2;
-			}
-		}
-
-		Client.viewportZoom = var3 * var6 / 334;
-		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
-			WorldMapManager.method676(var2, var3);
-		}
-
-		Client.viewportOffsetX = var0;
-		Client.viewportOffsetY = var1;
-		Client.viewportWidth = var2;
-		Client.viewportHeight = var3;
-	}
 }

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

@@ -4,41 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lz")
+@ObfuscatedName("lg")
 @Implements("FillMode")
 public enum FillMode implements Enumerated {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Llz;"
+		signature = "Llg;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Llz;"
+		signature = "Llg;"
 	)
-	field3854(1, 1),
+	field3850(1, 1),
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Llz;"
+		signature = "Llg;"
 	)
-	field3855(2, 2);
+	field3853(2, 2);
 
 	@ObfuscatedName("w")
-	@Export("SpriteBuffer_pixels")
-	static byte[][] SpriteBuffer_pixels;
-	@ObfuscatedName("l")
-	@Export("BZip2Decompressor_block")
-	static int[] BZip2Decompressor_block;
-	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 80643323
+		intValue = -1693216809
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1639591945
+		intValue = -19931109
 	)
 	@Export("id")
 	final int id;
@@ -48,13 +42,22 @@ public enum FillMode implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "7"
+		garbageValue = "-57"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(Lhz;I)V",
+		garbageValue = "-1700551628"
+	)
+	public static void method6117(AbstractArchive var0) {
+		FloorOverlayDefinition.FloorOverlayDefinition_archive = var0;
+	}
 }

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

@@ -7,80 +7,49 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("du")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("h")
+	@ObfuscatedName("ds")
 	@ObfuscatedSignature(
-		signature = "[[Lhl;"
+		signature = "Lif;"
 	)
-	@Export("Widget_interfaceComponents")
+	@Export("archive4")
-	public static Widget[][] Widget_interfaceComponents;
+	static Archive archive4;
-	@ObfuscatedName("hj")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -787534095
+		intValue = -813492053
-	)
-	@Export("cameraZ")
-	static int cameraZ;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1000348855
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -2093523795
+		intValue = -508707057
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -512662577
+		intValue = 1453565009
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lep;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = -2591467341780492125L
+		longValue = 5434856025712210831L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 424120209
+		intValue = -1187671267
 	)
 	@Export("flags")
 	int flags;
 
 	FloorDecoration() {
 	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		signature = "(CI)Z",
-		garbageValue = "-345109095"
-	)
-	@Export("isCharPrintable")
-	public static boolean isCharPrintable(char var0) {
-		if (var0 >= ' ' && var0 <= '~') {
-			return true;
-		} else if (var0 >= 160 && var0 <= 255) {
-			return true;
-		} else {
-			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
-		}
-	}
-
-	@ObfuscatedName("fe")
-	@ObfuscatedSignature(
-		signature = "(IB)I",
-		garbageValue = "3"
-	)
-	static int method2888(int var0) {
-		return var0 * 3 + 600;
-	}
 }

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

@@ -4,80 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ii")
+@ObfuscatedName("ib")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Lhf;"
-	)
-	@Export("FloorOverlayDefinition_archive")
-	public static AbstractArchive FloorOverlayDefinition_archive;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lef;"
+		signature = "Lhz;"
+	)
+	@Export("FloorOverlayDefinition_archive")
+	static AbstractArchive FloorOverlayDefinition_archive;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Leb;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("jk")
+	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		signature = "Lhl;"
-	)
-	static Widget field3507;
-	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 1374985713
+		intValue = 946777937
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -2103886801
+		intValue = -554828149
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1548545133
+		intValue = 1736494727
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2117743259
+		intValue = 2036887063
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 259844631
+		intValue = 636469013
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1486642951
+		intValue = 2078445359
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1953195007
+		intValue = -906220363
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1833494779
+		intValue = -484926363
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1532984689
+		intValue = -234627479
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -93,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1381729137"
+		garbageValue = "-50"
 	)
 	@Export("postDecode")
 	void postDecode() {
@@ -110,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lkg;II)V",
+		signature = "(Lkq;IB)V",
-		garbageValue = "-157824233"
+		garbageValue = "-31"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -127,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lkg;III)V",
+		signature = "(Lkq;IIB)V",
-		garbageValue = "-2104384515"
+		garbageValue = "1"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -147,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-1137503330"
+		garbageValue = "49"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -178,7 +173,7 @@ public class FloorOverlayDefinition extends DualNode {
 		double var12 = 0.0D;
 		double var14 = 0.0D;
 		double var16 = (var8 + var10) / 2.0D;
-		if (var10 != var8) {
+		if (var8 != var10) {
 			if (var16 < 0.5D) {
 				var14 = (var10 - var8) / (var10 + var8);
 			}
@@ -189,16 +184,16 @@ public class FloorOverlayDefinition extends DualNode {
 
 			if (var2 == var10) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) {
+			} else if (var10 == var4) {
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
 			} else if (var6 == var10) {
-				var12 = 4.0D + (var2 - var4) / (var10 - var8);
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
 			}
 		}
 
 		var12 /= 6.0D;
-		this.hue = (int)(256.0D * var12);
+		this.hue = (int)(var12 * 256.0D);
-		this.saturation = (int)(var14 * 256.0D);
+		this.saturation = (int)(256.0D * var14);
 		this.lightness = (int)(var16 * 256.0D);
 		if (this.saturation < 0) {
 			this.saturation = 0;
@@ -214,18 +209,59 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "([BI)Lky;",
+		signature = "(CLgs;B)I",
-		garbageValue = "1533965281"
+		garbageValue = "-103"
 	)
-	static Font method4853(byte[] var0) {
+	@Export("lowercaseChar")
-		if (var0 == null) {
+	static int lowercaseChar(char var0, Language var1) {
-			return null;
+		int var2 = var0 << 4;
-		} else {
+		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
-			Font var1 = new Font(var0, UrlRequester.SpriteBuffer_xOffsets, class216.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, VarcInt.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, FillMode.SpriteBuffer_pixels);
+			var0 = Character.toLowerCase(var0);
-			PcmPlayer.method2510();
+			var2 = (var0 << 4) + 1;
-			return var1;
 		}
+
+		if (var0 == 241 && var1 == Language.Language_ES) {
+			var2 = 1762;
+		}
+
+		return var2;
+	}
+
+	@ObfuscatedName("ji")
+	@ObfuscatedSignature(
+		signature = "([Lha;IIIZB)V",
+		garbageValue = "48"
+	)
+	@Export("resizeInterface")
+	static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) {
+		for (int var5 = 0; var5 < var0.length; ++var5) {
+			Widget var6 = var0[var5];
+			if (var6 != null && var6.parentId == var1) {
+				class32.alignWidgetSize(var6, var2, var3, var4);
+				class2.alignWidgetPosition(var6, var2, var3);
+				if (var6.scrollX > var6.scrollWidth - var6.width) {
+					var6.scrollX = var6.scrollWidth - var6.width;
+				}
+
+				if (var6.scrollX < 0) {
+					var6.scrollX = 0;
+				}
+
+				if (var6.scrollY > var6.scrollHeight - var6.height) {
+					var6.scrollY = var6.scrollHeight - var6.height;
+				}
+
+				if (var6.scrollY < 0) {
+					var6.scrollY = 0;
+				}
+
+				if (var6.type == 0) {
+					Messages.revalidateWidgetScroll(var0, var6, var4);
+				}
+			}
+		}
+
 	}
 }

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

@@ -4,48 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ig")
+@ObfuscatedName("iy")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Lhf;"
-	)
-	@Export("FloorUnderlayDefinition_archive")
-	public static AbstractArchive FloorUnderlayDefinition_archive;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lef;"
+		signature = "Lhz;"
+	)
+	@Export("FloorUnderlayDefinition_archive")
+	static AbstractArchive FloorUnderlayDefinition_archive;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Leb;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
-	static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
+	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1990790849
+		intValue = -1172468213
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 950733239
+		intValue = -1800958439
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1331768767
+		intValue = -217803579
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1638943331
+		intValue = 1888954087
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -49620877
+		intValue = 1484017615
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -58,20 +58,20 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.rgb = 0;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1444888846"
+		garbageValue = "47336247"
 	)
 	@Export("postDecode")
 	void postDecode() {
 		this.setHsl(this.rgb);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lkg;IB)V",
+		signature = "(Lkq;II)V",
-		garbageValue = "-99"
+		garbageValue = "790135935"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -85,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lkg;III)V",
+		signature = "(Lkq;III)V",
-		garbageValue = "-1897870876"
+		garbageValue = "-1066801871"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -98,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-2026180735"
+		garbageValue = "395351662"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -138,7 +138,7 @@ public class FloorUnderlayDefinition extends DualNode {
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var2 == var10) {
+			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var4 == var10) {
 				var12 = 2.0D + (var6 - var2) / (var10 - var8);
@@ -148,8 +148,8 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 
 		var12 /= 6.0D;
-		this.saturation = (int)(256.0D * var14);
+		this.saturation = (int)(var14 * 256.0D);
-		this.lightness = (int)(var16 * 256.0D);
+		this.lightness = (int)(256.0D * var16);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -165,13 +165,23 @@ public class FloorUnderlayDefinition extends DualNode {
 		if (var16 > 0.5D) {
 			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
 		} else {
-			this.hueMultiplier = (int)(512.0D * var14 * var16);
+			this.hueMultiplier = (int)(var16 * var14 * 512.0D);
 		}
 
 		if (this.hueMultiplier < 1) {
 			this.hueMultiplier = 1;
 		}
 
-		this.hue = (int)(var12 * (double)this.hueMultiplier);
+		this.hue = (int)((double)this.hueMultiplier * var12);
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(Lhz;III)Lls;",
+		garbageValue = "-1136853521"
+	)
+	@Export("SpriteBuffer_getSprite")
+	public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+		return !HitSplatDefinition.method4586(var0, var1, var2) ? null : Buffer.method5689();
 	}
 }

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("ky")
+@ObfuscatedName("ko")
 @Implements("Font")
 public final class Font extends AbstractFont {
 	public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
@@ -13,7 +13,7 @@ public final class Font extends AbstractFont {
 		super(var1);
 	}
 
-	@ObfuscatedName("u")
+	@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;
@@ -55,7 +55,7 @@ public final class Font extends AbstractFont {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("drawGlyphAlpha")
 	final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2;

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

@@ -3,52 +3,46 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ka")
+@ObfuscatedName("kk")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lkk;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lkk;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lkk;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lkk;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lkk;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Lka;"
+		signature = "Lkk;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("gg")
+	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "[Lln;"
-	)
-	@Export("headIconPkSprites")
-	static Sprite[] headIconPkSprites;
-	@ObfuscatedName("h")
 	@Export("name")
 	String name;
 
@@ -65,233 +59,35 @@ public class FontName {
 		this.name = var1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/Object;ZB)[B",
+		signature = "(Lig;B)Z",
-		garbageValue = "-6"
+		garbageValue = "9"
 	)
-	@Export("serialize")
+	static boolean method5377(ObjectDefinition var0) {
-	public static byte[] serialize(Object var0, boolean var1) {
+		if (var0.transforms != null) {
-		if (var0 == null) {
+			int[] var1 = var0.transforms;
-			return null;
+
-		} else if (var0 instanceof byte[]) {
+			for (int var2 = 0; var2 < var1.length; ++var2) {
-			byte[] var3 = (byte[])((byte[])var0);
+				int var3 = var1[var2];
-			return var1 ? ObjectSound.method1935(var3) : var3;
+				ObjectDefinition var4 = Coord.getObjectDefinition(var3);
-		} else if (var0 instanceof AbstractByteArrayCopier) {
+				if (var4.mapIconId != -1) {
-			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
+					return true;
-			return var2.get();
+				}
-		} else {
+			}
-			throw new IllegalArgumentException();
+		} else if (var0.mapIconId != -1) {
+			return true;
 		}
+
+		return false;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("lc")
 	@ObfuscatedSignature(
-		signature = "([Ljava/lang/CharSequence;IIS)Ljava/lang/String;",
+		signature = "(IB)V",
-		garbageValue = "11835"
+		garbageValue = "-46"
 	)
-	public static String method5425(CharSequence[] var0, int var1, int var2) {
+	static void method5376(int var0) {
-		if (var2 == 0) {
+		Client.oculusOrbState = var0;
-			return "";
-		} else if (var2 == 1) {
-			CharSequence var3 = var0[var1];
-			return var3 == null ? "null" : var3.toString();
-		} else {
-			int var8 = var2 + var1;
-			int var4 = 0;
-
-			for (int var5 = var1; var5 < var8; ++var5) {
-				CharSequence var6 = var0[var5];
-				if (var6 == null) {
-					var4 += 4;
-				} else {
-					var4 += var6.length();
-				}
-			}
-
-			StringBuilder var9 = new StringBuilder(var4);
-
-			for (int var10 = var1; var10 < var8; ++var10) {
-				CharSequence var7 = var0[var10];
-				if (var7 == null) {
-					var9.append("null");
-				} else {
-					var9.append(var7);
-				}
-			}
-
-			return var9.toString();
-		}
-	}
-
-	@ObfuscatedName("gw")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1549507676"
-	)
-	static void method5427() {
-		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
-			Varcs.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false);
-		}
-
-	}
-
-	@ObfuscatedName("gr")
-	@ObfuscatedSignature(
-		signature = "(IIIII)V",
-		garbageValue = "-310614097"
-	)
-	static final void method5426(int var0, int var1, int var2, int var3) {
-		Client.overheadTextCount = 0;
-		boolean var4 = false;
-		int var5 = -1;
-		int var6 = -1;
-		int var7 = Players.Players_count;
-		int[] var8 = Players.Players_indices;
-
-		int var9;
-		for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
-			Object var10;
-			if (var9 < var7) {
-				var10 = Client.players[var8[var9]];
-				if (var8[var9] == Client.combatTargetPlayerIndex) {
-					var4 = true;
-					var5 = var9;
-					continue;
-				}
-
-				if (var10 == class215.localPlayer) {
-					var6 = var9;
-					continue;
-				}
-			} else {
-				var10 = Client.npcs[Client.npcIndices[var9 - var7]];
-			}
-
-			class80.drawActor2d((Actor)var10, var9, var0, var1, var2, var3);
-		}
-
-		if (Client.renderSelf && var6 != -1) {
-			class80.drawActor2d(class215.localPlayer, var6, var0, var1, var2, var3);
-		}
-
-		if (var4) {
-			class80.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3);
-		}
-
-		for (var9 = 0; var9 < Client.overheadTextCount; ++var9) {
-			int var19 = Client.overheadTextXs[var9];
-			int var11 = Client.overheadTextYs[var9];
-			int var12 = Client.overheadTextXOffsets[var9];
-			int var13 = Client.overheadTextAscents[var9];
-			boolean var14 = true;
-
-			while (var14) {
-				var14 = false;
-
-				for (int var15 = 0; var15 < var9; ++var15) {
-					if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
-						var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15];
-						var14 = true;
-					}
-				}
-			}
-
-			Client.viewportTempX = Client.overheadTextXs[var9];
-			Client.viewportTempY = Client.overheadTextYs[var9] = var11;
-			String var20 = Client.overheadText[var9];
-			if (Client.chatEffects == 0) {
-				int var16 = 16776960;
-				if (Client.overheadTextColors[var9] < 6) {
-					var16 = Client.field857[Client.overheadTextColors[var9]];
-				}
-
-				if (Client.overheadTextColors[var9] == 6) {
-					var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
-				}
-
-				if (Client.overheadTextColors[var9] == 7) {
-					var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
-				}
-
-				if (Client.overheadTextColors[var9] == 8) {
-					var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
-				}
-
-				int var17;
-				if (Client.overheadTextColors[var9] == 9) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					if (var17 < 50) {
-						var16 = var17 * 1280 + 16711680;
-					} else if (var17 < 100) {
-						var16 = 16776960 - (var17 - 50) * 327680;
-					} else if (var17 < 150) {
-						var16 = (var17 - 100) * 5 + 65280;
-					}
-				}
-
-				if (Client.overheadTextColors[var9] == 10) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					if (var17 < 50) {
-						var16 = var17 * 5 + 16711680;
-					} else if (var17 < 100) {
-						var16 = 16711935 - (var17 - 50) * 327680;
-					} else if (var17 < 150) {
-						var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
-					}
-				}
-
-				if (Client.overheadTextColors[var9] == 11) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					if (var17 < 50) {
-						var16 = 16777215 - var17 * 327685;
-					} else if (var17 < 100) {
-						var16 = (var17 - 50) * 327685 + 65280;
-					} else if (var17 < 150) {
-						var16 = 16777215 - (var17 - 100) * 327680;
-					}
-				}
-
-				if (Client.overheadTextEffects[var9] == 0) {
-					JagexCache.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
-				}
-
-				if (Client.overheadTextEffects[var9] == 1) {
-					JagexCache.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var9] == 2) {
-					JagexCache.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
-				}
-
-				if (Client.overheadTextEffects[var9] == 3) {
-					JagexCache.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
-				}
-
-				if (Client.overheadTextEffects[var9] == 4) {
-					var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (JagexCache.fontBold12.stringWidth(var20) + 100) / 150;
-					Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1);
-					JagexCache.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0);
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
-				}
-
-				if (Client.overheadTextEffects[var9] == 5) {
-					var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-					int var18 = 0;
-					if (var17 < 25) {
-						var18 = var17 - 25;
-					} else if (var17 > 125) {
-						var18 = var17 - 125;
-					}
-
-					Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - JagexCache.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5);
-					JagexCache.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0);
-					Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
-				}
-			} else {
-				JagexCache.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0);
-			}
-		}
-
 	}
 }

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

@@ -4,27 +4,27 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kf")
+@ObfuscatedName("ki")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Lhz;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Lhz;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		signature = "(Lhf;Lhf;)V"
+		signature = "(Lhz;Lhz;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -32,10 +32,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "([Lka;B)Ljava/util/HashMap;",
+		signature = "([Lkk;I)Ljava/util/HashMap;",
-		garbageValue = "35"
+		garbageValue = "-819608021"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -47,12 +47,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				AbstractArchive var7 = this.spritesArchive;
+				Font var6 = ArchiveDisk.method5909(this.spritesArchive, this.fontsArchive, var5.name, "");
-				AbstractArchive var8 = this.fontsArchive;
-				String var9 = var5.name;
-				int var10 = var7.getGroupId(var9);
-				int var11 = var7.getFileId(var10, "");
-				Font var6 = class60.method1195(var7, var8, var10, var11);
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -62,42 +57,4 @@ public class Fonts {
 
 		return var2;
 	}
-
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "([Ljava/lang/String;[SIII)V",
-		garbageValue = "-1903452094"
-	)
-	@Export("sortItemsByName")
-	static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
-		if (var2 < var3) {
-			int var4 = (var3 + var2) / 2;
-			int var5 = var2;
-			String var6 = var0[var4];
-			var0[var4] = var0[var3];
-			var0[var3] = var6;
-			short var7 = var1[var4];
-			var1[var4] = var1[var3];
-			var1[var3] = var7;
-
-			for (int var8 = var2; var8 < var3; ++var8) {
-				if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
-					String var9 = var0[var8];
-					var0[var8] = var0[var5];
-					var0[var5] = var9;
-					short var10 = var1[var8];
-					var1[var8] = var1[var5];
-					var1[var5++] = var10;
-				}
-			}
-
-			var0[var3] = var0[var5];
-			var0[var5] = var6;
-			var1[var3] = var1[var5];
-			var1[var5] = var7;
-			sortItemsByName(var0, var1, var2, var5 - 1);
-			sortItemsByName(var0, var1, var5 + 1, var3);
-		}
-
-	}
 }

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

@@ -1,29 +1,20 @@
 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("eq")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("b")
+	@ObfuscatedName("f")
-	@Export("Interpreter_intLocals")
-	static int[] Interpreter_intLocals;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = 1770537973
-	)
-	static int field1880;
-	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "[Ldg;"
+		signature = "[Ldj;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		signature = "(Lhf;Lhf;IZ)V",
+		signature = "(Lhz;Lhz;IZ)V",
 		garbageValue = "0"
 	)
 	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
@@ -55,475 +46,234 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-1990783363"
+		garbageValue = "-996338531"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
 
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-360173892"
+	)
+	static void method3280() {
+		if (Login.field1173) {
+			Login.titleboxSprite = null;
+			Login.titlebuttonSprite = null;
+			Login.runesSprite = null;
+			UrlRequest.leftTitleSprite = null;
+			ScriptFrame.rightTitleSprite = null;
+			Login.logoSprite = null;
+			class30.title_muteSprite = null;
+			class218.options_buttons_0Sprite = null;
+			Login.options_buttons_2Sprite = null;
+			Calendar.worldSelectBackSprites = null;
+			AbstractWorldMapIcon.worldSelectFlagSprites = null;
+			Message.worldSelectArrows = null;
+			SpotAnimationDefinition.worldSelectStars = null;
+			class54.field483 = null;
+			StructDefinition.loginScreenRunesAnimation.method1812();
+			BoundaryObject.method3273(2);
+			BuddyRankComparator.method3362(true);
+			Login.field1173 = false;
+		}
+	}
+
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lel;[Lfh;B)V",
+		signature = "(ILcu;ZB)I",
-		garbageValue = "-55"
+		garbageValue = "43"
 	)
-	static final void method3319(Scene var0, CollisionMap[] var1) {
+	static int method3281(int var0, Script var1, boolean var2) {
-		int var2;
+		if (var0 < 1000) {
-		int var3;
+			return WorldMapManager.method656(var0, var1, var2);
-		int var4;
+		} else if (var0 < 1100) {
-		int var5;
+			return class60.method1170(var0, var1, var2);
-		for (var2 = 0; var2 < 4; ++var2) {
+		} else if (var0 < 1200) {
-			for (var3 = 0; var3 < 104; ++var3) {
+			return MidiPcmStream.method3737(var0, var1, var2);
-				for (var4 = 0; var4 < 104; ++var4) {
+		} else if (var0 < 1300) {
-					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) {
+			return Friend.method5286(var0, var1, var2);
-						var5 = var2;
+		} else if (var0 < 1400) {
-						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
+			return UrlRequester.method3306(var0, var1, var2);
-							var5 = var2 - 1;
+		} else if (var0 < 1500) {
-						}
+			return GrandExchangeOfferNameComparator.method134(var0, var1, var2);
+		} else if (var0 < 1600) {
+			return class2.method34(var0, var1, var2);
+		} else if (var0 < 1700) {
+			return ServerPacket.method3568(var0, var1, var2);
+		} else if (var0 < 1800) {
+			return UserList.method5193(var0, var1, var2);
+		} else if (var0 < 1900) {
+			return ServerPacket.method3569(var0, var1, var2);
+		} else if (var0 < 2000) {
+			return LoginPacket.method3575(var0, var1, var2);
+		} else if (var0 < 2100) {
+			return class60.method1170(var0, var1, var2);
+		} else if (var0 < 2200) {
+			return MidiPcmStream.method3737(var0, var1, var2);
+		} else if (var0 < 2300) {
+			return Friend.method5286(var0, var1, var2);
+		} else if (var0 < 2400) {
+			return UrlRequester.method3306(var0, var1, var2);
+		} else if (var0 < 2500) {
+			return GrandExchangeOfferNameComparator.method134(var0, var1, var2);
+		} else if (var0 < 2600) {
+			return class219.method4077(var0, var1, var2);
+		} else if (var0 < 2700) {
+			return WorldMapAreaData.method692(var0, var1, var2);
+		} else if (var0 < 2800) {
+			return GameShell.method1068(var0, var1, var2);
+		} else if (var0 < 2900) {
+			return class32.method559(var0, var1, var2);
+		} else if (var0 < 3000) {
+			return LoginPacket.method3575(var0, var1, var2);
+		} else if (var0 < 3200) {
+			return AbstractArchive.method4166(var0, var1, var2);
+		} else if (var0 < 3300) {
+			return AbstractByteArrayCopier.method3937(var0, var1, var2);
+		} else if (var0 < 3400) {
+			return class206.method3919(var0, var1, var2);
+		} else if (var0 < 3500) {
+			return DevicePcmPlayerProvider.method840(var0, var1, var2);
+		} else if (var0 < 3700) {
+			return MenuAction.method2069(var0, var1, var2);
+		} else if (var0 < 4000) {
+			return ScriptFrame.method1111(var0, var1, var2);
+		} else if (var0 < 4100) {
+			return GrandExchangeEvents.method72(var0, var1, var2);
+		} else if (var0 < 4200) {
+			return class60.method1171(var0, var1, var2);
+		} else if (var0 < 4300) {
+			return ScriptFrame.method1112(var0, var1, var2);
+		} else if (var0 < 5100) {
+			return Tiles.method1144(var0, var1, var2);
+		} else if (var0 < 5400) {
+			return UserComparator6.method3369(var0, var1, var2);
+		} else if (var0 < 5600) {
+			return VarpDefinition.method4347(var0, var1, var2);
+		} else if (var0 < 5700) {
+			return UserComparator7.method3345(var0, var1, var2);
+		} else if (var0 < 6300) {
+			return Player.method1277(var0, var1, var2);
+		} else if (var0 < 6600) {
+			return AbstractWorldMapData.method272(var0, var1, var2);
+		} else {
+			return var0 < 6700 ? WorldMapRectangle.method273(var0, var1, var2) : 2;
+		}
+	}
 
-						if (var5 >= 0) {
+	@ObfuscatedName("w")
-							var1[var5].setBlockedByFloor(var3, var4);
+	@ObfuscatedSignature(
-						}
+		signature = "(II)I",
-					}
+		garbageValue = "-1767342490"
-				}
+	)
-			}
+	@Export("iLog")
+	public static int iLog(int var0) {
+		int var1 = 0;
+		if (var0 < 0 || var0 >= 65536) {
+			var0 >>>= 16;
+			var1 += 16;
 		}
 
-		Tiles.field511 += (int)(Math.random() * 5.0D) - 2;
+		if (var0 >= 256) {
-		if (Tiles.field511 < -8) {
+			var0 >>>= 8;
-			Tiles.field511 = -8;
+			var1 += 8;
 		}
 
-		if (Tiles.field511 > 8) {
+		if (var0 >= 16) {
-			Tiles.field511 = 8;
+			var0 >>>= 4;
+			var1 += 4;
 		}
 
-		Tiles.field503 += (int)(Math.random() * 5.0D) - 2;
+		if (var0 >= 4) {
-		if (Tiles.field503 < -16) {
+			var0 >>>= 2;
-			Tiles.field503 = -16;
+			var1 += 2;
 		}
 
-		if (Tiles.field503 > 16) {
+		if (var0 >= 1) {
-			Tiles.field503 = 16;
+			var0 >>>= 1;
+			++var1;
 		}
 
+		return var0 + var1;
+	}
+
+	@ObfuscatedName("gl")
+	@ObfuscatedSignature(
+		signature = "(IIIIZB)V",
+		garbageValue = "36"
+	)
+	@Export("setViewportShape")
+	static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
+		if (var2 < 1) {
+			var2 = 1;
+		}
+
+		if (var3 < 1) {
+			var3 = 1;
+		}
+
+		int var5 = var3 - 334;
+		int var6;
+		if (var5 < 0) {
+			var6 = Client.field879;
+		} else if (var5 >= 100) {
+			var6 = Client.field880;
+		} else {
+			var6 = (Client.field880 - Client.field879) * var5 / 100 + Client.field879;
+		}
+
+		int var7 = var3 * var6 * 512 / (var2 * 334);
+		int var8;
 		int var9;
-		int var10;
+		short var10;
-		int var11;
+		if (var7 < Client.field804) {
-		int var12;
+			var10 = Client.field804;
-		int var13;
+			var6 = var10 * var2 * 334 / (var3 * 512);
-		int var14;
+			if (var6 > Client.field884) {
-		int var15;
+				var6 = Client.field884;
-		int var16;
+				var8 = var3 * var6 * 512 / (var10 * 334);
-		int[] var10000;
+				var9 = (var2 - var8) / 2;
-		int var17;
+				if (var4) {
-		int var18;
+					Rasterizer2D.Rasterizer2D_resetClip();
-		for (var2 = 0; var2 < 4; ++var2) {
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
-			byte[][] var42 = class51.field423[var2];
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
-			var9 = (int)Math.sqrt(5100.0D);
-			var10 = var9 * 768 >> 8;
-
-			int var19;
-			int var20;
-			for (var11 = 1; var11 < 103; ++var11) {
-				for (var12 = 1; var12 < 103; ++var12) {
-					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11];
-					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1];
-					var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536));
-					var16 = (var13 << 8) / var15;
-					var17 = 65536 / var15;
-					var18 = (var14 << 8) / var15;
-					var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96;
-					var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1);
-					Login.field1207[var12][var11] = var19 - var20;
 				}
+
+				var0 += var9;
+				var2 -= var9 * 2;
 			}
-
+		} else if (var7 > Client.field886) {
-			for (var11 = 0; var11 < 104; ++var11) {
+			var10 = Client.field886;
-				Tiles.Tiles_hue[var11] = 0;
+			var6 = var10 * var2 * 334 / (var3 * 512);
-				Tiles.Tiles_saturation[var11] = 0;
+			if (var6 < Client.field796) {
-				Tiles.Tiles_lightness[var11] = 0;
+				var6 = Client.field796;
-				class290.Tiles_hueMultiplier[var11] = 0;
+				var8 = var10 * var2 * 334 / (var6 * 512);
-				MouseRecorder.field588[var11] = 0;
+				var9 = (var3 - var8) / 2;
-			}
+				if (var4) {
-
+					Rasterizer2D.Rasterizer2D_resetClip();
-			for (var11 = -5; var11 < 109; ++var11) {
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
-				for (var12 = 0; var12 < 104; ++var12) {
+					Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
-					var13 = var11 + 5;
-					int var10002;
-					if (var13 >= 0 && var13 < 104) {
-						var14 = Tiles.field498[var2][var13][var12] & 255;
-						if (var14 > 0) {
-							FloorUnderlayDefinition var43 = WallDecoration.method3339(var14 - 1);
-							var10000 = Tiles.Tiles_hue;
-							var10000[var12] += var43.hue;
-							var10000 = Tiles.Tiles_saturation;
-							var10000[var12] += var43.saturation;
-							var10000 = Tiles.Tiles_lightness;
-							var10000[var12] += var43.lightness;
-							var10000 = class290.Tiles_hueMultiplier;
-							var10000[var12] += var43.hueMultiplier;
-							var10002 = MouseRecorder.field588[var12]++;
-						}
-					}
-
-					var14 = var11 - 5;
-					if (var14 >= 0 && var14 < 104) {
-						var15 = Tiles.field498[var2][var14][var12] & 255;
-						if (var15 > 0) {
-							FloorUnderlayDefinition var45 = WallDecoration.method3339(var15 - 1);
-							var10000 = Tiles.Tiles_hue;
-							var10000[var12] -= var45.hue;
-							var10000 = Tiles.Tiles_saturation;
-							var10000[var12] -= var45.saturation;
-							var10000 = Tiles.Tiles_lightness;
-							var10000[var12] -= var45.lightness;
-							var10000 = class290.Tiles_hueMultiplier;
-							var10000[var12] -= var45.hueMultiplier;
-							var10002 = MouseRecorder.field588[var12]--;
-						}
-					}
 				}
 
-				if (var11 >= 1 && var11 < 103) {
+				var1 += var9;
-					var12 = 0;
+				var3 -= var9 * 2;
-					var13 = 0;
-					var14 = 0;
-					var15 = 0;
-					var16 = 0;
-
-					for (var17 = -5; var17 < 109; ++var17) {
-						var18 = var17 + 5;
-						if (var18 >= 0 && var18 < 104) {
-							var12 += Tiles.Tiles_hue[var18];
-							var13 += Tiles.Tiles_saturation[var18];
-							var14 += Tiles.Tiles_lightness[var18];
-							var15 += class290.Tiles_hueMultiplier[var18];
-							var16 += MouseRecorder.field588[var18];
-						}
-
-						var19 = var17 - 5;
-						if (var19 >= 0 && var19 < 104) {
-							var12 -= Tiles.Tiles_hue[var19];
-							var13 -= Tiles.Tiles_saturation[var19];
-							var14 -= Tiles.Tiles_lightness[var19];
-							var15 -= class290.Tiles_hueMultiplier[var19];
-							var16 -= MouseRecorder.field588[var19];
-						}
-
-						if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) {
-							if (var2 < Tiles.Tiles_minPlane) {
-								Tiles.Tiles_minPlane = var2;
-							}
-
-							var20 = Tiles.field498[var2][var11][var17] & 255;
-							int var21 = Tiles.field499[var2][var11][var17] & 255;
-							if (var20 > 0 || var21 > 0) {
-								int var22 = Tiles.Tiles_heights[var2][var11][var17];
-								int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17];
-								int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1];
-								int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1];
-								int var26 = Login.field1207[var11][var17];
-								int var27 = Login.field1207[var11 + 1][var17];
-								int var28 = Login.field1207[var11 + 1][var17 + 1];
-								int var29 = Login.field1207[var11][var17 + 1];
-								int var30 = -1;
-								int var31 = -1;
-								int var32;
-								int var33;
-								if (var20 > 0) {
-									var32 = var12 * 256 / var15;
-									var33 = var13 / var16;
-									int var34 = var14 / var16;
-									var30 = FriendLoginUpdate.hslToRgb(var32, var33, var34);
-									var32 = var32 + Tiles.field511 & 255;
-									var34 += Tiles.field503;
-									if (var34 < 0) {
-										var34 = 0;
-									} else if (var34 > 255) {
-										var34 = 255;
-									}
-
-									var31 = FriendLoginUpdate.hslToRgb(var32, var33, var34);
-								}
-
-								if (var2 > 0) {
-									boolean var47 = true;
-									if (var20 == 0 && Tiles.field500[var2][var11][var17] != 0) {
-										var47 = false;
-									}
-
-									if (var21 > 0 && !WorldMapRectangle.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) {
-										var47 = false;
-									}
-
-									if (var47 && var23 == var22 && var24 == var22 && var22 == var25) {
-										var10000 = WorldMapLabel.field233[var2][var11];
-										var10000[var17] |= 2340;
-									}
-								}
-
-								var32 = 0;
-								if (var31 != -1) {
-									var32 = Rasterizer3D.Rasterizer3D_colorPalette[TriBool.method5255(var31, 96)];
-								}
-
-								if (var21 == 0) {
-									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, TriBool.method5255(var30, var26), TriBool.method5255(var30, var27), TriBool.method5255(var30, var28), TriBool.method5255(var30, var29), 0, 0, 0, 0, var32, 0);
-								} else {
-									var33 = Tiles.field500[var2][var11][var17] + 1;
-									byte var48 = Tiles.field501[var2][var11][var17];
-									FloorOverlayDefinition var35 = WorldMapRectangle.FloorUnderlayDefinition_get(var21 - 1);
-									int var36 = var35.texture;
-									int var37;
-									int var38;
-									int var39;
-									int var40;
-									if (var36 >= 0) {
-										var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36);
-										var37 = -1;
-									} else if (var35.primaryRgb == 16711935) {
-										var37 = -2;
-										var36 = -1;
-										var38 = -2;
-									} else {
-										var37 = FriendLoginUpdate.hslToRgb(var35.hue, var35.saturation, var35.lightness);
-										var39 = var35.hue + Tiles.field511 & 255;
-										var40 = var35.lightness + Tiles.field503;
-										if (var40 < 0) {
-											var40 = 0;
-										} else if (var40 > 255) {
-											var40 = 255;
-										}
-
-										var38 = FriendLoginUpdate.hslToRgb(var39, var35.saturation, var40);
-									}
-
-									var39 = 0;
-									if (var38 != -2) {
-										var39 = Rasterizer3D.Rasterizer3D_colorPalette[LoginScreenAnimation.method1832(var38, 96)];
-									}
-
-									if (var35.secondaryRgb != -1) {
-										var40 = var35.secondaryHue + Tiles.field511 & 255;
-										int var41 = var35.secondaryLightness + Tiles.field503;
-										if (var41 < 0) {
-											var41 = 0;
-										} else if (var41 > 255) {
-											var41 = 255;
-										}
-
-										var38 = FriendLoginUpdate.hslToRgb(var40, var35.secondarySaturation, var41);
-										var39 = Rasterizer3D.Rasterizer3D_colorPalette[LoginScreenAnimation.method1832(var38, 96)];
-									}
-
-									var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, TriBool.method5255(var30, var26), TriBool.method5255(var30, var27), TriBool.method5255(var30, var28), TriBool.method5255(var30, var29), LoginScreenAnimation.method1832(var37, var26), LoginScreenAnimation.method1832(var37, var27), LoginScreenAnimation.method1832(var37, var28), LoginScreenAnimation.method1832(var37, var29), var32, var39);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			for (var11 = 1; var11 < 103; ++var11) {
-				for (var12 = 1; var12 < 103; ++var12) {
-					if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) {
-						var17 = 0;
-					} else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) {
-						var17 = var2 - 1;
-					} else {
-						var17 = var2;
-					}
-
-					var0.setTileMinPlane(var2, var12, var11, var17);
-				}
-			}
-
-			Tiles.field498[var2] = null;
-			Tiles.field499[var2] = null;
-			Tiles.field500[var2] = null;
-			Tiles.field501[var2] = null;
-			class51.field423[var2] = null;
-		}
-
-		var0.method3165(-50, -10, -50);
-
-		for (var2 = 0; var2 < 104; ++var2) {
-			for (var3 = 0; var3 < 104; ++var3) {
-				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-					var0.setLinkBelow(var2, var3);
-				}
 			}
 		}
 
-		var2 = 1;
+		Client.viewportZoom = var3 * var6 / 334;
-		var3 = 2;
+		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
-		var4 = 4;
+			Language.method3634(var2, var3);
-
-		for (var5 = 0; var5 < 4; ++var5) {
-			if (var5 > 0) {
-				var2 <<= 3;
-				var3 <<= 3;
-				var4 <<= 3;
-			}
-
-			for (int var6 = 0; var6 <= var5; ++var6) {
-				for (int var7 = 0; var7 <= 104; ++var7) {
-					for (int var8 = 0; var8 <= 104; ++var8) {
-						short var46;
-						if ((WorldMapLabel.field233[var6][var8][var7] & var2) != 0) {
-							var9 = var7;
-							var10 = var7;
-							var11 = var6;
-
-							for (var12 = var6; var9 > 0 && (WorldMapLabel.field233[var6][var8][var9 - 1] & var2) != 0; --var9) {
-							}
-
-							while (var10 < 104 && (WorldMapLabel.field233[var6][var8][var10 + 1] & var2) != 0) {
-								++var10;
-							}
-
-							label492:
-							while (var11 > 0) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((WorldMapLabel.field233[var11 - 1][var8][var13] & var2) == 0) {
-										break label492;
-									}
-								}
-
-								--var11;
-							}
-
-							label481:
-							while (var12 < var5) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((WorldMapLabel.field233[var12 + 1][var8][var13] & var2) == 0) {
-										break label481;
-									}
-								}
-
-								++var12;
-							}
-
-							var13 = (var12 + 1 - var11) * (var10 - var9 + 1);
-							if (var13 >= 8) {
-								var46 = 240;
-								var15 = Tiles.Tiles_heights[var12][var8][var9] - var46;
-								var16 = Tiles.Tiles_heights[var11][var8][var9];
-								Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16);
-
-								for (var17 = var11; var17 <= var12; ++var17) {
-									for (var18 = var9; var18 <= var10; ++var18) {
-										var10000 = WorldMapLabel.field233[var17][var8];
-										var10000[var18] &= ~var2;
-									}
-								}
-							}
-						}
-
-						if ((WorldMapLabel.field233[var6][var8][var7] & var3) != 0) {
-							var9 = var8;
-							var10 = var8;
-							var11 = var6;
-
-							for (var12 = var6; var9 > 0 && (WorldMapLabel.field233[var6][var9 - 1][var7] & var3) != 0; --var9) {
-							}
-
-							while (var10 < 104 && (WorldMapLabel.field233[var6][var10 + 1][var7] & var3) != 0) {
-								++var10;
-							}
-
-							label545:
-							while (var11 > 0) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((WorldMapLabel.field233[var11 - 1][var13][var7] & var3) == 0) {
-										break label545;
-									}
-								}
-
-								--var11;
-							}
-
-							label534:
-							while (var12 < var5) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((WorldMapLabel.field233[var12 + 1][var13][var7] & var3) == 0) {
-										break label534;
-									}
-								}
-
-								++var12;
-							}
-
-							var13 = (var12 + 1 - var11) * (var10 - var9 + 1);
-							if (var13 >= 8) {
-								var46 = 240;
-								var15 = Tiles.Tiles_heights[var12][var9][var7] - var46;
-								var16 = Tiles.Tiles_heights[var11][var9][var7];
-								Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16);
-
-								for (var17 = var11; var17 <= var12; ++var17) {
-									for (var18 = var9; var18 <= var10; ++var18) {
-										var10000 = WorldMapLabel.field233[var17][var18];
-										var10000[var7] &= ~var3;
-									}
-								}
-							}
-						}
-
-						if ((WorldMapLabel.field233[var6][var8][var7] & var4) != 0) {
-							var9 = var8;
-							var10 = var8;
-							var11 = var7;
-
-							for (var12 = var7; var11 > 0 && (WorldMapLabel.field233[var6][var8][var11 - 1] & var4) != 0; --var11) {
-							}
-
-							while (var12 < 104 && (WorldMapLabel.field233[var6][var8][var12 + 1] & var4) != 0) {
-								++var12;
-							}
-
-							label598:
-							while (var9 > 0) {
-								for (var13 = var11; var13 <= var12; ++var13) {
-									if ((WorldMapLabel.field233[var6][var9 - 1][var13] & var4) == 0) {
-										break label598;
-									}
-								}
-
-								--var9;
-							}
-
-							label587:
-							while (var10 < 104) {
-								for (var13 = var11; var13 <= var12; ++var13) {
-									if ((WorldMapLabel.field233[var6][var10 + 1][var13] & var4) == 0) {
-										break label587;
-									}
-								}
-
-								++var10;
-							}
-
-							if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) {
-								var13 = Tiles.Tiles_heights[var6][var9][var11];
-								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13);
-
-								for (var14 = var9; var14 <= var10; ++var14) {
-									for (var15 = var11; var15 <= var12; ++var15) {
-										var10000 = WorldMapLabel.field233[var6][var14];
-										var10000[var15] &= ~var4;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
 		}
 
+		Client.viewportOffsetX = var0;
+		Client.viewportOffsetY = var1;
+		Client.viewportWidth = var2;
+		Client.viewportHeight = var3;
 	}
 }

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

@@ -2,22 +2,23 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jn")
+@ObfuscatedName("jg")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("u")
-	boolean field3629;
 	@ObfuscatedName("f")
-	boolean field3630;
+	boolean field3617;
+	@ObfuscatedName("i")
+	boolean field3618;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ljn;I)I",
+		signature = "(Ljg;B)I",
-		garbageValue = "-1380403624"
+		garbageValue = "73"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -29,23 +30,23 @@ public class Friend extends Buddy {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3629 && !var1.field3629) {
+		} else if (this.field3617 && !var1.field3617) {
 			return -1;
-		} else if (!this.field3629 && var1.field3629) {
+		} else if (!this.field3617 && var1.field3617) {
 			return 1;
-		} else if (this.field3630 && !var1.field3630) {
+		} else if (this.field3618 && !var1.field3618) {
 			return -1;
-		} else if (!this.field3630 && var1.field3630) {
+		} else if (!this.field3618 && var1.field3618) {
 			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		signature = "(Ljr;B)I",
+		signature = "(Ljy;S)I",
-		garbageValue = "41"
+		garbageValue = "9221"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -58,52 +59,88 @@ public class Friend extends Buddy {
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(ILcu;ZI)I",
-		garbageValue = "-825705813"
+		garbageValue = "316315133"
 	)
-	public static int method5293(int var0) {
+	static int method5286(int var0, Script var1, boolean var2) {
-		if (var0 > 0) {
+		Widget var3;
-			return 1;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
 		} else {
-			return var0 < 0 ? -1 : 0;
+			var3 = var2 ? UserComparator7.field1946 : class197.field2398;
+		}
+
+		LoginPacket.invalidateWidget(var3);
+		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) {
+			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) {
+				var3.modelType = 2;
+				var3.modelId = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) {
+				var3.modelType = 3;
+				var3.modelId = Message.localPlayer.appearance.getChatHeadId();
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			class188.Interpreter_intStackSize -= 2;
+			int var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			var3.itemId = var4;
+			var3.itemQuantity = var5;
+			ItemDefinition var6 = PacketBufferNode.ItemDefinition_get(var4);
+			var3.modelAngleX = var6.xan2d;
+			var3.modelAngleY = var6.yan2d;
+			var3.modelAngleZ = var6.zan2d;
+			var3.modelOffsetX = var6.offsetX2d;
+			var3.modelOffsetY = var6.offsetY2d;
+			var3.modelZoom = var6.zoom2d;
+			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
+				var3.itemQuantityMode = 0;
+			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) {
+				var3.itemQuantityMode = 1;
+			} else {
+				var3.itemQuantityMode = 2;
+			}
+
+			if (var3.field2645 > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.field2645;
+			} else if (var3.rawWidth > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
+			}
+
+			return 1;
 		}
 	}
 
-	@ObfuscatedName("jy")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(ZB)V",
+		signature = "(I)Lbe;",
-		garbageValue = "0"
+		garbageValue = "-422000887"
 	)
-	@Export("setTapToDrop")
+	@Export("getNextWorldListWorld")
-	static void setTapToDrop(boolean var0) {
+	static World getNextWorldListWorld() {
-		Client.tapToDrop = var0;
+		return World.World_listCount < World.World_count ? class162.World_worlds[++World.World_listCount - 1] : null;
 	}
 
-	@ObfuscatedName("jf")
+	@ObfuscatedName("kq")
 	@ObfuscatedSignature(
-		signature = "(IIII)Lbf;",
+		signature = "(I)V",
-		garbageValue = "-252811827"
+		garbageValue = "-2130982399"
 	)
-	static final InterfaceParent method5303(int var0, int var1, int var2) {
+	@Export("FriendSystem_invalidateFriends")
-		InterfaceParent var3 = new InterfaceParent();
+	static final void FriendSystem_invalidateFriends() {
-		var3.group = var1;
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
-		var3.type = var2;
+			Player var1 = Client.players[Players.Players_indices[var0]];
-		Client.interfaceParents.put(var3, (long)var0);
+			var1.clearIsFriend();
-		WorldMapArea.Widget_resetModelFrames(var1);
-		Widget var4 = Language.getWidget(var0);
-		ScriptEvent.invalidateWidget(var4);
-		if (Client.meslayerContinueWidget != null) {
-			ScriptEvent.invalidateWidget(Client.meslayerContinueWidget);
-			Client.meslayerContinueWidget = null;
 		}
 
-		Varps.method4043();
+		class216.method4013();
-		MilliClock.revalidateWidgetScroll(FloorDecoration.Widget_interfaceComponents[var0 >> 16], var4, false);
+		if (Calendar.clanChat != null) {
-		UserComparator9.runWidgetOnLoadListener(var1);
+			Calendar.clanChat.clearFriends();
-		if (Client.rootInterface != -1) {
-			GrandExchangeEvents.runIntfCloseListeners(Client.rootInterface, 1);
 		}
 
-		return var3;
 	}
 }

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

@@ -4,68 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jf")
+@ObfuscatedName("jj")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("rc")
+	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = -1971912431
-	)
-	static int field3643;
-	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Lhz;"
 	)
-	@Export("Widget_modelsArchive")
+	@Export("Widget_archive")
-	public static AbstractArchive Widget_modelsArchive;
+	static AbstractArchive Widget_archive;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 674667209
+		intValue = 1496749481
 	)
-	public int field3646;
+	public int field3623;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Ljb;"
+		signature = "Ljc;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		signature = "(Ljb;I)V"
+		signature = "(Ljc;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3646 = (int)(TaskHandler.currentTimeMillis() / 1000L);
+		this.field3623 = (int)(WorldMapID.currentTimeMillis() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("f")
+	static double method5301(double var0) {
+		return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D);
+	}
+
+	@ObfuscatedName("au")
 	@ObfuscatedSignature(
-		signature = "(IIII)I",
+		signature = "(Lcz;I)V",
-		garbageValue = "1735579843"
+		garbageValue = "-651295245"
 	)
-	@Export("hslToRgb")
+	public static final void method5300(class97 var0) {
-	static final int hslToRgb(int var0, int var1, int var2) {
+		ChatChannel.pcmPlayerProvider = var0;
-		if (var2 > 179) {
-			var1 /= 2;
-		}
-
-		if (var2 > 192) {
-			var1 /= 2;
-		}
-
-		if (var2 > 217) {
-			var1 /= 2;
-		}
-
-		if (var2 > 243) {
-			var1 /= 2;
-		}
-
-		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
-		return var3;
 	}
 }

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

@@ -1,91 +1,95 @@
+import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bz")
+@ObfuscatedName("bi")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("g")
+	@ObfuscatedName("x")
+	@Export("soundSystemExecutor")
+	static ScheduledExecutorService soundSystemExecutor;
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ljh;"
+		signature = "Ljr;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "Lju;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 618152065
+		intValue = 1346758177
 	)
-	int field1061;
+	int field1045;
 
 	@ObfuscatedSignature(
-		signature = "(Llg;)V"
+		signature = "(Lll;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1061 = 0;
+		this.field1045 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(I)Z",
-		garbageValue = "-1963052463"
-	)
-	boolean method1870() {
-		return this.field1061 == 2;
-	}
-
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)Z",
-		garbageValue = "-31"
+		garbageValue = "-1542848201"
 	)
-	final void method1867() {
+	boolean method1844() {
-		this.field1061 = 1;
+		return this.field1045 == 2;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkg;IB)V",
+		signature = "(B)V",
-		garbageValue = "52"
+		garbageValue = "0"
+	)
+	final void method1845() {
+		this.field1045 = 1;
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "(Lkq;II)V",
+		garbageValue = "818210154"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1061 = 2;
+		this.field1045 = 2;
-		WorldMapIcon_1.FriendSystem_invalidateFriends();
+		Friend.FriendSystem_invalidateFriends();
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "2007033957"
+		garbageValue = "64"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3646 < TaskHandler.currentTimeMillis() / 1000L - 5L) {
+			if ((long)var1.field3623 < WorldMapID.currentTimeMillis() / 1000L - 5L) {
 				if (var1.world > 0) {
-					GrandExchangeOfferAgeComparator.addGameMessage(5, "", var1.username + " has logged in.");
+					class83.addGameMessage(5, "", var1.username + " has logged in.");
 				}
 
 				if (var1.world == 0) {
-					GrandExchangeOfferAgeComparator.addGameMessage(5, "", var1.username + " has logged out.");
+					class83.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove();
@@ -94,38 +98,38 @@ public class FriendSystem {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-242142328"
+		garbageValue = "-3"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1061 = 0;
+		this.field1045 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(Ljb;ZI)Z",
+		signature = "(Ljc;ZI)Z",
-		garbageValue = "-557958994"
+		garbageValue = "-1562604277"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(class215.localPlayer.username)) {
+		} else if (var1.equals(Message.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Ljb;B)Z",
+		signature = "(Ljc;I)Z",
-		garbageValue = "94"
+		garbageValue = "-408948257"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -136,10 +140,10 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "905679920"
+		garbageValue = "-28"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -147,16 +151,16 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsListIsFull()) {
-					PacketBufferNode.method3670();
+					WorldMapRegion.method446();
-				} else if (class215.localPlayer.username.equals(var2)) {
+				} else if (Message.localPlayer.username.equals(var2)) {
-					WorldMapSection2.method347("You can't add yourself to your own friend list");
+					Tiles.method1143("You can't add yourself to your own friend list");
 				} else if (this.isFriended(var2, false)) {
-					class65.method1244(var1);
+					class288.method5335(var1);
 				} else if (this.isIgnored(var2)) {
-					WorldMapSection2.method347("Please remove " + var1 + " from your ignore list first");
+					Tiles.method1143("Please remove " + var1 + " from your ignore list first");
 				} else {
-					PacketBufferNode var3 = ModelData0.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
@@ -164,20 +168,20 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1079308803"
+		garbageValue = "1773395073"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field789 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field746 != 1;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "15"
+		garbageValue = "1243376516"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
@@ -185,34 +189,37 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.canAddIgnore()) {
-					GrandExchangeOfferNameComparator.method145();
+					VertexNormal.method2996();
-				} else if (class215.localPlayer.username.equals(var2)) {
+				} else if (Message.localPlayer.username.equals(var2)) {
-					WorldMapSection2.method347("You can't add yourself to your own ignore list");
+					WorldMapCacheName.method620();
 				} else if (this.isIgnored(var2)) {
-					WorldMapSection2.method347(var1 + " is already on your ignore list");
+					Tiles.method1143(var1 + " is already on your ignore list");
 				} else if (this.isFriended(var2, false)) {
-					WorldMapSectionType.method269(var1);
+					class191.method3640(var1);
 				} else {
-					class218.method4179(var1);
+					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher);
+					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
+					Client.packetWriter.addNode(var3);
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "97"
+		garbageValue = "-1684864200"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field789 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field746 != 1;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-774164721"
+		garbageValue = "975666104"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -220,22 +227,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					Client.field833 = Client.cycleCntr;
+					VertexNormal.method2995();
-					PacketBufferNode var3 = ModelData0.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				WorldMapIcon_1.FriendSystem_invalidateFriends();
+				Friend.FriendSystem_invalidateFriends();
 			}
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-1018111"
+		garbageValue = "2048585665"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -243,22 +250,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					Client.field833 = Client.cycleCntr;
+					VertexNormal.method2995();
-					PacketBufferNode var3 = ModelData0.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(class173.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				Language.FriendSystem_invalidateIgnoreds();
+				GameShell.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
-		signature = "(Ljb;B)Z",
+		signature = "(Ljc;I)Z",
-		garbageValue = "0"
+		garbageValue = "-2137551829"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
@@ -266,21 +273,63 @@ public class FriendSystem {
 		return var2 != null && var2.hasWorld();
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I)[Lgd;",
+		signature = "(I)V",
-		garbageValue = "-1110076754"
+		garbageValue = "-435303731"
 	)
-	public static class185[] method1927() {
+	@Export("savePreferences")
-		return new class185[]{class185.field2334, class185.field2332, class185.field2333, class185.field2339, class185.field2336, class185.field2341, class185.field2337, class185.field2331, class185.field2335, class185.field2340};
+	static void savePreferences() {
+		AccessFile var0 = null;
+
+		try {
+			var0 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, true);
+			Buffer var1 = Interpreter.clientPreferences.toBuffer();
+			var0.write(var1.array, 0, var1.offset);
+		} catch (Exception var3) {
+		}
+
+		try {
+			if (var0 != null) {
+				var0.closeSync(true);
+			}
+		} catch (Exception var2) {
+		}
+
 	}
 
-	@ObfuscatedName("ge")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(II)V",
-		garbageValue = "-90"
+		garbageValue = "2090172291"
 	)
-	static boolean method1920() {
+	@Export("clearItemContainer")
-		return (Client.drawPlayerNames & 2) != 0;
+	static void clearItemContainer(int var0) {
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		if (var1 != null) {
+			for (int var2 = 0; var2 < var1.ids.length; ++var2) {
+				var1.ids[var2] = -1;
+				var1.quantities[var2] = 0;
+			}
+
+		}
+	}
+
+	@ObfuscatedName("km")
+	@ObfuscatedSignature(
+		signature = "(Lha;IIII)V",
+		garbageValue = "688328393"
+	)
+	@Export("drawCompass")
+	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
+		SpriteMask var4 = var0.getSpriteMask(false);
+		if (var4 != null) {
+			if (Client.minimapState < 3) {
+				GrandExchangeOfferTotalQuantityComparator.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+			} else {
+				Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
+			}
+
+		}
 	}
 }

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

@@ -1,67 +1,65 @@
-import java.awt.Image;
+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("jh")
+@ObfuscatedName("jr")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("aa")
+	@ObfuscatedName("y")
-	static Image field3623;
-	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -273540175
+		intValue = 1316127355
 	)
-	int field3621;
+	int field3603;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ljj;"
+		signature = "Ljw;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		signature = "(Llg;)V"
+		signature = "(Lll;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3621 = 1;
+		this.field3603 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)Ljr;",
+		signature = "(B)Ljy;",
-		garbageValue = "-1592540968"
+		garbageValue = "68"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)[Ljr;",
+		signature = "(IB)[Ljy;",
-		garbageValue = "-122"
+		garbageValue = "32"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljb;ZI)Z",
+		signature = "(Ljc;ZI)Z",
-		garbageValue = "-331352727"
+		garbageValue = "-1998488053"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -73,10 +71,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(Lkg;IB)V",
+		signature = "(Lkq;IB)V",
-		garbageValue = "78"
+		garbageValue = "-60"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -101,7 +99,7 @@ public class FriendsList extends UserList {
 					Friend var11 = (Friend)this.getByCurrentUsername(var4);
 					if (var3) {
 						Friend var12 = (Friend)this.getByCurrentUsername(var5);
-						if (var12 != null && var12 != var11) {
+						if (var12 != null && var11 != var12) {
 							if (var11 != null) {
 								this.remove(var12);
 							} else {
@@ -140,17 +138,17 @@ public class FriendsList extends UserList {
 					}
 
 					if (var6 != var11.world) {
-						var11.int2 = ++this.field3621 - 1;
+						var11.int2 = ++this.field3603 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * -460007471) * 1502929201;
+							var11.int2 = -(var11.int2 * 604472963) * 509966379;
 						}
 
 						var11.world = var6;
 					}
 
 					var11.rank = var7;
-					var11.field3629 = var9;
+					var11.field3617 = var9;
-					var11.field3630 = var10;
+					var11.field3618 = var10;
 					continue;
 				}
 
@@ -161,4 +159,68 @@ public class FriendsList extends UserList {
 			return;
 		}
 	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(Lky;ZI)V",
+		garbageValue = "491459043"
+	)
+	public static void method5229(AbstractSocket var0, boolean var1) {
+		if (class297.NetCache_socket != null) {
+			try {
+				class297.NetCache_socket.close();
+			} catch (Exception var6) {
+			}
+
+			class297.NetCache_socket = null;
+		}
+
+		class297.NetCache_socket = var0;
+		BuddyRankComparator.method3362(var1);
+		NetCache.NetCache_responseHeaderBuffer.offset = 0;
+		PrivateChatMode.NetCache_currentResponse = null;
+		NetCache.NetCache_responseArchiveBuffer = null;
+		NetCache.field3150 = 0;
+
+		while (true) {
+			NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first();
+			if (var2 == null) {
+				while (true) {
+					var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first();
+					if (var2 == null) {
+						if (NetCache.field3145 != 0) {
+							try {
+								Buffer var7 = new Buffer(4);
+								var7.writeByte(4);
+								var7.writeByte(NetCache.field3145);
+								var7.writeShort(0);
+								class297.NetCache_socket.write(var7.array, 0, 4);
+							} catch (IOException var5) {
+								try {
+									class297.NetCache_socket.close();
+								} catch (Exception var4) {
+								}
+
+								++NetCache.NetCache_ioExceptions;
+								class297.NetCache_socket = null;
+							}
+						}
+
+						NetCache.NetCache_loadTime = 0;
+						NetCache.field3138 = WorldMapID.currentTimeMillis();
+						return;
+					}
+
+					NetCache.NetCache_pendingWritesQueue.addLast(var2);
+					NetCache.NetCache_pendingWrites.put(var2, var2.key);
+					++NetCache.NetCache_pendingWritesCount;
+					--NetCache.NetCache_pendingResponsesCount;
+				}
+			}
+
+			NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key);
+			++NetCache.NetCache_pendingPriorityWritesCount;
+			--NetCache.NetCache_pendingPriorityResponsesCount;
+		}
+	}
 }

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

@@ -4,13 +4,23 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lk")
+@ObfuscatedName("lw")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("u")
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		signature = "Lgm;"
+	)
+	@Export("midiPcmStream")
+	public static MidiPcmStream midiPcmStream;
+	@ObfuscatedName("f")
 	@Export("inflater")
 	Inflater inflater;
 
+	public GZipDecompressor() {
+		this(-1, 1000000, 1000000);
+	}
+
 	@ObfuscatedSignature(
 		signature = "(III)V",
 		garbageValue = "1000000"
@@ -18,14 +28,10 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	public GZipDecompressor() {
+	@ObfuscatedName("f")
-		this(-1, 1000000, 1000000);
-	}
-
-	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lkg;[BI)V",
+		signature = "(Lkq;[BI)V",
-		garbageValue = "1447004496"
+		garbageValue = "367442477"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {

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

@@ -4,100 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eh")
+@ObfuscatedName("el")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("qf")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1623440827
+		intValue = -1053912573
-	)
-	static int field1933;
-	@ObfuscatedName("hl")
-	@ObfuscatedGetter(
-		intValue = 143211467
-	)
-	@Export("cameraY")
-	static int cameraY;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 602271545
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 996548305
+		intValue = 684195751
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -28565159
+		intValue = -2140499041
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -213801155
+		intValue = 1955373001
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lee;"
+		signature = "Lep;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1884988183
+		intValue = -472959783
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -422485367
+		intValue = 1045037505
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 640777493
+		intValue = 820155369
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1986114597
+		intValue = -1317685703
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1415770979
+		intValue = -1799608733
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -2079543087
+		intValue = 262139045
 	)
-	int field1925;
+	int field1909;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1243689435
+		intValue = -792485469
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = 9016646142835721523L
+		longValue = -9063285699696577959L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -2013432545
+		intValue = 1504732917
 	)
 	@Export("flags")
 	int flags;
@@ -107,110 +96,35 @@ public final class GameObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(IILfg;Lfh;I)Z",
+		signature = "(Lgo;S)V",
-		garbageValue = "-1345578739"
+		garbageValue = "-26939"
 	)
-	static final boolean method3342(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+	public static void method3296(Huffman var0) {
-		int var4 = var0;
+		class206.huffman = var0;
-		int var5 = var1;
+	}
-		byte var6 = 64;
-		byte var7 = 64;
-		int var8 = var0 - var6;
-		int var9 = var1 - var7;
-		class173.directions[var6][var7] = 99;
-		class173.distances[var6][var7] = 0;
-		byte var10 = 0;
-		int var11 = 0;
-		class173.bufferX[var10] = var0;
-		byte var10001 = var10;
-		int var18 = var10 + 1;
-		class173.bufferY[var10001] = var1;
-		int[][] var12 = var3.flags;
 
-		while (var18 != var11) {
+	@ObfuscatedName("hd")
-			var4 = class173.bufferX[var11];
+	@ObfuscatedSignature(
-			var5 = class173.bufferY[var11];
+		signature = "(I)Z",
-			var11 = var11 + 1 & 4095;
+		garbageValue = "1099485994"
-			int var16 = var4 - var8;
+	)
-			int var17 = var5 - var9;
+	static boolean method3298() {
-			int var13 = var4 - var3.xInset;
+		return (Client.drawPlayerNames & 1) != 0;
-			int var14 = var5 - var3.yInset;
+	}
-			if (var2.hasArrived(2, var4, var5, var3)) {
-				class173.field2103 = var4;
-				class173.field2100 = var5;
-				return true;
-			}
 
-			int var15 = class173.distances[var16][var17] + 1;
+	@ObfuscatedName("if")
-			if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) {
+	@ObfuscatedSignature(
-				class173.bufferX[var18] = var4 - 1;
+		signature = "(IIIIB)V",
-				class173.bufferY[var18] = var5;
+		garbageValue = "3"
-				var18 = var18 + 1 & 4095;
+	)
-				class173.directions[var16 - 1][var17] = 2;
+	static final void method3297(int var0, int var1, int var2, int var3) {
-				class173.distances[var16 - 1][var17] = var15;
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
-			}
+			if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
-
+				Client.field833[var4] = true;
-			if (var16 < 126 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) {
-				class173.bufferX[var18] = var4 + 1;
-				class173.bufferY[var18] = var5;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 + 1][var17] = 8;
-				class173.distances[var16 + 1][var17] = var15;
-			}
-
-			if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) {
-				class173.bufferX[var18] = var4;
-				class173.bufferY[var18] = var5 - 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16][var17 - 1] = 1;
-				class173.distances[var16][var17 - 1] = var15;
-			}
-
-			if (var17 < 126 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) {
-				class173.bufferX[var18] = var4;
-				class173.bufferY[var18] = var5 + 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16][var17 + 1] = 4;
-				class173.distances[var16][var17 + 1] = var15;
-			}
-
-			if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) {
-				class173.bufferX[var18] = var4 - 1;
-				class173.bufferY[var18] = var5 - 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 - 1][var17 - 1] = 3;
-				class173.distances[var16 - 1][var17 - 1] = var15;
-			}
-
-			if (var16 < 126 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) {
-				class173.bufferX[var18] = var4 + 1;
-				class173.bufferY[var18] = var5 - 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 + 1][var17 - 1] = 9;
-				class173.distances[var16 + 1][var17 - 1] = var15;
-			}
-
-			if (var16 > 0 && var17 < 126 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) {
-				class173.bufferX[var18] = var4 - 1;
-				class173.bufferY[var18] = var5 + 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 - 1][var17 + 1] = 6;
-				class173.distances[var16 - 1][var17 + 1] = var15;
-			}
-
-			if (var16 < 126 && var17 < 126 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) {
-				class173.bufferX[var18] = var4 + 1;
-				class173.bufferY[var18] = var5 + 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 + 1][var17 + 1] = 12;
-				class173.distances[var16 + 1][var17 + 1] = var15;
 			}
 		}
 
-		class173.field2103 = var4;
-		class173.field2100 = var5;
-		return false;
 	}
 }

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

@@ -1,39 +1,60 @@
+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("y")
+@ObfuscatedName("x")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("u")
+	@ObfuscatedName("ss")
+	@ObfuscatedSignature(
+		signature = "Lld;"
+	)
+	@Export("worldMap")
+	static WorldMap worldMap;
+	@ObfuscatedName("bs")
+	@ObfuscatedSignature(
+		signature = "Lli;"
+	)
+	@Export("worldSelectLeftSprite")
+	static IndexedSprite worldSelectLeftSprite;
+	@ObfuscatedName("kx")
 	@ObfuscatedGetter(
-		intValue = 1903174229
+		intValue = -830703967
+	)
+	@Export("menuX")
+	static int menuX;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -492844339
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = -3619466799124397109L
+		longValue = 6772397130790099757L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Li;"
+		signature = "Ld;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		signature = "(Lkg;BI)V"
+		signature = "(Lkq;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated();
@@ -43,8 +64,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt();
 		int var5 = var1.readInt();
 		this.grandExchangeOffer = new GrandExchangeOffer();
-		this.grandExchangeOffer.method109(2);
+		this.grandExchangeOffer.method99(2);
-		this.grandExchangeOffer.method110(var2);
+		this.grandExchangeOffer.method100(var2);
 		this.grandExchangeOffer.unitPrice = var4;
 		this.grandExchangeOffer.totalQuantity = var5;
 		this.grandExchangeOffer.currentQuantity = 0;
@@ -52,72 +73,98 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(B)Ljava/lang/String;",
+		signature = "(I)Ljava/lang/String;",
-		garbageValue = "16"
+		garbageValue = "-859042126"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)Ljava/lang/String;",
-		garbageValue = "1776036206"
+		garbageValue = "342302982"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lkg;II)V",
+		signature = "(Ljava/lang/String;ILjava/lang/String;B)Z",
-		garbageValue = "-894744142"
+		garbageValue = "-128"
 	)
-	public static void method86(Buffer var0, int var1) {
+	static boolean method79(String var0, int var1, String var2) {
-		if (JagexCache.JagexCache_randomDat != null) {
+		if (var1 == 0) {
 			try {
-				JagexCache.JagexCache_randomDat.seek(0L);
+				if (!class50.field410.startsWith("win")) {
-				JagexCache.JagexCache_randomDat.write(var0.array, var1, 24);
+					throw new Exception();
-			} catch (Exception var3) {
+				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
+					throw new Exception();
+				} else {
+					String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
+
+					for (int var4 = 0; var4 < var0.length(); ++var4) {
+						if (var14.indexOf(var0.charAt(var4)) == -1) {
+							throw new Exception();
+						}
+					}
+
+					Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
+					return true;
+				}
+			} catch (Throwable var8) {
+				return false;
 			}
-		}
+		} else if (var1 == 1) {
-
+			try {
-	}
+				Applet var7 = class50.applet;
-
+				Object[] var5 = new Object[]{(new URL(class50.applet.getCodeBase(), var0)).toString()};
-	@ObfuscatedName("g")
+				Object var13 = JSObject.getWindow(var7).call(var2, var5);
-	@ObfuscatedSignature(
+				return var13 != null;
-		signature = "(Lkg;II)Ljava/lang/String;",
+			} catch (Throwable var9) {
-		garbageValue = "808138004"
+				return false;
-	)
+			}
-	static String method92(Buffer var0, int var1) {
+		} else if (var1 == 2) {
-		try {
+			try {
-			int var2 = var0.readUShortSmart();
+				class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_blank");
-			if (var2 > var1) {
+				return true;
-				var2 = var1;
+			} catch (Exception var10) {
+				return false;
+			}
+		} else if (var1 == 3) {
+			try {
+				Applet var3 = class50.applet;
+				JSObject.getWindow(var3).call("loggedout", (Object[])null);
+			} catch (Throwable var12) {
 			}
 
-			byte[] var3 = new byte[var2];
+			try {
-			var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2);
+				class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_top");
-			String var4 = NetCache.decodeStringCp1252(var3, 0, var2);
+				return true;
-			return var4;
+			} catch (Exception var11) {
-		} catch (Exception var6) {
+				return false;
-			return "Cabbage";
+			}
+		} else {
+			throw new IllegalArgumentException();
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(ILht;ZI)V",
-		garbageValue = "-357486416"
+		garbageValue = "1641094625"
 	)
-	static void method91(int var0) {
+	static void method80(int var0, Coord var1, boolean var2) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		WorldMapArea var3 = Canvas.getWorldMap().getMapArea(var0);
-		if (var1 != null) {
+		int var4 = Message.localPlayer.plane;
-			var1.remove();
+		int var5 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7);
-		}
+		int var6 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7);
+		Coord var7 = new Coord(var4, var5, var6);
+		Canvas.getWorldMap().method6373(var3, var7, var1, var2);
 	}
 }

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

@@ -7,28 +7,29 @@ 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("h")
+@ObfuscatedName("e")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("f")
+	@ObfuscatedName("nn")
+	@ObfuscatedGetter(
+		intValue = -1329032007
+	)
+	static int field31;
+	@ObfuscatedName("i")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("h")
+	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 130975453
-	)
-	static int field36;
-	@ObfuscatedName("u")
 	@Export("events")
 	public final List events;
 
@@ -41,7 +42,7 @@ public class GrandExchangeEvents {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkg;Z)V",
+		signature = "(Lkq;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -63,10 +64,10 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;ZI)V",
+		signature = "(Ljava/util/Comparator;ZB)V",
-		garbageValue = "1634803719"
+		garbageValue = "30"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -78,76 +79,494 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("fd")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Lbm;II)V",
-		garbageValue = "-1784799744"
+		garbageValue = "-1987798280"
 	)
-	static final void method83() {
+	@Export("runScript")
-		for (int var0 = 0; var0 < Client.npcCount; ++var0) {
+	static void runScript(ScriptEvent var0, int var1) {
-			int var1 = Client.npcIndices[var0];
+		Object[] var2 = var0.args;
-			NPC var2 = Client.npcs[var1];
+		Script var3;
-			if (var2 != null) {
+		int var17;
-				class3.updateActorSequence(var2, var2.definition.size);
+		if (HorizontalAlignment.isWorldMapEvent(var0.type)) {
-			}
+			WorldMapLabel.worldMapEvent = (WorldMapEvent)var2[0];
-		}
+			WorldMapElement var4 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(WorldMapLabel.worldMapEvent.mapElement);
-
+			var3 = class16.getWorldMapScript(var0.type, var4.objectId, var4.category);
-	}
-
-	@ObfuscatedName("jm")
-	@ObfuscatedSignature(
-		signature = "(Lhl;IIIIIIS)V",
-		garbageValue = "3880"
-	)
-	static final void method82(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		if (Client.field908) {
-			Client.alternativeScrollbarWidth = 32;
 		} else {
-			Client.alternativeScrollbarWidth = 0;
+			var17 = (Integer)var2[0];
+			var3 = SecureRandomCallable.getScript(var17);
 		}
 
-		Client.field908 = false;
+		if (var3 != null) {
-		int var7;
+			class188.Interpreter_intStackSize = 0;
-		if (MouseHandler.MouseHandler_currentButton == 1 || !JagexCache.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
+			class65.Interpreter_stringStackSize = 0;
-			if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
+			var17 = -1;
-				var0.scrollY -= 4;
+			int[] var5 = var3.opcodes;
-				ScriptEvent.invalidateWidget(var0);
+			int[] var6 = var3.intOperands;
-			} else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
+			byte var7 = -1;
-				var0.scrollY += 4;
+			Interpreter.Interpreter_frameDepth = 0;
-				ScriptEvent.invalidateWidget(var0);
+			Interpreter.field1077 = false;
-			} else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
+
-				var7 = var3 * (var3 - 32) / var4;
+			try {
-				if (var7 < 8) {
+				int var10;
-					var7 = 8;
+				try {
+					Interpreter.Interpreter_intLocals = new int[var3.localIntCount];
+					int var8 = 0;
+					class247.Interpreter_stringLocals = new String[var3.localStringCount];
+					int var9 = 0;
+
+					int var11;
+					String var18;
+					for (var10 = 1; var10 < var2.length; ++var10) {
+						if (var2[var10] instanceof Integer) {
+							var11 = (Integer)var2[var10];
+							if (var11 == -2147483647) {
+								var11 = var0.mouseX;
+							}
+
+							if (var11 == -2147483646) {
+								var11 = var0.mouseY;
+							}
+
+							if (var11 == -2147483645) {
+								var11 = var0.widget != null ? var0.widget.id : -1;
+							}
+
+							if (var11 == -2147483644) {
+								var11 = var0.opIndex;
+							}
+
+							if (var11 == -2147483643) {
+								var11 = var0.widget != null ? var0.widget.childIndex : -1;
+							}
+
+							if (var11 == -2147483642) {
+								var11 = var0.dragTarget != null ? var0.dragTarget.id : -1;
+							}
+
+							if (var11 == -2147483641) {
+								var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1;
+							}
+
+							if (var11 == -2147483640) {
+								var11 = var0.keyTyped;
+							}
+
+							if (var11 == -2147483639) {
+								var11 = var0.keyPressed;
+							}
+
+							Interpreter.Interpreter_intLocals[var8++] = var11;
+						} else if (var2[var10] instanceof String) {
+							var18 = (String)var2[var10];
+							if (var18.equals("event_opbase")) {
+								var18 = var0.targetName;
+							}
+
+							class247.Interpreter_stringLocals[var9++] = var18;
+						}
+					}
+
+					var10 = 0;
+					Interpreter.field1079 = var0.field557;
+
+					while (true) {
+						++var10;
+						if (var10 > var1) {
+							throw new RuntimeException();
+						}
+
+						++var17;
+						int var29 = var5[var17];
+						int var20;
+						if (var29 >= 100) {
+							boolean var32;
+							if (var3.intOperands[var17] == 1) {
+								var32 = true;
+							} else {
+								var32 = false;
+							}
+
+							var20 = Frames.method3281(var29, var3, var32);
+							switch(var20) {
+							case 0:
+								return;
+							case 1:
+							default:
+								break;
+							case 2:
+								throw new IllegalStateException();
+							}
+						} else if (var29 == 0) {
+							Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var6[var17];
+						} else if (var29 == ScriptOpcodes.GET_VARP) {
+							var11 = var6[var17];
+							Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Varps.Varps_main[var11];
+						} else if (var29 == ScriptOpcodes.SET_VARP) {
+							var11 = var6[var17];
+							Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+							BufferedSink.changeGameOptions(var11);
+						} else if (var29 == ScriptOpcodes.SCONST) {
+							Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
+						} else if (var29 == ScriptOpcodes.JUMP) {
+							var17 += var6[var17];
+						} else if (var29 == ScriptOpcodes.IF_ICMPNE) {
+							class188.Interpreter_intStackSize -= 2;
+							if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) {
+								var17 += var6[var17];
+							}
+						} else if (var29 == ScriptOpcodes.IF_ICMPEQ) {
+							class188.Interpreter_intStackSize -= 2;
+							if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) {
+								var17 += var6[var17];
+							}
+						} else if (var29 == ScriptOpcodes.IF_ICMPLT) {
+							class188.Interpreter_intStackSize -= 2;
+							if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) {
+								var17 += var6[var17];
+							}
+						} else if (var29 == ScriptOpcodes.IF_ICMPGT) {
+							class188.Interpreter_intStackSize -= 2;
+							if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) {
+								var17 += var6[var17];
+							}
+						} else if (var29 == ScriptOpcodes.RETURN) {
+							if (Interpreter.Interpreter_frameDepth == 0) {
+								return;
+							}
+
+							ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
+							var3 = var34.script;
+							var5 = var3.opcodes;
+							var6 = var3.intOperands;
+							var17 = var34.pc;
+							Interpreter.Interpreter_intLocals = var34.intLocals;
+							class247.Interpreter_stringLocals = var34.stringLocals;
+						} else if (var29 == ScriptOpcodes.GET_VARBIT) {
+							var11 = var6[var17];
+							Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = GameShell.getVarbit(var11);
+						} else if (var29 == ScriptOpcodes.SET_VARBIT) {
+							var11 = var6[var17];
+							ChatChannel.method2259(var11, Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
+						} else if (var29 == ScriptOpcodes.IF_ICMPLE) {
+							class188.Interpreter_intStackSize -= 2;
+							if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) {
+								var17 += var6[var17];
+							}
+						} else if (var29 == ScriptOpcodes.IF_ICMPGE) {
+							class188.Interpreter_intStackSize -= 2;
+							if (Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1]) {
+								var17 += var6[var17];
+							}
+						} else if (var29 == ScriptOpcodes.ILOAD) {
+							Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]];
+						} else if (var29 == ScriptOpcodes.ISTORE) {
+							Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+						} else if (var29 == ScriptOpcodes.SLOAD) {
+							Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = class247.Interpreter_stringLocals[var6[var17]];
+						} else if (var29 == ScriptOpcodes.SSTORE) {
+							class247.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize];
+						} else if (var29 == ScriptOpcodes.JOIN_STRING) {
+							var11 = var6[var17];
+							class65.Interpreter_stringStackSize -= var11;
+							String var31 = User.method5086(Interpreter.Interpreter_stringStack, class65.Interpreter_stringStackSize, var11);
+							Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var31;
+						} else if (var29 == ScriptOpcodes.POP_INT) {
+							--class188.Interpreter_intStackSize;
+						} else if (var29 == ScriptOpcodes.POP_STRING) {
+							--class65.Interpreter_stringStackSize;
+						} else {
+							int var15;
+							if (var29 != ScriptOpcodes.INVOKE) {
+								if (var29 == ScriptOpcodes.GET_VARC_INT) {
+									Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = MilliClock.varcs.getInt(var6[var17]);
+								} else if (var29 == ScriptOpcodes.SET_VARC_INT) {
+									MilliClock.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
+								} else if (var29 == ScriptOpcodes.DEFINE_ARRAY) {
+									var11 = var6[var17] >> 16;
+									var20 = var6[var17] & 65535;
+									int var21 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+									if (var21 < 0 || var21 > 5000) {
+										throw new RuntimeException();
+									}
+
+									Interpreter.Interpreter_arrayLengths[var11] = var21;
+									byte var22 = -1;
+									if (var20 == 105) {
+										var22 = 0;
+									}
+
+									for (var15 = 0; var15 < var21; ++var15) {
+										Interpreter.Interpreter_arrays[var11][var15] = var22;
+									}
+								} else if (var29 == ScriptOpcodes.GET_ARRAY_INT) {
+									var11 = var6[var17];
+									var20 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+									if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+										throw new RuntimeException();
+									}
+
+									Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20];
+								} else if (var29 == ScriptOpcodes.SET_ARRAY_INT) {
+									var11 = var6[var17];
+									class188.Interpreter_intStackSize -= 2;
+									var20 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+									if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+										throw new RuntimeException();
+									}
+
+									Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+								} else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) {
+									var18 = MilliClock.varcs.getStringOld(var6[var17]);
+									if (var18 == null) {
+										var18 = "null";
+									}
+
+									Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var18;
+								} else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) {
+									MilliClock.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]);
+								} else if (var29 == ScriptOpcodes.GET_VARC_STRING) {
+									var18 = MilliClock.varcs.getString(var6[var17]);
+									Interpreter.Interpreter_stringStack[++class65.Interpreter_stringStackSize - 1] = var18;
+								} else if (var29 == ScriptOpcodes.SET_VARC_STRING) {
+									MilliClock.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize]);
+								} else {
+									if (var29 != ScriptOpcodes.SWITCH) {
+										throw new IllegalStateException();
+									}
+
+									IterableNodeHashTable var33 = var3.switches[var6[var17]];
+									IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
+									if (var30 != null) {
+										var17 += var30.integer;
+									}
+								}
+							} else {
+								var11 = var6[var17];
+								Script var12 = SecureRandomCallable.getScript(var11);
+								int[] var13 = new int[var12.localIntCount];
+								String[] var14 = new String[var12.localStringCount];
+
+								for (var15 = 0; var15 < var12.intArgumentCount; ++var15) {
+									var13[var15] = Interpreter.Interpreter_intStack[var15 + (class188.Interpreter_intStackSize - var12.intArgumentCount)];
+								}
+
+								for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) {
+									var14[var15] = Interpreter.Interpreter_stringStack[var15 + (class65.Interpreter_stringStackSize - var12.stringArgumentCount)];
+								}
+
+								class188.Interpreter_intStackSize -= var12.intArgumentCount;
+								class65.Interpreter_stringStackSize -= var12.stringArgumentCount;
+								ScriptFrame var19 = new ScriptFrame();
+								var19.script = var3;
+								var19.pc = var17;
+								var19.intLocals = Interpreter.Interpreter_intLocals;
+								var19.stringLocals = class247.Interpreter_stringLocals;
+								Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19;
+								var3 = var12;
+								var5 = var12.opcodes;
+								var6 = var12.intOperands;
+								var17 = -1;
+								Interpreter.Interpreter_intLocals = var13;
+								class247.Interpreter_stringLocals = var14;
+							}
+						}
+					}
+				} catch (Exception var27) {
+					StringBuilder var24 = new StringBuilder(30);
+					var24.append("").append(var3.key).append(" ");
+
+					for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) {
+						var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" ");
+					}
+
+					var24.append("").append(var7);
+					DesktopPlatformInfoProvider.RunException_sendStackTrace(var24.toString(), var27);
+				}
+			} finally {
+				if (Interpreter.field1077) {
+					Interpreter.field1078 = true;
+					Clock.method3488();
+					Interpreter.field1078 = false;
+					Interpreter.field1077 = false;
 				}
 
-				int var8 = var6 - var2 - 16 - var7 / 2;
-				int var9 = var3 - 32 - var7;
-				var0.scrollY = var8 * (var4 - var3) / var9;
-				ScriptEvent.invalidateWidget(var0);
-				Client.field908 = true;
 			}
 		}
-
-		if (Client.mouseWheelRotation != 0) {
-			var7 = var0.width;
-			if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
-				var0.scrollY += Client.mouseWheelRotation * 45;
-				ScriptEvent.invalidateWidget(var0);
-			}
-		}
-
 	}
 
-	@ObfuscatedName("js")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(III)I",
-		garbageValue = "1838875215"
+		garbageValue = "-146870643"
 	)
-	@Export("runIntfCloseListeners")
+	@Export("ItemContainer_getCount")
-	static final void runIntfCloseListeners(int var0, int var1) {
+	static int ItemContainer_getCount(int var0, int var1) {
-		if (UserComparator3.loadInterface(var0)) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-			WorldMapIcon_0.runComponentCloseListeners(FloorDecoration.Widget_interfaceComponents[var0], var1);
+		if (var2 == null) {
+			return 0;
+		} else {
+			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0;
+		}
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(CB)Z",
+		garbageValue = "0"
+	)
+	static boolean method76(char var0) {
+		for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) {
+			if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@ObfuscatedName("aq")
+	@ObfuscatedSignature(
+		signature = "(ILcu;ZI)I",
+		garbageValue = "1983355550"
+	)
+	static int method72(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		if (var0 == ScriptOpcodes.ADD) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var4 + var3;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SUB) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 - var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.MULTIPLY) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 * var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.DIV) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 / var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.RANDOM) {
+			var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.RANDOMINC) {
+			var3 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
+			return 1;
+		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
+			class188.Interpreter_intStackSize -= 5;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			int var5 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2];
+			int var6 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 3];
+			int var7 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 4];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
+			return 1;
+		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SETBIT) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 | 1 << var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CLEARBIT) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
+			return 1;
+		} else if (var0 == ScriptOpcodes.TESTBIT) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
+			return 1;
+		} else if (var0 == ScriptOpcodes.MOD) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 % var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.POW) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			if (var3 == 0) {
+				Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0;
+			} else {
+				Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
+			}
+
+			return 1;
+		} else if (var0 == ScriptOpcodes.INVPOW) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			if (var3 == 0) {
+				Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = 0;
+				return 1;
+			} else {
+				switch(var4) {
+				case 0:
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
+					break;
+				case 1:
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3;
+					break;
+				case 2:
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
+					break;
+				case 3:
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
+					break;
+				case 4:
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
+					break;
+				default:
+					Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
+				}
+
+				return 1;
+			}
+		} else if (var0 == ScriptOpcodes.AND) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 & var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.OR) {
+			class188.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = var3 | var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SCALE) {
+			class188.Interpreter_intStackSize -= 3;
+			long var9 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize];
+			long var11 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 1];
+			long var13 = (long)Interpreter.Interpreter_intStack[class188.Interpreter_intStackSize + 2];
+			Interpreter.Interpreter_intStack[++class188.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
+			return 1;
+		} else {
+			return 2;
 		}
 	}
 }

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

@@ -1,43 +1,59 @@
-import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("i")
+@ObfuscatedName("d")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -1279002911
+	)
+	@Export("musicTrackFileId")
+	static int musicTrackFileId;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "Lli;"
+	)
+	static IndexedSprite field64;
+	@ObfuscatedName("fa")
+	@ObfuscatedSignature(
+		signature = "Lko;"
+	)
+	@Export("fontBold12")
+	static Font fontBold12;
+	@ObfuscatedName("f")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1162503983
+		intValue = 903381877
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 501595023
+		intValue = 1525595903
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -483385453
+		intValue = -181305079
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1432604557
+		intValue = -1020605845
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -446179957
+		intValue = 824366687
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -46,7 +62,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkg;Z)V",
+		signature = "(Lkq;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -58,42 +74,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "855351335"
+		garbageValue = "-519143415"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "8"
+		garbageValue = "-1944649855"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "6"
+		garbageValue = "-26019402"
 	)
-	void method109(int var1) {
+	void method99(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1915474642"
+		garbageValue = "-1969903695"
 	)
-	void method110(int var1) {
+	void method100(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -101,143 +117,31 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "([BIIII[Lfh;B)V",
+		signature = "(IIIII)V",
-		garbageValue = "0"
+		garbageValue = "-2077652257"
 	)
-	static final void method123(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+	static final void method114(int var0, int var1, int var2, int var3) {
-		int var7;
+		for (int var4 = var1; var4 <= var3 + var1; ++var4) {
-		int var8;
+			for (int var5 = var0; var5 <= var0 + var2; ++var5) {
-		for (int var6 = 0; var6 < 4; ++var6) {
+				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
-			for (var7 = 0; var7 < 64; ++var7) {
+					Tiles.field496[0][var5][var4] = 127;
-				for (var8 = 0; var8 < 64; ++var8) {
+					if (var0 == var5 && var5 > 0) {
-					if (var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) {
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
-						int[] var10000 = var5[var6].flags[var7 + var1];
-						var10000[var2 + var8] &= -16777217;
-					}
-				}
-			}
-		}
-
-		Buffer var10 = new Buffer(var0);
-
-		for (var7 = 0; var7 < 4; ++var7) {
-			for (var8 = 0; var8 < 64; ++var8) {
-				for (int var9 = 0; var9 < 64; ++var9) {
-					loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0);
-				}
-			}
-		}
-
-	}
-
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "(Ljava/awt/Component;I)V",
-		garbageValue = "-625365247"
-	)
-	static void method129(Component var0) {
-		var0.removeKeyListener(KeyHandler.KeyHandler_instance);
-		var0.removeFocusListener(KeyHandler.KeyHandler_instance);
-		KeyHandler.field397 = -1;
-	}
-
-	@ObfuscatedName("b")
-	@Export("base37DecodeLong")
-	public static String base37DecodeLong(long var0) {
-		if (var0 > 0L && var0 < 6582952005840035281L) {
-			if (var0 % 37L == 0L) {
-				return null;
-			} else {
-				int var2 = 0;
-
-				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
-					++var2;
-				}
-
-				StringBuilder var5;
-				char var8;
-				for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) {
-					long var6 = var0;
-					var0 /= 37L;
-					var8 = class288.base37Table[(int)(var6 - 37L * var0)];
-					if (var8 == '_') {
-						int var9 = var5.length() - 1;
-						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9)));
-						var8 = 160;
-					}
-				}
-
-				var5.reverse();
-				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0)));
-				return var5.toString();
-			}
-		} else {
-			return null;
-		}
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(Lkg;IIIIIIB)V",
-		garbageValue = "85"
-	)
-	@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) {
-			Tiles.Tiles_renderFlags[var1][var2][var3] = 0;
-
-			while (true) {
-				var7 = var0.readUnsignedByte();
-				if (var7 == 0) {
-					if (var1 == 0) {
-						Tiles.Tiles_heights[0][var2][var3] = -class188.method3692(var4 + var2 + 932731, var3 + 556238 + var5) * 8;
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
-					}
-					break;
-				}
-
-				if (var7 == 1) {
-					int var8 = var0.readUnsignedByte();
-					if (var8 == 1) {
-						var8 = 0;
 					}
 
-					if (var1 == 0) {
+					if (var5 == var0 + var2 && var5 < 103) {
-						Tiles.Tiles_heights[0][var2][var3] = -var8 * 8;
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
-					} else {
-						Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8;
 					}
-					break;
-				}
 
-				if (var7 <= 49) {
+					if (var4 == var1 && var4 > 0) {
-					Tiles.field499[var1][var2][var3] = var0.readByte();
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
-					Tiles.field500[var1][var2][var3] = (byte)((var7 - 2) / 4);
+					}
-					Tiles.field501[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
-				} else if (var7 <= 81) {
-					Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49);
-				} else {
-					Tiles.field498[var1][var2][var3] = (byte)(var7 - 81);
-				}
-			}
-		} else {
-			while (true) {
-				var7 = var0.readUnsignedByte();
-				if (var7 == 0) {
-					break;
-				}
 
-				if (var7 == 1) {
+					if (var4 == var3 + var1 && var4 < 103) {
-					var0.readUnsignedByte();
+						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
-					break;
+					}
-				}
-
-				if (var7 <= 49) {
-					var0.readUnsignedByte();
 				}
 			}
 		}

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

@@ -1,42 +1,20 @@
 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("o")
+@ObfuscatedName("v")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("sn")
+	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = 1973722011
-	)
-	@Export("foundItemIndex")
-	static int foundItemIndex;
-	@ObfuscatedName("dn")
 	@ObfuscatedSignature(
-		signature = "Lij;"
+		signature = "(Lx;Lx;I)I",
-	)
+		garbageValue = "-119535735"
-	@Export("archive0")
-	static Archive archive0;
-	@ObfuscatedName("gs")
-	@Export("regionLandArchiveIds")
-	static int[] regionLandArchiveIds;
-	@ObfuscatedName("he")
-	@ObfuscatedGetter(
-		intValue = -1622356541
-	)
-	static int field78;
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "(Ly;Ly;I)I",
-		garbageValue = "1968951579"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1);
+		return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1);
 	}
 
 	public boolean equals(Object var1) {
@@ -49,98 +27,19 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(II)Liy;",
+		signature = "(I)V",
-		garbageValue = "-1360050328"
+		garbageValue = "2135681337"
 	)
-	@Export("SequenceDefinition_get")
+	public static void method147() {
-	public static SequenceDefinition SequenceDefinition_get(int var0) {
+		class117.reflectionChecks = new IterableNodeDeque();
-		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		} else {
-			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
-			var1 = new SequenceDefinition();
-			if (var2 != null) {
-				var1.decode(new Buffer(var2));
-			}
-
-			var1.postDecode();
-			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
-			return var1;
-		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "1757015417"
-	)
-	@Export("addGameMessage")
-	static void addGameMessage(int var0, String var1, String var2) {
-		SecureRandomCallable.addChatMessage(var0, var1, var2, (String)null);
-	}
-
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-41"
+		garbageValue = "28"
 	)
-	@Export("WorldMapRegion_clearCachedSprites")
+	public static void method146() {
-	static void WorldMapRegion_clearCachedSprites() {
+		StructDefinition.StructDefinition_cached.clear();
-		WorldMapRegion.WorldMapRegion_cachedSprites.clear();
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(I)Llm;",
-		garbageValue = "1974052885"
-	)
-	static IndexedSprite method172() {
-		IndexedSprite var0 = new IndexedSprite();
-		var0.width = class325.SpriteBuffer_spriteWidth;
-		var0.height = UserComparator9.SpriteBuffer_spriteHeight;
-		var0.xOffset = UrlRequester.SpriteBuffer_xOffsets[0];
-		var0.yOffset = class216.SpriteBuffer_yOffsets[0];
-		var0.subWidth = class325.SpriteBuffer_spriteWidths[0];
-		var0.subHeight = VarcInt.SpriteBuffer_spriteHeights[0];
-		var0.palette = class325.SpriteBuffer_spritePalette;
-		var0.pixels = FillMode.SpriteBuffer_pixels[0];
-		PcmPlayer.method2510();
-		return var0;
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(Lbp;B)V",
-		garbageValue = "14"
-	)
-	@Export("changeWorld")
-	static void changeWorld(World var0) {
-		if (var0.isMembersOnly() != Client.isMembersWorld) {
-			Client.isMembersWorld = var0.isMembersOnly();
-			WorldMapCacheName.method637(var0.isMembersOnly());
-		}
-
-		Canvas.worldHost = var0.host;
-		Client.worldId = var0.id;
-		Client.worldProperties = var0.properties;
-		SecureRandomCallable.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
-		class49.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000;
-		WorldMapIcon_0.port3 = SecureRandomCallable.port1;
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(IZII)V",
-		garbageValue = "-1741540406"
-	)
-	public static final void method170(int var0, boolean var1, int var2) {
-		if (var0 >= 8000 && var0 <= 48000) {
-			Messages.PcmPlayer_sampleRate = var0;
-			PcmPlayer.PcmPlayer_stereo = var1;
-			RouteStrategy.field2114 = var2;
-		} else {
-			throw new IllegalArgumentException();
-		}
 	}
 }

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

@@ -1,624 +1,291 @@
+import java.io.File;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("x")
+@ObfuscatedName("o")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("ew")
+	@ObfuscatedName("i")
-	@ObfuscatedGetter(
+	@Export("FileSystem_cacheDir")
-		intValue = -2040766613
+	static File FileSystem_cacheDir;
-	)
+	@ObfuscatedName("ef")
-	static int field73;
-
-	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Ly;Ly;B)I",
+		signature = "Lif;"
-		garbageValue = "-36"
+	)
+	@Export("archive17")
+	static Archive archive17;
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(Lx;Lx;I)I",
+		garbageValue = "1230238028"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.getOfferName().compareTo(var2.getOfferName());
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("u")
+	public int compare(Object var1, Object var2) {
-	@ObfuscatedSignature(
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-		signature = "(I)V",
-		garbageValue = "1232300438"
-	)
-	static void method153() {
-		if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
-			KeyHandler.KeyHandler_keyCodes[186] = 57;
-			KeyHandler.KeyHandler_keyCodes[187] = 27;
-			KeyHandler.KeyHandler_keyCodes[188] = 71;
-			KeyHandler.KeyHandler_keyCodes[189] = 26;
-			KeyHandler.KeyHandler_keyCodes[190] = 72;
-			KeyHandler.KeyHandler_keyCodes[191] = 73;
-			KeyHandler.KeyHandler_keyCodes[192] = 58;
-			KeyHandler.KeyHandler_keyCodes[219] = 42;
-			KeyHandler.KeyHandler_keyCodes[220] = 74;
-			KeyHandler.KeyHandler_keyCodes[221] = 43;
-			KeyHandler.KeyHandler_keyCodes[222] = 59;
-			KeyHandler.KeyHandler_keyCodes[223] = 28;
-		} else {
-			KeyHandler.KeyHandler_keyCodes[44] = 71;
-			KeyHandler.KeyHandler_keyCodes[45] = 26;
-			KeyHandler.KeyHandler_keyCodes[46] = 72;
-			KeyHandler.KeyHandler_keyCodes[47] = 73;
-			KeyHandler.KeyHandler_keyCodes[59] = 57;
-			KeyHandler.KeyHandler_keyCodes[61] = 27;
-			KeyHandler.KeyHandler_keyCodes[91] = 42;
-			KeyHandler.KeyHandler_keyCodes[92] = 74;
-			KeyHandler.KeyHandler_keyCodes[93] = 43;
-			KeyHandler.KeyHandler_keyCodes[192] = 28;
-			KeyHandler.KeyHandler_keyCodes[222] = 58;
-			KeyHandler.KeyHandler_keyCodes[520] = 59;
-		}
-
 	}
 
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lby;II)V",
+		signature = "(Lhz;III)[Lls;",
-		garbageValue = "808339496"
+		garbageValue = "-1409771005"
 	)
-	@Export("runScript")
+	@Export("SpriteBuffer_getSpriteArray")
-	static void runScript(ScriptEvent var0, int var1) {
+	public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) {
-		Object[] var2 = var0.args;
+		if (!HitSplatDefinition.method4586(var0, var1, var2)) {
-		Script var3;
+			return null;
-		int var17;
-		if (class210.isWorldMapEvent(var0.type)) {
-			Messages.worldMapEvent = (WorldMapEvent)var2[0];
-			WorldMapElement var4 = Varcs.WorldMapElement_get(Messages.worldMapEvent.mapElement);
-			var3 = class195.getWorldMapScript(var0.type, var4.objectId, var4.category);
 		} else {
-			var17 = (Integer)var2[0];
+			Sprite[] var4 = new Sprite[class325.SpriteBuffer_spriteCount];
-			var3 = class30.getScript(var17);
-		}
 
-		if (var3 != null) {
+			for (int var5 = 0; var5 < class325.SpriteBuffer_spriteCount; ++var5) {
-			GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize = 0;
+				Sprite var6 = var4[var5] = new Sprite();
-			class43.Interpreter_stringStackSize = 0;
+				var6.width = class325.SpriteBuffer_spriteWidth;
-			var17 = -1;
+				var6.height = class325.SpriteBuffer_spriteHeight;
-			int[] var5 = var3.opcodes;
+				var6.xOffset = class325.SpriteBuffer_xOffsets[var5];
-			int[] var6 = var3.intOperands;
+				var6.yOffset = class325.SpriteBuffer_yOffsets[var5];
-			byte var7 = -1;
+				var6.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var5];
-			Interpreter.Interpreter_frameDepth = 0;
+				var6.subHeight = class325.SpriteBuffer_spriteHeights[var5];
-			Interpreter.field1093 = false;
+				int var7 = var6.subWidth * var6.subHeight;
+				byte[] var8 = class290.SpriteBuffer_pixels[var5];
+				var6.pixels = new int[var7];
 
-			try {
+				for (int var9 = 0; var9 < var7; ++var9) {
-				int var10;
+					var6.pixels[var9] = class268.SpriteBuffer_spritePalette[var8[var9] & 255];
-				try {
-					Frames.Interpreter_intLocals = new int[var3.localIntCount];
-					int var8 = 0;
-					LoginScreenAnimation.Interpreter_stringLocals = new String[var3.localStringCount];
-					int var9 = 0;
-
-					int var11;
-					String var18;
-					for (var10 = 1; var10 < var2.length; ++var10) {
-						if (var2[var10] instanceof Integer) {
-							var11 = (Integer)var2[var10];
-							if (var11 == -2147483647) {
-								var11 = var0.mouseX;
-							}
-
-							if (var11 == -2147483646) {
-								var11 = var0.mouseY;
-							}
-
-							if (var11 == -2147483645) {
-								var11 = var0.widget != null ? var0.widget.id : -1;
-							}
-
-							if (var11 == -2147483644) {
-								var11 = var0.opIndex;
-							}
-
-							if (var11 == -2147483643) {
-								var11 = var0.widget != null ? var0.widget.childIndex : -1;
-							}
-
-							if (var11 == -2147483642) {
-								var11 = var0.dragTarget != null ? var0.dragTarget.id : -1;
-							}
-
-							if (var11 == -2147483641) {
-								var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1;
-							}
-
-							if (var11 == -2147483640) {
-								var11 = var0.keyTyped;
-							}
-
-							if (var11 == -2147483639) {
-								var11 = var0.keyPressed;
-							}
-
-							Frames.Interpreter_intLocals[var8++] = var11;
-						} else if (var2[var10] instanceof String) {
-							var18 = (String)var2[var10];
-							if (var18.equals("event_opbase")) {
-								var18 = var0.targetName;
-							}
-
-							LoginScreenAnimation.Interpreter_stringLocals[var9++] = var18;
-						}
-					}
-
-					var10 = 0;
-					Interpreter.field1095 = var0.field577;
-
-					while (true) {
-						++var10;
-						if (var10 > var1) {
-							throw new RuntimeException();
-						}
-
-						++var17;
-						int var29 = var5[var17];
-						int var20;
-						if (var29 >= 100) {
-							boolean var32;
-							if (var3.intOperands[var17] == 1) {
-								var32 = true;
-							} else {
-								var32 = false;
-							}
-
-							var20 = NetCache.method4397(var29, var3, var32);
-							switch(var20) {
-							case 0:
-								return;
-							case 1:
-							default:
-								break;
-							case 2:
-								throw new IllegalStateException();
-							}
-						} else if (var29 == 0) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6[var17];
-						} else if (var29 == ScriptOpcodes.GET_VARP) {
-							var11 = var6[var17];
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Varps.Varps_main[var11];
-						} else if (var29 == ScriptOpcodes.SET_VARP) {
-							var11 = var6[var17];
-							Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-							ObjectDefinition.changeGameOptions(var11);
-						} else if (var29 == ScriptOpcodes.SCONST) {
-							Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
-						} else if (var29 == ScriptOpcodes.JUMP) {
-							var17 += var6[var17];
-						} else if (var29 == ScriptOpcodes.IF_ICMPNE) {
-							GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-							if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) {
-								var17 += var6[var17];
-							}
-						} else if (var29 == ScriptOpcodes.IF_ICMPEQ) {
-							GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-							if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) {
-								var17 += var6[var17];
-							}
-						} else if (var29 == ScriptOpcodes.IF_ICMPLT) {
-							GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-							if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) {
-								var17 += var6[var17];
-							}
-						} else if (var29 == ScriptOpcodes.IF_ICMPGT) {
-							GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-							if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) {
-								var17 += var6[var17];
-							}
-						} else if (var29 == ScriptOpcodes.RETURN) {
-							if (Interpreter.Interpreter_frameDepth == 0) {
-								return;
-							}
-
-							ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
-							var3 = var34.script;
-							var5 = var3.opcodes;
-							var6 = var3.intOperands;
-							var17 = var34.pc;
-							Frames.Interpreter_intLocals = var34.intLocals;
-							LoginScreenAnimation.Interpreter_stringLocals = var34.stringLocals;
-						} else if (var29 == ScriptOpcodes.GET_VARBIT) {
-							var11 = var6[var17];
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = FileSystem.getVarbit(var11);
-						} else if (var29 == ScriptOpcodes.SET_VARBIT) {
-							var11 = var6[var17];
-							JagexCache.method3540(var11, Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-						} else if (var29 == ScriptOpcodes.IF_ICMPLE) {
-							GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-							if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) {
-								var17 += var6[var17];
-							}
-						} else if (var29 == ScriptOpcodes.IF_ICMPGE) {
-							GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-							if (Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]) {
-								var17 += var6[var17];
-							}
-						} else if (var29 == ScriptOpcodes.ILOAD) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Frames.Interpreter_intLocals[var6[var17]];
-						} else if (var29 == ScriptOpcodes.ISTORE) {
-							Frames.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-						} else if (var29 == ScriptOpcodes.SLOAD) {
-							Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = LoginScreenAnimation.Interpreter_stringLocals[var6[var17]];
-						} else if (var29 == ScriptOpcodes.SSTORE) {
-							LoginScreenAnimation.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize];
-						} else if (var29 == ScriptOpcodes.JOIN_STRING) {
-							var11 = var6[var17];
-							class43.Interpreter_stringStackSize -= var11;
-							String var31 = FontName.method5425(Interpreter.Interpreter_stringStack, class43.Interpreter_stringStackSize, var11);
-							Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var31;
-						} else if (var29 == ScriptOpcodes.POP_INT) {
-							--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize;
-						} else if (var29 == ScriptOpcodes.POP_STRING) {
-							--class43.Interpreter_stringStackSize;
-						} else {
-							int var15;
-							if (var29 != ScriptOpcodes.INVOKE) {
-								if (var29 == ScriptOpcodes.GET_VARC_INT) {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = AttackOption.varcs.getInt(var6[var17]);
-								} else if (var29 == ScriptOpcodes.SET_VARC_INT) {
-									AttackOption.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-								} else if (var29 == ScriptOpcodes.DEFINE_ARRAY) {
-									var11 = var6[var17] >> 16;
-									var20 = var6[var17] & 65535;
-									int var21 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-									if (var21 < 0 || var21 > 5000) {
-										throw new RuntimeException();
-									}
-
-									Interpreter.Interpreter_arrayLengths[var11] = var21;
-									byte var22 = -1;
-									if (var20 == 105) {
-										var22 = 0;
-									}
-
-									for (var15 = 0; var15 < var21; ++var15) {
-										Interpreter.Interpreter_arrays[var11][var15] = var22;
-									}
-								} else if (var29 == ScriptOpcodes.GET_ARRAY_INT) {
-									var11 = var6[var17];
-									var20 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-									if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
-										throw new RuntimeException();
-									}
-
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20];
-								} else if (var29 == ScriptOpcodes.SET_ARRAY_INT) {
-									var11 = var6[var17];
-									GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-									var20 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-									if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
-										throw new RuntimeException();
-									}
-
-									Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1];
-								} else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) {
-									var18 = AttackOption.varcs.getStringOld(var6[var17]);
-									if (var18 == null) {
-										var18 = "null";
-									}
-
-									Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var18;
-								} else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) {
-									AttackOption.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]);
-								} else if (var29 == ScriptOpcodes.GET_VARC_STRING) {
-									var18 = AttackOption.varcs.getString(var6[var17]);
-									Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var18;
-								} else if (var29 == ScriptOpcodes.SET_VARC_STRING) {
-									AttackOption.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--class43.Interpreter_stringStackSize]);
-								} else {
-									if (var29 != ScriptOpcodes.SWITCH) {
-										throw new IllegalStateException();
-									}
-
-									IterableNodeHashTable var33 = var3.switches[var6[var17]];
-									IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-									if (var30 != null) {
-										var17 += var30.integer;
-									}
-								}
-							} else {
-								var11 = var6[var17];
-								Script var12 = class30.getScript(var11);
-								int[] var13 = new int[var12.localIntCount];
-								String[] var14 = new String[var12.localStringCount];
-
-								for (var15 = 0; var15 < var12.intArgumentCount; ++var15) {
-									var13[var15] = Interpreter.Interpreter_intStack[var15 + (GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - var12.intArgumentCount)];
-								}
-
-								for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) {
-									var14[var15] = Interpreter.Interpreter_stringStack[var15 + (class43.Interpreter_stringStackSize - var12.stringArgumentCount)];
-								}
-
-								GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= var12.intArgumentCount;
-								class43.Interpreter_stringStackSize -= var12.stringArgumentCount;
-								ScriptFrame var19 = new ScriptFrame();
-								var19.script = var3;
-								var19.pc = var17;
-								var19.intLocals = Frames.Interpreter_intLocals;
-								var19.stringLocals = LoginScreenAnimation.Interpreter_stringLocals;
-								Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19;
-								var3 = var12;
-								var5 = var12.opcodes;
-								var6 = var12.intOperands;
-								var17 = -1;
-								Frames.Interpreter_intLocals = var13;
-								LoginScreenAnimation.Interpreter_stringLocals = var14;
-							}
-						}
-					}
-				} catch (Exception var27) {
-					StringBuilder var24 = new StringBuilder(30);
-					var24.append("").append(var3.key).append(" ");
-
-					for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) {
-						var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" ");
-					}
-
-					var24.append("").append(var7);
-					Calendar.RunException_sendStackTrace(var24.toString(), var27);
 				}
-			} finally {
-				if (Interpreter.field1093) {
-					Interpreter.field1087 = true;
-					Actor.method1756();
-					Interpreter.field1087 = false;
-					Interpreter.field1093 = false;
-				}
-
 			}
+
+			Message.method1223();
+			return var4;
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkj;II)V",
+		signature = "(ILcu;ZB)I",
-		garbageValue = "1585697176"
+		garbageValue = "-68"
 	)
-	@Export("readPlayerUpdate")
+	static int method134(int var0, Script var1, boolean var2) {
-	static void readPlayerUpdate(PacketBuffer var0, int var1) {
+		Widget var3;
-		boolean var2 = var0.readBits(1) == 1;
+		if (var0 >= 2000) {
-		if (var2) {
+			var0 -= 1000;
-			Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
+			var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
-		}
-
-		int var3 = var0.readBits(2);
-		Player var4 = Client.players[var1];
-		if (var3 == 0) {
-			if (var2) {
-				var4.field630 = false;
-			} else if (Client.localPlayerIndex == var1) {
-				throw new RuntimeException();
-			} else {
-				Players.Players_regions[var1] = (var4.plane << 28) + (class51.baseX * 64 + var4.pathX[0] >> 13 << 14) + (VarcInt.baseY * 64 + var4.pathY[0] >> 13);
-				if (var4.field965 != -1) {
-					Players.Players_orientations[var1] = var4.field965;
-				} else {
-					Players.Players_orientations[var1] = var4.orientation;
-				}
-
-				Players.Players_targetIndices[var1] = var4.targetIndex;
-				Client.players[var1] = null;
-				if (var0.readBits(1) != 0) {
-					Client.updateExternalPlayer(var0, var1);
-				}
-
-			}
 		} else {
-			int var5;
+			var3 = var2 ? UserComparator7.field1946 : class197.field2398;
-			int var6;
+		}
-			int var7;
-			if (var3 == 1) {
-				var5 = var0.readBits(3);
-				var6 = var4.pathX[0];
-				var7 = var4.pathY[0];
-				if (var5 == 0) {
-					--var6;
-					--var7;
-				} else if (var5 == 1) {
-					--var7;
-				} else if (var5 == 2) {
-					++var6;
-					--var7;
-				} else if (var5 == 3) {
-					--var6;
-				} else if (var5 == 4) {
-					++var6;
-				} else if (var5 == 5) {
-					--var6;
-					++var7;
-				} else if (var5 == 6) {
-					++var7;
-				} else if (var5 == 7) {
-					++var6;
-					++var7;
-				}
 
-				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+		String var4 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize];
-					var4.resetPath(var6, var7);
+		int[] var5 = null;
-					var4.field630 = false;
+		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
-				} else if (var2) {
+			int var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
-					var4.field630 = true;
+			if (var6 > 0) {
-					var4.tileX = var6;
+				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]) {
-					var4.tileY = var7;
-				} else {
-					var4.field630 = false;
-					var4.method1255(var6, var7, Players.field1247[var1]);
 				}
+			}
 
-			} else if (var3 == 2) {
+			var4 = var4.substring(0, var4.length() - 1);
-				var5 = var0.readBits(4);
+		}
-				var6 = var4.pathX[0];
-				var7 = var4.pathY[0];
-				if (var5 == 0) {
-					var6 -= 2;
-					var7 -= 2;
-				} else if (var5 == 1) {
-					--var6;
-					var7 -= 2;
-				} else if (var5 == 2) {
-					var7 -= 2;
-				} else if (var5 == 3) {
-					++var6;
-					var7 -= 2;
-				} else if (var5 == 4) {
-					var6 += 2;
-					var7 -= 2;
-				} else if (var5 == 5) {
-					var6 -= 2;
-					--var7;
-				} else if (var5 == 6) {
-					var6 += 2;
-					--var7;
-				} else if (var5 == 7) {
-					var6 -= 2;
-				} else if (var5 == 8) {
-					var6 += 2;
-				} else if (var5 == 9) {
-					var6 -= 2;
-					++var7;
-				} else if (var5 == 10) {
-					var6 += 2;
-					++var7;
-				} else if (var5 == 11) {
-					var6 -= 2;
-					var7 += 2;
-				} else if (var5 == 12) {
-					--var6;
-					var7 += 2;
-				} else if (var5 == 13) {
-					var7 += 2;
-				} else if (var5 == 14) {
-					++var6;
-					var7 += 2;
-				} else if (var5 == 15) {
-					var6 += 2;
-					var7 += 2;
-				}
 
-				if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+		Object[] var8 = new Object[var4.length() + 1];
-					var4.resetPath(var6, var7);
-					var4.field630 = false;
-				} else if (var2) {
-					var4.field630 = true;
-					var4.tileX = var6;
-					var4.tileY = var7;
-				} else {
-					var4.field630 = false;
-					var4.method1255(var6, var7, Players.field1247[var1]);
-				}
 
+		int var7;
+		for (var7 = var8.length - 1; var7 >= 1; --var7) {
+			if (var4.charAt(var7 - 1) == 's') {
+				var8[var7] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize];
 			} else {
-				var5 = var0.readBits(1);
+				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
-				int var8;
+			}
-				int var9;
+		}
-				int var10;
-				int var11;
-				if (var5 == 0) {
-					var6 = var0.readBits(12);
-					var7 = var6 >> 10;
-					var8 = var6 >> 5 & 31;
-					if (var8 > 15) {
-						var8 -= 32;
-					}
 
-					var9 = var6 & 31;
+		var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
-					if (var9 > 15) {
+		if (var7 != -1) {
-						var9 -= 32;
+			var8[0] = new Integer(var7);
-					}
+		} else {
+			var8 = null;
+		}
 
-					var10 = var8 + var4.pathX[0];
+		if (var0 == ScriptOpcodes.CC_SETONCLICK) {
-					var11 = var9 + var4.pathY[0];
+			var3.onClick = var8;
-					if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+		} else if (var0 == ScriptOpcodes.CC_SETONHOLD) {
-						var4.resetPath(var10, var11);
+			var3.onHold = var8;
-						var4.field630 = false;
+		} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) {
-					} else if (var2) {
+			var3.onRelease = var8;
-						var4.field630 = true;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) {
-						var4.tileX = var10;
+			var3.onMouseOver = var8;
-						var4.tileY = var11;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) {
-					} else {
+			var3.onMouseLeave = var8;
-						var4.field630 = false;
+		} else if (var0 == ScriptOpcodes.CC_SETONDRAG) {
-						var4.method1255(var10, var11, Players.field1247[var1]);
+			var3.onDrag = var8;
-					}
+		} else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) {
+			var3.onTargetLeave = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) {
+			var3.onVarTransmit = var8;
+			var3.varTransmitTriggers = var5;
+		} else if (var0 == ScriptOpcodes.CC_SETONTIMER) {
+			var3.onTimer = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONOP) {
+			var3.onOp = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) {
+			var3.onDragComplete = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) {
+			var3.onClickRepeat = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) {
+			var3.onMouseRepeat = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) {
+			var3.onInvTransmit = var8;
+			var3.invTransmitTriggers = var5;
+		} else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) {
+			var3.onStatTransmit = var8;
+			var3.statTransmitTriggers = var5;
+		} else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) {
+			var3.onTargetEnter = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) {
+			var3.onScroll = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) {
+			var3.onChatTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONKEY) {
+			var3.onKey = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) {
+			var3.onFriendTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) {
+			var3.onClanTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) {
+			var3.onMiscTransmit = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) {
+			var3.onDialogAbort = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) {
+			var3.onSubChange = var8;
+		} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) {
+			var3.onStockTransmit = var8;
+		} else if (var0 == 1426) {
+			var3.field2562 = var8;
+		} else {
+			if (var0 != ScriptOpcodes.CC_SETONRESIZE) {
+				return 2;
+			}
 
-					var4.plane = (byte)(var7 + var4.plane & 3);
+			var3.onResize = var8;
-					if (Client.localPlayerIndex == var1) {
+		}
-						ClientPacket.Client_plane = var4.plane;
-					}
 
-				} else {
+		var3.hasListener = true;
-					var6 = var0.readBits(30);
+		return 1;
-					var7 = var6 >> 28;
+	}
-					var8 = var6 >> 14 & 16383;
-					var9 = var6 & 16383;
-					var10 = (class51.baseX * 64 + var8 + var4.pathX[0] & 16383) - class51.baseX * 64;
-					var11 = (VarcInt.baseY * 64 + var9 + var4.pathY[0] & 16383) - VarcInt.baseY * 64;
-					if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
-						var4.resetPath(var10, var11);
-						var4.field630 = false;
-					} else if (var2) {
-						var4.field630 = true;
-						var4.tileX = var10;
-						var4.tileY = var11;
-					} else {
-						var4.field630 = false;
-						var4.method1255(var10, var11, Players.field1247[var1]);
-					}
-
-					var4.plane = (byte)(var7 + var4.plane & 3);
-					if (Client.localPlayerIndex == var1) {
-						ClientPacket.Client_plane = var4.plane;
-					}
 
+	@ObfuscatedName("jc")
+	@ObfuscatedSignature(
+		signature = "(Lha;III)V",
+		garbageValue = "527227897"
+	)
+	@Export("clickWidget")
+	static final void clickWidget(Widget var0, int var1, int var2) {
+		if (Client.clickedWidget == null && !Client.isMenuOpen) {
+			if (var0 != null) {
+				Widget var4 = StudioGame.method4116(var0);
+				if (var4 == null) {
+					var4 = var0.parent;
 				}
+
+				if (var4 != null) {
+					Client.clickedWidget = var0;
+					var4 = StudioGame.method4116(var0);
+					if (var4 == null) {
+						var4 = var0.parent;
+					}
+
+					Client.clickedWidgetParent = var4;
+					Client.widgetClickX = var1;
+					Client.widgetClickY = var2;
+					WorldMapSection2.widgetDragDuration = 0;
+					Client.isDraggingWidget = false;
+					int var5 = GrandExchangeOfferOwnWorldComparator.method1288();
+					if (var5 != -1) {
+						BuddyRankComparator.method3361(var5);
+					}
+
+					return;
+				}
+			}
+
+		}
+	}
+
+	@ObfuscatedName("kn")
+	@ObfuscatedSignature(
+		signature = "(Lha;B)Z",
+		garbageValue = "26"
+	)
+	static final boolean method136(Widget var0) {
+		int var1 = var0.contentType;
+		if (var1 == 205) {
+			Client.logoutTimer = 250;
+			return true;
+		} else {
+			int var2;
+			int var3;
+			if (var1 >= 300 && var1 <= 313) {
+				var2 = (var1 - 300) / 2;
+				var3 = var1 & 1;
+				Client.playerAppearance.changeAppearance(var2, var3 == 1);
+			}
+
+			if (var1 >= 314 && var1 <= 323) {
+				var2 = (var1 - 314) / 2;
+				var3 = var1 & 1;
+				Client.playerAppearance.method3978(var2, var3 == 1);
+			}
+
+			if (var1 == 324) {
+				Client.playerAppearance.changeSex(false);
+			}
+
+			if (var1 == 325) {
+				Client.playerAppearance.changeSex(true);
+			}
+
+			if (var1 == 326) {
+				PacketBufferNode var4 = class2.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher);
+				Client.playerAppearance.write(var4.packetBuffer);
+				Client.packetWriter.addNode(var4);
+				return true;
+			} else {
+				return false;
 			}
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("kl")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(IIIILls;Lhy;I)V",
-		garbageValue = "1138794576"
+		garbageValue = "1019176627"
 	)
-	public static void method154() {
+	@Export("drawSpriteOnMinimap")
-		FloorOverlayDefinition.FloorOverlayDefinition_cached.clear();
+	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-	}
+		if (var4 != null) {
+			int var6 = Client.camAngleY & 2047;
+			int var7 = var3 * var3 + var2 * var2;
+			if (var7 <= 6400) {
+				int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
+				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
+				int var10 = var9 * var2 + var3 * var8 >> 16;
+				int var11 = var3 * var9 - var8 * var2 >> 16;
+				if (var7 > 2500) {
+					var4.method6251(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
+				} else {
+					var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
+				}
 
-	@ObfuscatedName("e")
+			}
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "121"
-	)
-	static final void method145() {
-		WorldMapSection2.method347("Your ignore list is full. Max of 100 for free users, and 400 for members");
-	}
-
-	@ObfuscatedName("fg")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "1975621391"
-	)
-	static final void method157() {
-		if (Client.field867 != ClientPacket.Client_plane) {
-			Client.field867 = ClientPacket.Client_plane;
-			Client.method1746(ClientPacket.Client_plane);
 		}
-
 	}
 }

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

@@ -5,42 +5,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bw")
+@ObfuscatedName("bb")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("qx")
+	@ObfuscatedName("rs")
 	@ObfuscatedGetter(
-		intValue = 785039360
+		intValue = 756915395
 	)
-	static int field639;
+	static int field623;
-	@ObfuscatedName("i")
+	@ObfuscatedName("eu")
-	@ObfuscatedSignature(
+	static int[] field626;
-		signature = "Lez;"
+	@ObfuscatedName("gf")
-	)
+	@Export("regionMapArchives")
-	@Export("World_request")
+	static byte[][] regionMapArchives;
-	static UrlRequest World_request;
+	@ObfuscatedName("f")
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 1039309317
-	)
-	@Export("loginBoxCenter")
-	static int loginBoxCenter;
-	@ObfuscatedName("aa")
-	@ObfuscatedSignature(
-		signature = "Llw;"
-	)
-	static Bounds field638;
-	@ObfuscatedName("u")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ly;Ly;I)I",
+		signature = "(Lx;Lx;I)I",
-		garbageValue = "415242896"
+		garbageValue = "-1149746990"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -61,464 +49,20 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 		}
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("fj")
+	public boolean equals(Object var1) {
+		return super.equals(var1);
+	}
+
+	@ObfuscatedName("ik")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(I)I",
-		garbageValue = "-2027936966"
+		garbageValue = "-524151860"
 	)
-	@Export("load")
+	static final int method1288() {
-	static void load() {
+		return Client.menuOptionsCount - 1;
-		int var0;
-		if (Client.titleLoadingStage == 0) {
-			class2.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
-
-			for (var0 = 0; var0 < 4; ++var0) {
-				Client.collisionMaps[var0] = new CollisionMap(104, 104);
-			}
-
-			Interpreter.sceneMinimapSprite = new Sprite(512, 512);
-			Login.Login_loadingText = "Starting game engine...";
-			Login.Login_loadingPercent = 5;
-			Client.titleLoadingStage = 20;
-		} else if (Client.titleLoadingStage == 20) {
-			Login.Login_loadingText = "Prepared visibility map";
-			Login.Login_loadingPercent = 10;
-			Client.titleLoadingStage = 30;
-		} else if (Client.titleLoadingStage == 30) {
-			GrandExchangeOfferAgeComparator.archive0 = GameShell.newArchive(0, false, true, true);
-			class43.archive1 = GameShell.newArchive(1, false, true, true);
-			class288.archive2 = GameShell.newArchive(2, true, false, true);
-			WorldMapID.archive3 = GameShell.newArchive(3, false, true, true);
-			SpriteMask.archive4 = GameShell.newArchive(4, false, true, true);
-			DirectByteArrayCopier.archive5 = GameShell.newArchive(5, true, true, true);
-			AbstractWorldMapData.archive6 = GameShell.newArchive(6, true, true, true);
-			ClientPacket.archive7 = GameShell.newArchive(7, false, true, true);
-			WorldMapRegion.archive8 = GameShell.newArchive(8, false, true, true);
-			class2.archive9 = GameShell.newArchive(9, false, true, true);
-			class81.archive10 = GameShell.newArchive(10, false, true, true);
-			ScriptFrame.archive11 = GameShell.newArchive(11, false, true, true);
-			class267.archive12 = GameShell.newArchive(12, false, true, true);
-			class269.archive13 = GameShell.newArchive(13, true, false, true);
-			class162.archive14 = GameShell.newArchive(14, false, true, true);
-			class210.archive15 = GameShell.newArchive(15, false, true, true);
-			AbstractWorldMapIcon.archive17 = GameShell.newArchive(17, true, true, true);
-			UserComparator9.archive18 = GameShell.newArchive(18, false, true, true);
-			class13.archive19 = GameShell.newArchive(19, false, true, true);
-			class60.archive20 = GameShell.newArchive(20, false, true, true);
-			Login.Login_loadingText = "Connecting to update server";
-			Login.Login_loadingPercent = 20;
-			Client.titleLoadingStage = 40;
-		} else if (Client.titleLoadingStage == 40) {
-			byte var30 = 0;
-			var0 = var30 + GrandExchangeOfferAgeComparator.archive0.percentage() * 4 / 100;
-			var0 += class43.archive1.percentage() * 4 / 100;
-			var0 += class288.archive2.percentage() * 2 / 100;
-			var0 += WorldMapID.archive3.percentage() * 2 / 100;
-			var0 += SpriteMask.archive4.percentage() * 6 / 100;
-			var0 += DirectByteArrayCopier.archive5.percentage() * 4 / 100;
-			var0 += AbstractWorldMapData.archive6.percentage() * 2 / 100;
-			var0 += ClientPacket.archive7.percentage() * 56 / 100;
-			var0 += WorldMapRegion.archive8.percentage() * 2 / 100;
-			var0 += class2.archive9.percentage() * 2 / 100;
-			var0 += class81.archive10.percentage() * 2 / 100;
-			var0 += ScriptFrame.archive11.percentage() * 2 / 100;
-			var0 += class267.archive12.percentage() * 2 / 100;
-			var0 += class269.archive13.percentage() * 2 / 100;
-			var0 += class162.archive14.percentage() * 2 / 100;
-			var0 += class210.archive15.percentage() * 2 / 100;
-			var0 += class13.archive19.percentage() / 100;
-			var0 += UserComparator9.archive18.percentage() / 100;
-			var0 += class60.archive20.percentage() / 100;
-			var0 += AbstractWorldMapIcon.archive17.method4345() && AbstractWorldMapIcon.archive17.isFullyLoaded() ? 1 : 0;
-			if (var0 != 100) {
-				if (var0 != 0) {
-					Login.Login_loadingText = "Checking for updates - " + var0 + "%";
-				}
-
-				Login.Login_loadingPercent = 30;
-			} else {
-				class266.method5064(GrandExchangeOfferAgeComparator.archive0, "Animations");
-				class266.method5064(class43.archive1, "Skeletons");
-				class266.method5064(SpriteMask.archive4, "Sound FX");
-				class266.method5064(DirectByteArrayCopier.archive5, "Maps");
-				class266.method5064(AbstractWorldMapData.archive6, "Music Tracks");
-				class266.method5064(ClientPacket.archive7, "Models");
-				class266.method5064(WorldMapRegion.archive8, "Sprites");
-				class266.method5064(ScriptFrame.archive11, "Music Jingles");
-				class266.method5064(class162.archive14, "Music Samples");
-				class266.method5064(class210.archive15, "Music Patches");
-				class266.method5064(class13.archive19, "World Map");
-				class266.method5064(UserComparator9.archive18, "World Map Geography");
-				class266.method5064(class60.archive20, "World Map Ground");
-				Actor.spriteIds = new GraphicsDefaults();
-				Actor.spriteIds.decode(AbstractWorldMapIcon.archive17);
-				Login.Login_loadingText = "Loaded update list";
-				Login.Login_loadingPercent = 30;
-				Client.titleLoadingStage = 45;
-			}
-		} else if (Client.titleLoadingStage == 45) {
-			GrandExchangeOfferAgeComparator.method170(22050, !Client.isLowDetail, 2);
-			MidiPcmStream var33 = new MidiPcmStream();
-			var33.method3775(9, 128);
-			MenuAction.pcmPlayer0 = HealthBarUpdate.method1776(GameShell.taskHandler, 0, 22050);
-			MenuAction.pcmPlayer0.setStream(var33);
-			BuddyRankComparator.method3483(class210.archive15, class162.archive14, SpriteMask.archive4, var33);
-			class60.pcmPlayer1 = HealthBarUpdate.method1776(GameShell.taskHandler, 1, 2048);
-			ClientPacket.pcmStreamMixer = new PcmStreamMixer();
-			class60.pcmPlayer1.setStream(ClientPacket.pcmStreamMixer);
-			LoginScreenAnimation.decimator = new Decimator(22050, Messages.PcmPlayer_sampleRate);
-			Login.Login_loadingText = "Prepared sound engine";
-			Login.Login_loadingPercent = 35;
-			Client.titleLoadingStage = 50;
-			WorldMapID.WorldMapElement_fonts = new Fonts(WorldMapRegion.archive8, class269.archive13);
-		} else {
-			int var1;
-			if (Client.titleLoadingStage == 50) {
-				FontName[] var32 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_plain11};
-				var1 = var32.length;
-				Fonts var28 = WorldMapID.WorldMapElement_fonts;
-				FontName[] var27 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_plain12, FontName.FontName_verdana15, FontName.FontName_plain11};
-				Client.fontsMap = var28.createMap(var27);
-				if (Client.fontsMap.size() < var1) {
-					Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%";
-					Login.Login_loadingPercent = 40;
-				} else {
-					AttackOption.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
-					Player.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12);
-					JagexCache.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12);
-					NPC.platformInfo = Client.platformInfoProvider.get();
-					Login.Login_loadingText = "Loaded fonts";
-					Login.Login_loadingPercent = 40;
-					Client.titleLoadingStage = 60;
-				}
-			} else {
-				Archive var2;
-				int var23;
-				Archive var34;
-				if (Client.titleLoadingStage == 60) {
-					var34 = class81.archive10;
-					var2 = WorldMapRegion.archive8;
-					var23 = 0;
-					if (var34.tryLoadFileByNames("title.jpg", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("logo", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("logo_deadman_mode", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("logo_seasonal_mode", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("titlebox", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("titlebutton", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("runes", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("title_mute", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) {
-						++var23;
-					}
-
-					if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) {
-						++var23;
-					}
-
-					var2.tryLoadFileByNames("sl_back", "");
-					var2.tryLoadFileByNames("sl_flags", "");
-					var2.tryLoadFileByNames("sl_arrows", "");
-					var2.tryLoadFileByNames("sl_stars", "");
-					var2.tryLoadFileByNames("sl_button", "");
-					byte var29 = 12;
-					if (var23 < var29) {
-						Login.Login_loadingText = "Loading title screen - " + var23 * 100 / var29 + "%";
-						Login.Login_loadingPercent = 50;
-					} else {
-						Login.Login_loadingText = "Loaded title screen";
-						Login.Login_loadingPercent = 50;
-						class81.updateGameState(5);
-						Client.titleLoadingStage = 70;
-					}
-				} else if (Client.titleLoadingStage == 70) {
-					if (!class288.archive2.isFullyLoaded()) {
-						Login.Login_loadingText = "Loading config - " + class288.archive2.loadPercent() + "%";
-						Login.Login_loadingPercent = 60;
-					} else {
-						Archive var31 = class288.archive2;
-						FloorOverlayDefinition.FloorOverlayDefinition_archive = var31;
-						var34 = class288.archive2;
-						FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var34;
-						CollisionMap.method3615(class288.archive2, ClientPacket.archive7);
-						AbstractWorldMapIcon.method625(class288.archive2, ClientPacket.archive7, Client.isLowDetail);
-						var2 = class288.archive2;
-						Archive var3 = ClientPacket.archive7;
-						NPCDefinition.NpcDefinition_archive = var2;
-						NPCDefinition.NpcDefinition_modelArchive = var3;
-						NetFileRequest.method4230(class288.archive2);
-						SoundSystem.method2529(class288.archive2, ClientPacket.archive7, Client.isMembersWorld, AttackOption.fontPlain11);
-						class83.method2090(class288.archive2, GrandExchangeOfferAgeComparator.archive0, class43.archive1);
-						Archive var24 = class288.archive2;
-						Archive var25 = ClientPacket.archive7;
-						SpotAnimationDefinition.SpotAnimationDefinition_archive = var24;
-						SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var25;
-						class185.method3665(class288.archive2);
-						Archive var6 = class288.archive2;
-						VarpDefinition.VarpDefinition_archive = var6;
-						VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16);
-						Archive var7 = WorldMapID.archive3;
-						Archive var8 = ClientPacket.archive7;
-						Archive var9 = WorldMapRegion.archive8;
-						Archive var10 = class269.archive13;
-						InvDefinition.Widget_archive = var7;
-						FriendLoginUpdate.Widget_modelsArchive = var8;
-						Widget.Widget_spritesArchive = var9;
-						Widget.Widget_fontsArchive = var10;
-						FloorDecoration.Widget_interfaceComponents = new Widget[InvDefinition.Widget_archive.getGroupCount()][];
-						Widget.Widget_loadedInterfaces = new boolean[InvDefinition.Widget_archive.getGroupCount()];
-						Archive var11 = class288.archive2;
-						InvDefinition.InvDefinition_archive = var11;
-						PacketBufferNode.method3679(class288.archive2);
-						Archive var12 = class288.archive2;
-						VarcInt.VarcInt_archive = var12;
-						Archive var13 = class288.archive2;
-						ParamDefinition.ParamDefinition_archive = var13;
-						AttackOption.varcs = new Varcs();
-						Archive var14 = class288.archive2;
-						Archive var15 = WorldMapRegion.archive8;
-						Archive var16 = class269.archive13;
-						HitSplatDefinition.HitSplatDefinition_archive = var14;
-						HitSplatDefinition.field3328 = var15;
-						HitSplatDefinition.HitSplatDefinition_fontsArchive = var16;
-						Player.method1285(class288.archive2, WorldMapRegion.archive8);
-						Archive var17 = class288.archive2;
-						Archive var18 = WorldMapRegion.archive8;
-						class223.WorldMapElement_archive = var18;
-						if (var17.isFullyLoaded()) {
-							WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35);
-							WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count];
-
-							for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) {
-								byte[] var20 = var17.takeFile(35, var19);
-								WorldMapElement.WorldMapElement_cached[var19] = new WorldMapElement(var19);
-								if (var20 != null) {
-									WorldMapElement.WorldMapElement_cached[var19].decode(new Buffer(var20));
-									WorldMapElement.WorldMapElement_cached[var19].method4461();
-								}
-							}
-						}
-
-						Login.Login_loadingText = "Loaded config";
-						Login.Login_loadingPercent = 60;
-						Client.titleLoadingStage = 80;
-					}
-				} else if (Client.titleLoadingStage == 80) {
-					var0 = 0;
-					if (class40.compass == null) {
-						class40.compass = class288.SpriteBuffer_getSprite(WorldMapRegion.archive8, Actor.spriteIds.compass, 0);
-					} else {
-						++var0;
-					}
-
-					if (class225.redHintArrowSprite == null) {
-						class225.redHintArrowSprite = class288.SpriteBuffer_getSprite(WorldMapRegion.archive8, Actor.spriteIds.field3808, 0);
-					} else {
-						++var0;
-					}
-
-					IndexedSprite[] var22;
-					if (GrandExchangeOfferTotalQuantityComparator.mapSceneSprites == null) {
-						var2 = WorldMapRegion.archive8;
-						var23 = Actor.spriteIds.mapScenes;
-						if (!GraphicsObject.method2030(var2, var23, 0)) {
-							var22 = null;
-						} else {
-							var22 = WallDecoration.method3341();
-						}
-
-						GrandExchangeOfferTotalQuantityComparator.mapSceneSprites = var22;
-					} else {
-						++var0;
-					}
-
-					if (FontName.headIconPkSprites == null) {
-						FontName.headIconPkSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.headIconsPk, 0);
-					} else {
-						++var0;
-					}
-
-					if (UrlRequest.headIconPrayerSprites == null) {
-						UrlRequest.headIconPrayerSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3799, 0);
-					} else {
-						++var0;
-					}
-
-					if (SequenceDefinition.headIconHintSprites == null) {
-						SequenceDefinition.headIconHintSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3804, 0);
-					} else {
-						++var0;
-					}
-
-					if (AttackOption.mapMarkerSprites == null) {
-						AttackOption.mapMarkerSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3805, 0);
-					} else {
-						++var0;
-					}
-
-					if (KeyHandler.crossSprites == null) {
-						KeyHandler.crossSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3806, 0);
-					} else {
-						++var0;
-					}
-
-					if (WorldMapData_0.mapDotSprites == null) {
-						WorldMapData_0.mapDotSprites = UserComparator5.SpriteBuffer_getSpriteArray(WorldMapRegion.archive8, Actor.spriteIds.field3807, 0);
-					} else {
-						++var0;
-					}
-
-					if (GrandExchangeOfferTotalQuantityComparator.scrollBarSprites == null) {
-						var2 = WorldMapRegion.archive8;
-						var23 = Actor.spriteIds.field3800;
-						if (!GraphicsObject.method2030(var2, var23, 0)) {
-							var22 = null;
-						} else {
-							var22 = WallDecoration.method3341();
-						}
-
-						GrandExchangeOfferTotalQuantityComparator.scrollBarSprites = var22;
-					} else {
-						++var0;
-					}
-
-					if (class192.modIconSprites == null) {
-						var2 = WorldMapRegion.archive8;
-						var23 = Actor.spriteIds.field3809;
-						if (!GraphicsObject.method2030(var2, var23, 0)) {
-							var22 = null;
-						} else {
-							var22 = WallDecoration.method3341();
-						}
-
-						class192.modIconSprites = var22;
-					} else {
-						++var0;
-					}
-
-					if (var0 < 11) {
-						Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%";
-						Login.Login_loadingPercent = 70;
-					} else {
-						AbstractFont.AbstractFont_modIconSprites = class192.modIconSprites;
-						class225.redHintArrowSprite.normalize();
-						var1 = (int)(Math.random() * 21.0D) - 10;
-						int var26 = (int)(Math.random() * 21.0D) - 10;
-						var23 = (int)(Math.random() * 21.0D) - 10;
-						int var4 = (int)(Math.random() * 41.0D) - 20;
-						GrandExchangeOfferTotalQuantityComparator.mapSceneSprites[0].shiftColors(var4 + var1, var26 + var4, var4 + var23);
-						Login.Login_loadingText = "Loaded sprites";
-						Login.Login_loadingPercent = 70;
-						Client.titleLoadingStage = 90;
-					}
-				} else if (Client.titleLoadingStage == 90) {
-					if (!class2.archive9.isFullyLoaded()) {
-						Login.Login_loadingText = "Loading textures - " + "0%";
-						Login.Login_loadingPercent = 90;
-					} else {
-						JagexCache.textureProvider = new TextureProvider(class2.archive9, WorldMapRegion.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
-						Rasterizer3D.Rasterizer3D_setTextureLoader(JagexCache.textureProvider);
-						Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
-						Client.titleLoadingStage = 100;
-					}
-				} else if (Client.titleLoadingStage == 100) {
-					var0 = JagexCache.textureProvider.getLoadedPercentage();
-					if (var0 < 100) {
-						Login.Login_loadingText = "Loading textures - " + var0 + "%";
-						Login.Login_loadingPercent = 90;
-					} else {
-						Login.Login_loadingText = "Loaded textures";
-						Login.Login_loadingPercent = 90;
-						Client.titleLoadingStage = 110;
-					}
-				} else if (Client.titleLoadingStage == 110) {
-					class2.mouseRecorder = new MouseRecorder();
-					GameShell.taskHandler.newThreadTask(class2.mouseRecorder, 10);
-					Login.Login_loadingText = "Loaded input handler";
-					Login.Login_loadingPercent = 92;
-					Client.titleLoadingStage = 120;
-				} else if (Client.titleLoadingStage == 120) {
-					if (!class81.archive10.tryLoadFileByNames("huffman", "")) {
-						Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
-						Login.Login_loadingPercent = 94;
-					} else {
-						Huffman var21 = new Huffman(class81.archive10.takeFileByNames("huffman", ""));
-						Messages.method2230(var21);
-						Login.Login_loadingText = "Loaded wordpack";
-						Login.Login_loadingPercent = 94;
-						Client.titleLoadingStage = 130;
-					}
-				} else if (Client.titleLoadingStage == 130) {
-					if (!WorldMapID.archive3.isFullyLoaded()) {
-						Login.Login_loadingText = "Loading interfaces - " + WorldMapID.archive3.loadPercent() * 4 / 5 + "%";
-						Login.Login_loadingPercent = 96;
-					} else if (!class267.archive12.isFullyLoaded()) {
-						Login.Login_loadingText = "Loading interfaces - " + (80 + class267.archive12.loadPercent() / 6) + "%";
-						Login.Login_loadingPercent = 96;
-					} else if (!class269.archive13.isFullyLoaded()) {
-						Login.Login_loadingText = "Loading interfaces - " + (96 + class269.archive13.loadPercent() / 50) + "%";
-						Login.Login_loadingPercent = 96;
-					} else {
-						Login.Login_loadingText = "Loaded interfaces";
-						Login.Login_loadingPercent = 98;
-						Client.titleLoadingStage = 140;
-					}
-				} else if (Client.titleLoadingStage == 140) {
-					Login.Login_loadingPercent = 100;
-					if (!class13.archive19.tryLoadGroupByName(WorldMapCacheName.field304.name)) {
-						Login.Login_loadingText = "Loading world map - " + class13.archive19.groupLoadPercentByName(WorldMapCacheName.field304.name) / 10 + "%";
-					} else {
-						if (WorldMapRegion.worldMap == null) {
-							WorldMapRegion.worldMap = new WorldMap();
-							WorldMapRegion.worldMap.init(class13.archive19, UserComparator9.archive18, class60.archive20, JagexCache.fontBold12, Client.fontsMap, GrandExchangeOfferTotalQuantityComparator.mapSceneSprites);
-						}
-
-						Login.Login_loadingText = "Loaded world map";
-						Client.titleLoadingStage = 150;
-					}
-				} else if (Client.titleLoadingStage == 150) {
-					class81.updateGameState(10);
-				}
-			}
-		}
 	}
 }

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

@@ -1,94 +1,93 @@
+import java.awt.Component;
+import java.awt.image.BufferedImage;
+import java.awt.image.PixelGrabber;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Comparator;
+import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("w")
+@ObfuscatedName("a")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("y")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -847322953
+		intValue = -113248427
 	)
-	@Export("Interpreter_intStackSize")
+	@Export("canvasWidth")
-	static int Interpreter_intStackSize;
+	public static int canvasWidth;
-	@ObfuscatedName("ge")
+	@ObfuscatedName("dw")
 	@ObfuscatedSignature(
-		signature = "[Llm;"
+		signature = "Lif;"
 	)
-	@Export("mapSceneSprites")
+	@Export("archive15")
-	static IndexedSprite[] mapSceneSprites;
+	static Archive archive15;
-	@ObfuscatedName("gu")
+	@ObfuscatedName("fh")
+	@ObfuscatedGetter(
+		intValue = 780531471
+	)
+	static int field47;
+	@ObfuscatedName("gv")
 	@ObfuscatedSignature(
-		signature = "[Llm;"
+		signature = "Lls;"
 	)
-	@Export("scrollBarSprites")
+	@Export("compass")
-	static IndexedSprite[] scrollBarSprites;
+	static Sprite compass;
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ly;Ly;B)I",
+		signature = "(Lx;Lx;I)I",
-		garbageValue = "85"
+		garbageValue = "-247020264"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1);
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("g")
+	public boolean equals(Object var1) {
-	@ObfuscatedSignature(
+		return super.equals(var1);
-		signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "1071559755"
-	)
-	public static String method97(CharSequence var0) {
-		String var1 = GrandExchangeOffer.base37DecodeLong(Actor.method1773(var0));
-		if (var1 == null) {
-			var1 = "";
-		}
-
-		return var1;
 	}
 
-	@ObfuscatedName("ke")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I)V",
+		signature = "([BI)Lls;",
-		garbageValue = "754530972"
+		garbageValue = "-146383667"
 	)
-	static void method104(Buffer var0) {
+	@Export("convertJpgToSprite")
-		if (Client.randomDatData != null) {
+	public static final Sprite convertJpgToSprite(byte[] var0) {
-			var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
+		BufferedImage var1 = null;
-		} else {
-			byte[] var2 = new byte[24];
 
-			try {
+		try {
-				JagexCache.JagexCache_randomDat.seek(0L);
+			var1 = ImageIO.read(new ByteArrayInputStream(var0));
-				JagexCache.JagexCache_randomDat.readFully(var2);
+			int var2 = var1.getWidth();
-
+			int var3 = var1.getHeight();
-				int var3;
+			int[] var4 = new int[var3 * var2];
-				for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) {
+			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
-				}
+			var5.grabPixels();
-
+			return new Sprite(var4, var2, var3);
-				if (var3 >= 24) {
+		} catch (IOException var7) {
-					throw new IOException();
+		} catch (InterruptedException var8) {
-				}
-			} catch (Exception var6) {
-				for (int var4 = 0; var4 < 24; ++var4) {
-					var2[var4] = -1;
-				}
-			}
-
-			var0.writeBytes(var2, 0, var2.length);
 		}
+
+		return new Sprite(0, 0);
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(Ljava/awt/Component;I)V",
+		garbageValue = "-1494911511"
+	)
+	static void method93(Component var0) {
+		var0.setFocusTraversalKeysEnabled(false);
+		var0.addKeyListener(KeyHandler.KeyHandler_instance);
+		var0.addFocusListener(KeyHandler.KeyHandler_instance);
 	}
 }

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

@@ -1,16 +1,29 @@
+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.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("k")
+@ObfuscatedName("c")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 815964443
+	)
+	@Export("KitDefinition_fileCount")
+	public static int KitDefinition_fileCount;
+
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ly;Ly;B)I",
+		signature = "(Lx;Lx;B)I",
-		garbageValue = "72"
+		garbageValue = "114"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -25,21 +38,139 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I)Ljava/lang/String;",
+		signature = "(IB)Lit;",
-		garbageValue = "2005210038"
+		garbageValue = "62"
 	)
-	public static String method142(Buffer var0) {
+	@Export("WorldMapElement_get")
-		return GrandExchangeEvent.method92(var0, 32767);
+	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);
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(Lkq;Ljava/lang/String;B)I",
-		garbageValue = "76"
+		garbageValue = "0"
 	)
-	public static int method143(int var0) {
+	public static int method122(Buffer var0, String var1) {
-		return WorldMapSectionType.method271(ViewportMouse.ViewportMouse_entityTags[var0]);
+		int var2 = var0.offset;
+		byte[] var3 = RouteStrategy.method3566(var1);
+		var0.writeSmartByteShort(var3.length);
+		var0.offset += class206.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
+		return var0.offset - var2;
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/Throwable;B)Ljava/lang/String;",
+		garbageValue = "41"
+	)
+	static String method124(Throwable var0) throws IOException {
+		String var1;
+		if (var0 instanceof RunException) {
+			RunException var2 = (RunException)var0;
+			var1 = var2.message + " | ";
+			var0 = var2.throwable;
+		} else {
+			var1 = "";
+		}
+
+		StringWriter var12 = new StringWriter();
+		PrintWriter var3 = new PrintWriter(var12);
+		var0.printStackTrace(var3);
+		var3.close();
+		String var4 = var12.toString();
+		BufferedReader var5 = new BufferedReader(new StringReader(var4));
+		String var6 = var5.readLine();
+
+		while (true) {
+			while (true) {
+				String var7 = var5.readLine();
+				if (var7 == null) {
+					var1 = var1 + "| " + var6;
+					return var1;
+				}
+
+				int var8 = var7.indexOf(40);
+				int var9 = var7.indexOf(41, var8 + 1);
+				if (var8 >= 0 && var9 >= 0) {
+					String var10 = var7.substring(var8 + 1, var9);
+					int var11 = var10.indexOf(".java:");
+					if (var11 >= 0) {
+						var10 = var10.substring(0, var11) + var10.substring(var11 + 5);
+						var1 = var1 + var10 + ' ';
+						continue;
+					}
+
+					var7 = var7.substring(0, var8);
+				}
+
+				var7 = var7.trim();
+				var7 = var7.substring(var7.lastIndexOf(32) + 1);
+				var7 = var7.substring(var7.lastIndexOf(9) + 1);
+				var1 = var1 + var7 + ' ';
+			}
+		}
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "(III)I",
+		garbageValue = "-2098166290"
+	)
+	static int method118(int var0, int var1) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		if (var2 == null) {
+			return 0;
+		} else if (var1 == -1) {
+			return 0;
+		} else {
+			int var3 = 0;
+
+			for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
+				if (var2.ids[var4] == var1) {
+					var3 += var2.quantities[var4];
+				}
+			}
+
+			return var3;
+		}
+	}
+
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "(Lha;IIII)V",
+		garbageValue = "673237004"
+	)
+	@Export("Widget_setKeyRate")
+	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		if (var0.field2631 == null) {
+			throw new RuntimeException();
+		} else {
+			var0.field2631[var1] = var2;
+			var0.field2670[var1] = var3;
+		}
+	}
+
+	@ObfuscatedName("ix")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1132135504"
+	)
+	@Export("Widget_runOnTargetLeave")
+	static void Widget_runOnTargetLeave() {
+		if (Client.isSpellSelected) {
+			Widget var0 = BZip2State.getWidgetChild(WorldMapDecoration.selectedSpellWidget, Client.selectedSpellChildIndex);
+			if (var0 != null && var0.onTargetLeave != null) {
+				ScriptEvent var1 = new ScriptEvent();
+				var1.widget = var0;
+				var1.args = var0.onTargetLeave;
+				Client.runScriptEvent(var1);
+			}
+
+			Client.isSpellSelected = false;
+			LoginPacket.invalidateWidget(var0);
+		}
 	}
 }

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

@@ -3,21 +3,21 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("p")
+@ObfuscatedName("b")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("lj")
+	@ObfuscatedName("dn")
 	@ObfuscatedSignature(
-		signature = "Lhl;"
+		signature = "Lif;"
 	)
-	static Widget field31;
+	@Export("archive6")
+	static Archive archive6;
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Ly;Ly;I)I",
+		signature = "(Lx;Lx;I)I",
-		garbageValue = "2079397392"
+		garbageValue = "1333549485"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -32,398 +32,95 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(IIB)I",
+		signature = "(II)V",
-		garbageValue = "19"
+		garbageValue = "1794257509"
 	)
-	static final int method76(int var0, int var1) {
+	static void method70(int var0) {
-		int var2 = var0 + var1 * 57;
+		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		var2 ^= var2 << 13;
+		if (var1 != null) {
-		int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE;
+			var1.remove();
-		return var3 >> 19 & 255;
-	}
-
-	@ObfuscatedName("ae")
-	@ObfuscatedSignature(
-		signature = "(ILci;ZI)I",
-		garbageValue = "-814260497"
-	)
-	static int method78(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == 6600) {
-			var3 = ClientPacket.Client_plane;
-			int var9 = class51.baseX * 64 + (class215.localPlayer.x >> 7);
-			int var5 = VarcInt.baseY * 64 + (class215.localPlayer.y >> 7);
-			Clock.getWorldMap().method6381(var3, var9, var5, true);
-			return 1;
-		} else {
-			WorldMapArea var11;
-			if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
-				var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-				String var16 = "";
-				var11 = Clock.getWorldMap().getMapArea(var3);
-				if (var11 != null) {
-					var16 = var11.getExternalName();
-				}
-
-				Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var16;
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
-				var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-				Clock.getWorldMap().setCurrentMapAreaId(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getZoomLevel();
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
-				var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-				Clock.getWorldMap().setZoomPercentage(var3);
-				return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
-				Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().isCacheLoaded() ? 1 : 0;
-				return 1;
-			} else {
-				Coord var15;
-				if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-					Clock.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-					Clock.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-					Clock.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
-					var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-					Clock.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y);
-					return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayX();
-					Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayY();
-					return 1;
-				} else {
-					WorldMapArea var13;
-					if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
-						var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-						var13 = Clock.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-						} else {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getOrigin().packed();
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
-						var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-						var13 = Clock.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-						} else {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64;
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
-						var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-						var13 = Clock.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-						} else {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1;
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
-						var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-						var13 = Clock.getWorldMap().getMapArea(var3);
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-						} else {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getZoom();
-						}
-
-						return 1;
-					} else if (var0 == 6615) {
-						var15 = Clock.getWorldMap().getDisplayCoord();
-						if (var15 == null) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-						} else {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.x;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var15.y;
-						}
-
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
-						Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().currentMapAreaId();
-						return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
-						var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-						var13 = Clock.getWorldMap().getCurrentMapArea();
-						if (var13 == null) {
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-							Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-							return 1;
-						} else {
-							int[] var14 = var13.position(var15.plane, var15.x, var15.y);
-							if (var14 == null) {
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-							} else {
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var14[0];
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var14[1];
-							}
-
-							return 1;
-						}
-					} else {
-						Coord var7;
-						if (var0 == 6618) {
-							var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-							var13 = Clock.getWorldMap().getCurrentMapArea();
-							if (var13 == null) {
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-								return 1;
-							} else {
-								var7 = var13.coord(var15.x, var15.y);
-								if (var7 == null) {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-								} else {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var7.packed();
-								}
-
-								return 1;
-							}
-						} else {
-							Coord var12;
-							if (var0 == 6619) {
-								GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-								var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-								var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]);
-								Canvas.method871(var3, var12, false);
-								return 1;
-							} else if (var0 == 6620) {
-								GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-								var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-								var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]);
-								Canvas.method871(var3, var12, true);
-								return 1;
-							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
-								GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-								var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-								var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]);
-								var11 = Clock.getWorldMap().getMapArea(var3);
-								if (var11 == null) {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = 0;
-									return 1;
-								} else {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0;
-									return 1;
-								}
-							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayWith();
-								Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getDisplayHeight();
-								return 1;
-							} else if (var0 == 6623) {
-								var15 = new Coord(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-								var13 = Clock.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
-								if (var13 == null) {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-								} else {
-									Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var13.getId();
-								}
-
-								return 1;
-							} else if (var0 == 6624) {
-								Clock.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-								return 1;
-							} else if (var0 == 6625) {
-								Clock.getWorldMap().resetMaxFlashCount();
-								return 1;
-							} else if (var0 == 6626) {
-								Clock.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize]);
-								return 1;
-							} else if (var0 == 6627) {
-								Clock.getWorldMap().resetCyclesPerFlash();
-								return 1;
-							} else {
-								boolean var10;
-								if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
-									var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1;
-									Clock.getWorldMap().setPerpetualFlash(var10);
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
-									var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-									Clock.getWorldMap().flashElement(var3);
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
-									var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-									Clock.getWorldMap().flashCategory(var3);
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
-									Clock.getWorldMap().stopCurrentFlashes();
-									return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
-									var10 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize] == 1;
-									Clock.getWorldMap().setElementsDisabled(var10);
-									return 1;
-								} else {
-									boolean var4;
-									if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
-										GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-										var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-										var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1] == 1;
-										Clock.getWorldMap().disableElement(var3, var4);
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
-										GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-										var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-										var4 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1] == 1;
-										Clock.getWorldMap().setCategoryDisabled(var3, var4);
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
-										Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().getElementsDisabled() ? 1 : 0;
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
-										var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-										Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().isElementDisabled(var3) ? 1 : 0;
-										return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
-										var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-										Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Clock.getWorldMap().isCategoryDisabled(var3) ? 1 : 0;
-										return 1;
-									} else if (var0 == 6638) {
-										GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize -= 2;
-										var3 = Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-										var12 = new Coord(Interpreter.Interpreter_intStack[GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize + 1]);
-										var7 = Clock.getWorldMap().method6430(var3, var12);
-										if (var7 == null) {
-											Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-										} else {
-											Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var7.packed();
-										}
-
-										return 1;
-									} else {
-										AbstractWorldMapIcon var8;
-										if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
-											var8 = Clock.getWorldMap().iconStart();
-											if (var8 == null) {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-											} else {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.getElement();
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.coord2.packed();
-											}
-
-											return 1;
-										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
-											var8 = Clock.getWorldMap().iconNext();
-											if (var8 == null) {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-											} else {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.getElement();
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var8.coord2.packed();
-											}
-
-											return 1;
-										} else {
-											WorldMapElement var6;
-											if (var0 == ScriptOpcodes.MEC_TEXT) {
-												var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-												var6 = Varcs.WorldMapElement_get(var3);
-												if (var6.name == null) {
-													Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = "";
-												} else {
-													Interpreter.Interpreter_stringStack[++class43.Interpreter_stringStackSize - 1] = var6.name;
-												}
-
-												return 1;
-											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
-												var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-												var6 = Varcs.WorldMapElement_get(var3);
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.textSize;
-												return 1;
-											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) {
-												var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-												var6 = Varcs.WorldMapElement_get(var3);
-												if (var6 == null) {
-													Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-												} else {
-													Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.category;
-												}
-
-												return 1;
-											} else if (var0 == ScriptOpcodes.MEC_SPRITE) {
-												var3 = Interpreter.Interpreter_intStack[--GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize];
-												var6 = Varcs.WorldMapElement_get(var3);
-												if (var6 == null) {
-													Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = -1;
-												} else {
-													Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = var6.sprite1;
-												}
-
-												return 1;
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages.worldMapEvent.mapElement;
-												return 1;
-											} else if (var0 == 6698) {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages.worldMapEvent.coord1.packed();
-												return 1;
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
-												Interpreter.Interpreter_intStack[++GrandExchangeOfferTotalQuantityComparator.Interpreter_intStackSize - 1] = Messages.worldMapEvent.coord2.packed();
-												return 1;
-											} else {
-												return 2;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
 		}
 	}
 
-	@ObfuscatedName("iv")
+	@ObfuscatedName("hr")
 	@ObfuscatedSignature(
-		signature = "(III)Ljava/lang/String;",
+		signature = "(ZLkl;I)V",
-		garbageValue = "-1702454117"
+		garbageValue = "386675414"
 	)
-	static final String method77(int var0, int var1) {
+	static final void method71(boolean var0, PacketBuffer var1) {
-		int var2 = var1 - var0;
+		while (true) {
-		if (var2 < -9) {
+			if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
-			return class222.colorStartTag(16711680);
+				int var2 = var1.readBits(15);
-		} else if (var2 < -6) {
+				if (var2 != 32767) {
-			return class222.colorStartTag(16723968);
+					boolean var3 = false;
-		} else if (var2 < -3) {
+					if (Client.npcs[var2] == null) {
-			return class222.colorStartTag(16740352);
+						Client.npcs[var2] = new NPC();
-		} else if (var2 < 0) {
+						var3 = true;
-			return class222.colorStartTag(16756736);
+					}
-		} else if (var2 > 9) {
+
-			return class222.colorStartTag(65280);
+					NPC var4 = Client.npcs[var2];
-		} else if (var2 > 6) {
+					Client.npcIndices[++Client.npcCount - 1] = var2;
-			return class222.colorStartTag(4259584);
+					var4.npcCycle = Client.cycle;
-		} else if (var2 > 3) {
+					int var5;
-			return class222.colorStartTag(8453888);
+					if (var0) {
-		} else {
+						var5 = var1.readBits(8);
-			return var2 > 0 ? class222.colorStartTag(12648192) : class222.colorStartTag(16776960);
+						if (var5 > 127) {
+							var5 -= 256;
+						}
+					} else {
+						var5 = var1.readBits(5);
+						if (var5 > 15) {
+							var5 -= 32;
+						}
+					}
+
+					int var6 = Client.defaultRotations[var1.readBits(3)];
+					if (var3) {
+						var4.orientation = var4.rotation = var6;
+					}
+
+					int var7 = var1.readBits(1);
+					int var8 = var1.readBits(1);
+					if (var8 == 1) {
+						Client.field720[++Client.field673 - 1] = var2;
+					}
+
+					var4.definition = AbstractUserComparator.getNpcDefinition(var1.readBits(14));
+					int var9;
+					if (var0) {
+						var9 = var1.readBits(8);
+						if (var9 > 127) {
+							var9 -= 256;
+						}
+					} else {
+						var9 = var1.readBits(5);
+						if (var9 > 15) {
+							var9 -= 32;
+						}
+					}
+
+					var4.field925 = var4.definition.size;
+					var4.field968 = var4.definition.rotation;
+					if (var4.field968 == 0) {
+						var4.rotation = 0;
+					}
+
+					var4.walkSequence = var4.definition.walkSequence;
+					var4.walkBackSequence = var4.definition.walkBackSequence;
+					var4.walkLeftSequence = var4.definition.walkLeftSequence;
+					var4.walkRightSequence = var4.definition.walkRightSequence;
+					var4.readySequence = var4.definition.readySequence;
+					var4.turnLeftSequence = var4.definition.turnLeftSequence;
+					var4.turnRightSequence = var4.definition.turnRightSequence;
+					var4.method2045(Message.localPlayer.pathX[0] + var5, Message.localPlayer.pathY[0] + var9, var7 == 1);
+					continue;
+				}
+			}
+
+			var1.exportIndex();
+			return;
 		}
 	}
 }

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("ku")
+@ObfuscatedName("kc")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 576730349
+		intValue = -1707006757
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 262749653
+		intValue = 990004197
 	)
-	public int field3808;
+	public int field3803;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1408165655
+		intValue = -1541922539
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -951498167
+		intValue = -1405131859
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 62857473
-	)
-	public int field3799;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1864495415
+		intValue = 1085795545
 	)
-	public int field3804;
+	public int field3798;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -1605363745
+		intValue = -1754657277
-	)
-	public int field3805;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -177407337
-	)
-	public int field3806;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -410491181
 	)
 	public int field3807;
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -270590657
+		intValue = -939471917
 	)
-	public int field3800;
+	public int field3804;
-	@ObfuscatedName("k")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 838114045
+		intValue = -773091265
 	)
-	public int field3809;
+	public int field3805;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -1993061967
+	)
+	public int field3806;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = -1849016603
+	)
+	public int field3799;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 735486601
+	)
+	public int field3808;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3808 = -1;
+		this.field3803 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3799 = -1;
+		this.field3798 = -1;
+		this.field3807 = -1;
 		this.field3804 = -1;
 		this.field3805 = -1;
 		this.field3806 = -1;
-		this.field3807 = -1;
+		this.field3799 = -1;
-		this.field3800 = -1;
+		this.field3808 = -1;
-		this.field3809 = -1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lhf;B)V",
+		signature = "(Lhz;B)V",
-		garbageValue = "16"
+		garbageValue = "-29"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3797.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3796.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -101,29 +101,44 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5618();
+				this.compass = var3.method5560();
-				this.field3808 = var3.method5618();
+				this.field3803 = var3.method5560();
-				this.mapScenes = var3.method5618();
+				this.mapScenes = var3.method5560();
-				this.headIconsPk = var3.method5618();
+				this.headIconsPk = var3.method5560();
-				this.field3799 = var3.method5618();
+				this.field3798 = var3.method5560();
-				this.field3804 = var3.method5618();
+				this.field3807 = var3.method5560();
-				this.field3805 = var3.method5618();
+				this.field3804 = var3.method5560();
-				this.field3806 = var3.method5618();
+				this.field3805 = var3.method5560();
-				this.field3807 = var3.method5618();
+				this.field3806 = var3.method5560();
-				this.field3800 = var3.method5618();
+				this.field3799 = var3.method5560();
-				this.field3809 = var3.method5618();
+				this.field3808 = var3.method5560();
 			}
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lhf;Ljava/lang/String;Ljava/lang/String;I)[Lln;",
+		signature = "([BB)V",
-		garbageValue = "-1956835175"
+		garbageValue = "-116"
 	)
-	public static Sprite[] method5997(AbstractArchive var0, String var1, String var2) {
+	@Export("ByteArrayPool_release")
-		int var3 = var0.getGroupId(var1);
+	public static synchronized void ByteArrayPool_release(byte[] var0) {
-		int var4 = var0.getFileId(var3, var2);
+		if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) {
-		return UserComparator5.SpriteBuffer_getSpriteArray(var0, var3, var4);
+			ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0;
+		} else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) {
+			ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0;
+		} else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
+			ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
+		} else {
+			if (ByteArrayPool.ByteArrayPool_arrays != null) {
+				for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) {
+					if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && Interpreter.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) {
+						ByteArrayPool.ByteArrayPool_arrays[var1][Interpreter.ByteArrayPool_altSizeArrayCounts[var1]++] = var0;
+						return;
+					}
+				}
+			}
+
+		}
 	}
 }

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

@@ -4,70 +4,70 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bk")
+@ObfuscatedName("bp")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("by")
+	@ObfuscatedName("gp")
 	@ObfuscatedSignature(
-		signature = "[Llm;"
+		signature = "[Lls;"
 	)
-	@Export("worldSelectStars")
+	@Export("headIconPrayerSprites")
-	static IndexedSprite[] worldSelectStars;
+	static Sprite[] headIconPrayerSprites;
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 816767025
+		intValue = -1192844989
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1764619827
+		intValue = -1714996375
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = -356819999
-	)
-	@Export("plane")
-	int plane;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -200533199
-	)
-	@Export("x")
-	int x;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 528585543
-	)
-	@Export("height")
-	int height;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1230154279
-	)
-	@Export("y")
-	int y;
-	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Liy;"
+		signature = "Liv;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("y")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1295103123
+		intValue = 1267418181
+	)
+	@Export("plane")
+	int plane;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -474548897
+	)
+	@Export("x")
+	int x;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 60095829
+	)
+	@Export("y")
+	int y;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 464992447
+	)
+	@Export("height")
+	int height;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = -945304711
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1745958933
+		intValue = 53235765
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -81,20 +81,20 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = WorldMapRegion.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = ClientPacket.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = GrandExchangeOfferAgeComparator.SequenceDefinition_get(var8);
+			this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(IB)V",
-		garbageValue = "-93"
+		garbageValue = "0"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -113,14 +113,14 @@ public final class GraphicsObject extends Entity {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(I)Ldf;",
+		signature = "(I)Ldw;",
-		garbageValue = "-174129419"
+		garbageValue = "822221372"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = WorldMapRegion.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = ClientPacket.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -131,207 +131,77 @@ public final class GraphicsObject extends Entity {
 		return var2 == null ? null : var2;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lkj;I)V",
+		signature = "(Lkl;I)V",
-		garbageValue = "-219604871"
+		garbageValue = "-2045791963"
 	)
-	static final void method2041(PacketBuffer var0) {
+	@Export("updatePlayer")
-		int var1 = 0;
+	static final void updatePlayer(PacketBuffer var0) {
 		var0.importIndex();
+		int var1 = Client.localPlayerIndex;
+		Player var2 = Message.localPlayer = Client.players[var1] = new Player();
+		var2.index = var1;
+		int var3 = var0.readBits(30);
+		byte var4 = (byte)(var3 >> 28);
+		int var5 = var3 >> 14 & 16383;
+		int var6 = var3 & 16383;
+		var2.pathX[0] = var5 - MusicPatchPcmStream.baseX * 64;
+		var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6);
+		var2.pathY[0] = var6 - ScriptEvent.baseY * 64;
+		var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
+		UrlRequest.Client_plane = var2.plane = var4;
+		if (Players.field1228[var1] != null) {
+			var2.read(Players.field1228[var1]);
+		}
 
-		byte[] var10000;
+		Players.Players_count = 0;
-		int var2;
+		Players.Players_indices[++Players.Players_count - 1] = var1;
-		int var3;
+		Players.field1230[var1] = 0;
-		int var4;
+		Players.Players_emptyIdxCount = 0;
-		for (var2 = 0; var2 < Players.Players_count; ++var2) {
+
-			var3 = Players.Players_indices[var2];
+		for (int var7 = 1; var7 < 2048; ++var7) {
-			if ((Players.field1246[var3] & 1) == 0) {
+			if (var1 != var7) {
-				if (var1 > 0) {
+				int var8 = var0.readBits(18);
-					--var1;
+				int var9 = var8 >> 16;
-					var10000 = Players.field1246;
+				int var10 = var8 >> 8 & 597;
-					var10000[var3] = (byte)(var10000[var3] | 2);
+				int var11 = var8 & 597;
-				} else {
+				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
-					var4 = var0.readBits(1);
+				Players.Players_orientations[var7] = 0;
-					if (var4 == 0) {
+				Players.Players_targetIndices[var7] = -1;
-						var1 = Login.method2124(var0);
+				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
-						var10000 = Players.field1246;
+				Players.field1230[var7] = 0;
-						var10000[var3] = (byte)(var10000[var3] | 2);
-					} else {
-						GrandExchangeOfferNameComparator.readPlayerUpdate(var0, var3);
-					}
-				}
 			}
 		}
 
 		var0.exportIndex();
-		if (var1 != 0) {
-			throw new RuntimeException();
-		} else {
-			var0.importIndex();
-
-			for (var2 = 0; var2 < Players.Players_count; ++var2) {
-				var3 = Players.Players_indices[var2];
-				if ((Players.field1246[var3] & 1) != 0) {
-					if (var1 > 0) {
-						--var1;
-						var10000 = Players.field1246;
-						var10000[var3] = (byte)(var10000[var3] | 2);
-					} else {
-						var4 = var0.readBits(1);
-						if (var4 == 0) {
-							var1 = Login.method2124(var0);
-							var10000 = Players.field1246;
-							var10000[var3] = (byte)(var10000[var3] | 2);
-						} else {
-							GrandExchangeOfferNameComparator.readPlayerUpdate(var0, var3);
-						}
-					}
-				}
-			}
-
-			var0.exportIndex();
-			if (var1 != 0) {
-				throw new RuntimeException();
-			} else {
-				var0.importIndex();
-
-				for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
-					var3 = Players.Players_emptyIndices[var2];
-					if ((Players.field1246[var3] & 1) != 0) {
-						if (var1 > 0) {
-							--var1;
-							var10000 = Players.field1246;
-							var10000[var3] = (byte)(var10000[var3] | 2);
-						} else {
-							var4 = var0.readBits(1);
-							if (var4 == 0) {
-								var1 = Login.method2124(var0);
-								var10000 = Players.field1246;
-								var10000[var3] = (byte)(var10000[var3] | 2);
-							} else if (Client.updateExternalPlayer(var0, var3)) {
-								var10000 = Players.field1246;
-								var10000[var3] = (byte)(var10000[var3] | 2);
-							}
-						}
-					}
-				}
-
-				var0.exportIndex();
-				if (var1 != 0) {
-					throw new RuntimeException();
-				} else {
-					var0.importIndex();
-
-					for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
-						var3 = Players.Players_emptyIndices[var2];
-						if ((Players.field1246[var3] & 1) == 0) {
-							if (var1 > 0) {
-								--var1;
-								var10000 = Players.field1246;
-								var10000[var3] = (byte)(var10000[var3] | 2);
-							} else {
-								var4 = var0.readBits(1);
-								if (var4 == 0) {
-									var1 = Login.method2124(var0);
-									var10000 = Players.field1246;
-									var10000[var3] = (byte)(var10000[var3] | 2);
-								} else if (Client.updateExternalPlayer(var0, var3)) {
-									var10000 = Players.field1246;
-									var10000[var3] = (byte)(var10000[var3] | 2);
-								}
-							}
-						}
-					}
-
-					var0.exportIndex();
-					if (var1 != 0) {
-						throw new RuntimeException();
-					} else {
-						Players.Players_count = 0;
-						Players.Players_emptyIdxCount = 0;
-
-						for (var2 = 1; var2 < 2048; ++var2) {
-							var10000 = Players.field1246;
-							var10000[var2] = (byte)(var10000[var2] >> 1);
-							Player var5 = Client.players[var2];
-							if (var5 != null) {
-								Players.Players_indices[++Players.Players_count - 1] = var2;
-							} else {
-								Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2;
-							}
-						}
-
-					}
-				}
-			}
-		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;II)Z",
+		signature = "(Lkq;I)Ljava/lang/String;",
-		garbageValue = "1506076524"
+		garbageValue = "2062021922"
 	)
-	static boolean method2040(String var0, int var1) {
+	public static String method2028(Buffer var0) {
-		return class237.method4422(var0, var1, "openjs");
+		return class195.method3664(var0, 32767);
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("lo")
-	@ObfuscatedSignature(
-		signature = "(Lhf;IIB)Z",
-		garbageValue = "19"
-	)
-	public static boolean method2030(AbstractArchive var0, int var1, int var2) {
-		byte[] var3 = var0.takeFile(var1, var2);
-		if (var3 == null) {
-			return false;
-		} else {
-			Buffer.SpriteBuffer_decode(var3);
-			return true;
-		}
-	}
-
-	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1587719078"
+		garbageValue = "-1979767282"
 	)
-	public static void method2039() {
+	static void method2030() {
-		ObjectDefinition.ObjectDefinition_cached.clear();
+		if (class215.field2534 != null) {
-		ObjectDefinition.ObjectDefinition_cachedModelData.clear();
+			Client.field749 = Client.cycle;
-		ObjectDefinition.ObjectDefinition_cachedEntities.clear();
+			class215.field2534.method4304();
-		ObjectDefinition.ObjectDefinition_cachedModels.clear();
-	}
 
-	@ObfuscatedName("in")
+			for (int var0 = 0; var0 < Client.players.length; ++var0) {
-	@ObfuscatedSignature(
+				if (Client.players[var0] != null) {
-		signature = "(Ljava/lang/String;Lhl;S)Ljava/lang/String;",
+					class215.field2534.method4303(MusicPatchPcmStream.baseX * 64 + (Client.players[var0].x >> 7), ScriptEvent.baseY * 64 + (Client.players[var0].y >> 7));
-		garbageValue = "128"
-	)
-	static String method2036(String var0, Widget var1) {
-		if (var0.indexOf("%") != -1) {
-			for (int var2 = 1; var2 <= 5; ++var2) {
-				while (true) {
-					int var3 = var0.indexOf("%" + var2);
-					if (var3 == -1) {
-						break;
-					}
-
-					String var4 = var0.substring(0, var3);
-					int var6 = Language.method3719(var1, var2 - 1);
-					String var5;
-					if (var6 < 999999999) {
-						var5 = Integer.toString(var6);
-					} else {
-						var5 = "*";
-					}
-
-					var0 = var4 + var5 + var0.substring(var3 + 2);
 				}
 			}
 		}
 
-		return var0;
 	}
 }

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

@@ -1,48 +1,42 @@
 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("cm")
+@ObfuscatedName("co")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("ay")
+	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = -1667121911
-	)
-	static int field1115;
-	@ObfuscatedName("kt")
-	@ObfuscatedGetter(
-		intValue = 751391879
-	)
-	@Export("menuX")
-	static int menuX;
-	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Ldk;"
+	)
+	@Export("soundSystem")
+	static SoundSystem soundSystem;
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "Lio;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Ljm;"
+		signature = "Ljl;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		signature = "(Liz;)V"
+		signature = "(Lio;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
+		signature = "(IIIII)V",
-		garbageValue = "34"
+		garbageValue = "76773386"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -75,10 +69,10 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(II)Lbl;",
+		signature = "(II)Lbu;",
-		garbageValue = "-1781435459"
+		garbageValue = "-2132773081"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -89,7 +83,7 @@ public class HealthBar extends Node {
 				var2 = var3;
 			}
 
-			if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
+			if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
 				return var2;
 			} else {
 				var2.remove();
@@ -100,78 +94,13 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1222201022"
+		garbageValue = "1427646863"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method4911();
+		return this.updates.method4843();
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-154641567"
-	)
-	public static void method2054() {
-		Widget.Widget_cachedSprites.clear();
-		Widget.Widget_cachedModels.clear();
-		Widget.Widget_cachedFonts.clear();
-		Widget.Widget_cachedSpriteMasks.clear();
-	}
-
-	@ObfuscatedName("hh")
-	@ObfuscatedSignature(
-		signature = "(III)V",
-		garbageValue = "1071237867"
-	)
-	@Export("updateItemPile")
-	static final void updateItemPile(int var0, int var1) {
-		NodeDeque var2 = Client.groundItems[ClientPacket.Client_plane][var0][var1];
-		if (var2 == null) {
-			class2.scene.removeGroundItemPile(ClientPacket.Client_plane, var0, var1);
-		} else {
-			long var3 = -99999999L;
-			TileItem var5 = null;
-
-			TileItem var6;
-			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
-				ItemDefinition var7 = Interpreter.ItemDefinition_get(var6.id);
-				long var8 = (long)var7.price;
-				if (var7.isStackable == 1) {
-					var8 *= (long)(var6.quantity + 1);
-				}
-
-				if (var8 > var3) {
-					var3 = var8;
-					var5 = var6;
-				}
-			}
-
-			if (var5 == null) {
-				class2.scene.removeGroundItemPile(ClientPacket.Client_plane, var0, var1);
-			} else {
-				var2.addLast(var5);
-				TileItem var12 = null;
-				TileItem var11 = null;
-
-				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
-					if (var6.id != var5.id) {
-						if (var12 == null) {
-							var12 = var6;
-						}
-
-						if (var12.id != var6.id && var11 == null) {
-							var11 = var6;
-						}
-					}
-				}
-
-				long var9 = MouseHandler.calculateTag(var0, var1, 3, false, 0);
-				class2.scene.newGroundItemPile(ClientPacket.Client_plane, var0, var1, class195.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ClientPacket.Client_plane), var5, var9, var12, var11);
-			}
-		}
 	}
 }

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

@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iz")
+@ObfuscatedName("io")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Lhf;"
-	)
-	@Export("HealthBarDefinition_archive")
-	public static AbstractArchive HealthBarDefinition_archive;
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Lhz;"
+	)
+	@Export("HealthBarDefinition_archive")
+	static AbstractArchive HealthBarDefinition_archive;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Lhz;"
 	)
 	@Export("HitSplatDefinition_spritesArchive")
 	static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Lef;"
+		signature = "Leb;"
 	)
 	@Export("HealthBarDefinition_cached")
-	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
+	static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lef;"
+		signature = "Leb;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -857529975
+		intValue = -1167570567
 	)
-	public int field3294;
+	public int field3249;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1543890887
+		intValue = 718576883
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1006919413
+		intValue = -34727519
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1284122497
+		intValue = 1802618683
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1289071467
+		intValue = -2121240959
 	)
 	@Export("int4")
 	public int int4;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -658363057
+		intValue = 727277
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -2107452847
+		intValue = -1886911471
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1482452371
+		intValue = 821957921
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("n")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1572537397
+		intValue = -1979565365
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -1358361165
+		intValue = -158138215
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -96,7 +96,7 @@ public class HealthBarDefinition extends DualNode {
 		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
 	}
 
-	public HealthBarDefinition() {
+	HealthBarDefinition() {
 		this.int1 = 255;
 		this.int2 = 255;
 		this.int3 = -1;
@@ -108,13 +108,13 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I)V",
+		signature = "(Lkq;B)V",
-		garbageValue = "1732750389"
+		garbageValue = "-127"
 	)
 	@Export("decode")
-	public void decode(Buffer var1) {
+	void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -125,10 +125,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Lkg;II)V",
+		signature = "(Lkq;IB)V",
-		garbageValue = "-186566893"
+		garbageValue = "21"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -145,9 +145,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method5618();
+			this.frontSpriteID = var1.method5560();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5618();
+			this.backSpriteID = var1.method5560();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -158,10 +158,10 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)Lln;",
+		signature = "(I)Lls;",
-		garbageValue = "621164098"
+		garbageValue = "470645524"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
@@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class288.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
@@ -182,10 +182,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(I)Lln;",
+		signature = "(I)Lls;",
-		garbageValue = "2117531338"
+		garbageValue = "-1178717952"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
@@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class288.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}

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

@@ -1,41 +1,33 @@
-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("bl")
+@ObfuscatedName("bu")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("iz")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -627572607
+		intValue = -1629160111
-	)
-	@Export("selectedItemId")
-	static int selectedItemId;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = -8508907
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1785180099
+		intValue = 618660317
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -529706747
+		intValue = -717144759
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1993456701
+		intValue = 938888871
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -47,10 +39,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
+		signature = "(IIIII)V",
-		garbageValue = "2"
+		garbageValue = "2118505733"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -59,377 +51,4 @@ public class HealthBarUpdate extends Node {
 		this.health2 = var3;
 		this.cycleOffset = var4;
 	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(II)I",
-		garbageValue = "-1436766786"
-	)
-	@Export("ViewportMouse_unpackX")
-	public static int ViewportMouse_unpackX(int var0) {
-		long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
-		int var1 = (int)(var2 >>> 0 & 127L);
-		return var1;
-	}
-
-	@ObfuscatedName("ad")
-	@ObfuscatedSignature(
-		signature = "(Lfu;III)Lde;",
-		garbageValue = "148025221"
-	)
-	public static final PcmPlayer method1776(TaskHandler var0, int var1, int var2) {
-		if (Messages.PcmPlayer_sampleRate == 0) {
-			throw new IllegalStateException();
-		} else if (var1 >= 0 && var1 < 2) {
-			if (var2 < 256) {
-				var2 = 256;
-			}
-
-			try {
-				PcmPlayer var3 = Interpreter.pcmPlayerProvider.player();
-				var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
-				var3.field1401 = var2;
-				var3.init();
-				var3.capacity = (var2 & -1024) + 1024;
-				if (var3.capacity > 16384) {
-					var3.capacity = 16384;
-				}
-
-				var3.open(var3.capacity);
-				if (RouteStrategy.field2114 > 0 && PcmPlayer.soundSystem == null) {
-					PcmPlayer.soundSystem = new SoundSystem();
-					PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1);
-					PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
-				}
-
-				if (PcmPlayer.soundSystem != null) {
-					if (PcmPlayer.soundSystem.players[var1] != null) {
-						throw new IllegalArgumentException();
-					}
-
-					PcmPlayer.soundSystem.players[var1] = var3;
-				}
-
-				return var3;
-			} catch (Throwable var4) {
-				return new PcmPlayer();
-			}
-		} else {
-			throw new IllegalArgumentException();
-		}
-	}
-
-	@ObfuscatedName("hv")
-	@ObfuscatedSignature(
-		signature = "(Lgd;I)V",
-		garbageValue = "1866013369"
-	)
-	static final void method1779(class185 var0) {
-		PacketBuffer var1 = Client.packetWriter.packetBuffer;
-		int var2;
-		int var3;
-		int var4;
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		if (class185.field2340 == var0) {
-			var2 = var1.readUnsignedByte();
-			var3 = var2 >> 2;
-			var4 = var2 & 3;
-			var5 = Client.field703[var3];
-			var6 = var1.method5689();
-			var7 = (var6 >> 4 & 7) + class227.field3092;
-			var8 = (var6 & 7) + class40.field343;
-			if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
-				Varps.updatePendingSpawn(ClientPacket.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1);
-			}
-
-		} else {
-			int var9;
-			if (class185.field2337 == var0) {
-				var2 = var1.method5728();
-				var3 = var2 >> 2;
-				var4 = var2 & 3;
-				var5 = Client.field703[var3];
-				var6 = var1.readUnsignedShort();
-				var7 = var1.readUnsignedByte();
-				var8 = (var7 >> 4 & 7) + class227.field3092;
-				var9 = (var7 & 7) + class40.field343;
-				if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) {
-					Varps.updatePendingSpawn(ClientPacket.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1);
-				}
-
-			} else {
-				TileItem var32;
-				if (class185.field2339 == var0) {
-					var2 = var1.readUnsignedShort();
-					var3 = var1.readUnsignedByte();
-					var4 = (var3 >> 4 & 7) + class227.field3092;
-					var5 = (var3 & 7) + class40.field343;
-					if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
-						NodeDeque var31 = Client.groundItems[ClientPacket.Client_plane][var4][var5];
-						if (var31 != null) {
-							for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) {
-								if ((var2 & 32767) == var32.id) {
-									var32.remove();
-									break;
-								}
-							}
-
-							if (var31.last() == null) {
-								Client.groundItems[ClientPacket.Client_plane][var4][var5] = null;
-							}
-
-							HealthBar.updateItemPile(var4, var5);
-						}
-					}
-
-				} else {
-					int var10;
-					if (class185.field2334 == var0) {
-						var2 = var1.readUnsignedByte();
-						var3 = var2 >> 4 & 15;
-						var4 = var2 & 7;
-						var5 = var1.method5689();
-						var6 = (var5 >> 4 & 7) + class227.field3092;
-						var7 = (var5 & 7) + class40.field343;
-						var8 = var1.method5631();
-						var9 = var1.readUnsignedShort();
-						if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-							var10 = var3 + 1;
-							if (class215.localPlayer.pathX[0] >= var6 - var10 && class215.localPlayer.pathX[0] <= var10 + var6 && class215.localPlayer.pathY[0] >= var7 - var10 && class215.localPlayer.pathY[0] <= var10 + var7 && Client.areaSoundEffectVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) {
-								Client.soundEffectIds[Client.soundEffectCount] = var9;
-								Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4;
-								Client.queuedSoundEffectDelays[Client.soundEffectCount] = var8;
-								Client.soundEffects[Client.soundEffectCount] = null;
-								Client.soundLocations[Client.soundEffectCount] = var3 + (var7 << 8) + (var6 << 16);
-								++Client.soundEffectCount;
-							}
-						}
-					}
-
-					int var11;
-					int var12;
-					int var13;
-					int var14;
-					if (class185.field2336 == var0) {
-						var2 = var1.method5689();
-						var3 = var1.readUnsignedShort();
-						var4 = var1.method5719();
-						var5 = var1.method5728();
-						var6 = (var5 >> 4 & 7) + class227.field3092;
-						var7 = (var5 & 7) + class40.field343;
-						byte var37 = var1.readByte();
-						var9 = var1.method5689() * 4;
-						var10 = var1.method5719();
-						var11 = var1.method5689() * 4;
-						var12 = var1.method5643();
-						byte var40 = var1.readByte();
-						var14 = var1.method5728();
-						var8 = var37 + var6;
-						var13 = var40 + var7;
-						if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104 && var8 >= 0 && var13 >= 0 && var8 < 104 && var13 < 104 && var4 != 65535) {
-							var6 = var6 * 128 + 64;
-							var7 = var7 * 128 + 64;
-							var8 = var8 * 128 + 64;
-							var13 = var13 * 128 + 64;
-							Projectile var15 = new Projectile(var4, ClientPacket.Client_plane, var6, var7, class195.getTileHeight(var6, var7, ClientPacket.Client_plane) - var11, var3 + Client.cycle, var10 + Client.cycle, var14, var2, var12, var9);
-							var15.setDestination(var8, var13, class195.getTileHeight(var8, var13, ClientPacket.Client_plane) - var9, var3 + Client.cycle);
-							Client.projectiles.addFirst(var15);
-						}
-
-					} else if (class185.field2332 == var0) {
-						var2 = var1.method5640();
-						var3 = var1.method5689();
-						var4 = (var3 >> 4 & 7) + class227.field3092;
-						var5 = (var3 & 7) + class40.field343;
-						var6 = var1.method5728();
-						var7 = var6 >> 2;
-						var8 = var6 & 3;
-						var9 = Client.field703[var7];
-						if (var4 >= 0 && var5 >= 0 && var4 < 103 && var5 < 103) {
-							if (var9 == 0) {
-								BoundaryObject var33 = class2.scene.method3130(ClientPacket.Client_plane, var4, var5);
-								if (var33 != null) {
-									var11 = ItemContainer.Entity_unpackID(var33.tag);
-									if (var7 == 2) {
-										var33.entity1 = new DynamicObject(var11, 2, var8 + 4, ClientPacket.Client_plane, var4, var5, var2, false, var33.entity1);
-										var33.entity2 = new DynamicObject(var11, 2, var8 + 1 & 3, ClientPacket.Client_plane, var4, var5, var2, false, var33.entity2);
-									} else {
-										var33.entity1 = new DynamicObject(var11, var7, var8, ClientPacket.Client_plane, var4, var5, var2, false, var33.entity1);
-									}
-								}
-							}
-
-							if (var9 == 1) {
-								WallDecoration var41 = class2.scene.method3131(ClientPacket.Client_plane, var4, var5);
-								if (var41 != null) {
-									var11 = ItemContainer.Entity_unpackID(var41.tag);
-									if (var7 != 4 && var7 != 5) {
-										if (var7 == 6) {
-											var41.entity1 = new DynamicObject(var11, 4, var8 + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1);
-										} else if (var7 == 7) {
-											var41.entity1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1);
-										} else if (var7 == 8) {
-											var41.entity1 = new DynamicObject(var11, 4, var8 + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1);
-											var41.entity2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity2);
-										}
-									} else {
-										var41.entity1 = new DynamicObject(var11, 4, var8, ClientPacket.Client_plane, var4, var5, var2, false, var41.entity1);
-									}
-								}
-							}
-
-							if (var9 == 2) {
-								GameObject var42 = class2.scene.method3253(ClientPacket.Client_plane, var4, var5);
-								if (var7 == 11) {
-									var7 = 10;
-								}
-
-								if (var42 != null) {
-									var42.entity = new DynamicObject(ItemContainer.Entity_unpackID(var42.tag), var7, var8, ClientPacket.Client_plane, var4, var5, var2, false, var42.entity);
-								}
-							}
-
-							if (var9 == 3) {
-								FloorDecoration var43 = class2.scene.getFloorDecoration(ClientPacket.Client_plane, var4, var5);
-								if (var43 != null) {
-									var43.entity = new DynamicObject(ItemContainer.Entity_unpackID(var43.tag), 22, var8, ClientPacket.Client_plane, var4, var5, var2, false, var43.entity);
-								}
-							}
-						}
-
-					} else if (class185.field2341 == var0) {
-						var2 = var1.method5640();
-						var3 = var1.readUnsignedByte();
-						var4 = var1.method5641();
-						var5 = var1.readUnsignedByte();
-						var6 = (var5 >> 4 & 7) + class227.field3092;
-						var7 = (var5 & 7) + class40.field343;
-						if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-							var6 = var6 * 128 + 64;
-							var7 = var7 * 128 + 64;
-							GraphicsObject var44 = new GraphicsObject(var2, ClientPacket.Client_plane, var6, var7, class195.getTileHeight(var6, var7, ClientPacket.Client_plane) - var3, var4, Client.cycle);
-							Client.graphicsObjects.addFirst(var44);
-						}
-
-					} else if (class185.field2331 == var0) {
-						var2 = var1.readUnsignedShort();
-						var3 = var1.method5641();
-						var4 = var1.method5641();
-						var5 = var1.method5631();
-						var6 = (var5 >> 4 & 7) + class227.field3092;
-						var7 = (var5 & 7) + class40.field343;
-						if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-							NodeDeque var34 = Client.groundItems[ClientPacket.Client_plane][var6][var7];
-							if (var34 != null) {
-								for (TileItem var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) {
-									if ((var2 & 32767) == var35.id && var4 == var35.quantity) {
-										var35.quantity = var3;
-										break;
-									}
-								}
-
-								HealthBar.updateItemPile(var6, var7);
-							}
-						}
-
-					} else if (class185.field2335 == var0) {
-						var2 = var1.readUnsignedShort();
-						var3 = var1.readUnsignedByte();
-						var4 = (var3 >> 4 & 7) + class227.field3092;
-						var5 = (var3 & 7) + class40.field343;
-						var6 = var1.method5640();
-						if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
-							var32 = new TileItem();
-							var32.id = var6;
-							var32.quantity = var2;
-							if (Client.groundItems[ClientPacket.Client_plane][var4][var5] == null) {
-								Client.groundItems[ClientPacket.Client_plane][var4][var5] = new NodeDeque();
-							}
-
-							Client.groundItems[ClientPacket.Client_plane][var4][var5].addFirst(var32);
-							HealthBar.updateItemPile(var4, var5);
-						}
-
-					} else {
-						if (class185.field2333 == var0) {
-							var2 = var1.readUnsignedShort();
-							var3 = var1.method5719();
-							var4 = var1.method5689();
-							var5 = var4 >> 2;
-							var6 = var4 & 3;
-							var7 = Client.field703[var5];
-							var8 = var1.method5641();
-							byte var38 = var1.method5772();
-							byte var39 = var1.method5637();
-							var11 = var1.readUnsignedByte();
-							var12 = (var11 >> 4 & 7) + class227.field3092;
-							var13 = (var11 & 7) + class40.field343;
-							var14 = var1.method5719();
-							byte var36 = var1.method5633();
-							byte var16 = var1.method5637();
-							Player var17;
-							if (var3 == Client.localPlayerIndex) {
-								var17 = class215.localPlayer;
-							} else {
-								var17 = Client.players[var3];
-							}
-
-							if (var17 != null) {
-								ObjectDefinition var18 = Occluder.getObjectDefinition(var2);
-								int var19;
-								int var20;
-								if (var6 != 1 && var6 != 3) {
-									var19 = var18.sizeX;
-									var20 = var18.sizeY;
-								} else {
-									var19 = var18.sizeY;
-									var20 = var18.sizeX;
-								}
-
-								int var21 = var12 + (var19 >> 1);
-								int var22 = var12 + (var19 + 1 >> 1);
-								int var23 = var13 + (var20 >> 1);
-								int var24 = var13 + (var20 + 1 >> 1);
-								int[][] var25 = Tiles.Tiles_heights[ClientPacket.Client_plane];
-								int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2;
-								int var27 = (var12 << 7) + (var19 << 6);
-								int var28 = (var13 << 7) + (var20 << 6);
-								Model var29 = var18.getModel(var5, var6, var25, var27, var26, var28);
-								if (var29 != null) {
-									Varps.updatePendingSpawn(ClientPacket.Client_plane, var12, var13, var7, -1, 0, 0, var8 + 1, var14 + 1);
-									var17.animationCycleStart = var8 + Client.cycle;
-									var17.animationCycleEnd = var14 + Client.cycle;
-									var17.model0 = var29;
-									var17.field623 = var12 * 128 + var19 * 64;
-									var17.field617 = var13 * 128 + var20 * 64;
-									var17.tileHeight2 = var26;
-									byte var30;
-									if (var38 > var16) {
-										var30 = var38;
-										var38 = var16;
-										var16 = var30;
-									}
-
-									if (var36 > var39) {
-										var30 = var36;
-										var36 = var39;
-										var39 = var30;
-									}
-
-									var17.field618 = var12 + var38;
-									var17.field621 = var16 + var12;
-									var17.field620 = var13 + var36;
-									var17.field622 = var13 + var39;
-								}
-							}
-						}
-
-					}
-				}
-			}
-		}
-	}
 }

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

@@ -4,120 +4,119 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ix")
+@ObfuscatedName("id")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("u")
+	@ObfuscatedName("qv")
+	@ObfuscatedGetter(
+		intValue = -2106163673
+	)
+	static int field3312;
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Lhz;"
 	)
 	@Export("HitSplatDefinition_archive")
 	public static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Lhz;"
 	)
-	public static AbstractArchive field3328;
+	public static AbstractArchive field3290;
-	@ObfuscatedName("b")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lhf;"
+		signature = "Leb;"
-	)
-	@Export("HitSplatDefinition_fontsArchive")
-	public static AbstractArchive HitSplatDefinition_fontsArchive;
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "Lef;"
 	)
 	@Export("HitSplatDefinition_cached")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lef;"
+		signature = "Leb;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Lef;"
+		signature = "Leb;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1295461739
+		intValue = 62489831
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 963128035
+		intValue = -167444243
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1733975883
+		intValue = 491261365
 	)
-	public int field3338;
+	public int field3298;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = 195481813
-	)
-	int field3351;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -1766289865
-	)
-	int field3340;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -2096395153
-	)
-	int field3341;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = -994685313
-	)
-	int field3349;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 634586915
-	)
-	public int field3343;
 	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 139308797
+		intValue = -1424505111
 	)
-	public int field3327;
+	int field3296;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = -1928448761
+	)
+	int field3300;
 	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1876635353
+		intValue = -524634903
 	)
-	public int field3348;
+	int field3291;
-	@ObfuscatedName("m")
-	String field3346;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -779748361
-	)
-	public int field3347;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = 1251989255
-	)
-	public int field3333;
-	@ObfuscatedName("l")
-	@Export("transforms")
-	public int[] transforms;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1418037543
+		intValue = -930676135
+	)
+	int field3302;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = -1984037709
+	)
+	public int field3303;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = 2001520185
+	)
+	public int field3304;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = -1759745425
+	)
+	public int field3305;
+	@ObfuscatedName("h")
+	String field3306;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -1901137879
+	)
+	public int field3299;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = 411378659
+	)
+	public int field3308;
+	@ObfuscatedName("r")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = -42681817
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = -1584841553
+		intValue = 380242275
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -128,31 +127,31 @@ public class HitSplatDefinition extends DualNode {
 		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
 	}
 
-	public HitSplatDefinition() {
+	HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3338 = 70;
+		this.field3298 = 70;
-		this.field3351 = -1;
+		this.field3296 = -1;
-		this.field3340 = -1;
+		this.field3300 = -1;
-		this.field3341 = -1;
+		this.field3291 = -1;
-		this.field3349 = -1;
+		this.field3302 = -1;
-		this.field3343 = 0;
+		this.field3303 = 0;
-		this.field3327 = 0;
+		this.field3304 = 0;
-		this.field3348 = -1;
+		this.field3305 = -1;
-		this.field3346 = "";
+		this.field3306 = "";
-		this.field3347 = -1;
+		this.field3299 = -1;
-		this.field3333 = 0;
+		this.field3308 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkg;B)V",
+		signature = "(Lkq;I)V",
-		garbageValue = "87"
+		garbageValue = "-13234196"
 	)
 	@Export("decode")
-	public void decode(Buffer var1) {
+	void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -163,41 +162,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lkg;II)V",
+		signature = "(Lkq;II)V",
-		garbageValue = "1254085068"
+		garbageValue = "-1783175438"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5618();
+			this.fontId = var1.method5560();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3351 = var1.method5618();
+			this.field3296 = var1.method5560();
 		} else if (var2 == 4) {
-			this.field3341 = var1.method5618();
+			this.field3291 = var1.method5560();
 		} else if (var2 == 5) {
-			this.field3340 = var1.method5618();
+			this.field3300 = var1.method5560();
 		} else if (var2 == 6) {
-			this.field3349 = var1.method5618();
+			this.field3302 = var1.method5560();
 		} else if (var2 == 7) {
-			this.field3343 = var1.readShort();
+			this.field3303 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3346 = var1.readStringCp1252NullCircumfixed();
+			this.field3306 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3338 = var1.readUnsignedShort();
+			this.field3298 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3327 = var1.readShort();
+			this.field3304 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3348 = 0;
+			this.field3305 = 0;
 		} else if (var2 == 12) {
-			this.field3347 = var1.readUnsignedByte();
+			this.field3299 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3333 = var1.readShort();
+			this.field3308 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3348 = var1.readUnsignedShort();
+			this.field3305 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -232,16 +231,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(I)Lix;",
+		signature = "(S)Lid;",
-		garbageValue = "938920807"
+		garbageValue = "1000"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = FileSystem.getVarbit(this.transformVarbit);
+			var1 = GameShell.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -253,36 +252,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		if (var2 != -1) {
+		return var2 != -1 ? MusicPatchNode.method3815(var2) : null;
-			HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
-			HitSplatDefinition var3;
-			if (var4 != null) {
-				var3 = var4;
-			} else {
-				byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2);
-				var4 = new HitSplatDefinition();
-				if (var5 != null) {
-					var4.decode(new Buffer(var5));
-				}
-
-				HitSplatDefinition_cached.put(var4, (long)var2);
-				var3 = var4;
-			}
-
-			return var3;
-		} else {
-			return null;
-		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-1476211586"
+		garbageValue = "384079116"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3346;
+		String var2 = this.field3306;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -290,26 +270,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + VarbitDefinition.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + class65.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(I)Lln;",
+		signature = "(B)Lls;",
-		garbageValue = "138954957"
+		garbageValue = "1"
 	)
-	public Sprite method4662() {
+	public Sprite method4600() {
-		if (this.field3351 < 0) {
+		if (this.field3296 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3351);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3296);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class288.SpriteBuffer_getSprite(field3328, this.field3351, 0);
+				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3296, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3351);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3296);
 				}
 
 				return var1;
@@ -317,22 +297,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(I)Lln;",
+		signature = "(I)Lls;",
-		garbageValue = "-1751554235"
+		garbageValue = "1869434079"
 	)
-	public Sprite method4663() {
+	public Sprite method4576() {
-		if (this.field3340 < 0) {
+		if (this.field3300 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3340);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3300);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class288.SpriteBuffer_getSprite(field3328, this.field3340, 0);
+				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3300, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3340);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3300);
 				}
 
 				return var1;
@@ -340,22 +320,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Lln;",
+		signature = "(B)Lls;",
-		garbageValue = "243869561"
+		garbageValue = "-53"
 	)
-	public Sprite method4671() {
+	public Sprite method4587() {
-		if (this.field3341 < 0) {
+		if (this.field3291 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3341);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3291);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class288.SpriteBuffer_getSprite(field3328, this.field3341, 0);
+				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3291, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3341);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3291);
 				}
 
 				return var1;
@@ -363,22 +343,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "(B)Lln;",
+		signature = "(B)Lls;",
-		garbageValue = "20"
+		garbageValue = "-100"
 	)
-	public Sprite method4657() {
+	public Sprite method4596() {
-		if (this.field3349 < 0) {
+		if (this.field3302 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3349);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3302);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class288.SpriteBuffer_getSprite(field3328, this.field3349, 0);
+				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3302, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3349);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3302);
 				}
 
 				return var1;
@@ -386,10 +366,10 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(I)Lky;",
+		signature = "(B)Lko;",
-		garbageValue = "-816521399"
+		garbageValue = "-24"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -400,7 +380,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class60.method1195(field3328, HitSplatDefinition_fontsArchive, this.fontId, 0);
+				var1 = class14.method160(field3290, class206.HitSplatDefinition_fontsArchive, this.fontId, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
 				}
@@ -409,4 +389,86 @@ public class HitSplatDefinition extends DualNode {
 			}
 		}
 	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Lhz;III)Z",
+		garbageValue = "-1590564834"
+	)
+	public static boolean method4586(AbstractArchive var0, int var1, int var2) {
+		byte[] var3 = var0.takeFile(var1, var2);
+		if (var3 == null) {
+			return false;
+		} else {
+			AbstractWorldMapIcon.SpriteBuffer_decode(var3);
+			return true;
+		}
+	}
+
+	@ObfuscatedName("hq")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1358506990"
+	)
+	static final void method4612() {
+		PacketBuffer var0 = Client.packetWriter.packetBuffer;
+		var0.importIndex();
+		int var1 = var0.readBits(8);
+		int var2;
+		if (var1 < Client.npcCount) {
+			for (var2 = var1; var2 < Client.npcCount; ++var2) {
+				Client.field745[++Client.field815 - 1] = Client.npcIndices[var2];
+			}
+		}
+
+		if (var1 > Client.npcCount) {
+			throw new RuntimeException("");
+		} else {
+			Client.npcCount = 0;
+
+			for (var2 = 0; var2 < var1; ++var2) {
+				int var3 = Client.npcIndices[var2];
+				NPC var4 = Client.npcs[var3];
+				int var5 = var0.readBits(1);
+				if (var5 == 0) {
+					Client.npcIndices[++Client.npcCount - 1] = var3;
+					var4.npcCycle = Client.cycle;
+				} else {
+					int var6 = var0.readBits(2);
+					if (var6 == 0) {
+						Client.npcIndices[++Client.npcCount - 1] = var3;
+						var4.npcCycle = Client.cycle;
+						Client.field720[++Client.field673 - 1] = var3;
+					} else {
+						int var7;
+						int var8;
+						if (var6 == 1) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2044(var7, (byte)1);
+							var8 = var0.readBits(1);
+							if (var8 == 1) {
+								Client.field720[++Client.field673 - 1] = var3;
+							}
+						} else if (var6 == 2) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2044(var7, (byte)2);
+							var8 = var0.readBits(3);
+							var4.method2044(var8, (byte)2);
+							int var9 = var0.readBits(1);
+							if (var9 == 1) {
+								Client.field720[++Client.field673 - 1] = var3;
+							}
+						} else if (var6 == 3) {
+							Client.field745[++Client.field815 - 1] = var3;
+						}
+					}
+				}
+			}
+
+		}
+	}
 }

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

@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ip")
+@ObfuscatedName("iz")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Lip;"
-	)
-	field3462(1, 0),
 	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lip;"
+		signature = "Liz;"
+	)
+	field3425(0, 0),
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Liz;"
 	)
 	@Export("HorizontalAlignment_centered")
 	HorizontalAlignment_centered(2, 1),
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Lip;"
+		signature = "Liz;"
 	)
-	field3458(0, 2);
+	field3424(1, 2);
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1180720231
+		intValue = -618314265
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 1019628395
+		intValue = 345899471
 	)
 	@Export("id")
 	final int id;
@@ -42,13 +42,173 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "7"
+		garbageValue = "-57"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
+
+	@ObfuscatedName("f")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "1134986404"
+	)
+	@Export("isWorldMapEvent")
+	public static boolean isWorldMapEvent(int var0) {
+		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17;
+	}
+
+	@ObfuscatedName("hv")
+	@ObfuscatedSignature(
+		signature = "(IIIIII)V",
+		garbageValue = "1599088353"
+	)
+	@Export("drawObject")
+	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
+		long var5 = class14.scene.getBoundaryObjectTag(var0, var1, var2);
+		int var7;
+		int var8;
+		int var9;
+		int var10;
+		int var12;
+		int var13;
+		if (var5 != 0L) {
+			var7 = class14.scene.getObjectFlags(var0, var1, var2, var5);
+			var8 = var7 >> 6 & 3;
+			var9 = var7 & 31;
+			var10 = var3;
+			if (class42.method790(var5)) {
+				var10 = var4;
+			}
+
+			int[] var11 = Language.sceneMinimapSprite.pixels;
+			var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
+			var13 = class2.Entity_unpackID(var5);
+			ObjectDefinition var14 = Coord.getObjectDefinition(var13);
+			if (var14.mapSceneId != -1) {
+				IndexedSprite var15 = class162.mapSceneSprites[var14.mapSceneId];
+				if (var15 != null) {
+					int var16 = (var14.sizeX * 4 - var15.subWidth) / 2;
+					int var17 = (var14.sizeY * 4 - var15.subHeight) / 2;
+					var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48);
+				}
+			} else {
+				if (var9 == 0 || var9 == 2) {
+					if (var8 == 0) {
+						var11[var12] = var10;
+						var11[var12 + 512] = var10;
+						var11[var12 + 1024] = var10;
+						var11[var12 + 1536] = var10;
+					} else if (var8 == 1) {
+						var11[var12] = var10;
+						var11[var12 + 1] = var10;
+						var11[var12 + 2] = var10;
+						var11[var12 + 3] = var10;
+					} else if (var8 == 2) {
+						var11[var12 + 3] = var10;
+						var11[var12 + 512 + 3] = var10;
+						var11[var12 + 1024 + 3] = var10;
+						var11[var12 + 1536 + 3] = var10;
+					} else if (var8 == 3) {
+						var11[var12 + 1536] = var10;
+						var11[var12 + 1536 + 1] = var10;
+						var11[var12 + 1536 + 2] = var10;
+						var11[var12 + 1536 + 3] = var10;
+					}
+				}
+
+				if (var9 == 3) {
+					if (var8 == 0) {
+						var11[var12] = var10;
+					} else if (var8 == 1) {
+						var11[var12 + 3] = var10;
+					} else if (var8 == 2) {
+						var11[var12 + 1536 + 3] = var10;
+					} else if (var8 == 3) {
+						var11[var12 + 1536] = var10;
+					}
+				}
+
+				if (var9 == 2) {
+					if (var8 == 3) {
+						var11[var12] = var10;
+						var11[var12 + 512] = var10;
+						var11[var12 + 1024] = var10;
+						var11[var12 + 1536] = var10;
+					} else if (var8 == 0) {
+						var11[var12] = var10;
+						var11[var12 + 1] = var10;
+						var11[var12 + 2] = var10;
+						var11[var12 + 3] = var10;
+					} else if (var8 == 1) {
+						var11[var12 + 3] = var10;
+						var11[var12 + 512 + 3] = var10;
+						var11[var12 + 1024 + 3] = var10;
+						var11[var12 + 1536 + 3] = var10;
+					} else if (var8 == 2) {
+						var11[var12 + 1536] = var10;
+						var11[var12 + 1536 + 1] = var10;
+						var11[var12 + 1536 + 2] = var10;
+						var11[var12 + 1536 + 3] = var10;
+					}
+				}
+			}
+		}
+
+		var5 = class14.scene.getGameObjectTag(var0, var1, var2);
+		if (var5 != 0L) {
+			var7 = class14.scene.getObjectFlags(var0, var1, var2, var5);
+			var8 = var7 >> 6 & 3;
+			var9 = var7 & 31;
+			var10 = class2.Entity_unpackID(var5);
+			ObjectDefinition var24 = Coord.getObjectDefinition(var10);
+			int var19;
+			if (var24.mapSceneId != -1) {
+				IndexedSprite var18 = class162.mapSceneSprites[var24.mapSceneId];
+				if (var18 != null) {
+					var13 = (var24.sizeX * 4 - var18.subWidth) / 2;
+					var19 = (var24.sizeY * 4 - var18.subHeight) / 2;
+					var18.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var24.sizeY) * 4 + var19 + 48);
+				}
+			} else if (var9 == 9) {
+				var12 = 15658734;
+				if (class42.method790(var5)) {
+					var12 = 15597568;
+				}
+
+				int[] var23 = Language.sceneMinimapSprite.pixels;
+				var19 = var1 * 4 + (103 - var2) * 2048 + 24624;
+				if (var8 != 0 && var8 != 2) {
+					var23[var19] = var12;
+					var23[var19 + 1 + 512] = var12;
+					var23[var19 + 1024 + 2] = var12;
+					var23[var19 + 1536 + 3] = var12;
+				} else {
+					var23[var19 + 1536] = var12;
+					var23[var19 + 1 + 1024] = var12;
+					var23[var19 + 512 + 2] = var12;
+					var23[var19 + 3] = var12;
+				}
+			}
+		}
+
+		var5 = class14.scene.getFloorDecorationTag(var0, var1, var2);
+		if (0L != var5) {
+			var7 = class2.Entity_unpackID(var5);
+			ObjectDefinition var20 = Coord.getObjectDefinition(var7);
+			if (var20.mapSceneId != -1) {
+				IndexedSprite var21 = class162.mapSceneSprites[var20.mapSceneId];
+				if (var21 != null) {
+					var10 = (var20.sizeX * 4 - var21.subWidth) / 2;
+					int var22 = (var20.sizeY * 4 - var21.subHeight) / 2;
+					var21.drawAt(var1 * 4 + var10 + 48, var22 + (104 - var2 - var20.sizeY) * 4 + 48);
+				}
+			}
+		}
+
+	}
 }

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

@@ -3,16 +3,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hg")
+@ObfuscatedName("go")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("keys")
 	int[] keys;
 
@@ -99,10 +99,10 @@ public class Huffman {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "([BII[BIB)I",
+		signature = "([BII[BII)I",
-		garbageValue = "-1"
+		garbageValue = "918574893"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -150,10 +150,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "([BI[BIII)I",
-		garbageValue = "661108656"
+		garbageValue = "273462814"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -294,65 +294,212 @@ public class Huffman {
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("w")
-	public static final int method4020(double var0, double var2, double var4) {
+	@ObfuscatedSignature(
-		double var6 = var4;
+		signature = "(I)V",
-		double var8 = var4;
+		garbageValue = "2034773594"
-		double var10 = var4;
+	)
-		if (var2 != 0.0D) {
+	public static void method3917() {
-			double var12;
+		VarbitDefinition.VarbitDefinition_cached.clear();
-			if (var4 < 0.5D) {
+	}
-				var12 = (1.0D + var2) * var4;
-			} else {
-				var12 = var4 + var2 - var2 * var4;
-			}
 
-			double var14 = 2.0D * var4 - var12;
+	@ObfuscatedName("ig")
-			double var16 = 0.3333333333333333D + var0;
+	@ObfuscatedSignature(
-			if (var16 > 1.0D) {
+		signature = "(IIIIB)V",
-				--var16;
+		garbageValue = "-1"
-			}
+	)
+	@Export("addSceneMenuOptions")
+	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+		if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
+			class1.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
+		}
 
-			double var20 = var0 - 0.3333333333333333D;
+		long var4 = -1L;
-			if (var20 < 0.0D) {
+		long var6 = -1L;
-				++var20;
-			}
 
-			if (var16 * 6.0D < 1.0D) {
+		int var8;
-				var6 = var16 * (var12 - var14) * 6.0D + var14;
+		for (var8 = 0; var8 < class192.method3654(); ++var8) {
-			} else if (var16 * 2.0D < 1.0D) {
+			long var9 = class14.method152(var8);
-				var6 = var12;
+			if (var9 != var6) {
-			} else if (3.0D * var16 < 2.0D) {
+				var6 = var9;
-				var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14;
+				int var23 = class288.method5334(ViewportMouse.ViewportMouse_entityTags[var8]);
-			} else {
+				int var12 = var23;
-				var6 = var14;
+				int var13 = class117.method2760(var8);
-			}
+				int var14 = CollisionMap.method3555(var8);
+				int var15 = WorldMapSection2.method322(var8);
+				if (var14 == 2 && class14.scene.getObjectFlags(UrlRequest.Client_plane, var23, var13, var9) >= 0) {
+					ObjectDefinition var16 = Coord.getObjectDefinition(var15);
+					if (var16.transforms != null) {
+						var16 = var16.transform();
+					}
 
-			if (var0 * 6.0D < 1.0D) {
+					if (var16 == null) {
-				var8 = var14 + var0 * (var12 - var14) * 6.0D;
+						continue;
-			} else if (var0 * 2.0D < 1.0D) {
+					}
-				var8 = var12;
-			} else if (3.0D * var0 < 2.0D) {
-				var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14;
-			} else {
-				var8 = var14;
-			}
 
-			if (var20 * 6.0D < 1.0D) {
+					if (Client.isItemSelected == 1) {
-				var10 = var20 * 6.0D * (var12 - var14) + var14;
+						class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 1, var15, var23, var13);
-			} else if (var20 * 2.0D < 1.0D) {
+					} else if (Client.isSpellSelected) {
-				var10 = var12;
+						if ((ReflectionCheck.selectedSpellFlags & 4) == 4) {
-			} else if (var20 * 3.0D < 2.0D) {
+							class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 2, var15, var23, var13);
-				var10 = var14 + 6.0D * (var12 - var14) * (0.6666666666666666D - var20);
+						}
-			} else {
+					} else {
-				var10 = var14;
+						String[] var24 = var16.actions;
+						if (var24 != null) {
+							for (int var25 = 4; var25 >= 0; --var25) {
+								if (var24[var25] != null) {
+									short var19 = 0;
+									if (var25 == 0) {
+										var19 = 3;
+									}
+
+									if (var25 == 1) {
+										var19 = 4;
+									}
+
+									if (var25 == 2) {
+										var19 = 5;
+									}
+
+									if (var25 == 3) {
+										var19 = 6;
+									}
+
+									if (var25 == 4) {
+										var19 = 1001;
+									}
+
+									class1.insertMenuItemNoShift(var24[var25], NPC.colorStartTag(65535) + var16.name, var19, var15, var12, var13);
+								}
+							}
+						}
+
+						class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(65535) + var16.name, 1002, var16.id, var12, var13);
+					}
+				}
+
+				int var17;
+				NPC var18;
+				Player var20;
+				int[] var31;
+				int var33;
+				if (var14 == 1) {
+					NPC var28 = Client.npcs[var15];
+					if (var28 == null) {
+						continue;
+					}
+
+					if (var28.definition.size == 1 && (var28.x & 127) == 64 && (var28.y & 127) == 64) {
+						for (var17 = 0; var17 < Client.npcCount; ++var17) {
+							var18 = Client.npcs[Client.npcIndices[var17]];
+							if (var18 != null && var18 != var28 && var18.definition.size == 1 && var18.x == var28.x && var28.y == var18.y) {
+								DefaultsGroup.addNpcToMenu(var18.definition, Client.npcIndices[var17], var12, var13);
+							}
+						}
+
+						var17 = Players.Players_count;
+						var31 = Players.Players_indices;
+
+						for (var33 = 0; var33 < var17; ++var33) {
+							var20 = Client.players[var31[var33]];
+							if (var20 != null && var28.x == var20.x && var20.y == var28.y) {
+								class30.addPlayerToMenu(var20, var31[var33], var12, var13);
+							}
+						}
+					}
+
+					DefaultsGroup.addNpcToMenu(var28.definition, var15, var12, var13);
+				}
+
+				if (var14 == 0) {
+					Player var29 = Client.players[var15];
+					if (var29 == null) {
+						continue;
+					}
+
+					if ((var29.x & 127) == 64 && (var29.y & 127) == 64) {
+						for (var17 = 0; var17 < Client.npcCount; ++var17) {
+							var18 = Client.npcs[Client.npcIndices[var17]];
+							if (var18 != null && var18.definition.size == 1 && var29.x == var18.x && var18.y == var29.y) {
+								DefaultsGroup.addNpcToMenu(var18.definition, Client.npcIndices[var17], var12, var13);
+							}
+						}
+
+						var17 = Players.Players_count;
+						var31 = Players.Players_indices;
+
+						for (var33 = 0; var33 < var17; ++var33) {
+							var20 = Client.players[var31[var33]];
+							if (var20 != null && var20 != var29 && var20.x == var29.x && var20.y == var29.y) {
+								class30.addPlayerToMenu(var20, var31[var33], var12, var13);
+							}
+						}
+					}
+
+					if (var15 != Client.combatTargetPlayerIndex) {
+						class30.addPlayerToMenu(var29, var15, var12, var13);
+					} else {
+						var4 = var9;
+					}
+				}
+
+				if (var14 == 3) {
+					NodeDeque var30 = Client.groundItems[UrlRequest.Client_plane][var12][var13];
+					if (var30 != null) {
+						for (TileItem var34 = (TileItem)var30.first(); var34 != null; var34 = (TileItem)var30.next()) {
+							ItemDefinition var32 = PacketBufferNode.ItemDefinition_get(var34.id);
+							if (Client.isItemSelected == 1) {
+								class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(16748608) + var32.name, 16, var34.id, var12, var13);
+							} else if (Client.isSpellSelected) {
+								if ((ReflectionCheck.selectedSpellFlags & 1) == 1) {
+									class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(16748608) + var32.name, 17, var34.id, var12, var13);
+								}
+							} else {
+								String[] var26 = var32.groundActions;
+
+								for (int var27 = 4; var27 >= 0; --var27) {
+									if (var26 != null && var26[var27] != null) {
+										byte var21 = 0;
+										if (var27 == 0) {
+											var21 = 18;
+										}
+
+										if (var27 == 1) {
+											var21 = 19;
+										}
+
+										if (var27 == 2) {
+											var21 = 20;
+										}
+
+										if (var27 == 3) {
+											var21 = 21;
+										}
+
+										if (var27 == 4) {
+											var21 = 22;
+										}
+
+										class1.insertMenuItemNoShift(var26[var27], NPC.colorStartTag(16748608) + var32.name, var21, var34.id, var12, var13);
+									} else if (var27 == 2) {
+										class1.insertMenuItemNoShift("Take", NPC.colorStartTag(16748608) + var32.name, 20, var34.id, var12, var13);
+									}
+								}
+
+								class1.insertMenuItemNoShift("Examine", NPC.colorStartTag(16748608) + var32.name, 1004, var34.id, var12, var13);
+							}
+						}
+					}
+				}
 			}
 		}
 
-		int var22 = (int)(var6 * 256.0D);
+		if (-1L != var4) {
-		int var13 = (int)(256.0D * var8);
+			var8 = class288.method5334(var4);
-		int var23 = (int)(256.0D * var10);
+			int var22 = (int)(var4 >>> 7 & 127L);
-		int var15 = var23 + (var13 << 8) + (var22 << 16);
+			Player var11 = Client.players[Client.combatTargetPlayerIndex];
-		return var15;
+			class30.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var22);
+		}
+
 	}
 }

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

@@ -1,50 +1,62 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ju")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("b")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Llk;"
+	)
+	@Export("rasterProvider")
+	public static AbstractRasterProvider rasterProvider;
+	@ObfuscatedName("af")
+	@ObfuscatedGetter(
+		intValue = 171916373
+	)
+	static int field3579;
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "Lll;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		signature = "(Llg;)V"
+		signature = "(Lll;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)Ljr;",
+		signature = "(B)Ljy;",
-		garbageValue = "-1592540968"
+		garbageValue = "68"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)[Ljr;",
+		signature = "(IB)[Ljy;",
-		garbageValue = "-122"
+		garbageValue = "32"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lkg;II)V",
+		signature = "(Lkq;II)V",
-		garbageValue = "931957014"
+		garbageValue = "1755489735"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -59,7 +71,7 @@ public class IgnoreList extends UserList {
 					Ignored var7 = (Ignored)this.getByCurrentUsername(var5);
 					if (var4) {
 						Ignored var8 = (Ignored)this.getByCurrentUsername(var6);
-						if (var8 != null && var7 != var8) {
+						if (var8 != null && var8 != var7) {
 							if (var7 != null) {
 								this.remove(var8);
 							} else {

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

@@ -4,14 +4,17 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ji")
+@ObfuscatedName("je")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("a")
+	@ObfuscatedName("rq")
-	public static String[] field3610;
-	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -2146797941
+		intValue = 220663936
+	)
+	static int field3589;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 53560497
 	)
 	@Export("id")
 	int id;
@@ -19,20 +22,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lji;I)I",
+		signature = "(Lje;I)I",
-		garbageValue = "-463772537"
+		garbageValue = "1201655164"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		signature = "(Ljr;B)I",
+		signature = "(Ljy;S)I",
-		garbageValue = "41"
+		garbageValue = "9221"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {

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("lm")
+@ObfuscatedName("li")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@Export("height")
 	public int height;
 
-	IndexedSprite() {
+	@ObfuscatedName("f")
-	}
-
-	@ObfuscatedName("u")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) {
@@ -54,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) {
@@ -87,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -133,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
-	public void method6182(int var1, int var2, int var3, int var4) {
+	public void method6124(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth;
 		int var6 = this.subHeight;
 		int var7 = 0;
@@ -195,7 +192,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5);
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@Export("IndexedSprite_two")
 	static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2);
@@ -249,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@Export("IndexedSprite_something")
 	static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
 		int var12 = var3;

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

@@ -4,112 +4,112 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dr")
+@ObfuscatedName("dp")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("d")
+	@ObfuscatedName("n")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("s")
+	@ObfuscatedName("u")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("m")
+	@ObfuscatedName("h")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("l")
+	@ObfuscatedName("r")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("g")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("z")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("p")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("y")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("w")
+	@ObfuscatedName("a")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("k")
+	@ObfuscatedName("c")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("x")
+	@ObfuscatedName("o")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "Ldh;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("n")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Ldx;"
+		signature = "Ldo;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@Export("offset")
 	int offset;
 
@@ -146,7 +146,7 @@ public class Instrument {
 		this.offset = 0;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
 		class300.clearIntArray(Instrument_samples, 0, var1);
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lkg;)V"
+		signature = "(Lkq;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -421,6 +421,6 @@ public class Instrument {
 		this.offset = var1.readUnsignedShort();
 		this.filter = new AudioFilter();
 		this.filterEnvelope = new SoundEnvelope();
-		this.filter.method2729(var1, this.filterEnvelope);
+		this.filter.method2713(var1, this.filterEnvelope);
 	}
 }

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

@@ -3,10 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("la")
+@ObfuscatedName("lq")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("u")
+	@ObfuscatedName("a")
+	public static short[] field4010;
+	@ObfuscatedName("f")
 	@Export("array")
 	int[] array;
 
@@ -32,10 +34,10 @@ public class IntHashTable {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "1209776810"
+		garbageValue = "409094237"
 	)
 	@Export("get")
 	public int get(int var1) {

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

@@ -2,10 +2,10 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ft")
+@ObfuscatedName("gx")
 @Implements("IntegerNode")
 public class IntegerNode extends Node {
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@Export("integer")
 	public int integer;
 

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

@@ -1,92 +1,51 @@
-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("bf")
+@ObfuscatedName("bz")
 @Implements("InterfaceParent")
 public class InterfaceParent extends Node {
-	@ObfuscatedName("pe")
+	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "Ljg;"
-	)
-	@Export("clanChat")
-	static ClanChat clanChat;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "Llm;"
-	)
-	@Export("options_buttons_0Sprite")
-	static IndexedSprite options_buttons_0Sprite;
-	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -827675327
+		intValue = 1533834755
 	)
 	@Export("group")
 	int group;
-	@ObfuscatedName("f")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -207646309
+		intValue = 642122867
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("b")
+	@ObfuscatedName("y")
-	boolean field561;
+	boolean field546;
 
 	InterfaceParent() {
-		this.field561 = false;
+		this.field546 = false;
 	}
 
-	@ObfuscatedName("fr")
+	@ObfuscatedName("fs")
 	@ObfuscatedSignature(
-		signature = "(Liy;IIIB)V",
+		signature = "(I)V",
-		garbageValue = "-6"
+		garbageValue = "472182360"
 	)
-	@Export("addSequenceSoundEffect")
+	@Export("logOut")
-	static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) {
+	static final void logOut() {
-		if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) {
+		Client.packetWriter.close();
-			if (var0.soundEffects != null && var1 < var0.soundEffects.length) {
+		class81.method2063();
-				int var4 = var0.soundEffects[var1];
+		class14.scene.clear();
-				if (var4 != 0) {
+
-					int var5 = var4 >> 8;
+		for (int var0 = 0; var0 < 4; ++var0) {
-					int var6 = var4 >> 4 & 7;
+			Client.collisionMaps[var0].clear();
-					int var7 = var4 & 15;
-					Client.soundEffectIds[Client.soundEffectCount] = var5;
-					Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
-					Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
-					Client.soundEffects[Client.soundEffectCount] = null;
-					int var8 = (var2 - 64) / 128;
-					int var9 = (var3 - 64) / 128;
-					Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
-					++Client.soundEffectCount;
-				}
-			}
 		}
-	}
 
-	@ObfuscatedName("hn")
+		System.gc();
-	@ObfuscatedSignature(
+		BoundaryObject.method3273(2);
-		signature = "(ZI)V",
+		Client.currentTrackGroupId = -1;
-		garbageValue = "1179821355"
+		Client.field767 = false;
-	)
+		WorldMapSectionType.method236();
-	static final void method1197(boolean var0) {
+		class195.updateGameState(10);
-		Tiles.playPcmPlayers();
-		++Client.packetWriter.pendingWrites;
-		if (Client.packetWriter.pendingWrites >= 50 || var0) {
-			Client.packetWriter.pendingWrites = 0;
-			if (!Client.field691 && Client.packetWriter.getSocket() != null) {
-				PacketBufferNode var1 = ModelData0.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher);
-				Client.packetWriter.addNode(var1);
-
-				try {
-					Client.packetWriter.flush();
-				} catch (IOException var3) {
-					Client.field691 = true;
-				}
-			}
-
-		}
 	}
 }