chore: rev 188

buildSrc/src/main/kotlin/Dependencies.kt

@@ -29,7 +29,7 @@ object ProjectVersions {
 
     const val openosrsVersion = "2.1.24-SNAPSHOT"
 
-    const val rsversion = 187
+    const val rsversion = 188
     const val cacheversion = 165
 }
 

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -1811,7 +1811,7 @@ public abstract class RSClientMixin implements RSClient
 	{
 		if (volume > 0 && client.getMusicVolume() <= 0 && client.getCurrentTrackGroupId() != -1)
 		{
-			client.playMusicTrack(client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false);
+			client.playMusicTrack(1000, client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false);
 		}
 
 		client.setClientMusicVolume(volume);

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

@@ -1072,7 +1072,7 @@ public interface RSClient extends RSGameShell, Client
 	void setViewportWalking(boolean viewportWalking);
 
 	@Import("playMusicTrack")
-	void playMusicTrack(RSAbstractArchive var0, int var1, int var2, int var3, boolean var4);
+	void playMusicTrack(int var0, RSAbstractArchive var1, int var2, int var3, int var4, boolean var5);
 
 	@Import("midiPcmStream")
 	RSMidiPcmStream getMidiPcmStream();

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

@@ -1,50 +1,35 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("gu")
+@ObfuscatedName("gv")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
+	@ObfuscatedName("se")
+	@ObfuscatedGetter(
+		intValue = -1844063971
+	)
+	@Export("foundItemIndex")
+	static int foundItemIndex;
+
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)[B",
-		garbageValue = "-112018699"
+		garbageValue = "-571467457"
 	)
 	@Export("get")
 	public abstract byte[] get();
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "([BB)V",
+		signature = "([BI)V",
-		garbageValue = "33"
+		garbageValue = "1471312739"
 	)
 	@Export("set")
 	public abstract void set(byte[] var1);
-
-	@ObfuscatedName("aw")
-	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
-		garbageValue = "-27"
-	)
-	static int method3937(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.SOUND_SYNTH) {
-			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("kn")
+@ObfuscatedName("kc")
 @Implements("AbstractFont")
 public abstract class AbstractFont extends Rasterizer2D {
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "[Lli;"
 	)
 	@Export("AbstractFont_modIconSprites")
 	public static IndexedSprite[] AbstractFont_modIconSprites;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@Export("AbstractFont_strike")
 	static int AbstractFont_strike;
 	@ObfuscatedName("v")
 	@Export("AbstractFont_underline")
 	static int AbstractFont_underline;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@Export("AbstractFont_previousShadow")
 	static int AbstractFont_previousShadow;
-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@Export("AbstractFont_shadow")
 	static int AbstractFont_shadow;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@Export("AbstractFont_previousColor")
 	static int AbstractFont_previousColor;
-	@ObfuscatedName("t")
+	@ObfuscatedName("k")
 	@Export("AbstractFont_color")
 	static int AbstractFont_color;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("AbstractFont_alpha")
 	static int AbstractFont_alpha;
-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@Export("AbstractFont_justificationTotal")
 	static int AbstractFont_justificationTotal;
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@Export("AbstractFont_justificationCurrent")
 	static int AbstractFont_justificationCurrent;
-	@ObfuscatedName("z")
+	@ObfuscatedName("f")
 	@Export("AbstractFont_random")
 	static Random AbstractFont_random;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("AbstractFont_lines")
 	static String[] AbstractFont_lines;
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	byte[][] pixels;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("advances")
 	int[] advances;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("widths")
 	int[] widths;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("heights")
 	int[] heights;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("leftBearings")
 	int[] leftBearings;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("topBearings")
 	int[] topBearings;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("ascent")
 	public int ascent;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("maxAscent")
 	public int maxAscent;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("maxDescent")
 	public int maxDescent;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@Export("kerning")
 	byte[] kerning;
 
@@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D {
 		this.readMetrics(var1);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("drawGlyph")
 	abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("drawGlyphAlpha")
 	abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@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)method5388(var11, var12, var4, this.advances, var10, var13, var8);
+							this.kerning[var8 + (var13 << 8)] = (byte)method5414(var11, var12, var4, this.advances, var10, var13, var8);
 						}
 					}
 				}
@@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("j")
 	@Export("charWidth")
 	int charWidth(char var1) {
 		if (var1 == 160) {
 			var1 = ' ';
 		}
 
-		return this.advances[NetSocket.charToByteCp1252(var1) & 255];
+		return this.advances[TextureProvider.charToByteCp1252(var1) & 255];
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("m")
 	@Export("stringWidth")
 	public int stringWidth(String var1) {
 		if (var1 == null) {
@@ -238,7 +238,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var7.equals("gt")) {
 								if (var7.startsWith("img=")) {
 									try {
-										int var8 = ArchiveDiskActionHandler.parseInt(var7.substring(4));
+										int var8 = VerticalAlignment.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)(NetSocket.charToByteCp1252(var6) & 255)];
+						var4 += this.advances[(char)(TextureProvider.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("d")
+	@ObfuscatedName("p")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) {
@@ -321,7 +321,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							var11 = '>';
 						} else if (var16.startsWith("img=")) {
 							try {
-								int var17 = ArchiveDiskActionHandler.parseInt(var16.substring(4));
+								int var17 = VerticalAlignment.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("c")
+	@ObfuscatedName("h")
 	@Export("lineWidth")
 	public int lineWidth(String var1, int var2) {
 		int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
@@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var4;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("v")
 	@Export("lineCount")
 	public int lineCount(String var1, int var2) {
 		return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("x")
 	@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("j")
+	@ObfuscatedName("w")
 	@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("n")
+	@ObfuscatedName("q")
 	@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("u")
+	@ObfuscatedName("z")
 	@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("z")
+	@ObfuscatedName("y")
 	@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("h")
+	@ObfuscatedName("f")
 	@Export("drawCenteredWave")
 	public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
 		if (var1 != null) {
@@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("a")
 	@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("aa")
+	@ObfuscatedName("u")
 	@Export("drawCenteredShake")
 	public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 != null) {
@@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("ae")
 	@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("aw")
+	@ObfuscatedName("af")
 	@Export("reset")
 	void reset(int var1, int var2) {
 		AbstractFont_strike = -1;
@@ -582,28 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D {
 		AbstractFont_justificationCurrent = 0;
 	}
 
-	@ObfuscatedName("as")
+	@ObfuscatedName("az")
 	@Export("decodeTag")
 	void decodeTag(String var1) {
 		try {
 			if (var1.startsWith("col=")) {
-				AbstractFont_color = VerticalAlignment.method4326(var1.substring(4), 16);
+				AbstractFont_color = ScriptEvent.method1202(var1.substring(4), 16);
 			} else if (var1.equals("/col")) {
 				AbstractFont_color = AbstractFont_previousColor;
 			} else if (var1.startsWith("str=")) {
-				AbstractFont_strike = VerticalAlignment.method4326(var1.substring(4), 16);
+				AbstractFont_strike = ScriptEvent.method1202(var1.substring(4), 16);
 			} else if (var1.equals("str")) {
 				AbstractFont_strike = 8388608;
 			} else if (var1.equals("/str")) {
 				AbstractFont_strike = -1;
 			} else if (var1.startsWith("u=")) {
-				AbstractFont_underline = VerticalAlignment.method4326(var1.substring(2), 16);
+				AbstractFont_underline = ScriptEvent.method1202(var1.substring(2), 16);
 			} else if (var1.equals("u")) {
 				AbstractFont_underline = 0;
 			} else if (var1.equals("/u")) {
 				AbstractFont_underline = -1;
 			} else if (var1.startsWith("shad=")) {
-				AbstractFont_shadow = VerticalAlignment.method4326(var1.substring(5), 16);
+				AbstractFont_shadow = ScriptEvent.method1202(var1.substring(5), 16);
 			} else if (var1.equals("shad")) {
 				AbstractFont_shadow = 0;
 			} else if (var1.equals("/shad")) {
@@ -616,7 +616,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ax")
 	@Export("calculateLineJustification")
 	void calculateLineJustification(String var1, int var2) {
 		int var3 = 0;
@@ -639,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("aj")
 	@Export("draw0")
 	void draw0(String var1, int var2, int var3) {
 		var3 -= this.ascent;
@@ -648,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)(NetSocket.charToByteCp1252(var1.charAt(var6)) & 255);
+				char var7 = (char)(TextureProvider.charToByteCp1252(var1.charAt(var6)) & 255);
 				if (var7 == '<') {
 					var4 = var6;
 				} else {
@@ -662,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 							if (!var8.equals("gt")) {
 								if (var8.startsWith("img=")) {
 									try {
-										var9 = ArchiveDiskActionHandler.parseInt(var8.substring(4));
+										var9 = VerticalAlignment.parseInt(var8.substring(4));
 										IndexedSprite var10 = AbstractFont_modIconSprites[var9];
 										var10.drawAt(var2, var3 + this.ascent - var10.height);
 										var2 += var10.width;
@@ -728,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("au")
 	@Export("drawWithOffsets0")
 	void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
 		var3 -= this.ascent;
@@ -738,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)(NetSocket.charToByteCp1252(var1.charAt(var9)) & 255);
+				char var10 = (char)(TextureProvider.charToByteCp1252(var1.charAt(var9)) & 255);
 				if (var10 == '<') {
 					var6 = var9;
 				} else {
@@ -767,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 										}
 
 										++var8;
-										var14 = ArchiveDiskActionHandler.parseInt(var11.substring(4));
+										var14 = VerticalAlignment.parseInt(var11.substring(4));
 										IndexedSprite var15 = AbstractFont_modIconSprites[var14];
 										var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
 										var2 += var15.width;
@@ -846,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("l")
-	static int method5388(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) {
+	static int method5414(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];
@@ -882,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return -var13;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("escapeBrackets")
 	public static String escapeBrackets(String var0) {
 		int var1 = var0.length();
@@ -911,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		return var6.toString();
 	}
 
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ay")
 	@Export("AbstractFont_drawGlyph")
 	static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) {
 		int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -953,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aa")
 	@Export("AbstractFont_placeGlyph")
 	static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2);
@@ -1001,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("aq")
 	@Export("AbstractFont_drawGlyphAlpha")
 	static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) {
 		int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -1043,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("ar")
+	@ObfuscatedName("as")
 	@Export("AbstractFont_placeGlyphAlpha")
 	static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
 		var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8;

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

@@ -4,21 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lk")
+@ObfuscatedName("lc")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2051103705
+		intValue = -677565243
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 705915003
+		intValue = 1515017949
 	)
 	@Export("height")
 	public int height;
@@ -26,29 +26,51 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "1570881200"
+		garbageValue = "-529782293"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
+		signature = "(IIIII)V",
-		garbageValue = "-116"
+		garbageValue = "934582222"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1390931728"
+		garbageValue = "-96"
 	)
 	@Export("apply")
 	public final void apply() {
 		Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height);
 	}
+
+	@ObfuscatedName("fx")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "-569880085"
+	)
+	static boolean method6151() {
+		if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) {
+			while (Client.archiveLoadersDone < Client.archiveLoaders.size()) {
+				ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone);
+				if (!var0.isLoaded()) {
+					return false;
+				}
+
+				++Client.archiveLoadersDone;
+			}
+
+			return true;
+		} else {
+			return true;
+		}
+	}
 }

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("ky")
+@ObfuscatedName("kr")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-647274291"
+		garbageValue = "-259367480"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "2115277231"
+		garbageValue = "-108"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-972484659"
+		garbageValue = "2004103994"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "497635177"
+		garbageValue = "-624446357"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-1642271193"
+		garbageValue = "1847434030"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-340382115"
+		garbageValue = "977025272"
 	)
 	@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("ds")
+@ObfuscatedName("dd")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@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("jm")
+@ObfuscatedName("jx")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "(Ljava/util/Comparator;B)V",
-		garbageValue = "1"
+		garbageValue = "71"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljy;Ljy;I)I",
+		signature = "(Ljk;Ljk;I)I",
-		garbageValue = "-1667132208"
+		garbageValue = "-1613196050"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -43,77 +43,45 @@ public abstract class AbstractUserComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)Liw;",
+		signature = "(III)I",
-		garbageValue = "928288295"
+		garbageValue = "-1320582539"
 	)
-	@Export("getNpcDefinition")
+	static int method5119(int var0, int var1) {
-	public static NPCDefinition getNpcDefinition(int var0) {
+		FloorOverlayDefinition var2 = ArchiveLoader.FloorUnderlayDefinition_get(var0);
-		NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
+		if (var2 == null) {
-		if (var1 != null) {
+			return var1;
+		} else if (var2.secondaryRgb >= 0) {
+			return var2.secondaryRgb | -16777216;
+		} else if (var2.texture >= 0) {
+			int var3 = class218.method4178(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture), 96);
+			return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216;
+		} else if (var2.primaryRgb == 16711935) {
 			return var1;
 		} else {
-			byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
+			int var4 = var2.hue;
-			var1 = new NPCDefinition();
+			int var5 = var2.saturation;
-			var1.id = var0;
+			int var6 = var2.lightness;
-			if (var2 != null) {
+			if (var6 > 179) {
-				var1.decode(new Buffer(var2));
+				var5 /= 2;
 			}
 
-			var1.postDecode();
+			if (var6 > 192) {
-			NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
+				var5 /= 2;
-			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;
-				}
 			}
 
+			if (var6 > 217) {
+				var5 /= 2;
+			}
+
+			if (var6 > 243) {
+				var5 /= 2;
+			}
+
+			int var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10);
+			int var8 = class218.method4178(var7, 96);
+			return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216;
 		}
 	}
 }

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

@@ -1,92 +1,88 @@
+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("ao")
+@ObfuscatedName("aq")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("bl")
+	@ObfuscatedName("qk")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lhq;"
+		intValue = -1430527955
 	)
-	static StudioGame field284;
+	static int field306;
-	@ObfuscatedName("by")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "[Lli;"
+		signature = "Lhj;"
-	)
-	@Export("worldSelectFlagSprites")
-	static IndexedSprite[] worldSelectFlagSprites;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "Lht;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lht;"
+		signature = "Lhj;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 130683095
+		intValue = -503139537
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -170696787
+		intValue = 1934442125
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		signature = "(Lht;Lht;)V"
+		signature = "(Lhj;Lhj;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "63"
+		garbageValue = "1499764486"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Law;",
+		signature = "(B)Laz;",
-		garbageValue = "-1801186977"
+		garbageValue = "124"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(S)I",
-		garbageValue = "-2033351231"
+		garbageValue = "-26101"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "1873129621"
+		garbageValue = "1"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "-1038278508"
+		garbageValue = "-671812733"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
@@ -97,27 +93,27 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("m")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(B)Z",
-		garbageValue = "3"
+		garbageValue = "-18"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "-2033564740"
+		garbageValue = "1514075887"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
 		} else {
-			WorldMapElement var3 = GrandExchangeOfferUnitPriceComparator.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = PacketBufferNode.WorldMapElement_get(this.getElement());
 			int var4 = this.getSubWidth();
 			int var5 = this.getSubHeight();
 			switch(var3.horizontalAlignment.value) {
@@ -127,30 +123,32 @@ public abstract class AbstractWorldMapIcon {
 				}
 				break;
 			case 1:
-				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
+				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
 					break;
 				}
 
 				return false;
 			case 2:
-				if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
+				if (var1 < this.screenX || var1 >= var4 + this.screenX) {
 					return false;
 				}
 			}
 
 			switch(var3.verticalAlignment.value) {
 			case 0:
-				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
+				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) {
-					return false;
+					break;
 				}
-				break;
+
+				return false;
 			case 1:
-				if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
+				if (var2 >= this.screenY && var2 < var5 + this.screenY) {
-					return false;
+					break;
 				}
-				break;
+
+				return false;
 			case 2:
-				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
 					return false;
 				}
 			}
@@ -159,10 +157,10 @@ public abstract class AbstractWorldMapIcon {
 		}
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(III)Z",
-		garbageValue = "501002350"
+		garbageValue = "-543519402"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
@@ -170,427 +168,305 @@ public abstract class AbstractWorldMapIcon {
 		if (var3 == null) {
 			return false;
 		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
-			return var2 >= this.screenY && var2 <= this.screenY + var3.height;
+			return var2 >= this.screenY && var2 <= var3.height + this.screenY;
 		} else {
 			return false;
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "([BI)V",
+		signature = "(Lks;ILba;IB)V",
-		garbageValue = "-1395894499"
+		garbageValue = "91"
 	)
-	@Export("SpriteBuffer_decode")
+	static final void method613(PacketBuffer var0, int var1, Player var2, int var3) {
-	static void SpriteBuffer_decode(byte[] var0) {
+		byte var4 = -1;
-		Buffer var1 = new Buffer(var0);
+		if ((var3 & 1024) != 0) {
-		var1.offset = var0.length - 2;
+			var2.field981 = var0.method5618();
-		class325.SpriteBuffer_spriteCount = var1.readUnsignedShort();
+			var2.field957 = var0.method5780();
-		class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount];
+			var2.field961 = var0.method5618();
-		class325.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount];
+			var2.field991 = var0.readByte();
-		UserComparator1.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount];
+			var2.field985 = var0.method5762() + Client.cycle;
-		class325.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount];
+			var2.field986 = var0.method5762() + Client.cycle;
-		class290.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][];
+			var2.field987 = var0.method5740();
-		var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8;
+			if (var2.field621) {
-		class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort();
+				var2.field981 += var2.tileX;
-		class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort();
+				var2.field957 += var2.tileY;
-		int var2 = (var1.readUnsignedByte() & 255) + 1;
+				var2.field961 += var2.tileX;
-
+				var2.field991 += var2.tileY;
-		int var3;
+				var2.pathLength = 0;
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+			} else {
-			class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort();
+				var2.field981 += var2.pathX[0];
-		}
+				var2.field957 += var2.pathY[0];
-
+				var2.field961 += var2.pathX[0];
-		for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) {
+				var2.field991 += var2.pathY[0];
-			class325.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort();
+				var2.pathLength = 1;
-		}
-
-		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;
 			}
+
+			var2.field998 = 0;
 		}
 
-		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("fp")
-	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "294564457"
-	)
-	static final void method612(boolean var0) {
-		if (var0) {
-			Client.field743 = Login.field1178 ? class160.field1984 : class160.field1986;
-		} else {
-			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;
+		if ((var3 & 4096) != 0) {
+			var2.spotAnimation = var0.readUnsignedShort();
+			var5 = var0.readInt();
+			var2.field980 = var5 >> 16;
+			var2.field979 = (var5 & 65535) + Client.cycle;
+			var2.spotAnimationFrame = 0;
+			var2.spotAnimationFrameCycle = 0;
+			if (var2.field979 > Client.cycle) {
+				var2.spotAnimationFrame = -1;
+			}
+
+			if (var2.spotAnimation == 65535) {
+				var2.spotAnimation = -1;
+			}
+		}
+
 		int var6;
-		int var7;
 		int var8;
 		int var9;
-		if (class179.field2293 == var0) {
+		int var12;
-			var2 = var1.method5628();
+		if ((var3 & 64) != 0) {
-			var3 = (var2 >> 4 & 7) + class3.field7;
+			var5 = var0.readUnsignedByte();
-			var4 = (var2 & 7) + PlayerAppearance.field2520;
+			int var7;
-			var5 = var1.method5723();
+			int var10;
-			var6 = var1.readUnsignedByte();
+			int var11;
-			var7 = var6 >> 2;
+			if (var5 > 0) {
-			var8 = var6 & 3;
+				for (var6 = 0; var6 < var5; ++var6) {
-			var9 = Client.field689[var7];
+					var8 = -1;
-			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+					var9 = -1;
-				class65.updatePendingSpawn(UrlRequest.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1);
+					var10 = -1;
-			}
+					var7 = var0.readUShortSmart();
-
+					if (var7 == 32767) {
-		} else if (class179.field2290 == var0) {
+						var7 = var0.readUShortSmart();
-			var2 = var1.method5582();
+						var9 = var0.readUShortSmart();
-			var3 = var1.method5723();
+						var8 = var0.readUShortSmart();
-			var4 = var1.readUnsignedByte();
+						var10 = var0.readUShortSmart();
-			var5 = (var4 >> 4 & 7) + class3.field7;
+					} else if (var7 != 32766) {
-			var6 = (var4 & 7) + PlayerAppearance.field2520;
+						var9 = var0.readUShortSmart();
-			var7 = var1.method5675();
+					} else {
-			if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+						var7 = -1;
-				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);
+					var11 = var0.readUShortSmart();
-					Skills.updateItemPile(var5, var6);
+					var2.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
+				}
+			}
+
+			var6 = var0.method5605();
+			if (var6 > 0) {
+				for (var7 = 0; var7 < var6; ++var7) {
+					var8 = var0.readUShortSmart();
+					var9 = var0.readUShortSmart();
+					if (var9 != 32767) {
+						var10 = var0.readUShortSmart();
+						var11 = var0.method5771();
+						var12 = var9 > 0 ? var0.method5771() : var11;
+						var2.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
+					} else {
+						var2.removeHealthBar(var8);
+					}
+				}
+			}
+		}
+
+		if ((var3 & 2048) != 0) {
+			Players.field1237[var1] = var0.method5618();
+		}
+
+		if ((var3 & 32) != 0) {
+			var5 = var0.method5614();
+			PlayerType var13 = (PlayerType)WorldMapSection0.findEnumerated(SecureRandomFuture.PlayerType_values(), var0.method5771());
+			boolean var17 = var0.readUnsignedByte() == 1;
+			var8 = var0.method5605();
+			var9 = var0.offset;
+			if (var2.username != null && var2.appearance != null) {
+				boolean var18 = false;
+				if (var13.isUser && KeyHandler.friendSystem.isIgnored(var2.username)) {
+					var18 = true;
 				}
 
+				if (!var18 && Client.field759 == 0 && !var2.isHidden) {
+					Players.field1248.offset = 0;
+					var0.readBytes(Players.field1248.array, 0, var8);
+					Players.field1248.offset = 0;
+					String var14 = AbstractFont.escapeBrackets(class40.method735(WallDecoration.method3356(Players.field1248)));
+					var2.overheadText = var14.trim();
+					var2.overheadTextColor = var5 >> 8;
+					var2.overheadTextEffect = var5 & 255;
+					var2.overheadTextCyclesRemaining = 150;
+					var2.isAutoChatting = var17;
+					var2.field954 = var2 != class192.localPlayer && var13.isUser && "" != Client.field780 && var14.toLowerCase().indexOf(Client.field780) == -1;
+					if (var13.isPrivileged) {
+						var12 = var17 ? 91 : 1;
+					} else {
+						var12 = var17 ? 90 : 2;
+					}
+
+					if (var13.modIcon != -1) {
+						ClientPreferences.addGameMessage(var12, Language.method3728(var13.modIcon) + var2.username.getName(), var14);
+					} else {
+						ClientPreferences.addGameMessage(var12, var2.username.getName(), var14);
+					}
+				}
+			}
+
+			var0.offset = var8 + var9;
+		}
+
+		if ((var3 & 1) != 0) {
+			var5 = var0.method5740();
+			if (var5 == 65535) {
+				var5 = -1;
+			}
+
+			var6 = var0.method5605();
+			InterfaceParent.performPlayerAnimation(var2, var5, var6);
+		}
+
+		if ((var3 & 512) != 0) {
+			var4 = var0.method5609();
+		}
+
+		if ((var3 & 2) != 0) {
+			var2.targetIndex = var0.readUnsignedShort();
+			if (var2.targetIndex == 65535) {
+				var2.targetIndex = -1;
+			}
+		}
+
+		if ((var3 & 8) != 0) {
+			var5 = var0.method5771();
+			byte[] var19 = new byte[var5];
+			Buffer var15 = new Buffer(var19);
+			var0.readBytes(var19, 0, var5);
+			Players.field1235[var1] = var15;
+			var2.read(var15);
+		}
+
+		if ((var3 & 256) != 0) {
+			for (var5 = 0; var5 < 3; ++var5) {
+				var2.actions[var5] = var0.readStringCp1252NullTerminated();
+			}
+		}
+
+		if ((var3 & 16) != 0) {
+			var2.overheadText = var0.readStringCp1252NullTerminated();
+			if (var2.overheadText.charAt(0) == '~') {
+				var2.overheadText = var2.overheadText.substring(1);
+				ClientPreferences.addGameMessage(2, var2.username.getName(), var2.overheadText);
+			} else if (var2 == class192.localPlayer) {
+				ClientPreferences.addGameMessage(2, var2.username.getName(), var2.overheadText);
+			}
+
+			var2.isAutoChatting = false;
+			var2.overheadTextColor = 0;
+			var2.overheadTextEffect = 0;
+			var2.overheadTextCyclesRemaining = 150;
+		}
+
+		if ((var3 & 128) != 0) {
+			var2.field967 = var0.readUnsignedShort();
+			if (var2.pathLength == 0) {
+				var2.orientation = var2.field967;
+				var2.field967 = -1;
+			}
+		}
+
+		if (var2.field621) {
+			if (var4 == 127) {
+				var2.resetPath(var2.tileX, var2.tileY);
 			} else {
-				int var10;
+				byte var16;
-				if (class179.field2297 == var0) {
+				if (var4 != -1) {
-					var2 = var1.method5723();
+					var16 = var4;
-					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) {
+					var16 = Players.field1237[var1];
-						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) {
+				var2.method1266(var2.tileX, var2.tileY, var16);
-							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) {
+	@ObfuscatedName("az")
-									var30 = var37;
+	@ObfuscatedSignature(
-									var37 = var12;
+		signature = "(Lff;III)Ldw;",
-									var12 = var30;
+		garbageValue = "1204269673"
-								}
+	)
+	public static final PcmPlayer method627(TaskHandler var0, int var1, int var2) {
+		if (PcmPlayer.field1398 == 0) {
+			throw new IllegalStateException();
+		} else if (var1 >= 0 && var1 < 2) {
+			if (var2 < 256) {
+				var2 = 256;
+			}
 
-								var17.field605 = var13 + var5;
+			try {
-								var17.field607 = var5 + var11;
+				PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player();
-								var17.field606 = var37 + var6;
+				var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256];
-								var17.field608 = var6 + var12;
+				var3.field1401 = var2;
-							}
+				var3.init();
-						}
+				var3.capacity = (var2 & -1024) + 1024;
+				if (var3.capacity > 16384) {
+					var3.capacity = 16384;
+				}
+
+				var3.open(var3.capacity);
+				if (GrandExchangeEvent.field45 > 0 && UserComparator2.soundSystem == null) {
+					UserComparator2.soundSystem = new SoundSystem();
+					Frames.soundSystemExecutor = Executors.newScheduledThreadPool(1);
+					Frames.soundSystemExecutor.scheduleAtFixedRate(UserComparator2.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
+				}
+
+				if (UserComparator2.soundSystem != null) {
+					if (UserComparator2.soundSystem.players[var1] != null) {
+						throw new IllegalArgumentException();
 					}
 
+					UserComparator2.soundSystem.players[var1] = var3;
 				}
+
+				return var3;
+			} catch (Throwable var4) {
+				return new PcmPlayer();
 			}
+		} else {
+			throw new IllegalArgumentException();
 		}
 	}
 
-	@ObfuscatedName("is")
+	@ObfuscatedName("fa")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		signature = "(IIII)V",
-		garbageValue = "-1072362060"
+		garbageValue = "926175900"
 	)
-	@Export("insertMenuItem")
+	@Export("queueSoundEffect")
-	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+	static void queueSoundEffect(int var0, int var1, int var2) {
-		if (!Client.isMenuOpen) {
+		if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
-			if (Client.menuOptionsCount < 500) {
+			Client.soundEffectIds[Client.soundEffectCount] = var0;
-				Client.menuActions[Client.menuOptionsCount] = var0;
+			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
-				Client.menuTargets[Client.menuOptionsCount] = var1;
+			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
-				Client.menuOpcodes[Client.menuOptionsCount] = var2;
+			Client.soundEffects[Client.soundEffectCount] = null;
-				Client.menuIdentifiers[Client.menuOptionsCount] = var3;
+			Client.soundLocations[Client.soundEffectCount] = 0;
-				Client.menuArguments1[Client.menuOptionsCount] = var4;
+			++Client.soundEffectCount;
-				Client.menuArguments2[Client.menuOptionsCount] = var5;
-				Client.menuShiftClick[Client.menuOptionsCount] = var6;
-				++Client.menuOptionsCount;
-			}
-
 		}
+
+	}
+
+	@ObfuscatedName("kt")
+	@ObfuscatedSignature(
+		signature = "(IB)V",
+		garbageValue = "4"
+	)
+	static void method628(int var0) {
+		for (IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.first(); var1 != null; var1 = (IntegerNode)Client.widgetClickMasks.next()) {
+			if ((long)var0 == (var1.key >> 48 & 65535L)) {
+				var1.remove();
+			}
+		}
+
 	}
 }

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

@@ -9,27 +9,27 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("mk")
+@ObfuscatedName("mx")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = -2099605315629278245L
+		longValue = -6958977035237183007L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		longValue = 9136921121469373871L
+		longValue = -8139275980542647059L
 	)
 	@Export("offset")
 	long offset;
 
 	public AccessFile(File var1, String var2, long var3) throws IOException {
-		if (var3 == -1L) {
+		if (-1L == var3) {
 			var3 = Long.MAX_VALUE;
 		}
 
@@ -49,17 +49,17 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([BIIB)V",
+		signature = "([BIII)V",
-		garbageValue = "87"
+		garbageValue = "-1955646442"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
@@ -73,20 +73,20 @@ public final class AccessFile {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1441194559"
+		garbageValue = "-1993690958"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(ZS)V",
+		signature = "(ZI)V",
-		garbageValue = "180"
+		garbageValue = "1689425186"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -104,20 +104,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)J",
-		garbageValue = "-1766264538"
+		garbageValue = "1409759117"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "1663251439"
+		garbageValue = "-1292209502"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {

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

@@ -4,320 +4,326 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bv")
+@ObfuscatedName("bx")
 @Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("as")
+	@ObfuscatedName("hw")
 	@ObfuscatedGetter(
-		intValue = 274195699
+		intValue = -1081089529
+	)
+	@Export("cameraZ")
+	static int cameraZ;
+	@ObfuscatedName("ax")
+	@ObfuscatedGetter(
+		intValue = -892372587
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1601699261
+		intValue = -340039451
 	)
 	@Export("y")
 	int y;
 	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = -1309373011
+		intValue = 349053657
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ay")
 	@Export("isWalking")
 	boolean isWalking;
+	@ObfuscatedName("aa")
+	@ObfuscatedGetter(
+		intValue = -697437632
+	)
+	int field942;
 	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = 511883639
+		intValue = 1907492229
-	)
-	int field925;
-	@ObfuscatedName("ao")
-	@ObfuscatedGetter(
-		intValue = -1397421297
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("an")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = -218556909
+		intValue = -1598432795
 	)
 	@Export("readySequence")
 	int readySequence;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1204927265
+		intValue = -291727723
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -824766843
+		intValue = -1728008405
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = -1263337971
+		intValue = -1086097041
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1033895093
+		intValue = -1467237959
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 1049050611
+		intValue = 1983487081
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
 	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = -1372236963
+		intValue = 849163825
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = -1324653627
+		intValue = 1212229631
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("am")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ao")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("ax")
-	boolean field937;
 	@ObfuscatedName("at")
+	boolean field954;
+	@ObfuscatedName("an")
 	@ObfuscatedGetter(
-		intValue = -171465493
+		intValue = 411062959
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("af")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -1280129029
+		intValue = 303951077
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ai")
 	@ObfuscatedGetter(
-		intValue = -373599431
+		intValue = -1337341867
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ap")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ah")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bq")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bf")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bc")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
 	@ObfuscatedName("bk")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bb")
 	@ObfuscatedSignature(
-		signature = "Ljl;"
+		signature = "Ljj;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = -842697287
+		intValue = -186074271
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bp")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = -2004895213
+		intValue = 49507657
 	)
-	int field960;
+	int field967;
 	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = -1753452087
+		intValue = 1446195429
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = 25834883
+		intValue = 707889715
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bw")
 	@ObfuscatedGetter(
-		intValue = -143174307
+		intValue = -1510221367
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = 382239063
+		intValue = 2138595105
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("bs")
+	@ObfuscatedName("bn")
 	@ObfuscatedGetter(
-		intValue = -226786267
+		intValue = -1231128891
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("ba")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = 175494277
+		intValue = -733211881
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = 62784213
+		intValue = 825906927
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = 1890920221
+		intValue = -768397183
 	)
-	int field958;
+	int field983;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = 185005207
+		intValue = 340005731
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bv")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = 1786856989
+		intValue = -1782758549
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bh")
 	@ObfuscatedGetter(
-		intValue = -327769151
+		intValue = 794012987
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("be")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = -1796469609
+		intValue = 2005510657
 	)
-	int field943;
+	int field979;
-	@ObfuscatedName("bd")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 1623110031
+		intValue = 1479778797
 	)
-	int field963;
+	int field980;
-	@ObfuscatedName("bf")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = -909355861
+		intValue = 1805966651
 	)
-	int field921;
+	int field981;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = -1912574851
+		intValue = 491483643
 	)
-	int field965;
+	int field961;
+	@ObfuscatedName("bv")
+	@ObfuscatedGetter(
+		intValue = 479016033
+	)
+	int field957;
+	@ObfuscatedName("bo")
+	@ObfuscatedGetter(
+		intValue = 1112662559
+	)
+	int field991;
 	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 503419835
+		intValue = -71204417
 	)
-	int field966;
+	int field985;
-	@ObfuscatedName("bt")
-	@ObfuscatedGetter(
-		intValue = 625634807
-	)
-	int field929;
-	@ObfuscatedName("bp")
-	@ObfuscatedGetter(
-		intValue = -202999541
-	)
-	int field950;
-	@ObfuscatedName("co")
-	@ObfuscatedGetter(
-		intValue = 1681195499
-	)
-	int field969;
 	@ObfuscatedName("cp")
 	@ObfuscatedGetter(
-		intValue = 819823007
+		intValue = 78951405
 	)
-	int field970;
+	int field986;
-	@ObfuscatedName("cd")
+	@ObfuscatedName("cg")
 	@ObfuscatedGetter(
-		intValue = 1293515615
+		intValue = 179265201
+	)
+	int field987;
+	@ObfuscatedName("cr")
+	@ObfuscatedGetter(
+		intValue = -787364139
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("co")
 	@ObfuscatedGetter(
-		intValue = -958995757
+		intValue = 1402601371
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("ck")
 	@ObfuscatedGetter(
-		intValue = -839837513
+		intValue = 186982923
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cb")
+	@ObfuscatedName("cn")
 	@ObfuscatedGetter(
-		intValue = -1474803963
+		intValue = 661505811
 	)
-	int field974;
+	int field956;
-	@ObfuscatedName("cf")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 1709100513
+		intValue = 1778571567
 	)
-	int field968;
+	int field975;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("ct")
 	@ObfuscatedGetter(
-		intValue = 905332161
+		intValue = -1795737793
 	)
 	@Export("pathLength")
 	int pathLength;
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cb")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("cf")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cm")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cx")
+	@ObfuscatedName("cz")
 	@ObfuscatedGetter(
-		intValue = 426432369
+		intValue = -1512455111
 	)
-	int field980;
+	int field997;
-	@ObfuscatedName("ck")
+	@ObfuscatedName("cu")
 	@ObfuscatedGetter(
-		intValue = -1929716187
+		intValue = -737673093
 	)
-	int field926;
+	int field998;
 
 	Actor() {
 		this.isWalking = false;
-		this.field925 = 1;
+		this.field942 = 64;
 		this.readySequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -327,7 +333,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field937 = false;
+		this.field954 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -340,7 +346,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field960 = -1;
+		this.field967 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -348,26 +354,26 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field958 = 0;
+		this.field983 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field974 = 0;
+		this.field956 = 0;
-		this.field968 = 32;
+		this.field975 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field980 = 0;
+		this.field997 = 0;
-		this.field926 = 0;
+		this.field998 = 0;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(S)Z",
+		signature = "(I)Z",
-		garbageValue = "3163"
+		garbageValue = "-515224238"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
@@ -376,18 +382,18 @@ public abstract class Actor extends Entity {
 
 	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-52"
+		garbageValue = "-847107041"
 	)
-	final void method1742() {
+	final void method1740() {
 		this.pathLength = 0;
-		this.field926 = 0;
+		this.field998 = 0;
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "2136221861"
+		garbageValue = "-913342353"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -407,38 +413,52 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = MusicPatchNode.method3815(var1);
+			HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1);
-			var10 = var12.field3299;
+			HitSplatDefinition var12;
-			var11 = var12.field3298;
+			if (var13 != null) {
+				var12 = var13;
+			} else {
+				byte[] var14 = class49.HitSplatDefinition_archive.takeFile(32, var1);
+				var13 = new HitSplatDefinition();
+				if (var14 != null) {
+					var13.decode(new Buffer(var14));
+				}
+
+				HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1);
+				var12 = var13;
+			}
+
+			var10 = var12.field3337;
+			var11 = var12.field3328;
 		}
 
-		int var14;
+		int var15;
 		if (var8) {
 			if (var10 == -1) {
 				return;
 			}
 
 			var9 = 0;
-			var14 = 0;
+			var15 = 0;
 			if (var10 == 0) {
-				var14 = this.hitSplatCycles[0];
+				var15 = this.hitSplatCycles[0];
 			} else if (var10 == 1) {
-				var14 = this.hitSplatValues[0];
+				var15 = this.hitSplatValues[0];
 			}
 
-			for (int var13 = 1; var13 < 4; ++var13) {
+			for (int var16 = 1; var16 < 4; ++var16) {
 				if (var10 == 0) {
-					if (this.hitSplatCycles[var13] < var14) {
+					if (this.hitSplatCycles[var16] < var15) {
-						var9 = var13;
+						var9 = var16;
-						var14 = this.hitSplatCycles[var13];
+						var15 = this.hitSplatCycles[var16];
 					}
-				} else if (var10 == 1 && this.hitSplatValues[var13] < var14) {
+				} else if (var10 == 1 && this.hitSplatValues[var16] < var15) {
-					var9 = var13;
+					var9 = var16;
-					var14 = this.hitSplatValues[var13];
+					var15 = this.hitSplatValues[var16];
 				}
 			}
 
-			if (var10 == 1 && var14 >= var2) {
+			if (var10 == 1 && var15 >= var2) {
 				return;
 			}
 		} else {
@@ -446,11 +466,11 @@ public abstract class Actor extends Entity {
 				this.hitSplatCount = 0;
 			}
 
-			for (var14 = 0; var14 < 4; ++var14) {
+			for (var15 = 0; var15 < 4; ++var15) {
-				byte var15 = this.hitSplatCount;
+				byte var17 = this.hitSplatCount;
 				this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
-				if (this.hitSplatCycles[var15] <= var5) {
+				if (this.hitSplatCycles[var17] <= var5) {
-					var9 = var15;
+					var9 = var17;
 					break;
 				}
 			}
@@ -465,14 +485,14 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "1083208214"
+		garbageValue = "1968439377"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var7 = class32.method548(var1);
+		HealthBarDefinition var7 = PacketWriter.method2329(var1);
 		HealthBar var8 = null;
 		HealthBar var9 = null;
 		int var10 = var7.int2;
@@ -481,7 +501,7 @@ public abstract class Actor extends Entity {
 		HealthBar var12;
 		for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) {
 			++var11;
-			if (var12.definition.field3249 == var7.field3249) {
+			if (var12.definition.field3275 == var7.field3275) {
 				var12.put(var2 + var4, var5, var6, var3);
 				return;
 			}
@@ -512,14 +532,14 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-982043878"
+		garbageValue = "51"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = class32.method548(var1);
+		HealthBarDefinition var2 = PacketWriter.method2329(var1);
 
 		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) {
 			if (var2 == var3.definition) {
@@ -530,38 +550,40 @@ public abstract class Actor extends Entity {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(IIZB)Ljava/lang/String;",
-		garbageValue = "277"
+		garbageValue = "91"
 	)
-	public static void method1755() {
+	static String method1741(int var0, int var1, boolean var2) {
-		GZipDecompressor.midiPcmStream.clear();
+		if (var1 >= 2 && var1 <= 36) {
-		class197.field2392 = 1;
+			if (var2 && var0 >= 0) {
-		Coord.musicTrackArchive = null;
+				int var3 = 2;
-	}
 
-	@ObfuscatedName("p")
+				for (int var4 = var0 / var1; var4 != 0; ++var3) {
-	@ObfuscatedSignature(
+					var4 /= var1;
-		signature = "(I)V",
+				}
-		garbageValue = "540632011"
-	)
-	public static void method1756() {
-		VarpDefinition.VarpDefinition_cached.clear();
-	}
 
-	@ObfuscatedName("ih")
+				char[] var5 = new char[var3];
-	@ObfuscatedSignature(
+				var5[0] = '+';
-		signature = "(I)V",
+
-		garbageValue = "276036566"
+				for (int var6 = var3 - 1; var6 > 0; --var6) {
-	)
+					int var7 = var0;
-	@Export("addCancelMenuEntry")
+					var0 /= var1;
-	static void addCancelMenuEntry() {
+					int var8 = var7 - var0 * var1;
-		WorldMapData_1.method708();
+					if (var8 >= 10) {
-		Client.menuActions[0] = "Cancel";
+						var5[var6] = (char)(var8 + 87);
-		Client.menuTargets[0] = "";
+					} else {
-		Client.menuOpcodes[0] = 1006;
+						var5[var6] = (char)(var8 + 48);
-		Client.menuShiftClick[0] = false;
+					}
-		Client.menuOptionsCount = 1;
+				}
+
+				return new String(var5);
+			} else {
+				return Integer.toString(var0, var1);
+			}
+		} else {
+			throw new IllegalArgumentException("" + var1);
+		}
 	}
 }

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("dj")
+@ObfuscatedName("dh")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
-	static int[] field1615;
+	static int[] field1628;
+	@ObfuscatedName("t")
+	static int[] field1621;
+	@ObfuscatedName("o")
+	static int[] field1627;
+	@ObfuscatedName("e")
+	static int[] field1623;
 	@ObfuscatedName("i")
-	static int[] field1614;
-	@ObfuscatedName("y")
-	static int[] field1611;
-	@ObfuscatedName("w")
-	static int[] field1616;
-	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lek;"
+		signature = "Lec;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field1615 = new int[500];
+		field1628 = new int[500];
-		field1614 = new int[500];
+		field1621 = new int[500];
-		field1611 = new int[500];
+		field1627 = new int[500];
-		field1616 = new int[500];
+		field1623 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		signature = "([BLek;)V"
+		signature = "([BLec;)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) {
-							field1615[var7] = var10;
+							field1628[var7] = var10;
-							field1614[var7] = 0;
+							field1621[var7] = 0;
-							field1611[var7] = 0;
+							field1627[var7] = 0;
-							field1616[var7] = 0;
+							field1623[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field1615[var7] = var8;
+				field1628[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field1614[var7] = var4.readShortSmart();
+					field1621[var7] = var4.readShortSmart();
 				} else {
-					field1614[var7] = var11;
+					field1621[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field1611[var7] = var4.readShortSmart();
+					field1627[var7] = var4.readShortSmart();
 				} else {
-					field1611[var7] = var11;
+					field1627[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field1616[var7] = var4.readShortSmart();
+					field1623[var7] = var4.readShortSmart();
 				} else {
-					field1616[var7] = var11;
+					field1623[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] = field1615[var8];
+				this.transformSkeletonLabels[var8] = field1628[var8];
-				this.transformXs[var8] = field1614[var8];
+				this.transformXs[var8] = field1621[var8];
-				this.transformYs[var8] = field1611[var8];
+				this.transformYs[var8] = field1627[var8];
-				this.transformZs[var8] = field1616[var8];
+				this.transformZs[var8] = field1623[var8];
 			}
 
 		}

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

@@ -5,180 +5,194 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("if")
+@ObfuscatedName("ia")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("aw")
+	@ObfuscatedName("az")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("m")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Lkg;"
+		signature = "Lky;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lkg;"
+		signature = "Lky;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("r")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -1842467633
+		intValue = 1512012277
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
-	volatile boolean field3130;
+	volatile boolean field3159;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ae")
-	boolean field3131;
+	boolean field3165;
-	@ObfuscatedName("av")
+	@ObfuscatedName("af")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -1109025613
+		intValue = 291322429
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -1689263625
+		intValue = 1082053615
 	)
 	@Export("indexVersion")
 	int indexVersion;
 	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = 756827345
+		intValue = 1711156023
 	)
-	int field3128;
+	int field3157;
 
 	static {
 		Archive_crc = new CRC32();
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkg;Lkg;IZZZ)V"
+		signature = "(Lky;Lky;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3130 = false;
+		this.field3159 = false;
-		this.field3131 = false;
+		this.field3165 = false;
-		this.field3128 = -1;
+		this.field3157 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3131 = var6;
+		this.field3165 = var6;
-		class48.method862(this, this.index);
+		class83.method2110(this, this.index);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "236985177"
+		garbageValue = "-1758408707"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
-		int var2 = this.index;
+		class210.method4032(this.index, var1);
-		long var3 = (long)((var2 << 16) + var1);
-		NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
-		if (var5 != null) {
-			NetCache.NetCache_pendingWritesQueue.addLast(var5);
-		}
-
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IS)I",
+		signature = "(IB)I",
-		garbageValue = "6161"
+		garbageValue = "27"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		if (super.groups[var1] != null) {
 			return 100;
+		} else if (this.validGroups[var1]) {
+			return 100;
 		} else {
-			return this.validGroups[var1] ? 100 : Clock.method3489(this.index, var1);
+			int var3 = this.index;
+			long var4 = (long)((var3 << 16) + var1);
+			int var2;
+			if (GrandExchangeEvent.NetCache_currentResponse != null && GrandExchangeEvent.NetCache_currentResponse.key == var4) {
+				var2 = VertexNormal.NetCache_responseArchiveBuffer.offset * 99 / (VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding) + 1;
+			} else {
+				var2 = 0;
+			}
+
+			return var2;
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "1606315041"
+		garbageValue = "1179679189"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			class30.method543(var1, this.archiveDisk, this);
+			NetSocket.method3613(var1, this.archiveDisk, this);
 		} else {
-			class226.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
 		}
 
 	}
 
-	@ObfuscatedName("de")
+	@ObfuscatedName("dc")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "-47"
+		garbageValue = "-757168814"
 	)
-	public boolean method4246() {
+	public boolean method4372() {
-		return this.field3130;
+		return this.field3159;
 	}
 
-	@ObfuscatedName("df")
+	@ObfuscatedName("dj")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1662836587"
+		garbageValue = "1215614912"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3130) {
+		if (this.field3159) {
 			return 100;
 		} else if (super.groups != null) {
 			return 99;
 		} else {
-			int var1 = Clock.method3489(255, this.index);
+			int var2 = this.index;
-			if (var1 >= 100) {
+			long var3 = (long)(var2 + 16711680);
-				var1 = 99;
+			int var1;
+			if (GrandExchangeEvent.NetCache_currentResponse != null && var3 == GrandExchangeEvent.NetCache_currentResponse.key) {
+				var1 = VertexNormal.NetCache_responseArchiveBuffer.offset * 99 / (VertexNormal.NetCache_responseArchiveBuffer.array.length - GrandExchangeEvent.NetCache_currentResponse.padding) + 1;
+			} else {
+				var1 = 0;
 			}
 
-			return var1;
+			int var5 = var1;
+			if (var1 >= 100) {
+				var5 = 99;
+			}
+
+			return var5;
 		}
 	}
 
-	@ObfuscatedName("di")
+	@ObfuscatedName("de")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "-190190944"
+		garbageValue = "0"
 	)
 	@Export("loadIndex")
-	public void loadIndex(int var1, int var2) {
+	void loadIndex(int var1, int var2) {
 		this.indexCrc = var1;
 		this.indexVersion = var2;
 		if (this.masterDisk != null) {
-			class30.method543(this.index, this.masterDisk, this);
+			NetSocket.method3613(this.index, this.masterDisk, this);
 		} else {
-			class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+			BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}
 
 	}
 
-	@ObfuscatedName("dr")
+	@ObfuscatedName("df")
 	@ObfuscatedSignature(
 		signature = "(I[BZZI)V",
-		garbageValue = "-1214934891"
+		garbageValue = "1506082666"
 	)
 	@Export("write")
-	public void write(int var1, byte[] var2, boolean var3, boolean var4) {
+	void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3130) {
+			if (this.field3159) {
 				throw new RuntimeException();
 			}
 
 			if (this.masterDisk != null) {
-				ByteArrayPool.method5805(this.index, var2, this.masterDisk);
+				BuddyRankComparator.method3507(this.index, var2, this.masterDisk);
 			}
 
 			this.decodeIndex(var2);
@@ -187,7 +201,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) {
-				ByteArrayPool.method5805(var1, var2, this.archiveDisk);
+				BuddyRankComparator.method3507(var1, var2, this.archiveDisk);
 				this.validGroups[var1] = true;
 			}
 
@@ -210,21 +224,21 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("dg")
+	@ObfuscatedName("dn")
 	@ObfuscatedSignature(
-		signature = "(Lkg;I[BZI)V",
+		signature = "(Lky;I[BZB)V",
-		garbageValue = "-1566911980"
+		garbageValue = "-124"
 	)
 	@Export("load")
 	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3130) {
+			if (this.field3159) {
 				throw new RuntimeException();
 			}
 
 			if (var3 == null) {
-				class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
@@ -232,11 +246,11 @@ public class Archive extends AbstractArchive {
 			Archive_crc.update(var3, 0, var3.length);
 			var5 = (int)Archive_crc.getValue();
 			if (var5 != this.indexCrc) {
-				class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
-			Buffer var11 = new Buffer(Skills.decompressBytes(var3));
+			Buffer var11 = new Buffer(class2.decompressBytes(var3));
 			int var12 = var11.readUnsignedByte();
 			if (var12 != 5 && var12 != 6) {
 				throw new RuntimeException(var12 + "," + this.index + "," + var2);
@@ -248,21 +262,21 @@ public class Archive extends AbstractArchive {
 			}
 
 			if (var8 != this.indexVersion) {
-				class226.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 				return;
 			}
 
 			this.decodeIndex(var3);
 			this.loadAllLocal();
 		} else {
-			if (!var4 && var2 == this.field3128) {
+			if (!var4 && var2 == this.field3157) {
-				this.field3130 = true;
+				this.field3159 = true;
 			}
 
 			if (var3 == null || var3.length <= 2) {
 				this.validGroups[var2] = false;
-				if (this.field3131 || var4) {
+				if (this.field3165 || var4) {
-					class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -274,8 +288,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.field3131 || var4) {
+				if (this.field3165 || var4) {
-					class226.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
 				return;
@@ -301,10 +315,10 @@ public class Archive extends AbstractArchive {
 
 	}
 
-	@ObfuscatedName("dh")
+	@ObfuscatedName("dy")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1822102759"
+		garbageValue = "-901365537"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -316,46 +330,56 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3130 = true;
+			this.field3159 = true;
 		} else {
-			this.field3128 = -1;
+			this.field3157 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
-					WorldMapLabelSize.method186(var1, this.archiveDisk, this);
+					ArchiveDisk var2 = this.archiveDisk;
-					this.field3128 = var1;
+					ArchiveDiskAction var4 = new ArchiveDiskAction();
+					var4.type = 1;
+					var4.key = (long)var1;
+					var4.archiveDisk = var2;
+					var4.archive = this;
+					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4);
+					}
+
+					NetSocket.method3595();
+					this.field3157 = var1;
 				}
 			}
 
-			if (this.field3128 == -1) {
+			if (this.field3157 == -1) {
-				this.field3130 = true;
+				this.field3159 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("dl")
+	@ObfuscatedName("dq")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "1057662007"
+		garbageValue = "1567701044"
 	)
-	public boolean method4266(int var1) {
+	public boolean method4347(int var1) {
 		return this.validGroups[var1];
 	}
 
-	@ObfuscatedName("da")
+	@ObfuscatedName("dd")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "693879570"
+		garbageValue = "-507892306"
 	)
-	public boolean method4275(int var1) {
+	public boolean method4348(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("dp")
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-576778169"
+		garbageValue = "1870889361"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -377,34 +401,4 @@ 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("kg")
+@ObfuscatedName("ky")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 77454403
-	)
-	@Export("archive")
-	int archive;
-	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Lmy;"
+		signature = "Lme;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lmy;"
+		signature = "Lme;"
 	)
 	@Export("idxFile")
 	BufferedFile idxFile;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1304769843
+		intValue = 92062517
+	)
+	@Export("archive")
+	int archive;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = -1875566271
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -42,7 +42,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(ILmy;Lmy;I)V"
+		signature = "(ILme;Lme;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("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)[B",
+		signature = "(II)[B",
-		garbageValue = "-19"
+		garbageValue = "1862196910"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
@@ -101,7 +101,7 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 10;
-								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
+								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
 								var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
 								var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8);
 								var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16);
@@ -112,14 +112,14 @@ public final class ArchiveDisk {
 								}
 
 								var13 = 8;
-								this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
+								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
 								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 || var7 != var10 || var12 != this.archive) {
+							if (var9 != var1 || var10 != var7 || var12 != this.archive) {
 								var10000 = null;
 								return (byte[])var10000;
 							}
@@ -148,10 +148,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I[BII)Z",
-		garbageValue = "1696997019"
+		garbageValue = "2136581865"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
@@ -169,10 +169,10 @@ public final class ArchiveDisk {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I[BIZI)Z",
-		garbageValue = "957483155"
+		garbageValue = "-1086221243"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
@@ -244,7 +244,7 @@ public final class ArchiveDisk {
 									var12 = ArchiveDisk_buffer[7] & 255;
 								}
 
-								if (var10 != var1 || var8 != var11 || var12 != this.archive) {
+								if (var10 != var1 || var11 != var8 || var12 != this.archive) {
 									var10000 = false;
 									return var10000;
 								}
@@ -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((long)var6 * 520L);
+								this.datFile.seek(520L * (long)var6);
 								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((long)var6 * 520L);
+								this.datFile.seek(520L * (long)var6);
 								this.datFile.write(ArchiveDisk_buffer, 0, 8);
 								var10 = var3 - var7;
 								if (var10 > 512) {
@@ -333,24 +333,4 @@ 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,4 +1,3 @@
-import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -8,24 +7,30 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("hr")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("f")
+	@ObfuscatedName("ky")
 	@ObfuscatedGetter(
-		intValue = -867682367
+		intValue = 1465828327
+	)
+	@Export("menuX")
+	static int menuX;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 529558381
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("data")
 	byte[] data;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lkg;"
+		signature = "Lky;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lif;"
+		signature = "Lia;"
 	)
 	@Export("archive")
 	Archive archive;
@@ -33,14 +38,52 @@ public class ArchiveDiskAction extends Node {
 	ArchiveDiskAction() {
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljava/awt/Component;I)V",
+		signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "2084975828"
+		garbageValue = "-2068094459"
 	)
-	static void method4120(Component var0) {
+	public static String method4216(CharSequence var0) {
-		var0.removeKeyListener(KeyHandler.KeyHandler_instance);
+		int var1 = var0.length();
-		var0.removeFocusListener(KeyHandler.KeyHandler_instance);
+		StringBuilder var2 = new StringBuilder(var1);
-		KeyHandler.field373 = -1;
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			char var4 = var0.charAt(var3);
+			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
+				if (var4 == ' ') {
+					var2.append('+');
+				} else {
+					byte var5 = TextureProvider.charToByteCp1252(var4);
+					var2.append('%');
+					int var6 = var5 >> 4 & 15;
+					if (var6 >= 10) {
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48));
+					}
+
+					var6 = var5 & 15;
+					if (var6 >= 10) {
+						var2.append((char)(var6 + 55));
+					} else {
+						var2.append((char)(var6 + 48));
+					}
+				}
+			} else {
+				var2.append(var4);
+			}
+		}
+
+		return var2.toString();
+	}
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		signature = "(CB)Z",
+		garbageValue = "57"
+	)
+	@Export("isAlphaNumeric")
+	public static boolean isAlphaNumeric(char var0) {
+		return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
 	}
 }

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

@@ -4,37 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ih")
+@ObfuscatedName("ik")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ljs;"
+		signature = "Ljw;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
 	static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ljs;"
+		signature = "Lii;"
+	)
+	@Export("SpotAnimationDefinition_modelArchive")
+	public static AbstractArchive SpotAnimationDefinition_modelArchive;
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "Ljw;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
 	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 509614069
+		intValue = 416833363
 	)
-	static int field3120;
+	public static int field3150;
-	@ObfuscatedName("w")
+	@ObfuscatedName("i")
 	@Export("ArchiveDiskActionHandler_lock")
-	static Object ArchiveDiskActionHandler_lock;
+	public static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("p")
-	@Export("ArchiveDiskActionHandler_thread")
-	static Thread ArchiveDiskActionHandler_thread;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3120 = 0;
+		field3150 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -63,39 +66,393 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3120 <= 1) {
+						if (field3150 <= 1) {
-							field3120 = 0;
+							field3150 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3120 = 600;
+						field3150 = 600;
 					}
 				} else {
-					ServerBuild.method4111(100L);
+					FriendLoginUpdate.method5325(100L);
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3120 <= 1) {
+						if (field3150 <= 1) {
-							field3120 = 0;
+							field3150 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3120;
+						--field3150;
 					}
 				}
 			}
 		} catch (Exception var13) {
-			DesktopPlatformInfoProvider.RunException_sendStackTrace((String)null, var13);
+			class225.RunException_sendStackTrace((String)null, var13);
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)I",
+		signature = "(IIIIIILem;Lfv;I)V",
-		garbageValue = "139365615"
+		garbageValue = "-1749856384"
 	)
-	@Export("parseInt")
+	static final void method4336(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-	public static int parseInt(CharSequence var0) {
+		if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
-		return TriBool.parseIntCustomRadix(var0, 10, true);
+			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][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2;
+			int var17 = (var1 << 7) + (var9 << 6);
+			int var18 = (var2 << 7) + (var10 << 6);
+			long var19 = GameShell.calculateTag(var1, var2, 2, var8.int1 == 0, var3);
+			int var21 = var5 + (var4 << 6);
+			if (var8.int3 == 1) {
+				var21 += 256;
+			}
+
+			if (var8.hasSound()) {
+				ObjectSound.method1931(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.method3165(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21);
+						if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
+							var10000 = UrlRequest.field1940[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.field508[var4], 0, var19, var21);
+						if (var4 == 0) {
+							if (var8.clipped) {
+								InterfaceParent.field565[var0][var1][var2] = 50;
+								InterfaceParent.field565[var0][var1][var2 + 1] = 50;
+							}
+
+							if (var8.modelClipped) {
+								var10000 = UrlRequest.field1940[var0][var1];
+								var10000[var2] |= 585;
+							}
+						} else if (var4 == 1) {
+							if (var8.clipped) {
+								InterfaceParent.field565[var0][var1][var2 + 1] = 50;
+								InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50;
+							}
+
+							if (var8.modelClipped) {
+								var10000 = UrlRequest.field1940[var0][var1];
+								var10000[1 + var2] |= 1170;
+							}
+						} else if (var4 == 2) {
+							if (var8.clipped) {
+								InterfaceParent.field565[var0][var1 + 1][var2] = 50;
+								InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50;
+							}
+
+							if (var8.modelClipped) {
+								var10000 = UrlRequest.field1940[var0][var1 + 1];
+								var10000[var2] |= 585;
+							}
+						} else if (var4 == 3) {
+							if (var8.clipped) {
+								InterfaceParent.field565[var0][var1][var2] = 50;
+								InterfaceParent.field565[var0][var1 + 1][var2] = 50;
+							}
+
+							if (var8.modelClipped) {
+								var10000 = UrlRequest.field1940[var0][var1];
+								var10000[var2] |= 1170;
+							}
+						}
+
+						if (var8.interactType != 0 && var7 != null) {
+							var7.method3626(var1, var2, var5, var4, var8.boolean1);
+						}
+
+						if (var8.int2 != 16) {
+							var6.method3171(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.field513[var4], 0, var19, var21);
+						if (var8.clipped) {
+							if (var4 == 0) {
+								InterfaceParent.field565[var0][var1][var2 + 1] = 50;
+							} else if (var4 == 1) {
+								InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50;
+							} else if (var4 == 2) {
+								InterfaceParent.field565[var0][var1 + 1][var2] = 50;
+							} else if (var4 == 3) {
+								InterfaceParent.field565[var0][var1][var2] = 50;
+							}
+						}
+
+						if (var8.interactType != 0 && var7 != null) {
+							var7.method3626(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.field508[var4], Tiles.field508[var28], var19, var21);
+							if (var8.modelClipped) {
+								if (var4 == 0) {
+									var10000 = UrlRequest.field1940[var0][var1];
+									var10000[var2] |= 585;
+									var10000 = UrlRequest.field1940[var0][var1];
+									var10000[var2 + 1] |= 1170;
+								} else if (var4 == 1) {
+									var10000 = UrlRequest.field1940[var0][var1];
+									var10000[var2 + 1] |= 1170;
+									var10000 = UrlRequest.field1940[var0][var1 + 1];
+									var10000[var2] |= 585;
+								} else if (var4 == 2) {
+									var10000 = UrlRequest.field1940[var0][var1 + 1];
+									var10000[var2] |= 585;
+									var10000 = UrlRequest.field1940[var0][var1];
+									var10000[var2] |= 1170;
+								} else if (var4 == 3) {
+									var10000 = UrlRequest.field1940[var0][var1];
+									var10000[var2] |= 1170;
+									var10000 = UrlRequest.field1940[var0][var1];
+									var10000[var2] |= 585;
+								}
+							}
+
+							if (var8.interactType != 0 && var7 != null) {
+								var7.method3626(var1, var2, var5, var4, var8.boolean1);
+							}
+
+							if (var8.int2 != 16) {
+								var6.method3171(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.field513[var4], 0, var19, var21);
+							if (var8.clipped) {
+								if (var4 == 0) {
+									InterfaceParent.field565[var0][var1][var2 + 1] = 50;
+								} else if (var4 == 1) {
+									InterfaceParent.field565[var0][var1 + 1][var2 + 1] = 50;
+								} else if (var4 == 2) {
+									InterfaceParent.field565[var0][var1 + 1][var2] = 50;
+								} else if (var4 == 3) {
+									InterfaceParent.field565[var0][var1][var2] = 50;
+								}
+							}
+
+							if (var8.interactType != 0 && var7 != null) {
+								var7.method3626(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.method3165(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.method3171(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.field508[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(GrandExchangeEvents.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.field508[var4], 0, var28 * Tiles.field506[var4], var28 * Tiles.field516[var4], var19, var21);
+							} else if (var5 == 6) {
+								var28 = 8;
+								var31 = var6.getBoundaryObjectTag(var0, var1, var2);
+								if (0L != var31) {
+									var28 = Occluder.getObjectDefinition(GrandExchangeEvents.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.field503[var4], var28 * Tiles.field517[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 (0L != var31) {
+									var28 = Occluder.getObjectDefinition(GrandExchangeEvents.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.field503[var4], var28 * Tiles.field517[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.method3165(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).method2952() / 4;
+							if (var23 > 30) {
+								var23 = 30;
+							}
+						}
+
+						for (int var24 = 0; var24 <= var9; ++var24) {
+							for (int var25 = 0; var25 <= var10; ++var25) {
+								if (var23 > InterfaceParent.field565[var0][var24 + var1][var25 + var2]) {
+									InterfaceParent.field565[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/ArchiveLoader.java

@@ -1,39 +1,42 @@
-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("bx")
+@ObfuscatedName("bp")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("a")
+	@ObfuscatedName("cj")
-	static int[][] field512;
+	@Export("mouseCam")
-	@ObfuscatedName("i")
+	static boolean mouseCam;
+	@ObfuscatedName("gw")
 	@ObfuscatedSignature(
-		signature = "Lif;"
+		signature = "Llt;"
+	)
+	@Export("redHintArrowSprite")
+	static Sprite redHintArrowSprite;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "Lia;"
 	)
 	@Export("archive")
 	final Archive archive;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1214838645
+		intValue = -737175839
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2093675437
+		intValue = -1316044815
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		signature = "(Lif;Ljava/lang/String;)V"
+		signature = "(Lia;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -41,17 +44,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1163747631"
+		garbageValue = "1992240637"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4275(var1) || this.archive.method4266(var1)) {
+			if (!this.archive.method4348(var1) || this.archive.method4347(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -59,39 +62,253 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)J",
+		signature = "(II)Lig;",
-		garbageValue = "-2"
+		garbageValue = "1395082133"
 	)
-	static long method1156() {
+	@Export("FloorUnderlayDefinition_get")
-		try {
+	public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) {
-			URL var0 = new URL(NetFileRequest.method4121("services", false) + "m=accountappeal/login.ws");
+		FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0);
-			URLConnection var1 = var0.openConnection();
+		if (var1 != null) {
-			var1.setRequestProperty("connection", "close");
+			return var1;
-			var1.setDoInput(true);
+		} else {
-			var1.setDoOutput(true);
+			byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0);
-			var1.setConnectTimeout(5000);
+			var1 = new FloorOverlayDefinition();
-			OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream());
+			if (var2 != null) {
-			var2.write("data1=req");
+				var1.decode(new Buffer(var2), var0);
-			var2.flush();
+			}
-			InputStream var3 = var1.getInputStream();
-			Buffer var4 = new Buffer(new byte[1000]);
 
-			do {
+			var1.postDecode();
-				int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset);
+			FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0);
-				if (var5 == -1) {
+			return var1;
-					var4.offset = 0;
+		}
-					long var7 = var4.readLong();
+	}
-					return var7;
+
+	@ObfuscatedName("w")
+	@ObfuscatedSignature(
+		signature = "(IIIIIIILem;Lfv;I)V",
+		garbageValue = "2035242734"
+	)
+	static final void method1168(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
+		ObjectDefinition var9 = Occluder.getObjectDefinition(var4);
+		int var10;
+		int var11;
+		if (var5 != 1 && var5 != 3) {
+			var10 = var9.sizeX;
+			var11 = var9.sizeY;
+		} else {
+			var10 = var9.sizeY;
+			var11 = var9.sizeX;
+		}
+
+		int var12;
+		int var13;
+		if (var10 + var2 <= 104) {
+			var12 = (var10 >> 1) + var2;
+			var13 = var2 + (var10 + 1 >> 1);
+		} else {
+			var12 = var2;
+			var13 = var2 + 1;
+		}
+
+		int var14;
+		int var15;
+		if (var3 + var11 <= 104) {
+			var14 = var3 + (var11 >> 1);
+			var15 = var3 + (var11 + 1 >> 1);
+		} else {
+			var14 = var3;
+			var15 = var3 + 1;
+		}
+
+		int[][] var16 = Tiles.Tiles_heights[var1];
+		int var17 = var16[var13][var15] + var16[var13][var14] + var16[var12][var14] + var16[var12][var15] >> 2;
+		int var18 = (var2 << 7) + (var10 << 6);
+		int var19 = (var3 << 7) + (var11 << 6);
+		long var20 = GameShell.calculateTag(var2, var3, 2, var9.int1 == 0, var4);
+		int var22 = (var5 << 6) + var6;
+		if (var9.int3 == 1) {
+			var22 += 256;
+		}
+
+		Object var23;
+		if (var6 == 22) {
+			if (var9.animationId == -1 && var9.transforms == null) {
+				var23 = var9.getModel(22, var5, var16, var18, var17, var19);
+			} else {
+				var23 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+			}
+
+			var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var23, var20, var22);
+			if (var9.interactType == 1) {
+				var8.setBlockedByFloorDec(var2, var3);
+			}
+
+		} else if (var6 != 10 && var6 != 11) {
+			if (var6 >= 12) {
+				if (var9.animationId == -1 && var9.transforms == null) {
+					var23 = var9.getModel(var6, var5, var16, var18, var17, var19);
+				} else {
+					var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
 				}
 
-				var4.offset += var5;
+				var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22);
-			} while(var4.offset < 1000);
+				if (var9.interactType != 0) {
+					var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+				}
+
+			} else if (var6 == 0) {
+				if (var9.animationId == -1 && var9.transforms == null) {
+					var23 = var9.getModel(0, var5, var16, var18, var17, var19);
+				} else {
+					var23 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+				}
+
+				var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, var20, var22);
+				if (var9.interactType != 0) {
+					var8.method3626(var2, var3, var6, var5, var9.boolean1);
+				}
+
+			} else if (var6 == 1) {
+				if (var9.animationId == -1 && var9.transforms == null) {
+					var23 = var9.getModel(1, var5, var16, var18, var17, var19);
+				} else {
+					var23 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+				}
+
+				var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22);
+				if (var9.interactType != 0) {
+					var8.method3626(var2, var3, var6, var5, var9.boolean1);
+				}
+
+			} else {
+				int var29;
+				if (var6 == 2) {
+					var29 = var5 + 1 & 3;
+					Object var24;
+					Object var25;
+					if (var9.animationId == -1 && var9.transforms == null) {
+						var24 = var9.getModel(2, var5 + 4, var16, var18, var17, var19);
+						var25 = var9.getModel(2, var29, var16, var18, var17, var19);
+					} else {
+						var24 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
+						var25 = new DynamicObject(var4, 2, var29, var1, var2, var3, var9.animationId, true, (Entity)null);
+					}
+
+					var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var24, (Entity)var25, Tiles.field508[var5], Tiles.field508[var29], var20, var22);
+					if (var9.interactType != 0) {
+						var8.method3626(var2, var3, var6, var5, var9.boolean1);
+					}
+
+				} else if (var6 == 3) {
+					if (var9.animationId == -1 && var9.transforms == null) {
+						var23 = var9.getModel(3, var5, var16, var18, var17, var19);
+					} else {
+						var23 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+					}
+
+					var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22);
+					if (var9.interactType != 0) {
+						var8.method3626(var2, var3, var6, var5, var9.boolean1);
+					}
+
+				} else if (var6 == 9) {
+					if (var9.animationId == -1 && var9.transforms == null) {
+						var23 = var9.getModel(var6, var5, var16, var18, var17, var19);
+					} else {
+						var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+					}
+
+					var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22);
+					if (var9.interactType != 0) {
+						var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+					}
+
+				} else if (var6 == 4) {
+					if (var9.animationId == -1 && var9.transforms == null) {
+						var23 = var9.getModel(4, var5, var16, var18, var17, var19);
+					} else {
+						var23 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+					}
+
+					var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, 0, 0, var20, var22);
+				} else {
+					Object var26;
+					long var30;
+					if (var6 == 5) {
+						var29 = 16;
+						var30 = var7.getBoundaryObjectTag(var0, var2, var3);
+						if (var30 != 0L) {
+							var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2;
+						}
+
+						if (var9.animationId == -1 && var9.transforms == null) {
+							var26 = var9.getModel(4, var5, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field508[var5], 0, var29 * Tiles.field506[var5], var29 * Tiles.field516[var5], var20, var22);
+					} else if (var6 == 6) {
+						var29 = 8;
+						var30 = var7.getBoundaryObjectTag(var0, var2, var3);
+						if (var30 != 0L) {
+							var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2;
+						}
+
+						if (var9.animationId == -1 && var9.transforms == null) {
+							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22);
+					} else if (var6 == 7) {
+						int var32 = var5 + 2 & 3;
+						if (var9.animationId == -1 && var9.transforms == null) {
+							var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19);
+						} else {
+							var23 = new DynamicObject(var4, 4, var32 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, 256, var32, 0, 0, var20, var22);
+					} else if (var6 == 8) {
+						var29 = 8;
+						var30 = var7.getBoundaryObjectTag(var0, var2, var3);
+						if (var30 != 0L) {
+							var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2;
+						}
+
+						int var28 = var5 + 2 & 3;
+						Object var27;
+						if (var9.animationId == -1 && var9.transforms == null) {
+							var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
+							var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19);
+						} else {
+							var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
+							var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
+						}
+
+						var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22);
+					}
+				}
+			}
+		} else {
+			if (var9.animationId == -1 && var9.transforms == null) {
+				var23 = var9.getModel(10, var5, var16, var18, var17, var19);
+			} else {
+				var23 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
+			}
+
+			if (var23 != null) {
+				var7.method3165(var0, var2, var3, var17, var10, var11, (Entity)var23, var6 == 11 ? 256 : 0, var20, var22);
+			}
+
+			if (var9.interactType != 0) {
+				var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
+			}
 
-			return 0L;
-		} catch (Exception var9) {
-			return 0L;
 		}
 	}
 }

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

@@ -4,49 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cf")
+@ObfuscatedName("cd")
 @Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lcf;"
+		signature = "Lcd;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lcf;"
+		signature = "Lcd;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lcf;"
+		signature = "Lcd;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lcf;"
+		signature = "Lcd;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "[Lmy;"
-	)
-	@Export("JagexCache_idxFiles")
-	public static BufferedFile[] JagexCache_idxFiles;
-	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 478106921
+		intValue = -324037883
 	)
-	@Export("canvasHeight")
+	@Export("musicTrackVolume")
-	public static int canvasHeight;
+	public static int musicTrackVolume;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -201450723
+		intValue = 1398359293
 	)
 	@Export("id")
 	final int id;
@@ -55,63 +49,179 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-57"
+		garbageValue = "1"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(II)Z",
-		garbageValue = "-1189493177"
+		garbageValue = "-458989272"
 	)
-	@Export("Messages_getLastChatID")
+	public static boolean method2117(int var0) {
-	static int Messages_getLastChatID(int var0) {
+		return (var0 & 1) != 0;
-		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
+	}
-		if (var1 == null) {
+
-			return -1;
+	@ObfuscatedName("t")
-		} else {
+	@ObfuscatedSignature(
-			return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count;
+		signature = "(Lks;IB)V",
+		garbageValue = "100"
+	)
+	@Export("updatePlayers")
+	static final void updatePlayers(PacketBuffer var0, int var1) {
+		int var2 = var0.offset;
+		Players.Players_pendingUpdateCount = 0;
+		WorldMapIcon_0.method206(var0);
+		class43.method813(var0);
+		if (var0.offset - var2 != var1) {
+			throw new RuntimeException(var0.offset - var2 + " " + var1);
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lha;I[B[BI)V",
+		signature = "(I)Ljava/lang/String;",
-		garbageValue = "304370962"
+		garbageValue = "546448401"
 	)
-	@Export("Widget_setKey")
+	static String method2115() {
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		return WorldMapSection2.clientPreferences.hideUsername ? WorldMapSection2.method321(Login.Login_username) : Login.Login_username;
-		if (var0.field2626 == null) {
+	}
-			if (var2 == null) {
-				return;
-			}
 
-			var0.field2626 = new byte[11][];
+	@ObfuscatedName("p")
-			var0.field2629 = new byte[11][];
+	@ObfuscatedSignature(
-			var0.field2631 = new int[11];
+		signature = "(IIIIIZI)Llt;",
-			var0.field2670 = new int[11];
+		garbageValue = "603666538"
+	)
+	@Export("getItemSprite")
+	public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
+		if (var1 == -1) {
+			var4 = 0;
+		} else if (var4 == 2 && var1 != 1) {
+			var4 = 1;
 		}
 
-		var0.field2626[var1] = var2;
+		long var6 = ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var3 << 42);
-		if (var2 != null) {
+		Sprite var8;
-			var0.field2625 = true;
+		if (!var5) {
-		} else {
+			var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6);
-			var0.field2625 = false;
+			if (var8 != null) {
+				return var8;
+			}
+		}
 
-			for (int var4 = 0; var4 < var0.field2626.length; ++var4) {
+		ItemDefinition var9 = HealthBarDefinition.ItemDefinition_get(var0);
-				if (var0.field2626[var4] != null) {
+		if (var1 > 1 && var9.countobj != null) {
-					var0.field2625 = true;
+			int var10 = -1;
-					break;
+
+			for (int var11 = 0; var11 < 10; ++var11) {
+				if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) {
+					var10 = var9.countobj[var11];
 				}
 			}
+
+			if (var10 != -1) {
+				var9 = HealthBarDefinition.ItemDefinition_get(var10);
+			}
 		}
 
-		var0.field2629[var1] = var3;
+		Model var21 = var9.getModel(1);
+		if (var21 == null) {
+			return null;
+		} else {
+			Sprite var22 = null;
+			if (var9.noteTemplate != -1) {
+				var22 = getItemSprite(var9.note, 10, 1, 0, 0, true);
+				if (var22 == null) {
+					return null;
+				}
+			} else if (var9.notedId != -1) {
+				var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
+				if (var22 == null) {
+					return null;
+				}
+			} else if (var9.placeholderTemplate != -1) {
+				var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
+				if (var22 == null) {
+					return null;
+				}
+			}
+
+			int[] var12 = Rasterizer2D.Rasterizer2D_pixels;
+			int var13 = Rasterizer2D.Rasterizer2D_width;
+			int var14 = Rasterizer2D.Rasterizer2D_height;
+			int[] var15 = new int[4];
+			Rasterizer2D.Rasterizer2D_getClipArray(var15);
+			var8 = new Sprite(36, 32);
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
+			Rasterizer2D.Rasterizer2D_clear();
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+			Rasterizer3D.method3101(16, 16);
+			Rasterizer3D.field1762 = false;
+			if (var9.placeholderTemplate != -1) {
+				var22.drawTransBgAt(0, 0);
+			}
+
+			int var16 = var9.zoom2d;
+			if (var5) {
+				var16 = (int)(1.5D * (double)var16);
+			} else if (var2 == 2) {
+				var16 = (int)(1.04D * (double)var16);
+			}
+
+			int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
+			int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
+			var21.calculateBoundsCylinder();
+			var21.method2946(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
+			if (var9.notedId != -1) {
+				var22.drawTransBgAt(0, 0);
+			}
+
+			if (var2 >= 1) {
+				var8.outline(1);
+			}
+
+			if (var2 >= 2) {
+				var8.outline(16777215);
+			}
+
+			if (var3 != 0) {
+				var8.shadow(var3);
+			}
+
+			Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
+			if (var9.noteTemplate != -1) {
+				var22.drawTransBgAt(0, 0);
+			}
+
+			if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
+				Font var19 = ItemDefinition.ItemDefinition_fontPlain11;
+				String var20;
+				if (var1 < 100000) {
+					var20 = "<col=ffff00>" + var1 + "</col>";
+				} else if (var1 < 10000000) {
+					var20 = "<col=ffffff>" + var1 / 1000 + "K" + "</col>";
+				} else {
+					var20 = "<col=00ff80>" + var1 / 1000000 + "M" + "</col>";
+				}
+
+				var19.draw(var20, 0, 9, 16776960, 1);
+			}
+
+			if (!var5) {
+				ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6);
+			}
+
+			Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
+			Rasterizer2D.Rasterizer2D_setClipArray(var15);
+			Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+			Rasterizer3D.field1762 = true;
+			return var8;
+		}
 	}
 }

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

@@ -3,154 +3,154 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dh")
+@ObfuscatedName("df")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
-	static float[][] field1445;
+	static float[][] field1474;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
-	static float field1447;
+	static float field1472;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
-	int[][][] field1450;
+	int[][][] field1467;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
-	int[][][] field1443;
+	int[][][] field1476;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
-	int[] field1444;
+	int[] field1469;
 
 	static {
-		field1445 = new float[2][8];
+		field1474 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field1450 = new int[2][2][4];
+		this.field1467 = new int[2][2][4];
-		this.field1443 = new int[2][2][4];
+		this.field1476 = new int[2][2][4];
-		this.field1444 = new int[2];
+		this.field1469 = new int[2];
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
-	float method2710(int var1, int var2, float var3) {
+	float method2758(int var1, int var2, float var3) {
-		float var4 = (float)this.field1443[var1][0][var2] + var3 * (float)(this.field1443[var1][1][var2] - this.field1443[var1][0][var2]);
+		float var4 = (float)this.field1476[var1][0][var2] + var3 * (float)(this.field1476[var1][1][var2] - this.field1476[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
-	float method2700(int var1, int var2, float var3) {
+	float method2770(int var1, int var2, float var3) {
-		float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]);
+		float var4 = (float)this.field1467[var1][0][var2] + var3 * (float)(this.field1467[var1][1][var2] - this.field1467[var1][0][var2]);
 		var4 *= 1.2207031E-4F;
 		return normalize(var4);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1444[0] + (float)(this.field1444[1] - this.field1444[0]) * var2;
+			var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1447 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			field1472 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1447 * 65536.0F);
+			forwardMultiplier = (int)(field1472 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
 		} else {
-			var3 = this.method2710(var1, 0, var2);
+			var3 = this.method2758(var1, 0, var2);
-			field1445[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, 0, var2));
+			field1474[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2770(var1, 0, var2));
-			field1445[var1][1] = var3 * var3;
+			field1474[var1][1] = var3 * var3;
 
 			float[] var10000;
 			int var4;
 			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-				var3 = this.method2710(var1, var4, var2);
+				var3 = this.method2758(var1, var4, var2);
-				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2700(var1, var4, var2));
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2770(var1, var4, var2));
 				float var6 = var3 * var3;
-				field1445[var1][var4 * 2 + 1] = field1445[var1][var4 * 2 - 1] * var6;
+				field1474[var1][var4 * 2 + 1] = field1474[var1][var4 * 2 - 1] * var6;
-				field1445[var1][var4 * 2] = field1445[var1][var4 * 2 - 1] * var5 + field1445[var1][var4 * 2 - 2] * var6;
+				field1474[var1][var4 * 2] = field1474[var1][var4 * 2 - 1] * var5 + field1474[var1][var4 * 2 - 2] * var6;
 
 				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-					var10000 = field1445[var1];
+					var10000 = field1474[var1];
-					var10000[var7] += field1445[var1][var7 - 1] * var5 + field1445[var1][var7 - 2] * var6;
+					var10000[var7] += field1474[var1][var7 - 1] * var5 + field1474[var1][var7 - 2] * var6;
 				}
 
-				var10000 = field1445[var1];
+				var10000 = field1474[var1];
-				var10000[1] += field1445[var1][0] * var5 + var6;
+				var10000[1] += field1474[var1][0] * var5 + var6;
-				var10000 = field1445[var1];
+				var10000 = field1474[var1];
 				var10000[0] += var5;
 			}
 
 			if (var1 == 0) {
 				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-					var10000 = field1445[0];
+					var10000 = field1474[0];
-					var10000[var4] *= field1447;
+					var10000[var4] *= field1472;
 				}
 			}
 
 			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-				coefficients[var1][var4] = (int)(field1445[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1474[var1][var4] * 65536.0F);
 			}
 
 			return this.pairs[var1] * 2;
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkq;Ldo;)V"
+		signature = "(Lkp;Lds;)V"
 	)
-	final void method2713(Buffer var1, SoundEnvelope var2) {
+	final void method2769(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
 		if (var3 != 0) {
-			this.field1444[0] = var1.readUnsignedShort();
+			this.field1469[0] = var1.readUnsignedShort();
-			this.field1444[1] = var1.readUnsignedShort();
+			this.field1469[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.field1450[var5][0][var6] = var1.readUnsignedShort();
+					this.field1467[var5][0][var6] = var1.readUnsignedShort();
-					this.field1443[var5][0][var6] = var1.readUnsignedShort();
+					this.field1476[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.field1450[var5][1][var6] = var1.readUnsignedShort();
+						this.field1467[var5][1][var6] = var1.readUnsignedShort();
-						this.field1443[var5][1][var6] = var1.readUnsignedShort();
+						this.field1476[var5][1][var6] = var1.readUnsignedShort();
 					} else {
-						this.field1450[var5][1][var6] = this.field1450[var5][0][var6];
+						this.field1467[var5][1][var6] = this.field1467[var5][0][var6];
-						this.field1443[var5][1][var6] = this.field1443[var5][0][var6];
+						this.field1476[var5][1][var6] = this.field1476[var5][0][var6];
 					}
 				}
 			}
 
-			if (var4 != 0 || this.field1444[1] != this.field1444[0]) {
+			if (var4 != 0 || this.field1469[1] != this.field1469[0]) {
 				var2.decodeSegments(var1);
 			}
 		} else {
-			int[] var7 = this.field1444;
+			int[] var7 = this.field1469;
-			this.field1444[1] = 0;
+			this.field1469[1] = 0;
 			var7[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("normalize")
 	static float normalize(float var0) {
 		float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);

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

@@ -3,12 +3,12 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kp")
+@ObfuscatedName("kf")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Lkv;"
+		signature = "Lki;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("BZip2Decompressor_decompress")
 	public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
 		synchronized(BZip2Decompressor_state) {
@@ -29,7 +29,7 @@ public final class BZip2Decompressor {
 			BZip2Decompressor_state.bsLive = 0;
 			BZip2Decompressor_state.bsBuff = 0;
 			BZip2Decompressor_state.nextBit_unused = 0;
-			BZip2Decompressor_state.field3726 = 0;
+			BZip2Decompressor_state.field3729 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkv;)V"
+		signature = "(Lki;)V"
 	)
-	static void method5816(BZip2State var0) {
+	static void method5836(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = SoundSystem.BZip2Decompressor_block;
+		int[] var6 = WorldMapManager.BZip2Decompressor_block;
-		int var7 = var0.field3733;
+		int var7 = var0.field3746;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3742 + 1;
+		int var12 = var0.field3754 + 1;
 
 		label61:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field3726;
+		int var13 = var0.field3729;
-		var0.field3726 += var10 - var10;
+		var0.field3729 += var10 - var10;
-		if (var0.field3726 < var13) {
+		if (var0.field3729 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		SoundSystem.BZip2Decompressor_block = var6;
+		WorldMapManager.BZip2Decompressor_block = var6;
-		var0.field3733 = var7;
+		var0.field3746 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkv;)V"
+		signature = "(Lki;)V"
 	)
 	@Export("BZip2Decompressor_decompress")
 	static void BZip2Decompressor_decompress(BZip2State var0) {
@@ -192,9 +192,9 @@ public final class BZip2Decompressor {
 		int[] var23 = null;
 		int[] var24 = null;
 		int[] var25 = null;
-		var0.blockSize100k = 1;
+		var0.blockSize100k = 1410065408;
-		if (SoundSystem.BZip2Decompressor_block == null) {
+		if (WorldMapManager.BZip2Decompressor_block == null) {
-			SoundSystem.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
+			WorldMapManager.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]++;
-							SoundSystem.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							WorldMapManager.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) {
-								SoundSystem.BZip2Decompressor_block[var47] = var1 & 255;
+								WorldMapManager.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(SoundSystem.BZip2Decompressor_block[var36] & 255);
+						var1 = (byte)(WorldMapManager.BZip2Decompressor_block[var36] & 255);
-						var10000 = SoundSystem.BZip2Decompressor_block;
+						var10000 = WorldMapManager.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3746 = WorldMapManager.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3733 = SoundSystem.BZip2Decompressor_block[var0.field3733];
+					var0.field3746 = WorldMapManager.BZip2Decompressor_block[var0.field3746];
-					var0.su_ch2 = (byte)(var0.field3733 & 255);
+					var0.su_ch2 = (byte)(var0.field3746 & 255);
-					var0.field3733 >>= 8;
+					var0.field3746 >>= 8;
 					++var0.nblocks_used;
-					var0.field3742 = var47;
+					var0.field3754 = var47;
-					method5816(var0);
+					method5836(var0);
-					if (var0.field3742 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
+					if (var0.field3754 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) {
 						var26 = true;
 						break;
 					}
@@ -538,27 +538,27 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Lkv;)B"
+		signature = "(Lki;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkv;)B"
+		signature = "(Lki;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(ILkv;)I"
+		signature = "(ILki;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Lkv;)V"
+		signature = "(Lki;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@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("kv")
+@ObfuscatedName("ki")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
-	final int field3721;
+	final int field3736;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
-	final int field3728;
+	final int field3718;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
-	final int field3716;
+	final int field3748;
-	@ObfuscatedName("w")
-	final int field3722;
-	@ObfuscatedName("p")
-	final int field3735;
-	@ObfuscatedName("b")
-	final int field3719;
 	@ObfuscatedName("e")
+	final int field3720;
+	@ObfuscatedName("i")
+	final int field3717;
+	@ObfuscatedName("g")
+	final int field3722;
+	@ObfuscatedName("d")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -117705425
+		intValue = -807035473
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 808052371
+		intValue = -1509070377
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 862638407
+		intValue = -902711531
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 982229001
+		intValue = 1633057799
 	)
 	@Export("outputLength")
 	int outputLength;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1677667273
+		intValue = 135980565
 	)
-	int field3726;
+	int field3729;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -320144157
+		intValue = 1481212591
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 720575069
+		intValue = -29854091
 	)
 	@Export("bsBuff")
 	int bsBuff;
-	@ObfuscatedName("t")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 846973035
+		intValue = -725667235
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1197540352
+		intValue = -1401293824
 	)
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 184664593
+		intValue = 2006117845
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -1391220013
+		intValue = -1496152105
 	)
-	int field3733;
+	int field3746;
-	@ObfuscatedName("z")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1996939641
+		intValue = 2017789723
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("m")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 903678455
+		intValue = -2065710979
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1381794175
+		intValue = -402806649
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ae")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("av")
+	@ObfuscatedName("af")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("az")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ax")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("aj")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
 	@ObfuscatedName("au")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("ay")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("aa")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aq")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("an")
+	@ObfuscatedName("as")
 	@Export("base")
 	int[][] base;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ak")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ac")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("aw")
 	@ObfuscatedGetter(
-		intValue = 871538763
+		intValue = 1642554811
 	)
-	int field3742;
+	int field3754;
 
 	BZip2State() {
-		this.field3721 = 4096;
+		this.field3736 = 4096;
-		this.field3728 = 16;
+		this.field3718 = 16;
-		this.field3716 = 258;
+		this.field3748 = 258;
-		this.field3722 = 6;
+		this.field3720 = 6;
-		this.field3735 = 50;
+		this.field3717 = 50;
-		this.field3719 = 18002;
+		this.field3722 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -183,18 +183,16 @@ public final class BZip2State {
 		this.minLens = new int[6];
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("ae")
 	@ObfuscatedSignature(
-		signature = "(IIB)Lha;",
+		signature = "(Ljava/lang/String;IB)V",
-		garbageValue = "119"
+		garbageValue = "84"
 	)
-	@Export("getWidgetChild")
+	static final void method5833(String var0, int var1) {
-	public static Widget getWidgetChild(int var0, int var1) {
+		PacketBufferNode var2 = TilePaint.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher);
-		Widget var2 = Tile.getWidget(var0);
+		var2.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0) + 1);
-		if (var1 == -1) {
+		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
-			return var2;
+		var2.packetBuffer.method5603(var1);
-		} else {
+		Client.packetWriter.addNode(var2);
-			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
-		}
 	}
 }

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

@@ -4,66 +4,60 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("er")
+@ObfuscatedName("eu")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
 	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "Lhz;"
-	)
-	@Export("Widget_spritesArchive")
-	static AbstractArchive Widget_spritesArchive;
-	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1534521391
+		intValue = -432640287
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1718210699
+		intValue = -970419585
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1666415467
+		intValue = -1376780288
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -211420525
+		intValue = 778552875
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 951647449
+		intValue = -829648765
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Leq;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Leq;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = 3162324910013074859L
+		longValue = 515248560912133581L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1096622413
+		intValue = -1262947559
 	)
 	@Export("flags")
 	int flags;
@@ -73,31 +67,44 @@ public final class BoundaryObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(I)V",
-		garbageValue = "-13"
+		garbageValue = "2085601803"
 	)
-	public static void method3273(int var0) {
+	public static void method3333() {
-		class197.field2392 = 1;
+		synchronized(KeyHandler.KeyHandler_instance) {
-		Coord.musicTrackArchive = null;
+			++KeyHandler.KeyHandler_idleCycles;
-		class16.musicTrackGroupId = -1;
+			KeyHandler.field406 = KeyHandler.field408;
-		GrandExchangeOffer.musicTrackFileId = -1;
+			KeyHandler.field405 = 0;
-		class197.musicTrackVolume = 0;
+			int var1;
-		WorldMapDecoration.musicTrackBoolean = false;
+			if (KeyHandler.field387 < 0) {
-		ParamDefinition.field3275 = var0;
+				for (var1 = 0; var1 < 112; ++var1) {
-	}
+					KeyHandler.KeyHandler_pressedKeys[var1] = false;
+				}
 
-	@ObfuscatedName("m")
+				KeyHandler.field387 = KeyHandler.field400;
-	@ObfuscatedSignature(
+			} else {
-		signature = "(Ljava/lang/String;II)V",
+				while (KeyHandler.field387 != KeyHandler.field400) {
-		garbageValue = "-318547131"
+					var1 = KeyHandler.field399[KeyHandler.field400];
-	)
+					KeyHandler.field400 = KeyHandler.field400 + 1 & 127;
-	static final void method3274(String var0, int var1) {
+					if (var1 < 0) {
-		PacketBufferNode var2 = class2.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher);
+						KeyHandler.KeyHandler_pressedKeys[~var1] = false;
-		var2.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var0) + 1);
+					} else {
-		var2.packetBuffer.writeStringCp1252NullTerminated(var0);
+						if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field405 < KeyHandler.field404.length - 1) {
-		var2.packetBuffer.method5696(var1);
+							KeyHandler.field404[++KeyHandler.field405 - 1] = var1;
-		Client.packetWriter.addNode(var2);
+						}
+
+						KeyHandler.KeyHandler_pressedKeys[var1] = true;
+					}
+				}
+			}
+
+			if (KeyHandler.field405 > 0) {
+				KeyHandler.KeyHandler_idleCycles = 0;
+			}
+
+			KeyHandler.field408 = KeyHandler.field407;
+		}
 	}
 }

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

@@ -1,33 +1,39 @@
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.Socket;
 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("lh")
+@ObfuscatedName("ll")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -136751855
+		intValue = -743788715
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1318120515
+		intValue = 390143547
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -388222223
+		intValue = -1967964901
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1704369811
+		intValue = 1178395907
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +47,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-535694945"
+		garbageValue = "2024948285"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +58,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IIB)V",
-		garbageValue = "69"
+		garbageValue = "-30"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,22 +69,22 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Llh;Llh;I)V",
+		signature = "(Lll;Lll;I)V",
-		garbageValue = "871538763"
+		garbageValue = "-782590696"
 	)
-	public void method5997(Bounds var1, Bounds var2) {
+	public void method6031(Bounds var1, Bounds var2) {
-		this.method6005(var1, var2);
+		this.method6032(var1, var2);
-		this.method5999(var1, var2);
+		this.method6033(var1, var2);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Llh;Llh;I)V",
+		signature = "(Lll;Lll;I)V",
-		garbageValue = "-541537742"
+		garbageValue = "-997217284"
 	)
-	void method6005(Bounds var1, Bounds var2) {
+	void method6032(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
@@ -86,8 +92,8 @@ public class Bounds {
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method6000() > var1.method6000()) {
+		if (var2.method6034() > var1.method6034()) {
-			var2.highX -= var2.method6000() - var1.method6000();
+			var2.highX -= var2.method6034() - var1.method6034();
 		}
 
 		if (var2.highX < 0) {
@@ -96,12 +102,12 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Llh;Llh;B)V",
+		signature = "(Lll;Lll;I)V",
-		garbageValue = "-89"
+		garbageValue = "1896853998"
 	)
-	void method5999(Bounds var1, Bounds var2) {
+	void method6033(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
@@ -109,8 +115,8 @@ public class Bounds {
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method5994() > var1.method5994()) {
+		if (var2.method6035() > var1.method6035()) {
-			var2.highY -= var2.method5994() - var1.method5994();
+			var2.highY -= var2.method6035() - var1.method6035();
 		}
 
 		if (var2.highY < 0) {
@@ -119,25 +125,87 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "1022454109"
+		garbageValue = "1353685285"
 	)
-	int method6000() {
+	int method6034() {
 		return this.lowX + this.highX;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "1"
+		garbageValue = "-155482088"
 	)
-	int method5994() {
+	int method6035() {
 		return this.highY + this.lowY;
 	}
 
 	public String toString() {
 		return null;
 	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;",
+		garbageValue = "1378927694"
+	)
+	static String method6058(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("af")
+	@ObfuscatedSignature(
+		signature = "(Ljava/net/Socket;IIB)Lkr;",
+		garbageValue = "-41"
+	)
+	public static AbstractSocket method6040(Socket var0, int var1, int var2) throws IOException {
+		return new BufferedNetSocket(var0, var1, var2);
+	}
 }

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

@@ -1,29 +1,27 @@
-import java.io.IOException;
-import java.net.Socket;
 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("jt")
+@ObfuscatedName("je")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 945410251
+		intValue = -1462953665
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 509966379
+		intValue = 179134735
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1815065489
+		intValue = -1349530221
 	)
 	@Export("rank")
 	public int rank;
@@ -32,10 +30,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-309378639"
+		garbageValue = "1991575010"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -46,99 +44,46 @@ public class Buddy extends User {
 	@ObfuscatedName("ab")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1803035811"
+		garbageValue = "-1822334974"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("bj")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-1364700600"
+		garbageValue = "-101"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
+		signature = "(Ljava/lang/CharSequence;I)I",
-		garbageValue = "1663251439"
+		garbageValue = "631809601"
 	)
-	public static String method5214(String var0) {
+	public static int method5234(CharSequence var0) {
 		int var1 = var0.length();
-		char[] var2 = new char[var1];
+		int var2 = 0;
-		byte var3 = 2;
 
-		for (int var4 = 0; var4 < var1; ++var4) {
+		for (int var3 = 0; var3 < var1; ++var3) {
-			char var5 = var0.charAt(var4);
+			var2 = (var2 << 5) - var2 + var0.charAt(var3);
-			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);
+		return var2;
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("ah")
 	@ObfuscatedSignature(
-		signature = "(Ljava/net/Socket;III)Lky;",
+		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "62058076"
+		garbageValue = "-2002208158"
 	)
-	public static AbstractSocket method5215(Socket var0, int var1, int var2) throws IOException {
+	@Export("stringCp1252NullTerminatedByteSize")
-		return new BufferedNetSocket(var0, var1, var2);
+	public static int stringCp1252NullTerminatedByteSize(String var0) {
-	}
+		return var0.length() + 1;
-
-	@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,13 +1,24 @@
-import java.io.IOException;
+import java.awt.Component;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ed")
+@ObfuscatedName("fx")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("f")
+	@ObfuscatedName("bc")
+	@ObfuscatedSignature(
+		signature = "Lhq;"
+	)
+	static ServerBuild field1987;
+	@ObfuscatedName("dr")
+	@ObfuscatedSignature(
+		signature = "Lia;"
+	)
+	@Export("archive7")
+	static Archive archive7;
+	@ObfuscatedName("c")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -15,10 +26,10 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljt;Ljt;B)I",
+		signature = "(Lje;Lje;I)I",
-		garbageValue = "70"
+		garbageValue = "552186656"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
@@ -33,98 +44,112 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ZB)V",
+		signature = "(I[BLky;B)V",
-		garbageValue = "-2"
+		garbageValue = "-1"
 	)
-	public static void method3362(boolean var0) {
+	static void method3507(int var0, byte[] var1, ArchiveDisk var2) {
-		if (class297.NetCache_socket != null) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction();
-			try {
+		var3.type = 0;
-				Buffer var1 = new Buffer(4);
+		var3.key = (long)var0;
-				var1.writeByte(var0 ? 2 : 3);
+		var3.data = var1;
-				var1.writeMedium(0);
+		var3.archiveDisk = var2;
-				class297.NetCache_socket.write(var1.array, 0, 4);
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-			} catch (IOException var4) {
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
-				try {
+		}
-					class297.NetCache_socket.close();
-				} catch (Exception var3) {
-				}
 
-				++NetCache.NetCache_ioExceptions;
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-				class297.NetCache_socket = null;
+			if (ArchiveDiskActionHandler.field3150 == 0) {
+				class218.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+				class218.ArchiveDiskActionHandler_thread.setDaemon(true);
+				class218.ArchiveDiskActionHandler_thread.start();
+				class218.ArchiveDiskActionHandler_thread.setPriority(5);
 			}
 
+			ArchiveDiskActionHandler.field3150 = 600;
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;I)Z",
+		signature = "(Ljava/awt/Component;I)V",
-		garbageValue = "-1979792654"
+		garbageValue = "-837089812"
 	)
-	public static boolean method3363(AbstractArchive var0, AbstractArchive var1) {
+	static void method3505(Component var0) {
-		WorldMapElement.WorldMapElement_archive = var1;
+		var0.addMouseListener(MouseHandler.MouseHandler_instance);
-		if (!var0.isFullyLoaded()) {
+		var0.addMouseMotionListener(MouseHandler.MouseHandler_instance);
-			return false;
+		var0.addFocusListener(MouseHandler.MouseHandler_instance);
-		} 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();
-				}
-			}
 
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(CB)Z",
+		garbageValue = "0"
+	)
+	public static boolean method3510(char var0) {
+		if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) {
 			return true;
+		} else {
+			if (var0 != 0) {
+				char[] var1 = class288.cp1252AsciiExtension;
+
+				for (int var2 = 0; var2 < var1.length; ++var2) {
+					char var3 = var1[var2];
+					if (var0 == var3) {
+						return true;
+					}
+				}
+			}
+
+			return false;
 		}
 	}
 
-	@ObfuscatedName("gd")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Lbn;III)V",
+		signature = "(Lia;IIIBZI)V",
-		garbageValue = "-49955773"
+		garbageValue = "-1197984265"
 	)
-	@Export("performPlayerAnimation")
+	@Export("requestNetFile")
-	static void performPlayerAnimation(Player var0, int var1, int var2) {
+	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
-		if (var0.sequence == var1 && var1 != -1) {
+		long var6 = (long)((var1 << 16) + var2);
-			int var3 = WorldMapSection0.SequenceDefinition_get(var1).field3495;
+		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
-			if (var3 == 1) {
+		if (var8 == null) {
-				var0.sequenceFrame = 0;
+			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
-				var0.sequenceFrameCycle = 0;
+			if (var8 == null) {
-				var0.sequenceDelay = var2;
+				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
-				var0.field958 = 0;
+				if (var8 != null) {
-			}
+					if (var5) {
+						var8.removeDual();
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
+						--NetCache.NetCache_pendingWritesCount;
+						++NetCache.NetCache_pendingPriorityWritesCount;
+					}
 
-			if (var3 == 2) {
+				} else {
-				var0.field958 = 0;
+					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;
+					}
+
+				}
 			}
-		} 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("my")
+@ObfuscatedName("me")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lmk;"
+		signature = "Lmx;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		longValue = -5118577974640492239L
+		longValue = -8444963977777256649L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 999715569
+		intValue = 322598023
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = -7430138866634347913L
+		longValue = 2521859524399949401L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1565373677
+		intValue = -477832747
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = -5354612076530734833L
+		longValue = 8179397345785106237L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -2323016013084465375L
+		longValue = 3198798508515629197L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		longValue = 4889558715252805571L
+		longValue = 4935958229854898805L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		longValue = 7555588731094843747L
+		longValue = 647147803493944647L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		signature = "(Lmk;II)V"
+		signature = "(Lmx;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("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1595800163"
+		garbageValue = "-1756613502"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,7 +95,7 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
@@ -105,30 +105,30 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(B)J",
-		garbageValue = "91"
+		garbageValue = "-80"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "([BB)V",
+		signature = "([BI)V",
-		garbageValue = "-24"
+		garbageValue = "-1589882877"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "([BIIB)V",
-		garbageValue = "61"
+		garbageValue = "22"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -146,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset;
 			int var7 = var3;
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset));
 				if (var8 > var3) {
 					var8 = var3;
@@ -200,15 +200,15 @@ public class BufferedFile {
 
 				long var13 = -1L;
 				long var10 = -1L;
-				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) {
+				if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) {
 					var13 = this.writeBufferOffset;
-				} else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) {
+				} else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) {
 					var13 = var4;
 				}
 
-				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) {
+				if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) {
 					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
-				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= (long)this.writeBufferLength + this.writeBufferOffset) {
 					var10 = (long)var7 + var4;
 				}
 
@@ -231,10 +231,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1578743019"
+		garbageValue = "-1700584004"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -261,23 +261,23 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "732073067"
+		garbageValue = "-1609695177"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		try {
 			if (this.offset + (long)var3 > this.length) {
-				this.length = (long)var3 + this.offset;
+				this.length = this.offset + (long)var3;
 			}
 
-			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) {
+			if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > this.writeBufferOffset + (long)this.writeBufferLength)) {
 				this.flush();
 			}
 
-			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) {
+			if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) {
 				int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset));
 				System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4);
 				this.offset += (long)var4;
@@ -314,21 +314,21 @@ public class BufferedFile {
 
 				long var9 = -1L;
 				long var6 = -1L;
-				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 					var9 = this.offset;
-				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) {
+				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) {
 					var9 = this.readBufferOffset;
 				}
 
-				if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) {
+				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) {
 					var6 = this.offset + (long)var3;
-				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) {
+				} else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) {
 					var6 = this.readBufferOffset + (long)this.readBufferLength;
 				}
 
 				if (var9 > -1L && var6 > var9) {
 					int var8 = (int)(var6 - var9);
-					System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8);
+					System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8);
 				}
 
 				this.offset += (long)var3;
@@ -339,37 +339,37 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "-37"
+		garbageValue = "118"
 	)
 	@Export("flush")
 	void flush() throws IOException {
-		if (-1L != this.writeBufferOffset) {
+		if (this.writeBufferOffset != -1L) {
-			if (this.fileOffset != this.writeBufferOffset) {
+			if (this.writeBufferOffset != this.fileOffset) {
 				this.accessFile.seek(this.writeBufferOffset);
 				this.fileOffset = this.writeBufferOffset;
 			}
 
 			this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength);
-			this.fileOffset += 1565373677L * (long)(this.writeBufferLength * -466302747);
+			this.fileOffset += (long)(this.writeBufferLength * -2104387715) * -477832747L;
 			if (this.fileOffset > this.fileLength) {
 				this.fileLength = this.fileOffset;
 			}
 
 			long var1 = -1L;
 			long var3 = -1L;
-			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) {
 				var1 = this.writeBufferOffset;
 			} else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) {
 				var1 = this.readBufferOffset;
 			}
 
-			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) {
+			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= (long)this.readBufferLength + this.readBufferOffset) {
-				var3 = this.writeBufferOffset + (long)this.writeBufferLength;
+				var3 = (long)this.writeBufferLength + this.writeBufferOffset;
-			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= this.writeBufferOffset + (long)this.writeBufferLength) {
+			} else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) {
-				var3 = (long)this.readBufferLength + this.readBufferOffset;
+				var3 = this.readBufferOffset + (long)this.readBufferLength;
 			}
 
 			if (var1 > -1L && var3 > var1) {

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

@@ -8,24 +8,18 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("kw")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("fr")
+	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "Leo;"
-	)
-	@Export("urlRequester")
-	static UrlRequester urlRequester;
-	@ObfuscatedName("f")
 	@Export("socket")
 	Socket socket;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lkx;"
+		signature = "Lkk;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lkb;"
+		signature = "Lkv;"
 	)
 	@Export("sink")
 	BufferedSink sink;
@@ -40,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-647274291"
+		garbageValue = "-259367480"
 	)
 	@Export("close")
 	public void close() {
@@ -57,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "2115277231"
+		garbageValue = "-108"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-972484659"
+		garbageValue = "2004103994"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "497635177"
+		garbageValue = "-624446357"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "-1642271193"
+		garbageValue = "1847434030"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-340382115"
+		garbageValue = "977025272"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {

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

@@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kb")
+@ObfuscatedName("kv")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1559219719
+		intValue = -2050676869
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -196208499
+		intValue = -1109896429
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1767380433
+		intValue = -1699191965
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("closed")
 	boolean closed;
 
@@ -54,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "649877335"
+		garbageValue = "-96"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -79,10 +79,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([BIII)V",
+		signature = "([BIIB)V",
-		garbageValue = "-1804311851"
+		garbageValue = "0"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -119,10 +119,10 @@ public class BufferedSink implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1910014350"
+		garbageValue = "1954153796"
 	)
 	@Export("close")
 	void close() {
@@ -198,161 +198,141 @@ public class BufferedSink implements Runnable {
 
 	}
 
-	@ObfuscatedName("kr")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(DDIB)[D",
-		garbageValue = "1908686960"
+		garbageValue = "80"
 	)
-	@Export("changeGameOptions")
+	public static double[] method5902(double var0, double var2, int var4) {
-	static final void changeGameOptions(int var0) {
+		int var5 = var4 * 2 + 1;
-		Buddy.method5211();
+		double[] var6 = new double[var5];
-		MouseRecorder.method1187();
+		int var7 = -var4;
-		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) {
+		for (int var8 = 0; var7 <= var4; ++var8) {
-					Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
+			var6[var8] = ViewportMouse.method3061((double)var7, var0, var2);
-					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D);
+			++var7;
-				}
+		}
 
-				if (var2 == 3) {
+		return var6;
-					Rasterizer3D.Rasterizer3D_setBrightness(0.7D);
+	}
-					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D);
-				}
 
-				if (var2 == 4) {
+	@ObfuscatedName("i")
-					Rasterizer3D.Rasterizer3D_setBrightness(0.6D);
+	@ObfuscatedSignature(
-					((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D);
+		signature = "([BIIB)Z",
-				}
+		garbageValue = "0"
+	)
+	static final boolean method5913(byte[] var0, int var1, int var2) {
+		boolean var3 = true;
+		Buffer var4 = new Buffer(var0);
+		int var5 = -1;
 
-				NetSocket.method3525();
+		label68:
+		while (true) {
+			int var6 = var4.method5589();
+			if (var6 == 0) {
+				return var3;
 			}
 
-			if (var1 == 3) {
+			var5 += var6;
-				short var3 = 0;
+			int var7 = 0;
-				if (var2 == 0) {
+			boolean var8 = false;
-					var3 = 255;
-				}
 
-				if (var2 == 1) {
+			while (true) {
-					var3 = 192;
+				int var9;
-				}
+				while (!var8) {
-
+					var9 = var4.readUShortSmart();
-				if (var2 == 2) {
+					if (var9 == 0) {
-					var3 = 128;
+						continue label68;
-				}
-
-				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;
+					var7 += var9 - 1;
+					int var10 = var7 & 63;
+					int var11 = var7 >> 6 & 63;
+					int var12 = var4.readUnsignedByte() >> 2;
+					int var13 = var11 + var1;
+					int var14 = var10 + var2;
+					if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
+						ObjectDefinition var15 = Occluder.getObjectDefinition(var5);
+						if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
+							if (!var15.needsModelFiles()) {
+								++Client.field700;
+								var3 = false;
+							}
+
+							var8 = true;
+						}
+					}
 				}
+
+				var9 = var4.readUShortSmart();
+				if (var9 == 0) {
+					break;
+				}
+
+				var4.readUnsignedByte();
+			}
+		}
+	}
+
+	@ObfuscatedName("fy")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "-529911776"
+	)
+	@Export("playSong")
+	static void playSong(int var0) {
+		if (var0 == -1 && !Client.field881) {
+			class197.midiPcmStream.clear();
+			class197.field2414 = 1;
+			UserComparator5.musicTrackArchive = null;
+		} else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field881) {
+			TaskHandler.method3554(2, MouseHandler.archive6, var0, 0, Client.musicVolume, false);
+		}
+
+		Client.currentTrackGroupId = var0;
+	}
+
+	@ObfuscatedName("km")
+	@ObfuscatedSignature(
+		signature = "(Lhn;I)Z",
+		garbageValue = "-2086851217"
+	)
+	static final boolean method5915(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 == 4) {
+			if (var1 >= 314 && var1 <= 323) {
-				if (var2 == 0) {
+				var2 = (var1 - 314) / 2;
-					Client.soundEffectVolume = 127;
+				var3 = var1 & 1;
-				}
+				Client.playerAppearance.method4066(var2, var3 == 1);
-
-				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) {
+			if (var1 == 324) {
-				Client.leftClickOpensMenu = var2;
+				Client.playerAppearance.changeSex(false);
 			}
 
-			if (var1 == 6) {
+			if (var1 == 325) {
-				Client.chatEffects = var2;
+				Client.playerAppearance.changeSex(true);
 			}
 
-			if (var1 == 9) {
+			if (var1 == 326) {
-				Client.field901 = var2;
+				PacketBufferNode var4 = TilePaint.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher);
+				Client.playerAppearance.write(var4.packetBuffer);
+				Client.packetWriter.addNode(var4);
+				return true;
+			} else {
+				return false;
 			}
-
-			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("kx")
+@ObfuscatedName("kk")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 608753777
+		intValue = 276934727
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1571350283
+		intValue = 1985873745
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1626755739
+		intValue = 738500389
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("exception")
 	IOException exception;
 
@@ -52,10 +52,10 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(IB)Z",
-		garbageValue = "2103445622"
+		garbageValue = "89"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
@@ -86,10 +86,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(S)I",
+		signature = "(I)I",
-		garbageValue = "8192"
+		garbageValue = "-956188768"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -110,15 +110,15 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "54"
+		garbageValue = "0"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
 		synchronized(this) {
-			if (this.limit == this.position) {
+			if (this.position == this.limit) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
 				} else {
@@ -133,10 +133,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "1982977111"
+		garbageValue = "-2106245122"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -174,10 +174,10 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-103"
+		garbageValue = "-2102342981"
 	)
 	@Export("close")
 	void close() {
@@ -244,14 +244,35 @@ public class BufferedSource implements Runnable {
 		}
 	}
 
-	@ObfuscatedName("fv")
+	@ObfuscatedName("jm")
 	@ObfuscatedSignature(
-		signature = "(Lif;Ljava/lang/String;I)V",
+		signature = "(B)V",
-		garbageValue = "502005158"
+		garbageValue = "114"
 	)
-	static void method5925(Archive var0, String var1) {
+	static void method5934() {
-		ArchiveLoader var2 = new ArchiveLoader(var0, var1);
+		for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) {
-		Client.archiveLoaders.add(var2);
+			int var1 = var0.group;
-		Client.field629 += var2.groupCount;
+			if (ScriptFrame.loadInterface(var1)) {
+				boolean var2 = true;
+				Widget[] var3 = WorldMapLabel.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 = Varps.getWidget(var4);
+					if (var5 != null) {
+						NPCDefinition.invalidateWidget(var5);
+					}
+				}
+			}
+		}
+
 	}
 }

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

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

@@ -4,40 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kj")
+@ObfuscatedName("ka")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -210161975
+		intValue = 1009050051
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1380698397
+		intValue = 2126667647
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 750629749
+		intValue = -82871939
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("ByteArrayPool_alternativeSizes")
 	static int[] ByteArrayPool_alternativeSizes;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("ByteArrayPool_arrays")
 	static byte[][][] ByteArrayPool_arrays;
 
@@ -50,37 +50,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
-	@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 = "877934718"
+		garbageValue = "103093333"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -117,9 +90,9 @@ public class ByteArrayPool {
 				if (ByteArrayPool_alternativeSizes[var4] != var0) {
 					if (var0 < ByteArrayPool_alternativeSizes[var4]) {
 					}
-				} else if (Interpreter.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+				} else if (VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
-					byte[] var3 = ByteArrayPool_arrays[var4][--Interpreter.ByteArrayPool_altSizeArrayCounts[var4]];
+					byte[] var3 = ByteArrayPool_arrays[var4][--VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4]];
-					ByteArrayPool_arrays[var4][Interpreter.ByteArrayPool_altSizeArrayCounts[var4]] = null;
+					ByteArrayPool_arrays[var4][VerticalAlignment.ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}

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

@@ -4,36 +4,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hd")
+@ObfuscatedName("gz")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("pb")
+	@ObfuscatedName("c")
-	@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("i")
+	@ObfuscatedName("t")
 	@Export("DAYS_OF_THE_WEEK")
 	static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("Calendar_calendar")
 	static java.util.Calendar Calendar_calendar;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "[Lls;"
+		signature = "Lii;"
 	)
-	@Export("worldSelectBackSprites")
+	@Export("Widget_modelsArchive")
-	static Sprite[] worldSelectBackSprites;
+	static AbstractArchive Widget_modelsArchive;
 
 	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"}};
@@ -42,39 +30,12 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(Lkq;Llc;B)Llc;",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-33"
+		garbageValue = "-1040616662"
 	)
-	@Export("readStringIntParameters")
+	static final void method4014(String var0) {
-	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
+		class60.method1188("Please remove " + var0 + " from your ignore list first");
-		int var2 = var0.readUnsignedByte();
-		int var3;
-		if (var1 == null) {
-			int var4 = var2 - 1;
-			var4 |= var4 >>> 1;
-			var4 |= var4 >>> 2;
-			var4 |= var4 >>> 4;
-			var4 |= var4 >>> 8;
-			var4 |= var4 >>> 16;
-			var3 = var4 + 1;
-			var1 = new IterableNodeHashTable(var3);
-		}
-
-		for (var3 = 0; var3 < var2; ++var3) {
-			boolean var7 = var0.readUnsignedByte() == 1;
-			int var5 = var0.readMedium();
-			Object var6;
-			if (var7) {
-				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
-			} else {
-				var6 = new IntegerNode(var0.readInt());
-			}
-
-			var1.put((Node)var6, (long)var5);
-		}
-
-		return var1;
 	}
 }

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

@@ -2,22 +2,19 @@ import java.awt.Component;
 import java.awt.Graphics;
 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("af")
+@ObfuscatedName("ai")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("qn")
+	@ObfuscatedName("t")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 739574061
+		signature = "Lii;"
 	)
-	static int field397;
+	@Export("SequenceDefinition_animationsArchive")
-	@ObfuscatedName("gk")
+	static AbstractArchive SequenceDefinition_animationsArchive;
-	@Export("xteaKeys")
+	@ObfuscatedName("c")
-	static int[][] xteaKeys;
-	@ObfuscatedName("f")
 	@Export("component")
 	Component component;
 
@@ -25,76 +22,45 @@ public final class Canvas extends java.awt.Canvas {
 		this.component = var1;
 	}
 
-	public final void update(Graphics var1) {
-		this.component.update(var1);
-	}
-
 	public final void paint(Graphics var1) {
 		this.component.paint(var1);
 	}
 
-	@ObfuscatedName("w")
+	public final void update(Graphics var1) {
-	@ObfuscatedSignature(
+		this.component.update(var1);
-		signature = "(IIIIB)V",
-		garbageValue = "-7"
-	)
-	@Export("itemContainerSetItem")
-	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var4 == null) {
-			var4 = new ItemContainer();
-			ItemContainer.itemContainers.put(var4, (long)var0);
-		}
-
-		if (var4.ids.length <= var1) {
-			int[] var5 = new int[var1 + 1];
-			int[] var6 = new int[var1 + 1];
-
-			int var7;
-			for (var7 = 0; var7 < var4.ids.length; ++var7) {
-				var5[var7] = var4.ids[var7];
-				var6[var7] = var4.quantities[var7];
-			}
-
-			for (var7 = var4.ids.length; var7 < var1; ++var7) {
-				var5[var7] = -1;
-				var6[var7] = 0;
-			}
-
-			var4.ids = var5;
-			var4.quantities = var6;
-		}
-
-		var4.ids[var1] = var2;
-		var4.quantities[var1] = var3;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("fq")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)Lli;",
+		signature = "(B)V",
-		garbageValue = "-1768952191"
+		garbageValue = "-97"
 	)
-	@Export("SpriteBuffer_getIndexedSpriteByName")
+	static final void method861() {
-	public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+		if (FileSystem.ClanChat_inClanChat) {
-		int var3 = var0.getGroupId(var1);
+			if (InterfaceParent.clanChat != null) {
-		int var4 = var0.getFileId(var3, var2);
+				InterfaceParent.clanChat.sort();
-		IndexedSprite var5;
+			}
-		if (!HitSplatDefinition.method4586(var0, var3, var4)) {
+
-			var5 = null;
+			DefaultsGroup.method5953();
-		} else {
+			FileSystem.ClanChat_inClanChat = false;
-			var5 = WorldMapDecoration.method327();
 		}
 
-		return var5;
 	}
 
-	@ObfuscatedName("ey")
+	@ObfuscatedName("hf")
 	@ObfuscatedSignature(
-		signature = "(I)Lld;",
+		signature = "(IIB)I",
-		garbageValue = "-228805350"
+		garbageValue = "-77"
 	)
-	@Export("getWorldMap")
+	static int method864(int var0, int var1) {
-	static WorldMap getWorldMap() {
+		int var2 = var1 - 334;
-		return GrandExchangeEvent.worldMap;
+		if (var2 < 0) {
+			var2 = 0;
+		} else if (var2 > 100) {
+			var2 = 100;
+		}
+
+		int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight;
+		return var0 * var3 / 256;
 	}
 }

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

@@ -4,24 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ct")
+@ObfuscatedName("cq")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "Lcz;"
-	)
-	@Export("pcmPlayerProvider")
-	static class97 pcmPlayerProvider;
 	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = -899235317
+	)
+	public static int field1289;
+	@ObfuscatedName("k")
+	public static String[] field1291;
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "[Lbs;"
+		signature = "[Lbn;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 510013085
+		intValue = -2026360781
 	)
 	@Export("count")
 	int count;
@@ -30,10 +31,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbs;",
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbn;",
-		garbageValue = "481031645"
+		garbageValue = "0"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -61,95 +62,140 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)Lbs;",
+		signature = "(II)Lbn;",
-		garbageValue = "-2132499563"
+		garbageValue = "187354939"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "134905957"
+		garbageValue = "40"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("hj")
 	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
+		signature = "(IIZI)V",
-		garbageValue = "1959752215"
+		garbageValue = "-1620265194"
 	)
-	static String method2269(int var0) {
+	static final void method2302(int var0, int var1, boolean var2) {
-		return "<img=" + var0 + ">";
+		if (!var2 || var0 != SecureRandomCallable.field530 || Language.field2359 != var1) {
-	}
+			SecureRandomCallable.field530 = var0;
+			Language.field2359 = var1;
+			Projectile.updateGameState(25);
+			class197.drawLoadingMessage("Loading - please wait.", true);
+			int var3 = Messages.baseX * 64;
+			int var4 = Language.baseY * 64;
+			Messages.baseX = (var0 - 6) * 8;
+			Language.baseY = (var1 - 6) * 8;
+			int var5 = Messages.baseX * 64 - var3;
+			int var6 = Language.baseY * 64 - var4;
+			var3 = Messages.baseX * 64;
+			var4 = Language.baseY * 64;
+
+			int var7;
+			int var9;
+			int[] var10000;
+			for (var7 = 0; var7 < 32768; ++var7) {
+				NPC var8 = Client.npcs[var7];
+				if (var8 != null) {
+					for (var9 = 0; var9 < 10; ++var9) {
+						var10000 = var8.pathX;
+						var10000[var9] -= var5;
+						var10000 = var8.pathY;
+						var10000[var9] -= var6;
+					}
+
+					var8.x -= var5 * 128;
+					var8.y -= var6 * 128;
+				}
+			}
+
+			for (var7 = 0; var7 < 2048; ++var7) {
+				Player var21 = Client.players[var7];
+				if (var21 != null) {
+					for (var9 = 0; var9 < 10; ++var9) {
+						var10000 = var21.pathX;
+						var10000[var9] -= var5;
+						var10000 = var21.pathY;
+						var10000[var9] -= var6;
+					}
+
+					var21.x -= var5 * 128;
+					var21.y -= var6 * 128;
+				}
+			}
+
+			byte var20 = 0;
+			byte var18 = 104;
+			byte var22 = 1;
+			if (var5 < 0) {
+				var20 = 103;
+				var18 = -1;
+				var22 = -1;
+			}
+
+			byte var10 = 0;
+			byte var11 = 104;
+			byte var12 = 1;
+			if (var6 < 0) {
+				var10 = 103;
+				var11 = -1;
+				var12 = -1;
+			}
+
+			int var14;
+			for (int var13 = var20; var18 != var13; var13 += var22) {
+				for (var14 = var10; var11 != var14; var14 += var12) {
+					int var15 = var13 + var5;
+					int var16 = var6 + var14;
+
+					for (int var17 = 0; var17 < 4; ++var17) {
+						if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
+							Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
+						} else {
+							Client.groundItems[var17][var13][var14] = null;
+						}
+					}
+				}
+			}
+
+			for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) {
+				var19.x -= var5;
+				var19.y -= var6;
+				if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) {
+					var19.remove();
+				}
+			}
+
+			if (Client.destinationX != 0) {
+				Client.destinationX -= var5;
+				Client.destinationY -= var6;
+			}
+
+			Client.soundEffectCount = 0;
+			Client.isCameraLocked = false;
+			HitSplatDefinition.cameraX -= var5 << 7;
+			Actor.cameraZ -= var6 << 7;
+			PendingSpawn.oculusOrbFocalPointX -= var5 << 7;
+			Skeleton.oculusOrbFocalPointY -= var6 << 7;
+			Client.field704 = -1;
+			Client.graphicsObjects.clear();
+			Client.projectiles.clear();
+
+			for (var14 = 0; var14 < 4; ++var14) {
+				Client.collisionMaps[var14].clear();
+			}
 
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		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,82 +4,82 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jq")
+@ObfuscatedName("jl")
 @Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Lmv;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Ljv;"
+		signature = "Ljh;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@Export("minKick")
 	public byte minKick;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 208405129
+		intValue = 1887951893
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1142922895
+		intValue = 404560335
 	)
-	int field3614;
+	int field3628;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;Ljv;)V"
+		signature = "(Lmv;Ljh;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3614 = 1;
+		this.field3628 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)Ljy;",
+		signature = "(S)Ljk;",
-		garbageValue = "68"
+		garbageValue = "30683"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IB)[Ljy;",
+		signature = "(IB)[Ljk;",
-		garbageValue = "32"
+		garbageValue = "19"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "505839882"
+		garbageValue = "-26"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1));
+		String var3 = WorldMapArea.base37DecodeLong(VerticalAlignment.method4424(var1));
 		if (var3 == null) {
 			var3 = "";
 		}
@@ -87,14 +87,14 @@ public class ClanChat extends UserList {
 		this.name = var3;
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "1040645085"
+		garbageValue = "-11"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		String var3 = CollisionMap.base37DecodeLong(class226.method4101(var1));
+		String var3 = WorldMapArea.base37DecodeLong(VerticalAlignment.method4424(var1));
 		if (var3 == null) {
 			var3 = "";
 		}
@@ -102,39 +102,66 @@ public class ClanChat extends UserList {
 		this.owner = var3;
 	}
 
-	@ObfuscatedName("cg")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lkq;I)V",
+		signature = "(Lkp;I)V",
-		garbageValue = "171385473"
+		garbageValue = "-866668156"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		this.readName(WorldMapIcon_0.method201(var2));
+		long var5 = var2;
+		String var4;
+		int var7;
+		if (var2 > 0L && var2 < 6582952005840035281L) {
+			if (0L == var2 % 37L) {
+				var4 = null;
+			} else {
+				var7 = 0;
+
+				for (long var13 = var2; var13 != 0L; var13 /= 37L) {
+					++var7;
+				}
+
+				StringBuilder var15 = new StringBuilder(var7);
+
+				while (0L != var5) {
+					long var11 = var5;
+					var5 /= 37L;
+					var15.append(class289.base37Table[(int)(var11 - var5 * 37L)]);
+				}
+
+				var4 = var15.reverse().toString();
+			}
+		} else {
+			var4 = null;
+		}
+
+		this.readName(var4);
 		this.minKick = var1.readByte();
-		int var4 = var1.readUnsignedByte();
+		var7 = var1.readUnsignedByte();
-		if (var4 != 255) {
+		if (var7 != 255) {
 			this.clear();
 
-			for (int var5 = 0; var5 < var4; ++var5) {
+			for (int var8 = 0; var8 < var7; ++var8) {
-				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
+				ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
-				int var7 = var1.readUnsignedShort();
+				int var10 = var1.readUnsignedShort();
-				var6.set(var7, ++this.field3614 - 1);
+				var9.set(var10, ++this.field3628 - 1);
-				var6.rank = var1.readByte();
+				var9.rank = var1.readByte();
 				var1.readStringCp1252NullTerminated();
-				this.isLocalPlayer(var6);
+				this.isLocalPlayer(var9);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(Lkq;I)V",
+		signature = "(Lkp;I)V",
-		garbageValue = "-1031148737"
+		garbageValue = "1239861248"
 	)
-	public final void method5262(Buffer var1) {
+	public final void method5296(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -164,17 +191,17 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3614 - 1);
+			var6.set(var3, ++this.field3628 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
 
 	}
 
-	@ObfuscatedName("cr")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1039852282"
+		garbageValue = "58"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -184,10 +211,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cb")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "32"
+		garbageValue = "-275876635"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -197,10 +224,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("cz")
+	@ObfuscatedName("cf")
 	@ObfuscatedSignature(
-		signature = "(Ljd;I)V",
+		signature = "(Ljt;I)V",
-		garbageValue = "667645943"
+		garbageValue = "1790054092"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {
@@ -209,4 +236,49 @@ public class ClanChat extends UserList {
 		}
 
 	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(Lhn;I[B[BI)V",
+		garbageValue = "1586924151"
+	)
+	@Export("Widget_setKey")
+	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
+		if (var0.field2702 == null) {
+			if (var2 == null) {
+				return;
+			}
+
+			var0.field2702 = new byte[11][];
+			var0.field2648 = new byte[11][];
+			var0.field2649 = new int[11];
+			var0.field2560 = new int[11];
+		}
+
+		var0.field2702[var1] = var2;
+		if (var2 != null) {
+			var0.field2646 = true;
+		} else {
+			var0.field2646 = false;
+
+			for (int var4 = 0; var4 < var0.field2702.length; ++var4) {
+				if (var0.field2702[var4] != null) {
+					var0.field2646 = true;
+					break;
+				}
+			}
+		}
+
+		var0.field2648[var1] = var3;
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(CI)Z",
+		garbageValue = "520942545"
+	)
+	@Export("isCharAlphabetic")
+	public static boolean isCharAlphabetic(char var0) {
+		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
+	}
 }

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

@@ -1,31 +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("jd")
+@ObfuscatedName("jt")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("ex")
+	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -1283772433
-	)
-	static int field3566;
-	@ObfuscatedName("fm")
-	@ObfuscatedGetter(
-		intValue = 1387790873
-	)
-	static int field3567;
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Ljf;"
+		signature = "Lju;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ljf;"
+		signature = "Lju;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -35,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1521819508"
+		garbageValue = "-526388551"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "2007555671"
+		garbageValue = "2130139941"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -59,30 +48,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1569748469"
+		garbageValue = "-2012869833"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = Message.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = KeyHandler.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(I)V",
-		garbageValue = "3103"
+		garbageValue = "1620040890"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-732818208"
+		garbageValue = "-84"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -93,40 +82,74 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1631625166"
+		garbageValue = "-749177789"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = Message.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = KeyHandler.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("jp")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IIIIII)V",
+		signature = "(Ljava/lang/CharSequence;IZI)Z",
-		garbageValue = "2022495737"
+		garbageValue = "-1733263063"
 	)
-	@Export("drawScrollBar")
+	static boolean method5073(CharSequence var0, int var1, boolean var2) {
-	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+		if (var1 >= 2 && var1 <= 36) {
-		class60.scrollBarSprites[0].drawAt(var0, var1);
+			boolean var3 = false;
-		class60.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
+			boolean var4 = false;
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field691);
+			int var5 = 0;
-		int var5 = var3 * (var3 - 32) / var4;
+			int var6 = var0.length();
-		if (var5 < 8) {
-			var5 = 8;
-		}
 
-		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
+			for (int var7 = 0; var7 < var6; ++var7) {
-		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field692);
+				char var8 = var0.charAt(var7);
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field694);
+				if (var7 == 0) {
-		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field694);
+					if (var8 == '-') {
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field694);
+						var3 = true;
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field694);
+						continue;
-		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);
+					if (var8 == '+') {
-		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field693);
+						continue;
+					}
+				}
+
+				int var10;
+				if (var8 >= '0' && var8 <= '9') {
+					var10 = var8 - '0';
+				} else if (var8 >= 'A' && var8 <= 'Z') {
+					var10 = var8 - '7';
+				} else {
+					if (var8 < 'a' || var8 > 'z') {
+						return false;
+					}
+
+					var10 = var8 - 'W';
+				}
+
+				if (var10 >= var1) {
+					return false;
+				}
+
+				if (var3) {
+					var10 = -var10;
+				}
+
+				int var9 = var5 * var1 + var10;
+				if (var9 / var1 != var5) {
+					return false;
+				}
+
+				var5 = var9;
+				var4 = true;
+			}
+
+			return var4;
+		} else {
+			throw new IllegalArgumentException("" + var1);
+		}
 	}
 }

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

@@ -7,46 +7,39 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bf")
+@ObfuscatedName("bj")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("qu")
+	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "Ldr;"
-	)
-	@Export("decimator")
-	static Decimator decimator;
-	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1642477041
+		intValue = 1562806739
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("jz")
+	@ObfuscatedName("fb")
 	@ObfuscatedSignature(
-		signature = "Lha;"
+		signature = "Lkr;"
 	)
-	@Export("dragInventoryWidget")
+	static AbstractSocket field1052;
-	static Widget dragInventoryWidget;
+	@ObfuscatedName("o")
-	@ObfuscatedName("y")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -732780625
+		intValue = -122570971
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -59,11 +52,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1835(true);
+		this.method1849(true);
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkq;)V"
+		signature = "(Lkp;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -103,26 +96,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1835(true);
+				this.method1849(true);
 			}
 		} else {
-			this.method1835(true);
+			this.method1849(true);
 		}
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ZS)V",
+		signature = "(ZI)V",
-		garbageValue = "-15246"
+		garbageValue = "1265192708"
 	)
-	void method1835(boolean var1) {
+	void method1849(boolean var1) {
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Lkq;",
+		signature = "(I)Lkp;",
-		garbageValue = "458366092"
+		garbageValue = "-1961223036"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -144,4 +137,168 @@ public class ClientPreferences {
 		var1.writeBoolean(this.hideUsername);
 		return var1;
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(I)[Llf;",
+		garbageValue = "-1068264717"
+	)
+	@Export("FillMode_values")
+	public static FillMode[] FillMode_values() {
+		return new FillMode[]{FillMode.field3858, FillMode.SOLID, FillMode.field3854};
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(ILjava/lang/String;Ljava/lang/String;I)V",
+		garbageValue = "-756119302"
+	)
+	@Export("addGameMessage")
+	static void addGameMessage(int var0, String var1, String var2) {
+		class173.addChatMessage(var0, var1, var2, (String)null);
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1958479056"
+	)
+	public static void method1854() {
+		while (true) {
+			ArchiveDiskAction var0;
+			synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+				var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast();
+			}
+
+			if (var0 == null) {
+				return;
+			}
+
+			var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false);
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "([BIIIIIII[Lfv;I)V",
+		garbageValue = "-1733201175"
+	)
+	static final void method1853(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
+		int var10;
+		for (int var9 = 0; var9 < 8; ++var9) {
+			for (var10 = 0; var10 < 8; ++var10) {
+				if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) {
+					int[] var10000 = var8[var1].flags[var9 + var2];
+					var10000[var10 + var3] &= -16777217;
+				}
+			}
+		}
+
+		Buffer var13 = new Buffer(var0);
+
+		for (var10 = 0; var10 < 4; ++var10) {
+			for (int var11 = 0; var11 < 64; ++var11) {
+				for (int var12 = 0; var12 < 64; ++var12) {
+					if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
+						WorldMapArea.loadTerrain(var13, var1, var2 + ModelData0.method3322(var11 & 7, var12 & 7, var7), var3 + ViewportMouse.method3059(var11 & 7, var12 & 7, var7), 0, 0, var7);
+					} else {
+						WorldMapArea.loadTerrain(var13, 0, -1, -1, 0, 0, 0);
+					}
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("gh")
+	@ObfuscatedSignature(
+		signature = "(Lba;I)Z",
+		garbageValue = "-1602315616"
+	)
+	static boolean method1840(Player var0) {
+		if (Client.drawPlayerNames == 0) {
+			return false;
+		} else {
+			boolean var1;
+			if (class192.localPlayer == var0) {
+				var1 = (Client.drawPlayerNames & 8) != 0;
+				return var1;
+			} else {
+				var1 = MouseRecorder.method1210() || LoginScreenAnimation.method1819() && var0.isFriend();
+				if (!var1) {
+					boolean var2 = (Client.drawPlayerNames & 2) != 0;
+					var1 = var2 && var0.isClanMember();
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("hy")
+	@ObfuscatedSignature(
+		signature = "(S)V",
+		garbageValue = "14321"
+	)
+	static final void method1852() {
+		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.field828[++Client.field766 - 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.field867[++Client.field690 - 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.method2083(var7, (byte)1);
+							var8 = var0.readBits(1);
+							if (var8 == 1) {
+								Client.field867[++Client.field690 - 1] = var3;
+							}
+						} else if (var6 == 2) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method2083(var7, (byte)2);
+							var8 = var0.readBits(3);
+							var4.method2083(var8, (byte)2);
+							int var9 = var0.readBits(1);
+							if (var9 == 1) {
+								Client.field867[++Client.field690 - 1] = var3;
+							}
+						} else if (var6 == 3) {
+							Client.field828[++Client.field766 - 1] = var3;
+						}
+					}
+				}
+			}
+
+		}
+	}
 }

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

@@ -1,59 +1,98 @@
 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("fc")
+@ObfuscatedName("fu")
 @Implements("Clock")
 public abstract class Clock {
+	@ObfuscatedName("da")
+	@ObfuscatedSignature(
+		signature = "Lia;"
+	)
+	@Export("archive19")
+	static Archive archive19;
+	@ObfuscatedName("ju")
+	@ObfuscatedGetter(
+		intValue = 346699043
+	)
+	@Export("Client_plane")
+	static int Client_plane;
+
 	Clock() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "4"
+		garbageValue = "29"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(III)I",
-		garbageValue = "670539248"
+		garbageValue = "-561232674"
 	)
 	@Export("wait")
 	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(III)I",
+		signature = "([BB)Lce;",
-		garbageValue = "90199453"
+		garbageValue = "-106"
 	)
-	static int method3489(int var0, int var1) {
+	@Export("newScript")
-		long var2 = (long)((var0 << 16) + var1);
+	static Script newScript(byte[] var0) {
-		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;
+		Script var1 = new Script();
-	}
+		Buffer var2 = new Buffer(var0);
+		var2.offset = var2.array.length - 2;
+		int var3 = var2.readUnsignedShort();
+		int var4 = var2.array.length - 2 - var3 - 12;
+		var2.offset = var4;
+		int var5 = var2.readInt();
+		var1.localIntCount = var2.readUnsignedShort();
+		var1.localStringCount = var2.readUnsignedShort();
+		var1.intArgumentCount = var2.readUnsignedShort();
+		var1.stringArgumentCount = var2.readUnsignedShort();
+		int var6 = var2.readUnsignedByte();
+		int var7;
+		int var8;
+		if (var6 > 0) {
+			var1.switches = var1.newIterableNodeHashTable(var6);
 
-	@ObfuscatedName("kk")
+			for (var7 = 0; var7 < var6; ++var7) {
-	@ObfuscatedSignature(
+				var8 = var2.readUnsignedShort();
-		signature = "(I)V",
+				IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? DynamicObject.method2293(var8) : 1);
-		garbageValue = "1974720745"
+				var1.switches[var7] = var9;
-	)
-	static final void method3488() {
-		PacketBufferNode var0 = class2.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
-		Client.packetWriter.addNode(var0);
 
-		for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
+				while (var8-- > 0) {
-			if (var1.type == 0 || var1.type == 3) {
+					int var10 = var2.readInt();
-				VarpDefinition.closeInterface(var1, true);
+					int var11 = var2.readInt();
+					var9.put(new IntegerNode(var11), (long)var10);
+				}
 			}
 		}
 
-		if (Client.meslayerContinueWidget != null) {
+		var2.offset = 0;
-			LoginPacket.invalidateWidget(Client.meslayerContinueWidget);
+		var2.readStringCp1252NullTerminatedOrNull();
-			Client.meslayerContinueWidget = null;
+		var1.opcodes = new int[var5];
+		var1.intOperands = new int[var5];
+		var1.stringOperands = new String[var5];
+
+		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) {
+			var8 = var2.readUnsignedShort();
+			if (var8 == 3) {
+				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+				var1.intOperands[var7] = var2.readInt();
+			} else {
+				var1.intOperands[var7] = var2.readUnsignedByte();
+			}
 		}
 
+		return var1;
 	}
 }

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

@@ -1,43 +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("fp")
+@ObfuscatedName("fv")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("d")
+	@ObfuscatedName("o")
-	public static short[][] field2066;
-	@ObfuscatedName("ev")
-	@Export("worldHost")
-	static String worldHost;
-	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -733536729
+		intValue = 54587863
+	)
+	@Export("KitDefinition_fileCount")
+	public static int KitDefinition_fileCount;
+	@ObfuscatedName("aa")
+	@ObfuscatedGetter(
+		intValue = 1510475887
 	)
 	@Export("xInset")
-	public int xInset;
+	int xInset;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("aq")
 	@ObfuscatedGetter(
-		intValue = -572637509
+		intValue = 1655019513
 	)
 	@Export("yInset")
-	public int yInset;
+	int yInset;
-	@ObfuscatedName("an")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 1390386939
+		intValue = -120946659
 	)
 	@Export("xSize")
 	int xSize;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1658785195
+		intValue = 910331901
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("az")
+	@ObfuscatedName("ac")
 	@Export("flags")
 	public int[][] flags;
 
@@ -50,10 +50,10 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-734218208"
+		garbageValue = "76"
 	)
 	@Export("clear")
 	public void clear() {
@@ -69,12 +69,12 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
+		signature = "(IIIIZI)V",
-		garbageValue = "1"
+		garbageValue = "1606080292"
 	)
-	public void method3552(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3626(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -221,10 +221,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(IIIIZI)V",
+		signature = "(IIIIZB)V",
-		garbageValue = "-629817472"
+		garbageValue = "1"
 	)
 	@Export("addGameObject")
 	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
@@ -248,10 +248,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-1485831416"
+		garbageValue = "-909320528"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
@@ -261,10 +261,10 @@ public class CollisionMap {
 		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "1736221922"
+		garbageValue = "16"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
@@ -274,10 +274,10 @@ public class CollisionMap {
 		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(IIII)V",
-		garbageValue = "677755057"
+		garbageValue = "13415555"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
@@ -285,12 +285,12 @@ public class CollisionMap {
 		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(IIIIZB)V",
+		signature = "(IIIIZI)V",
-		garbageValue = "-90"
+		garbageValue = "-127214723"
 	)
-	public void method3534(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3621(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -437,10 +437,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		signature = "(IIIIIZI)V",
-		garbageValue = "1274501460"
+		garbageValue = "1921144321"
 	)
 	@Export("setFlagOffNonSquare")
 	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
@@ -470,10 +470,10 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(IIIB)V",
-		garbageValue = "114"
+		garbageValue = "16"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
@@ -481,102 +481,70 @@ public class CollisionMap {
 		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "55211859"
+		garbageValue = "1328839290"
 	)
-	public void method3535(int var1, int var2) {
+	public void method3624(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		int[] var10000 = this.flags[var1];
 		var10000[var2] &= -262145;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
-	@Export("base37DecodeLong")
+	@ObfuscatedSignature(
-	public static String base37DecodeLong(long var0) {
+		signature = "(II)I",
-		if (var0 > 0L && var0 < 6582952005840035281L) {
+		garbageValue = "-1311825595"
-			if (var0 % 37L == 0L) {
+	)
-				return null;
+	@Export("iLog")
-			} else {
+	public static int iLog(int var0) {
-				int var2 = 0;
+		int var1 = 0;
-
+		if (var0 < 0 || var0 >= 65536) {
-				for (long var3 = var0; var3 != 0L; var3 /= 37L) {
+			var0 >>>= 16;
-					++var2;
+			var1 += 16;
-				}
-
-				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("b")
-	@ObfuscatedSignature(
-		signature = "(IS)I",
-		garbageValue = "1536"
-	)
-	public static int method3555(int var0) {
-		return class268.method5012(ViewportMouse.ViewportMouse_entityTags[var0]);
-	}
-
-	@ObfuscatedName("a")
-	@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;
-				}
-			}
 
+		if (var0 >= 256) {
+			var0 >>>= 8;
+			var1 += 8;
 		}
+
+		if (var0 >= 16) {
+			var0 >>>= 4;
+			var1 += 4;
+		}
+
+		if (var0 >= 4) {
+			var0 >>>= 2;
+			var1 += 2;
+		}
+
+		if (var0 >= 1) {
+			var0 >>>= 1;
+			++var1;
+		}
+
+		return var0 + var1;
+	}
+
+	@ObfuscatedName("fn")
+	@ObfuscatedSignature(
+		signature = "(III)V",
+		garbageValue = "-557927999"
+	)
+	static void method3650(int var0, int var1) {
+		int[] var2 = new int[9];
+
+		for (int var3 = 0; var3 < var2.length; ++var3) {
+			int var4 = var3 * 32 + 15 + 128;
+			int var5 = var4 * 3 + 600;
+			int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
+			int var6 = Canvas.method864(var5, var1);
+			var2[var3] = var7 * var6 >> 16;
+		}
+
+		Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
 	}
 }

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

@@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ht")
+@ObfuscatedName("hj")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("b")
+	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "Lhz;"
-	)
-	@Export("musicTrackArchive")
-	public static AbstractArchive musicTrackArchive;
-	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 84466269
+		intValue = 995034769
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 468184679
+		intValue = 1797414909
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -387366221
+		intValue = 1015808091
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		signature = "(Lht;)V"
+		signature = "(Lhj;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -58,20 +52,20 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "-72"
+		garbageValue = "6116423"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lht;I)Z",
+		signature = "(Lhj;I)Z",
-		garbageValue = "1703593953"
+		garbageValue = "-557558477"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
@@ -84,10 +78,10 @@ public class Coord {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "32"
+		garbageValue = "-120"
 	)
 	@Export("toString")
 	String toString(String var1) {
@@ -109,33 +103,4 @@ public class Coord {
 			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
 		}
 	}
-
-	@ObfuscatedName("f")
-	@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));
-			}
-
-			var1.postDecode();
-			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

@@ -4,28 +4,28 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dr")
+@ObfuscatedName("dj")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2103215085
+		intValue = 1591513513
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 643968559
+		intValue = -1648120479
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
 		if (var2 != var1) {
-			int var3 = class179.method3580(var1, var2);
+			int var3 = MouseHandler.method1111(var1, var2);
 			var1 /= var3;
 			var2 /= var3;
 			this.inputRate = var1;
@@ -40,7 +40,7 @@ public class Decimator {
 					var8 = 0;
 				}
 
-				int var9 = (int)Math.ceil(7.0D + var6);
+				int var9 = (int)Math.ceil(var6 + 7.0D);
 				if (var9 > 14) {
 					var9 = 14;
 				}
@@ -53,17 +53,17 @@ public class Decimator {
 					}
 
 					var14 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var8 - var6));
-					var5[var8] = (int)Math.floor(var14 * 65536.0D + 0.5D);
+					var5[var8] = (int)Math.floor(0.5D + 65536.0D * var14);
 				}
 			}
 
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "([BI)[B",
-		garbageValue = "-1964001548"
+		garbageValue = "992629690"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
@@ -80,7 +80,7 @@ public class Decimator {
 
 				int var9;
 				for (var9 = 0; var9 < 14; ++var9) {
-					var3[var9 + var4] += var8[var9] * var7;
+					var3[var9 + var4] += var7 * var8[var9];
 				}
 
 				var5 += this.outputRate;
@@ -106,31 +106,181 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "-1093845583"
+		garbageValue = "-356284580"
 	)
 	@Export("scaleRate")
 	int scaleRate(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate);
+			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate);
 		}
 
 		return var1;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IB)I",
-		garbageValue = "1063686920"
+		garbageValue = "5"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
 		if (this.table != null) {
-			var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6;
+			var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
 		}
 
 		return var1;
 	}
+
+	@ObfuscatedName("c")
+	public static final int method2600(double var0, double var2, double var4) {
+		double var6 = var4;
+		double var8 = var4;
+		double var10 = var4;
+		if (var2 != 0.0D) {
+			double var12;
+			if (var4 < 0.5D) {
+				var12 = var4 * (var2 + 1.0D);
+			} else {
+				var12 = var2 + var4 - var2 * var4;
+			}
+
+			double var14 = var4 * 2.0D - var12;
+			double var16 = 0.3333333333333333D + var0;
+			if (var16 > 1.0D) {
+				--var16;
+			}
+
+			double var20 = var0 - 0.3333333333333333D;
+			if (var20 < 0.0D) {
+				++var20;
+			}
+
+			if (var16 * 6.0D < 1.0D) {
+				var6 = var14 + 6.0D * (var12 - var14) * var16;
+			} else if (2.0D * var16 < 1.0D) {
+				var6 = var12;
+			} else if (3.0D * var16 < 2.0D) {
+				var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14;
+			} else {
+				var6 = var14;
+			}
+
+			if (var0 * 6.0D < 1.0D) {
+				var8 = var14 + 6.0D * (var12 - var14) * var0;
+			} else if (2.0D * var0 < 1.0D) {
+				var8 = var12;
+			} else if (var0 * 3.0D < 2.0D) {
+				var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D;
+			} else {
+				var8 = var14;
+			}
+
+			if (var20 * 6.0D < 1.0D) {
+				var10 = 6.0D * (var12 - var14) * var20 + var14;
+			} else if (2.0D * var20 < 1.0D) {
+				var10 = var12;
+			} else if (var20 * 3.0D < 2.0D) {
+				var10 = (0.6666666666666666D - var20) * (var12 - var14) * 6.0D + var14;
+			} else {
+				var10 = var14;
+			}
+		}
+
+		int var22 = (int)(256.0D * var6);
+		int var13 = (int)(var8 * 256.0D);
+		int var23 = (int)(256.0D * var10);
+		int var15 = var23 + (var13 << 8) + (var22 << 16);
+		return var15;
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(CI)C",
+		garbageValue = "2008041614"
+	)
+	public static char method2597(char var0) {
+		switch(var0) {
+		case ' ':
+		case '-':
+		case '_':
+		case ' ':
+			return '_';
+		case '#':
+		case '[':
+		case ']':
+			return var0;
+		case 'À':
+		case 'Á':
+		case 'Â':
+		case 'Ã':
+		case 'Ä':
+		case 'à':
+		case 'á':
+		case 'â':
+		case 'ã':
+		case 'ä':
+			return 'a';
+		case 'Ç':
+		case 'ç':
+			return 'c';
+		case 'È':
+		case 'É':
+		case 'Ê':
+		case 'Ë':
+		case 'è':
+		case 'é':
+		case 'ê':
+		case 'ë':
+			return 'e';
+		case 'Í':
+		case 'Î':
+		case 'Ï':
+		case 'í':
+		case 'î':
+		case 'ï':
+			return 'i';
+		case 'Ñ':
+		case 'ñ':
+			return 'n';
+		case 'Ò':
+		case 'Ó':
+		case 'Ô':
+		case 'Õ':
+		case 'Ö':
+		case 'ò':
+		case 'ó':
+		case 'ô':
+		case 'õ':
+		case 'ö':
+			return 'o';
+		case 'Ù':
+		case 'Ú':
+		case 'Û':
+		case 'Ü':
+		case 'ù':
+		case 'ú':
+		case 'û':
+		case 'ü':
+			return 'u';
+		case 'ß':
+			return 'b';
+		case 'ÿ':
+		case 'Ÿ':
+			return 'y';
+		default:
+			return Character.toLowerCase(var0);
+		}
+	}
+
+	@ObfuscatedName("n")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "2087967382"
+	)
+	static final boolean method2601() {
+		return ViewportMouse.ViewportMouse_isInViewport;
+	}
 }

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

@@ -1,168 +1,52 @@
-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("kz")
+@ObfuscatedName("kn")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lkz;"
+		signature = "Lkn;"
 	)
-	static final DefaultsGroup field3796;
+	static final DefaultsGroup field3793;
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
-	@Export("JagexCache_locationFile")
-	static File JagexCache_locationFile;
-	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 154892097
+		intValue = 1864717017
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3796 = new DefaultsGroup(3);
+		field3793 = new DefaultsGroup(3);
 	}
 
 	DefaultsGroup(int var1) {
 		this.group = var1;
 	}
 
-	@ObfuscatedName("ii")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Liw;IIII)V",
+		signature = "(I)Lbg;",
-		garbageValue = "-2125986282"
+		garbageValue = "310437659"
 	)
-	@Export("addNpcToMenu")
+	@Export("getNextWorldListWorld")
-	static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
+	static World getNextWorldListWorld() {
-		if (Client.menuOptionsCount < 400) {
+		return World.World_listCount < World.World_count ? class96.World_worlds[++World.World_listCount - 1] : null;
-			if (var0.transforms != null) {
+	}
-				var0 = var0.transform();
-			}
 
-			if (var0 != null) {
+	@ObfuscatedName("kz")
-				if (var0.isInteractable) {
+	@ObfuscatedSignature(
-					if (!var0.isFollower || Client.followerIndex == var1) {
+		signature = "(I)V",
-						String var4 = var0.name;
+		garbageValue = "-245092845"
-						int var7;
+	)
-						int var8;
+	static final void method5953() {
-						if (var0.combatLevel != 0) {
+		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
-							var7 = var0.combatLevel;
+			Player var1 = Client.players[Players.Players_indices[var0]];
-							var8 = Message.localPlayer.combatLevel;
+			var1.clearIsInClanChat();
-							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("fe")
+@ObfuscatedName("ek")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Llc;"
+		signature = "Llp;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lji;"
+		signature = "Ljb;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lem;"
+		signature = "Lev;"
 	)
-	class155 field1978;
+	class146 field1953;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,7 +42,7 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
@@ -73,16 +73,16 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lff;)V"
+		signature = "(Lef;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -94,7 +94,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@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.field1978 != null) {
+				if (this.field1953 != null) {
-					this.field1978.method3386(var5.get());
+					this.field1953.method3397(var5.get());
 				}
 			}
 
@@ -125,7 +125,7 @@ public final class DemotingHashTable {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@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("b")
+	@ObfuscatedName("g")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

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

@@ -1,44 +1,41 @@
-import java.io.DataInputStream;
-import java.net.URL;
-import java.util.Random;
 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("lb")
+@ObfuscatedName("la")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 2108856267
+		intValue = -2006912315
 	)
-	int field3897;
+	int field3900;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -526176171
+		intValue = 713316533
 	)
-	int field3896;
+	int field3901;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1221750841
+		intValue = 2074317301
 	)
-	int field3899;
+	int field3902;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)Llx;",
+		signature = "(I)Llv;",
-		garbageValue = "-83"
+		garbageValue = "-1317089795"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (class81.field1129.startsWith("win")) {
+		if (class160.field1998.startsWith("win")) {
 			var1 = 1;
-		} else if (class81.field1129.startsWith("mac")) {
+		} else if (class160.field1998.startsWith("mac")) {
 			var1 = 2;
-		} else if (class81.field1129.startsWith("linux")) {
+		} else if (class160.field1998.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -136,11 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6317(var5);
+		this.method6331(var5);
-		Runtime.getRuntime();
+		int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1;
-		int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
 		int var11;
-		if (this.field3897 > 3) {
+		if (this.field3900 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -154,98 +150,55 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		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, "");
+		return new PlatformInfo(var1, var24, var7, var8, this.field3900, this.field3901, this.field3902, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-1"
-	)
-	void method6317(String var1) {
-		if (var1.startsWith("1.")) {
-			this.method6316(var1);
-		} else {
-			this.method6324(var1);
-		}
-
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "50"
-	)
-	void method6316(String var1) {
-		String[] var2 = var1.split("\\.");
-
-		try {
-			this.field3897 = Integer.parseInt(var2[1]);
-			var2 = var2[2].split("_");
-			this.field3896 = Integer.parseInt(var2[0]);
-			this.field3899 = Integer.parseInt(var2[1]);
-		} catch (Exception var4) {
-		}
-
-	}
-
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1412850976"
+		garbageValue = "-1120202582"
 	)
-	void method6324(String var1) {
+	void method6331(String var1) {
+		if (var1.startsWith("1.")) {
+			this.method6323(var1);
+		} else {
+			this.method6322(var1);
+		}
+
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;B)V",
+		garbageValue = "1"
+	)
+	void method6323(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
-			this.field3897 = Integer.parseInt(var2[0]);
+			this.field3900 = Integer.parseInt(var2[1]);
-			this.field3896 = Integer.parseInt(var2[1]);
+			var2 = var2[2].split("_");
-			this.field3899 = Integer.parseInt(var2[2]);
+			this.field3901 = Integer.parseInt(var2[0]);
+			this.field3902 = Integer.parseInt(var2[1]);
 		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/Throwable;B)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "0"
+		garbageValue = "-78"
 	)
-	@Export("RunException_sendStackTrace")
+	void method6322(String var1) {
-	public static void RunException_sendStackTrace(String var0, Throwable var1) {
+		String[] var2 = var1.split("\\.");
-		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) {
-			}
 
+		try {
+			this.field3900 = Integer.parseInt(var2[0]);
+			this.field3901 = Integer.parseInt(var2[1]);
+			this.field3902 = Integer.parseInt(var2[2]);
+		} catch (Exception var4) {
 		}
+
 	}
 }

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

@@ -9,62 +9,61 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ai")
+@ObfuscatedName("ap")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 828002731
+		intValue = -1117759731
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "15"
+		garbageValue = "-111"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)(DirectByteArrayCopier.field2490 * -168449264), 16, SoundCache.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)PcmPlayer.field1398, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
-		this.byteSamples = new byte[256 << (SoundCache.PcmPlayer_stereo ? 2 : 1)];
+		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "797185937"
+		garbageValue = "-871749312"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
 		try {
-			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (SoundCache.PcmPlayer_stereo ? 2 : 1));
+			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
 			this.line = (SourceDataLine)AudioSystem.getLine(var2);
 			this.line.open();
 			this.line.start();
 			this.capacity2 = var1;
 		} catch (LineUnavailableException var5) {
-			if (ScriptFrame.method1109(var1) != 1) {
+			int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
-				int var4 = var1 - 1;
+			var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
-				var4 |= var4 >>> 1;
+			var4 = (var4 >>> 4) + var4 & 252645135;
-				var4 |= var4 >>> 2;
+			var4 += var4 >>> 8;
-				var4 |= var4 >>> 4;
+			var4 += var4 >>> 16;
-				var4 |= var4 >>> 8;
+			int var3 = var4 & 255;
-				var4 |= var4 >>> 16;
+			if (var3 != 1) {
-				int var3 = var4 + 1;
+				this.open(DynamicObject.method2293(var1));
-				this.open(var3);
 			} else {
 				this.line = null;
 				throw var5;
@@ -72,21 +71,21 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "2013132005"
+		garbageValue = "-164846701"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (SoundCache.PcmPlayer_stereo ? 2 : 1));
+		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
-		if (SoundCache.PcmPlayer_stereo) {
+		if (PcmPlayer.PcmPlayer_stereo) {
 			var1 <<= 1;
 		}
 
@@ -103,10 +102,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(I)V",
-		garbageValue = "390"
+		garbageValue = "1942741652"
 	)
 	@Export("close")
 	protected void close() {
@@ -117,10 +116,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1127195595"
+		garbageValue = "2088617942"
 	)
 	@Export("discard")
 	protected void discard() {

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

@@ -2,226 +2,41 @@ 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("ax")
+@ObfuscatedName("an")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements class97 {
+public class DevicePcmPlayerProvider implements class99 {
-	@ObfuscatedName("aq")
+	@ObfuscatedName("av")
-	static String field391;
+	@ObfuscatedSignature(
+		signature = "Llc;"
+	)
+	@Export("rasterProvider")
+	public static AbstractRasterProvider rasterProvider;
 
 	DevicePcmPlayerProvider() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)Lcw;",
+		signature = "(I)Ldw;",
-		garbageValue = "479224621"
+		garbageValue = "-1842325799"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;ZII)V",
+		signature = "(I)V",
-		garbageValue = "808644232"
+		garbageValue = "-1589308129"
 	)
-	static void method841(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
+	public static void method855() {
-		if (Login.field1173) {
+		if (KeyHandler.KeyHandler_instance != null) {
-			if (var3 == 4) {
+			synchronized(KeyHandler.KeyHandler_instance) {
-				Login.loginIndex = 4;
+				KeyHandler.KeyHandler_instance = null;
-			}
-
-		} else {
-			Login.loginIndex = var3;
-			Rasterizer2D.Rasterizer2D_clear();
-			byte[] var4 = var0.takeFileByNames("title.jpg", "");
-			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,26 +1,26 @@
 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("he")
+@ObfuscatedName("gc")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("p")
+	@ObfuscatedName("v")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 1433331089
+		signature = "Lli;"
 	)
-	public static int field2490;
+	@Export("options_buttons_2Sprite")
-	@ObfuscatedName("f")
+	static IndexedSprite options_buttons_2Sprite;
+	@ObfuscatedName("c")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)[B",
-		garbageValue = "-112018699"
+		garbageValue = "-571467457"
 	)
 	@Export("get")
 	public byte[] get() {
@@ -30,10 +30,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "([BB)V",
+		signature = "([BI)V",
-		garbageValue = "33"
+		garbageValue = "1471312739"
 	)
 	@Export("set")
 	public void set(byte[] var1) {
@@ -42,12 +42,60 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		this.directBuffer.put(var1);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lhz;B)V",
+		signature = "(IIB)V",
-		garbageValue = "7"
+		garbageValue = "19"
 	)
-	public static void method3940(AbstractArchive var0) {
+	public static void method4006(int var0, int var1) {
-		class286.EnumDefinition_archive = var0;
+		VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
+		VarbitDefinition var2;
+		if (var3 != null) {
+			var2 = var3;
+		} else {
+			byte[] var8 = class287.VarbitDefinition_archive.takeFile(14, var0);
+			var3 = new VarbitDefinition();
+			if (var8 != null) {
+				var3.decode(new Buffer(var8));
+			}
+
+			VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0);
+			var2 = var3;
+		}
+
+		int var4 = var2.baseVar;
+		int var5 = var2.startBit;
+		int var6 = var2.endBit;
+		int var7 = Varps.Varps_masks[var6 - var5];
+		if (var1 < 0 || var1 > var7) {
+			var1 = 0;
+		}
+
+		var7 <<= var5;
+		Varps.Varps_main[var4] = Varps.Varps_main[var4] & ~var7 | var1 << var5 & var7;
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "(CI)Z",
+		garbageValue = "-186978734"
+	)
+	static boolean method4004(char var0) {
+		for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) {
+			if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@ObfuscatedName("bf")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "-470893406"
+	)
+	public static int method4012(String var0) {
+		return var0.length() + 2;
 	}
 }

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

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

@@ -3,26 +3,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gw")
+@ObfuscatedName("fa")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cu")
+	@ObfuscatedName("ce")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cg")
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		signature = "Lgw;"
+		signature = "Lfa;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cq")
 	@ObfuscatedSignature(
-		signature = "Lgw;"
+		signature = "Lfa;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cz")
+	@ObfuscatedName("ca")
 	@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("in")
+@ObfuscatedName("jq")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lgw;"
+		signature = "Lfa;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lgw;)V"
+		signature = "(Lfa;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lgw;)V"
+		signature = "(Lfa;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "()Lgw;"
+		signature = "()Lfa;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -4,66 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cg")
+@ObfuscatedName("cw")
 @Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("f")
+	@ObfuscatedName("bw")
+	@ObfuscatedSignature(
+		signature = "[Lli;"
+	)
+	@Export("worldSelectStars")
+	static IndexedSprite[] worldSelectStars;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -95317183
+		intValue = 1669181917
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1520992013
+		intValue = -433017079
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1128540715
+		intValue = -857154587
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1824445575
+		intValue = 1092550967
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1187953645
+		intValue = -660680399
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -589129473
+		intValue = 74739559
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Liv;"
+		signature = "Lip;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 1848001731
+		intValue = -1110728841
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 22641631
+		intValue = -1571006873
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLep;)V"
+		signature = "(IIIIIIIZLeq;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -73,10 +79,10 @@ public class DynamicObject extends Entity {
 		this.x = var5;
 		this.y = var6;
 		if (var7 != -1) {
-			this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var7);
+			this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var7);
 			this.frame = 0;
 			this.cycleStart = Client.cycle - 1;
-			if (this.sequenceDefinition.field3495 == 0 && var9 != null && var9 instanceof DynamicObject) {
+			if (this.sequenceDefinition.field3516 == 0 && var9 != null && var9 instanceof DynamicObject) {
 				DynamicObject var10 = (DynamicObject)var9;
 				if (this.sequenceDefinition == var10.sequenceDefinition) {
 					this.frame = var10.frame;
@@ -93,10 +99,10 @@ public class DynamicObject extends Entity {
 
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)Ldw;",
+		signature = "(I)Ldx;",
-		garbageValue = "822221372"
+		garbageValue = "-2133076860"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -106,11 +112,11 @@ public class DynamicObject extends Entity {
 				var1 = 100;
 			}
 
-			label56: {
+			label57: {
 				do {
 					do {
 						if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-							break label56;
+							break label57;
 						}
 
 						var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -126,7 +132,7 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectDefinition var12 = Coord.getObjectDefinition(this.id);
+		ObjectDefinition var12 = Occluder.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
@@ -149,76 +155,74 @@ 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[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2;
+			int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
 			int var10 = (this.x << 7) + (var2 << 6);
 			int var11 = (this.y << 7) + (var3 << 6);
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
 		}
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([Lgz;II)Lgz;",
+		signature = "(IB)I",
-		garbageValue = "2071189465"
+		garbageValue = "2"
 	)
-	@Export("findEnumerated")
+	public static int method2293(int var0) {
-	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
+		--var0;
-		Enumerated[] var2 = var0;
+		var0 |= var0 >>> 1;
-
+		var0 |= var0 >>> 2;
-		for (int var3 = 0; var3 < var2.length; ++var3) {
+		var0 |= var0 >>> 4;
-			Enumerated var4 = var2[var3];
+		var0 |= var0 >>> 8;
-			if (var1 == var4.rsOrdinal()) {
+		var0 |= var0 >>> 16;
-				return var4;
+		return var0 + 1;
-			}
-		}
-
-		return null;
 	}
 
-	@ObfuscatedName("jr")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "([Lha;II)V",
+		signature = "(Lkp;J)V"
-		garbageValue = "-794395559"
 	)
-	@Export("runComponentCloseListeners")
+	static void method2291(Buffer var0, long var1) {
-	static final void runComponentCloseListeners(Widget[] var0, int var1) {
+		var1 /= 10L;
-		for (int var2 = 0; var2 < var0.length; ++var2) {
+		if (var1 < 0L) {
-			Widget var3 = var0[var2];
+			var1 = 0L;
-			if (var3 != null) {
+		} else if (var1 > 65535L) {
-				if (var3.type == 0) {
+			var1 = 65535L;
-					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;
-						}
-					}
-
-					var5 = new ScriptEvent();
-					var5.widget = var3;
-					var5.args = var3.onSubChange;
-					Client.runScriptEvent(var5);
-				}
-			}
 		}
 
+		var0.writeShort((int)var1);
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-1735804307"
+	)
+	public static void method2292() {
+		Huffman.SpriteBuffer_xOffsets = null;
+		NPC.SpriteBuffer_yOffsets = null;
+		class326.SpriteBuffer_spriteWidths = null;
+		class326.SpriteBuffer_spriteHeights = null;
+		class326.SpriteBuffer_spritePalette = null;
+		class326.SpriteBuffer_pixels = null;
+	}
+
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		signature = "(IIB)I",
+		garbageValue = "-75"
+	)
+	static final int method2286(int var0, int var1) {
+		if (var0 == -1) {
+			return 12345678;
+		} else {
+			var1 = (var0 & 127) * var1 / 128;
+			if (var1 < 2) {
+				var1 = 2;
+			} else if (var1 > 126) {
+				var1 = 126;
+			}
+
+			return (var0 & 65408) + var1;
+		}
 	}
 }

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

@@ -4,12 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ep")
+@ObfuscatedName("eq")
 @Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("ce")
+	@ObfuscatedName("nj")
+	@ObfuscatedSignature(
+		signature = "[Lhn;"
+	)
+	static Widget[] field1866;
+	@ObfuscatedName("gj")
+	@ObfuscatedSignature(
+		signature = "Llt;"
+	)
+	@Export("compass")
+	static Sprite compass;
+	@ObfuscatedName("cy")
 	@ObfuscatedGetter(
-		intValue = -294742571
+		intValue = -384609857
 	)
 	@Export("height")
 	public int height;
@@ -18,17 +29,17 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)Ldw;",
+		signature = "(I)Ldx;",
-		garbageValue = "822221372"
+		garbageValue = "-2133076860"
 	)
 	@Export("getModel")
 	protected Model getModel() {
 		return null;
 	}
 
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cn")
 	@Export("draw")
 	void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
 		Model var11 = this.getModel();
@@ -38,4 +49,22 @@ public abstract class Entity extends DualNode {
 		}
 
 	}
+
+	@ObfuscatedName("fr")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "-553494705"
+	)
+	static final void method3332() {
+		int var0 = Players.Players_count;
+		int[] var1 = Players.Players_indices;
+
+		for (int var2 = 0; var2 < var0; ++var2) {
+			Player var3 = Client.players[var1[var2]];
+			if (var3 != null) {
+				ScriptFrame.updateActorSequence(var3, 1);
+			}
+		}
+
+	}
 }

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

@@ -4,43 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ik")
+@ObfuscatedName("iw")
 @Implements("EnumDefinition")
 public class EnumDefinition extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1935496033
+		intValue = 763609869
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 2015380105
+		intValue = 1620263743
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -53,10 +53,10 @@ public class EnumDefinition extends DualNode {
 		this.outputCount = 0;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkq;I)V",
+		signature = "(Lkp;I)V",
-		garbageValue = "-1351538350"
+		garbageValue = "-1295672156"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -70,10 +70,10 @@ public class EnumDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkq;II)V",
+		signature = "(Lkp;II)V",
-		garbageValue = "789591005"
+		garbageValue = "1239403484"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -110,13 +110,61 @@ public class EnumDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1025007031"
+		garbageValue = "-1222306007"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount;
 	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "(II)Les;",
+		garbageValue = "-1471944994"
+	)
+	@Export("getFrames")
+	static Frames getFrames(int var0) {
+		Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			AbstractArchive var3 = Canvas.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;
+		}
+	}
 }

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("gz")
+@ObfuscatedName("gq")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-57"
+		garbageValue = "1"
 	)
 	@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("eb")
+@ObfuscatedName("eh")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lgw;"
+		signature = "Lfa;"
 	)
-	DualNode field1974;
+	DualNode field1950;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Llc;"
+		signature = "Llp;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lji;"
+		signature = "Ljb;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field1974 = new DualNode();
+		this.field1950 = 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("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(J)Lgw;"
+		signature = "(J)Lfa;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lgw;J)V"
+		signature = "(Lfa;J)V"
 	)
 	@Export("put")
 	public void put(DualNode var1, long var2) {
@@ -79,7 +79,7 @@ public final class EvictingDualNodeHashTable {
 			DualNode var4 = this.deque.removeLast();
 			var4.remove();
 			var4.removeDual();
-			if (var4 == this.field1974) {
+			if (var4 == this.field1950) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1974 = new DualNode();
+		this.field1950 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

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

@@ -2,29 +2,96 @@ 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("es")
+@ObfuscatedName("et")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 2144913037
+		intValue = 1677646269
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2071532839
+		intValue = 531566341
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1947716121
+		intValue = 1439819501
 	)
 	@Export("z")
 	int z;
 
 	FaceNormal() {
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(Lii;Lii;III)Lko;",
+		garbageValue = "1973799897"
+	)
+	public static Font method3335(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+		if (!class228.method4199(var0, var2, var3)) {
+			return null;
+		} else {
+			byte[] var5 = var1.takeFile(var2, var3);
+			Font var4;
+			if (var5 == null) {
+				var4 = null;
+			} else {
+				Font var6 = new Font(var5, Huffman.SpriteBuffer_xOffsets, NPC.SpriteBuffer_yOffsets, class326.SpriteBuffer_spriteWidths, class326.SpriteBuffer_spriteHeights, class326.SpriteBuffer_spritePalette, class326.SpriteBuffer_pixels);
+				DynamicObject.method2292();
+				var4 = var6;
+			}
+
+			return var4;
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "2042389443"
+	)
+	public static boolean method3334() {
+		ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last();
+		return var0 != null;
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Lii;Ljava/lang/String;Ljava/lang/String;I)[Lli;",
+		garbageValue = "326479912"
+	)
+	public static IndexedSprite[] method3336(AbstractArchive var0, String var1, String var2) {
+		int var3 = var0.getGroupId(var1);
+		int var4 = var0.getFileId(var3, var2);
+		IndexedSprite[] var5;
+		if (!class228.method4199(var0, var3, var4)) {
+			var5 = null;
+		} else {
+			IndexedSprite[] var7 = new IndexedSprite[class326.SpriteBuffer_spriteCount];
+
+			for (int var8 = 0; var8 < class326.SpriteBuffer_spriteCount; ++var8) {
+				IndexedSprite var9 = var7[var8] = new IndexedSprite();
+				var9.width = GZipDecompressor.SpriteBuffer_spriteWidth;
+				var9.height = class326.SpriteBuffer_spriteHeight;
+				var9.xOffset = Huffman.SpriteBuffer_xOffsets[var8];
+				var9.yOffset = NPC.SpriteBuffer_yOffsets[var8];
+				var9.subWidth = class326.SpriteBuffer_spriteWidths[var8];
+				var9.subHeight = class326.SpriteBuffer_spriteHeights[var8];
+				var9.palette = class326.SpriteBuffer_spritePalette;
+				var9.pixels = class326.SpriteBuffer_pixels[var8];
+			}
+
+			DynamicObject.method2292();
+			var5 = var7;
+		}
+
+		return var5;
+	}
 }

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

@@ -1,20 +1,43 @@
+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("fg")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("f")
+	@ObfuscatedName("pk")
+	@Export("ClanChat_inClanChat")
+	static boolean ClanChat_inClanChat;
+	@ObfuscatedName("c")
 	@Export("FileSystem_hasPermissions")
 	static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("y")
+	@ObfuscatedName("t")
+	@Export("FileSystem_cacheDir")
+	static File FileSystem_cacheDir;
+	@ObfuscatedName("o")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		signature = "Lgk;"
+	)
+	@Export("musicTrack")
+	public static MusicTrack musicTrack;
 
 	static {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(III)Z",
+		garbageValue = "-1674158829"
+	)
+	static boolean method3572(int var0, int var1) {
+		return var0 != 4 || var1 < 8;
+	}
 }

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

@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lg")
+@ObfuscatedName("lf")
 @Implements("FillMode")
 public enum FillMode implements Enumerated {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Llf;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Llf;"
 	)
-	field3850(1, 1),
+	field3858(1, 1),
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Llg;"
+		signature = "Llf;"
 	)
-	field3853(2, 2);
+	field3854(2, 2);
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1693216809
+		intValue = -999027833
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -19931109
+		intValue = 2109460743
 	)
 	@Export("id")
 	final int id;
@@ -42,22 +42,13 @@ public enum FillMode implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-57"
+		garbageValue = "1"
 	)
 	@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,49 +7,99 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("du")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("ds")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lif;"
+		signature = "Lli;"
 	)
-	@Export("archive4")
+	@Export("logoSprite")
-	static Archive archive4;
+	static IndexedSprite logoSprite;
-	@ObfuscatedName("f")
+	@ObfuscatedName("ja")
+	@ObfuscatedSignature(
+		signature = "Lhn;"
+	)
+	static Widget field1604;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -813492053
+		intValue = -340818917
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -508707057
+		intValue = 2029727385
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1453565009
+		intValue = -588436191
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Leq;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = 5434856025712210831L
+		longValue = -1449564120774695343L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1187671267
+		intValue = -1732648277
 	)
 	@Export("flags")
 	int flags;
 
 	FloorDecoration() {
 	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(Llp;ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "1267809906"
+	)
+	static String method2914(IterableNodeHashTable var0, int var1, String var2) {
+		if (var0 == null) {
+			return var2;
+		} else {
+			ObjectNode var3 = (ObjectNode)var0.get((long)var1);
+			return var3 == null ? var2 : (String)var3.obj;
+		}
+	}
+
+	@ObfuscatedName("o")
+	@ObfuscatedSignature(
+		signature = "(IIIIIIB)I",
+		garbageValue = "94"
+	)
+	public static int method2913(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 var0;
+		} else if (var2 == 1) {
+			return var1;
+		} else {
+			return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1);
+		}
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-2102248580"
+	)
+	static final void method2912(String var0) {
+		class60.method1188("Please remove " + var0 + " from your friend list first");
+	}
 }

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

@@ -4,75 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ib")
+@ObfuscatedName("ig")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
 	@Export("FloorOverlayDefinition_archive")
-	static AbstractArchive FloorOverlayDefinition_archive;
+	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 946777937
+		intValue = 935951655
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -554828149
+		intValue = 1095526673
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1736494727
+		intValue = -1729092423
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 2036887063
+		intValue = -29355705
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 636469013
+		intValue = -1250783645
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 2078445359
+		intValue = -1922537883
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -906220363
+		intValue = 291644117
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -484926363
+		intValue = 1538627711
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -234627479
+		intValue = 1197825263
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -88,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-50"
+		garbageValue = "342799854"
 	)
 	@Export("postDecode")
 	void postDecode() {
@@ -105,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkq;IB)V",
+		signature = "(Lkp;IB)V",
-		garbageValue = "-31"
+		garbageValue = "-45"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Lkq;IIB)V",
+		signature = "(Lkp;IIB)V",
-		garbageValue = "1"
+		garbageValue = "16"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "49"
+		garbageValue = "-1731410531"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -172,10 +172,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 		double var12 = 0.0D;
 		double var14 = 0.0D;
-		double var16 = (var8 + var10) / 2.0D;
+		double var16 = (var10 + var8) / 2.0D;
 		if (var8 != var10) {
 			if (var16 < 0.5D) {
-				var14 = (var10 - var8) / (var10 + var8);
+				var14 = (var10 - var8) / (var8 + var10);
 			}
 
 			if (var16 >= 0.5D) {
@@ -185,9 +185,9 @@ public class FloorOverlayDefinition extends DualNode {
 			if (var2 == var10) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var10 == var4) {
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
 			} else if (var6 == var10) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
+				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
@@ -209,59 +209,643 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("iy")
 	@ObfuscatedSignature(
-		signature = "(CLgs;B)I",
+		signature = "([Lhn;IIIIIIIIB)V",
-		garbageValue = "-103"
+		garbageValue = "40"
 	)
-	@Export("lowercaseChar")
+	@Export("drawInterface")
-	static int lowercaseChar(char var0, Language var1) {
+	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		int var2 = var0 << 4;
+		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-		if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
+		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
-			var0 = Character.toLowerCase(var0);
-			var2 = (var0 << 4) + 1;
-		}
 
-		if (var0 == 241 && var1 == Language.Language_ES) {
+		for (int var9 = 0; var9 < var0.length; ++var9) {
-			var2 = 1762;
+			Widget var10 = var0[var9];
-		}
+			if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
-
+				int var11;
-		return var2;
+				if (var8 == -1) {
-	}
+					Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
-
+					Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y;
-	@ObfuscatedName("ji")
+					Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width;
-	@ObfuscatedSignature(
+					Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height;
-		signature = "([Lha;IIIZB)V",
+					var11 = ++Client.rootWidgetCount - 1;
-		garbageValue = "48"
+				} else {
-	)
+					var11 = var8;
-	@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) {
+				var10.rootIndex = var11;
-					var6.scrollX = 0;
+				var10.cycle = Client.cycle;
-				}
+				if (!var10.isIf3 || !VarcInt.isComponentHidden(var10)) {
+					if (var10.contentType > 0) {
+						GrandExchangeEvent.method93(var10);
+					}
 
-				if (var6.scrollY > var6.scrollHeight - var6.height) {
+					int var12 = var10.x + var6;
-					var6.scrollY = var6.scrollHeight - var6.height;
+					int var13 = var7 + var10.y;
-				}
+					int var14 = var10.transparencyTop;
+					int var15;
+					int var16;
+					if (var10 == Client.clickedWidget) {
+						if (var1 != -1412584499 && !var10.isScrollBar) {
+							Entity.field1866 = var0;
+							WorldMapIcon_0.field142 = var6;
+							UserComparator9.field1965 = var7;
+							continue;
+						}
 
-				if (var6.scrollY < 0) {
+						if (Client.isDraggingWidget && Client.field824) {
-					var6.scrollY = 0;
+							var15 = MouseHandler.MouseHandler_x;
-				}
+							var16 = MouseHandler.MouseHandler_y;
+							var15 -= Client.widgetClickX;
+							var16 -= Client.widgetClickY;
+							if (var15 < Client.field919) {
+								var15 = Client.field919;
+							}
 
-				if (var6.type == 0) {
+							if (var15 + var10.width > Client.field919 + Client.clickedWidgetParent.width) {
-					Messages.revalidateWidgetScroll(var0, var6, var4);
+								var15 = Client.field919 + Client.clickedWidgetParent.width - var10.width;
+							}
+
+							if (var16 < Client.field826) {
+								var16 = Client.field826;
+							}
+
+							if (var16 + var10.height > Client.field826 + Client.clickedWidgetParent.height) {
+								var16 = Client.field826 + Client.clickedWidgetParent.height - var10.height;
+							}
+
+							var12 = var15;
+							var13 = var16;
+						}
+
+						if (!var10.isScrollBar) {
+							var14 = 128;
+						}
+					}
+
+					int var17;
+					int var18;
+					int var20;
+					int var21;
+					int var22;
+					int var30;
+					if (var10.type == 2) {
+						var15 = var2;
+						var16 = var3;
+						var17 = var4;
+						var18 = var5;
+					} else if (var10.type == 9) {
+						var30 = var12;
+						var20 = var13;
+						var21 = var12 + var10.width;
+						var22 = var13 + var10.height;
+						if (var21 < var12) {
+							var30 = var21;
+							var21 = var12;
+						}
+
+						if (var22 < var13) {
+							var20 = var22;
+							var22 = var13;
+						}
+
+						++var21;
+						++var22;
+						var15 = var30 > var2 ? var30 : var2;
+						var16 = var20 > var3 ? var20 : var3;
+						var17 = var21 < var4 ? var21 : var4;
+						var18 = var22 < var5 ? var22 : var5;
+					} else {
+						var30 = var12 + var10.width;
+						var20 = var13 + var10.height;
+						var15 = var12 > var2 ? var12 : var2;
+						var16 = var13 > var3 ? var13 : var3;
+						var17 = var30 < var4 ? var30 : var4;
+						var18 = var20 < var5 ? var20 : var5;
+					}
+
+					if (!var10.isIf3 || var15 < var17 && var16 < var18) {
+						if (var10.contentType != 0) {
+							if (var10.contentType == 1336) {
+								if (Client.displayFps) {
+									var13 += 15;
+									class13.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
+									var13 += 15;
+									Runtime var38 = Runtime.getRuntime();
+									var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L);
+									var21 = 16776960;
+									if (var20 > 327680 && !Client.isLowDetail) {
+										var21 = 16711680;
+									}
+
+									class13.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
+									var13 += 15;
+								}
+								continue;
+							}
+
+							if (var10.contentType == 1337) {
+								Client.viewportX = var12;
+								Client.viewportY = var13;
+								WorldMapSection1.drawEntities(var12, var13, var10.width, var10.height);
+								Client.field851[var10.rootIndex] = true;
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+								continue;
+							}
+
+							if (var10.contentType == 1338) {
+								WorldMapRegion.drawMinimap(var10, var12, var13, var11);
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+								continue;
+							}
+
+							if (var10.contentType == 1339) {
+								UserComparator8.drawCompass(var10, var12, var13, var11);
+								Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+								continue;
+							}
+
+							if (var10.contentType == 1400) {
+								WorldMapIcon_0.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle);
+							}
+
+							if (var10.contentType == 1401) {
+								WorldMapIcon_0.worldMap.drawOverview(var12, var13, var10.width, var10.height);
+							}
+
+							if (var10.contentType == 1402) {
+								WorldMapLabelSize.loginScreenRunesAnimation.draw(var12, Client.cycle);
+							}
+						}
+
+						if (var10.type == 0) {
+							if (!var10.isIf3 && VarcInt.isComponentHidden(var10) && var10 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1) {
+								continue;
+							}
+
+							if (!var10.isIf3) {
+								if (var10.scrollY > var10.scrollHeight - var10.height) {
+									var10.scrollY = var10.scrollHeight - var10.height;
+								}
+
+								if (var10.scrollY < 0) {
+									var10.scrollY = 0;
+								}
+							}
+
+							drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+							if (var10.children != null) {
+								drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+							}
+
+							InterfaceParent var19 = (InterfaceParent)Client.interfaceParents.get((long)var10.id);
+							if (var19 != null) {
+								ServerPacket.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11);
+							}
+
+							Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+							Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+						}
+
+						if (Client.isResizable || Client.field853[var11] || Client.gameDrawingMode > 1) {
+							if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
+								WorldMapRectangle.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+							}
+
+							if (var10.type != 1) {
+								int var23;
+								int var24;
+								int var25;
+								int var26;
+								if (var10.type == 2) {
+									var30 = 0;
+
+									for (var20 = 0; var20 < var10.rawHeight; ++var20) {
+										for (var21 = 0; var21 < var10.rawWidth; ++var21) {
+											var22 = var21 * (var10.paddingX + 32) + var12;
+											var23 = var20 * (var10.paddingY + 32) + var13;
+											if (var30 < 20) {
+												var22 += var10.inventoryXOffsets[var30];
+												var23 += var10.inventoryYOffsets[var30];
+											}
+
+											if (var10.itemIds[var30] <= 0) {
+												if (var10.inventorySprites != null && var30 < 20) {
+													Sprite var46 = var10.getInventorySprite(var30);
+													if (var46 != null) {
+														var46.drawTransBgAt(var22, var23);
+													} else if (Widget.field2697) {
+														NPCDefinition.invalidateWidget(var10);
+													}
+												}
+											} else {
+												boolean var39 = false;
+												boolean var40 = false;
+												var26 = var10.itemIds[var30] - 1;
+												if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == class185.dragInventoryWidget && var30 == Client.dragItemSlotSource) {
+													Sprite var35;
+													if (Client.isItemSelected == 1 && var30 == class65.selectedItemSlot && var10.id == FriendSystem.selectedItemWidget) {
+														var35 = AttackOption.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false);
+													} else {
+														var35 = AttackOption.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false);
+													}
+
+													if (var35 != null) {
+														if (var10 == class185.dragInventoryWidget && var30 == Client.dragItemSlotSource) {
+															var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX;
+															var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY;
+															if (var24 < 5 && var24 > -5) {
+																var24 = 0;
+															}
+
+															if (var25 < 5 && var25 > -5) {
+																var25 = 0;
+															}
+
+															if (Client.itemDragDuration < 5) {
+																var24 = 0;
+																var25 = 0;
+															}
+
+															var35.drawTransAt(var22 + var24, var25 + var23, 128);
+															if (var1 != -1) {
+																Widget var28 = var0[var1 & 65535];
+																int var29;
+																if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
+																	var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field707 / 3;
+																	if (var29 > Client.field707 * 10) {
+																		var29 = Client.field707 * 10;
+																	}
+
+																	if (var29 > var28.scrollY) {
+																		var29 = var28.scrollY;
+																	}
+
+																	var28.scrollY -= var29;
+																	Client.draggedWidgetY += var29;
+																	NPCDefinition.invalidateWidget(var28);
+																}
+
+																if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
+																	var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field707 / 3;
+																	if (var29 > Client.field707 * 10) {
+																		var29 = Client.field707 * 10;
+																	}
+
+																	if (var29 > var28.scrollHeight - var28.height - var28.scrollY) {
+																		var29 = var28.scrollHeight - var28.height - var28.scrollY;
+																	}
+
+																	var28.scrollY += var29;
+																	Client.draggedWidgetY -= var29;
+																	NPCDefinition.invalidateWidget(var28);
+																}
+															}
+														} else if (var10 == Skeleton.field1793 && var30 == Client.field752) {
+															var35.drawTransAt(var22, var23, 128);
+														} else {
+															var35.drawTransBgAt(var22, var23);
+														}
+													} else {
+														NPCDefinition.invalidateWidget(var10);
+													}
+												}
+											}
+
+											++var30;
+										}
+									}
+								} else if (var10.type == 3) {
+									if (ScriptFrame.runCs1(var10)) {
+										var30 = var10.color2;
+										if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+											var30 = var10.mouseOverColor2;
+										}
+									} else {
+										var30 = var10.color;
+										if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+											var30 = var10.mouseOverColor;
+										}
+									}
+
+									if (var10.fill) {
+										switch(var10.fillMode.value) {
+										case 1:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
+											break;
+										case 2:
+											Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255));
+											break;
+										default:
+											if (var14 == 0) {
+												Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30);
+											} else {
+												Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+											}
+										}
+									} else if (var14 == 0) {
+										Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30);
+									} else {
+										Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+									}
+								} else {
+									Font var36;
+									if (var10.type == 4) {
+										var36 = var10.getFont();
+										if (var36 == null) {
+											if (Widget.field2697) {
+												NPCDefinition.invalidateWidget(var10);
+											}
+										} else {
+											String var43 = var10.text;
+											if (ScriptFrame.runCs1(var10)) {
+												var20 = var10.color2;
+												if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+													var20 = var10.mouseOverColor2;
+												}
+
+												if (var10.text2.length() > 0) {
+													var43 = var10.text2;
+												}
+											} else {
+												var20 = var10.color;
+												if (var10 == GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+													var20 = var10.mouseOverColor;
+												}
+											}
+
+											if (var10.isIf3 && var10.itemId != -1) {
+												ItemDefinition var47 = HealthBarDefinition.ItemDefinition_get(var10.itemId);
+												var43 = var47.name;
+												if (var43 == null) {
+													var43 = "null";
+												}
+
+												if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
+													var43 = PacketWriter.colorStartTag(16748608) + var43 + "</col>" + " " + 'x' + WorldMapCacheName.formatItemStacks(var10.itemQuantity);
+												}
+											}
+
+											if (var10 == Client.meslayerContinueWidget) {
+												var43 = "Please wait...";
+												var20 = var10.color;
+											}
+
+											if (!var10.isIf3) {
+												var43 = MouseHandler.method1096(var43, var10);
+											}
+
+											var36.drawLines(var43, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
+										}
+									} else if (var10.type == 5) {
+										Sprite var37;
+										if (!var10.isIf3) {
+											var37 = var10.getSprite(ScriptFrame.runCs1(var10));
+											if (var37 != null) {
+												var37.drawTransBgAt(var12, var13);
+											} else if (Widget.field2697) {
+												NPCDefinition.invalidateWidget(var10);
+											}
+										} else {
+											if (var10.itemId != -1) {
+												var37 = AttackOption.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
+											} else {
+												var37 = var10.getSprite(false);
+											}
+
+											if (var37 == null) {
+												if (Widget.field2697) {
+													NPCDefinition.invalidateWidget(var10);
+												}
+											} else {
+												var20 = var37.width;
+												var21 = var37.height;
+												if (!var10.spriteTiling) {
+													var22 = var10.width * 4096 / var20;
+													if (var10.spriteAngle != 0) {
+														var37.method6210(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
+													} else if (var14 != 0) {
+														var37.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+													} else if (var20 == var10.width && var21 == var10.height) {
+														var37.drawTransBgAt(var12, var13);
+													} else {
+														var37.drawScaledAt(var12, var13, var10.width, var10.height);
+													}
+												} else {
+													Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
+													var22 = (var20 - 1 + var10.width) / var20;
+													var23 = (var21 - 1 + var10.height) / var21;
+
+													for (var24 = 0; var24 < var22; ++var24) {
+														for (var25 = 0; var25 < var23; ++var25) {
+															if (var10.spriteAngle != 0) {
+																var37.method6210(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
+															} else if (var14 != 0) {
+																var37.drawTransAt(var12 + var24 * var20, var13 + var21 * var25, 256 - (var14 & 255));
+															} else {
+																var37.drawTransBgAt(var12 + var24 * var20, var13 + var25 * var21);
+															}
+														}
+													}
+
+													Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+												}
+											}
+										}
+									} else {
+										ItemDefinition var32;
+										if (var10.type == 6) {
+											boolean var44 = ScriptFrame.runCs1(var10);
+											if (var44) {
+												var20 = var10.sequenceId2;
+											} else {
+												var20 = var10.sequenceId;
+											}
+
+											Model var41 = null;
+											var22 = 0;
+											if (var10.itemId != -1) {
+												var32 = HealthBarDefinition.ItemDefinition_get(var10.itemId);
+												if (var32 != null) {
+													var32 = var32.getCountObj(var10.itemQuantity);
+													var41 = var32.getModel(1);
+													if (var41 != null) {
+														var41.calculateBoundsCylinder();
+														var22 = var41.height / 2;
+													} else {
+														NPCDefinition.invalidateWidget(var10);
+													}
+												}
+											} else if (var10.modelType == 5) {
+												if (var10.modelId == 0) {
+													var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+												} else {
+													var41 = class192.localPlayer.getModel();
+												}
+											} else if (var20 == -1) {
+												var41 = var10.getModel((SequenceDefinition)null, -1, var44, class192.localPlayer.appearance);
+												if (var41 == null && Widget.field2697) {
+													NPCDefinition.invalidateWidget(var10);
+												}
+											} else {
+												SequenceDefinition var45 = GraphicsDefaults.SequenceDefinition_get(var20);
+												var41 = var10.getModel(var45, var10.modelFrame, var44, class192.localPlayer.appearance);
+												if (var41 == null && Widget.field2697) {
+													NPCDefinition.invalidateWidget(var10);
+												}
+											}
+
+											Rasterizer3D.method3101(var10.width / 2 + var12, var10.height / 2 + var13);
+											var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
+											var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
+											if (var41 != null) {
+												if (!var10.isIf3) {
+													var41.method2946(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+												} else {
+													var41.calculateBoundsCylinder();
+													if (var10.modelOrthog) {
+														var41.method2938(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+													} else {
+														var41.method2946(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY);
+													}
+												}
+											}
+
+											Rasterizer3D.Rasterizer3D_method3();
+										} else {
+											if (var10.type == 7) {
+												var36 = var10.getFont();
+												if (var36 == null) {
+													if (Widget.field2697) {
+														NPCDefinition.invalidateWidget(var10);
+													}
+													continue;
+												}
+
+												var20 = 0;
+
+												for (var21 = 0; var21 < var10.rawHeight; ++var21) {
+													for (var22 = 0; var22 < var10.rawWidth; ++var22) {
+														if (var10.itemIds[var20] > 0) {
+															var32 = HealthBarDefinition.ItemDefinition_get(var10.itemIds[var20] - 1);
+															String var34;
+															if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) {
+																var34 = PacketWriter.colorStartTag(16748608) + var32.name + "</col>";
+															} else {
+																var34 = PacketWriter.colorStartTag(16748608) + var32.name + "</col>" + " " + 'x' + WorldMapCacheName.formatItemStacks(var10.itemQuantities[var20]);
+															}
+
+															var25 = var12 + var22 * (var10.paddingX + 115);
+															var26 = (var10.paddingY + 12) * var21 + var13;
+															if (var10.textXAlignment == 0) {
+																var36.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else if (var10.textXAlignment == 1) {
+																var36.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
+															} else {
+																var36.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1);
+															}
+														}
+
+														++var20;
+													}
+												}
+											}
+
+											if (var10.type == 8 && var10 == VarbitDefinition.field3296 && Client.field796 == Client.field797) {
+												var30 = 0;
+												var20 = 0;
+												Font var31 = class13.fontPlain12;
+												String var33 = var10.text;
+
+												String var42;
+												for (var33 = MouseHandler.method1096(var33, var10); var33.length() > 0; var20 = var20 + var31.ascent + 1) {
+													var24 = var33.indexOf("<br>");
+													if (var24 != -1) {
+														var42 = var33.substring(0, var24);
+														var33 = var33.substring(var24 + 4);
+													} else {
+														var42 = var33;
+														var33 = "";
+													}
+
+													var25 = var31.stringWidth(var42);
+													if (var25 > var30) {
+														var30 = var25;
+													}
+												}
+
+												var30 += 6;
+												var20 += 7;
+												var24 = var12 + var10.width - 5 - var30;
+												var25 = var13 + var10.height + 5;
+												if (var24 < var12 + 5) {
+													var24 = var12 + 5;
+												}
+
+												if (var24 + var30 > var4) {
+													var24 = var4 - var30;
+												}
+
+												if (var20 + var25 > var5) {
+													var25 = var5 - var20;
+												}
+
+												Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120);
+												Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0);
+												var33 = var10.text;
+												var26 = var25 + var31.ascent + 2;
+
+												for (var33 = MouseHandler.method1096(var33, var10); var33.length() > 0; var26 = var26 + var31.ascent + 1) {
+													int var27 = var33.indexOf("<br>");
+													if (var27 != -1) {
+														var42 = var33.substring(0, var27);
+														var33 = var33.substring(var27 + 4);
+													} else {
+														var42 = var33;
+														var33 = "";
+													}
+
+													var31.draw(var42, var24 + 3, var26, 0, -1);
+												}
+											}
+
+											if (var10.type == 9) {
+												if (var10.field2606) {
+													var30 = var12;
+													var20 = var13 + var10.height;
+													var21 = var12 + var10.width;
+													var22 = var13;
+												} else {
+													var30 = var12;
+													var20 = var13;
+													var21 = var12 + var10.width;
+													var22 = var13 + var10.height;
+												}
+
+												if (var10.lineWid == 1) {
+													Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color);
+												} else {
+													GrandExchangeOfferWorldComparator.method74(var30, var20, var21, var22, var10.color, var10.lineWid);
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
 				}
 			}
 		}
 
 	}
+
+	@ObfuscatedName("kx")
+	@ObfuscatedSignature(
+		signature = "(I)Z",
+		garbageValue = "-825352084"
+	)
+	public static boolean method4835() {
+		return Client.staffModLevel >= 2;
+	}
 }

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("iy")
+@ObfuscatedName("ix")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
 	static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1172468213
+		intValue = 324274119
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1800958439
+		intValue = 38778911
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -217803579
+		intValue = -974835439
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 1888954087
+		intValue = 1002192481
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1484017615
+		intValue = 1556624477
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -58,20 +58,20 @@ public class FloorUnderlayDefinition extends DualNode {
 		this.rgb = 0;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "47336247"
+		garbageValue = "-667447338"
 	)
 	@Export("postDecode")
 	void postDecode() {
 		this.setHsl(this.rgb);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(Lkq;II)V",
+		signature = "(Lkp;IB)V",
-		garbageValue = "790135935"
+		garbageValue = "34"
 	)
 	@Export("decode")
 	void decode(Buffer var1, int var2) {
@@ -85,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkq;III)V",
+		signature = "(Lkp;IIB)V",
-		garbageValue = "-1066801871"
+		garbageValue = "-93"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -98,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "395351662"
+		garbageValue = "15"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -131,7 +131,7 @@ public class FloorUnderlayDefinition extends DualNode {
 		double var16 = (var10 + var8) / 2.0D;
 		if (var10 != var8) {
 			if (var16 < 0.5D) {
-				var14 = (var10 - var8) / (var10 + var8);
+				var14 = (var10 - var8) / (var8 + var10);
 			}
 
 			if (var16 >= 0.5D) {
@@ -140,8 +140,8 @@ public class FloorUnderlayDefinition extends DualNode {
 
 			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var4 == var10) {
+			} else if (var10 == var4) {
-				var12 = 2.0D + (var6 - var2) / (var10 - var8);
+				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
 			} else if (var10 == var6) {
 				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
@@ -149,7 +149,7 @@ public class FloorUnderlayDefinition extends DualNode {
 
 		var12 /= 6.0D;
 		this.saturation = (int)(var14 * 256.0D);
-		this.lightness = (int)(256.0D * var16);
+		this.lightness = (int)(var16 * 256.0D);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -165,23 +165,137 @@ public class FloorUnderlayDefinition extends DualNode {
 		if (var16 > 0.5D) {
 			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
 		} else {
-			this.hueMultiplier = (int)(var16 * var14 * 512.0D);
+			this.hueMultiplier = (int)(512.0D * var16 * var14);
 		}
 
 		if (this.hueMultiplier < 1) {
 			this.hueMultiplier = 1;
 		}
 
-		this.hue = (int)((double)this.hueMultiplier * var12);
+		this.hue = (int)(var12 * (double)this.hueMultiplier);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lhz;III)Lls;",
+		signature = "(CLgl;I)C",
-		garbageValue = "-1136853521"
+		garbageValue = "-291129938"
 	)
-	@Export("SpriteBuffer_getSprite")
+	@Export("standardizeChar")
-	public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) {
+	static char standardizeChar(char var0, Language var1) {
-		return !HitSplatDefinition.method4586(var0, var1, var2) ? null : Buffer.method5689();
+		if (var0 >= 192 && var0 <= 255) {
+			if (var0 >= 192 && var0 <= 198) {
+				return 'A';
+			}
+
+			if (var0 == 199) {
+				return 'C';
+			}
+
+			if (var0 >= 200 && var0 <= 203) {
+				return 'E';
+			}
+
+			if (var0 >= 204 && var0 <= 207) {
+				return 'I';
+			}
+
+			if (var0 == 209 && var1 != Language.Language_ES) {
+				return 'N';
+			}
+
+			if (var0 >= 210 && var0 <= 214) {
+				return 'O';
+			}
+
+			if (var0 >= 217 && var0 <= 220) {
+				return 'U';
+			}
+
+			if (var0 == 221) {
+				return 'Y';
+			}
+
+			if (var0 == 223) {
+				return 's';
+			}
+
+			if (var0 >= 224 && var0 <= 230) {
+				return 'a';
+			}
+
+			if (var0 == 231) {
+				return 'c';
+			}
+
+			if (var0 >= 232 && var0 <= 235) {
+				return 'e';
+			}
+
+			if (var0 >= 236 && var0 <= 239) {
+				return 'i';
+			}
+
+			if (var0 == 241 && var1 != Language.Language_ES) {
+				return 'n';
+			}
+
+			if (var0 >= 242 && var0 <= 246) {
+				return 'o';
+			}
+
+			if (var0 >= 249 && var0 <= 252) {
+				return 'u';
+			}
+
+			if (var0 == 253 || var0 == 255) {
+				return 'y';
+			}
+		}
+
+		if (var0 == 338) {
+			return 'O';
+		} else if (var0 == 339) {
+			return 'o';
+		} else if (var0 == 376) {
+			return 'Y';
+		} else {
+			return var0;
+		}
+	}
+
+	@ObfuscatedName("if")
+	@ObfuscatedSignature(
+		signature = "([Lhn;IIIZB)V",
+		garbageValue = "1"
+	)
+	@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) {
+				UrlRequester.alignWidgetSize(var6, var2, var3, var4);
+				InterfaceParent.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) {
+					WorldMapIcon_1.revalidateWidgetScroll(var0, var6, var4);
+				}
+			}
+		}
+
 	}
 }

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

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

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

@@ -1,48 +1,70 @@
 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("kk")
+@ObfuscatedName("kq")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("f")
+	@ObfuscatedName("qm")
+	@ObfuscatedGetter(
+		intValue = -1887929743
+	)
+	static int field3660;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lkk;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lkk;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lkk;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lkk;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lkk;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lkk;"
+		signature = "Lkq;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("e")
+	@ObfuscatedName("eh")
+	@ObfuscatedGetter(
+		intValue = -1770194779
+	)
+	static int field3650;
+	@ObfuscatedName("gt")
+	@ObfuscatedGetter(
+		intValue = -1472159493
+	)
+	static int field3663;
+	@ObfuscatedName("lo")
+	@ObfuscatedGetter(
+		intValue = 1238804293
+	)
+	@Export("selectedSpellWidget")
+	static int selectedSpellWidget;
+	@ObfuscatedName("d")
 	@Export("name")
 	String name;
 
@@ -59,35 +81,21 @@ public class FontName {
 		this.name = var1;
 	}
 
-	@ObfuscatedName("az")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lig;B)Z",
+		signature = "(B)I",
-		garbageValue = "9"
+		garbageValue = "2"
 	)
-	static boolean method5377(ObjectDefinition var0) {
+	public static int method5401() {
-		if (var0.transforms != null) {
+		return KeyHandler.KeyHandler_idleCycles;
-			int[] var1 = var0.transforms;
-
-			for (int var2 = 0; var2 < var1.length; ++var2) {
-				int var3 = var1[var2];
-				ObjectDefinition var4 = Coord.getObjectDefinition(var3);
-				if (var4.mapIconId != -1) {
-					return true;
-				}
-			}
-		} else if (var0.mapIconId != -1) {
-			return true;
-		}
-
-		return false;
 	}
 
-	@ObfuscatedName("lc")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(I)V",
-		garbageValue = "-46"
+		garbageValue = "-1505118855"
 	)
-	static void method5376(int var0) {
+	public static void method5402() {
-		Client.oculusOrbState = var0;
+		KitDefinition.KitDefinition_cached.clear();
 	}
 }

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

@@ -1,30 +1,37 @@
 import java.util.HashMap;
 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("ki")
+@ObfuscatedName("kz")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 902886517
+	)
+	@Export("gameCyclesToDo")
+	static int gameCyclesToDo;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;)V"
+		signature = "(Lii;Lii;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -32,10 +39,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([Lkk;I)Ljava/util/HashMap;",
+		signature = "([Lkq;I)Ljava/util/HashMap;",
-		garbageValue = "-819608021"
+		garbageValue = "-448655147"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -47,7 +54,12 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = ArchiveDisk.method5909(this.spritesArchive, this.fontsArchive, var5.name, "");
+				AbstractArchive var7 = this.spritesArchive;
+				AbstractArchive var8 = this.fontsArchive;
+				String var9 = var5.name;
+				int var10 = var7.getGroupId(var9);
+				int var11 = var7.getFileId(var10, "");
+				Font var6 = FaceNormal.method3335(var7, var8, var10, var11);
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -57,4 +69,27 @@ public class Fonts {
 
 		return var2;
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(II)Lit;",
+		garbageValue = "291132223"
+	)
+	@Export("StructDefinition_getStructDefinition")
+	public static StructDefinition StructDefinition_getStructDefinition(int var0) {
+		StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
+			var1 = new StructDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode();
+			StructDefinition.StructDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
 }

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

@@ -1,20 +1,30 @@
+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("eq")
+@ObfuscatedName("es")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("f")
+	@ObfuscatedName("l")
+	@Export("soundSystemExecutor")
+	static ScheduledExecutorService soundSystemExecutor;
+	@ObfuscatedName("ah")
+	@ObfuscatedGetter(
+		intValue = -1849974283
+	)
+	static int field1885;
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "[Ldj;"
+		signature = "[Ldh;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		signature = "(Lhz;Lhz;IZ)V",
+		signature = "(Lii;Lii;IZ)V",
 		garbageValue = "0"
 	)
 	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
@@ -46,234 +56,43 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-996338531"
+		garbageValue = "-1402532864"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "([BS)Ljava/lang/String;",
-		garbageValue = "-360173892"
+		garbageValue = "255"
 	)
-	static void method3280() {
+	public static String method3340(byte[] var0) {
-		if (Login.field1173) {
+		int var2 = var0.length;
-			Login.titleboxSprite = null;
+		StringBuilder var3 = new StringBuilder();
-			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")
+		for (int var4 = 0; var4 < var2 + 0; var4 += 3) {
-	@ObfuscatedSignature(
+			int var5 = var0[var4] & 255;
-		signature = "(ILcu;ZB)I",
+			var3.append(class290.field3646[var5 >>> 2]);
-		garbageValue = "43"
+			if (var4 < var2 - 1) {
-	)
+				int var6 = var0[var4 + 1] & 255;
-	static int method3281(int var0, Script var1, boolean var2) {
+				var3.append(class290.field3646[(var5 & 3) << 4 | var6 >>> 4]);
-		if (var0 < 1000) {
+				if (var4 < var2 - 2) {
-			return WorldMapManager.method656(var0, var1, var2);
+					int var7 = var0[var4 + 2] & 255;
-		} else if (var0 < 1100) {
+					var3.append(class290.field3646[(var6 & 15) << 2 | var7 >>> 6]).append(class290.field3646[var7 & 63]);
-			return class60.method1170(var0, var1, var2);
+				} else {
-		} else if (var0 < 1200) {
+					var3.append(class290.field3646[(var6 & 15) << 2]).append("=");
-			return MidiPcmStream.method3737(var0, var1, var2);
-		} else if (var0 < 1300) {
-			return Friend.method5286(var0, var1, var2);
-		} else if (var0 < 1400) {
-			return UrlRequester.method3306(var0, var1, var2);
-		} 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;
-		}
-	}
-
-	@ObfuscatedName("w")
-	@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;
-		}
-
-		if (var0 >= 256) {
-			var0 >>>= 8;
-			var1 += 8;
-		}
-
-		if (var0 >= 16) {
-			var0 >>>= 4;
-			var1 += 4;
-		}
-
-		if (var0 >= 4) {
-			var0 >>>= 2;
-			var1 += 2;
-		}
-
-		if (var0 >= 1) {
-			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;
-		short var10;
-		if (var7 < Client.field804) {
-			var10 = Client.field804;
-			var6 = var10 * var2 * 334 / (var3 * 512);
-			if (var6 > Client.field884) {
-				var6 = Client.field884;
-				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);
 				}
-
+			} else {
-				var0 += var9;
+				var3.append(class290.field3646[(var5 & 3) << 4]).append("==");
-				var2 -= var9 * 2;
-			}
-		} else if (var7 > Client.field886) {
-			var10 = Client.field886;
-			var6 = var10 * var2 * 334 / (var3 * 512);
-			if (var6 < Client.field796) {
-				var6 = Client.field796;
-				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;
+		String var1 = var3.toString();
-		if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
+		return var1;
-			Language.method3634(var2, var3);
-		}
-
-		Client.viewportOffsetX = var0;
-		Client.viewportOffsetY = var1;
-		Client.viewportWidth = var2;
-		Client.viewportHeight = var3;
 	}
 }

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

@@ -2,23 +2,22 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("jg")
+@ObfuscatedName("jy")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
-	boolean field3617;
-	@ObfuscatedName("i")
 	boolean field3618;
+	@ObfuscatedName("t")
+	boolean field3619;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljg;B)I",
+		signature = "(Ljy;S)I",
-		garbageValue = "73"
+		garbageValue = "30306"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
@@ -30,23 +29,23 @@ public class Friend extends Buddy {
 			return -1;
 		} else if (var1.world != 0 && super.world == 0) {
 			return 1;
-		} else if (this.field3617 && !var1.field3617) {
-			return -1;
-		} else if (!this.field3617 && var1.field3617) {
-			return 1;
 		} else if (this.field3618 && !var1.field3618) {
 			return -1;
 		} else if (!this.field3618 && var1.field3618) {
 			return 1;
+		} else if (this.field3619 && !var1.field3619) {
+			return -1;
+		} else if (!this.field3619 && var1.field3619) {
+			return 1;
 		} else {
 			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		signature = "(Ljy;S)I",
+		signature = "(Ljk;I)I",
-		garbageValue = "9221"
+		garbageValue = "-746331144"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -57,90 +56,13 @@ public class Friend extends Buddy {
 		return this.compareToFriend((Friend)var1);
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("gm")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZI)I",
+		signature = "(I)I",
-		garbageValue = "316315133"
+		garbageValue = "-1214522869"
 	)
-	static int method5286(int var0, Script var1, boolean var2) {
+	@Export("getWindowedMode")
-		Widget var3;
+	static int getWindowedMode() {
-		if (var0 >= 2000) {
+		return Client.isResizable ? 2 : 1;
-			var0 -= 1000;
-			var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
-		} else {
-			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("x")
-	@ObfuscatedSignature(
-		signature = "(I)Lbe;",
-		garbageValue = "-422000887"
-	)
-	@Export("getNextWorldListWorld")
-	static World getNextWorldListWorld() {
-		return World.World_listCount < World.World_count ? class162.World_worlds[++World.World_listCount - 1] : null;
-	}
-
-	@ObfuscatedName("kq")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-2130982399"
-	)
-	@Export("FriendSystem_invalidateFriends")
-	static final void FriendSystem_invalidateFriends() {
-		for (int var0 = 0; var0 < Players.Players_count; ++var0) {
-			Player var1 = Client.players[Players.Players_indices[var0]];
-			var1.clearIsFriend();
-		}
-
-		class216.method4013();
-		if (Calendar.clanChat != null) {
-			Calendar.clanChat.clearFriends();
-		}
-
 	}
 }

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

@@ -4,50 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jj")
+@ObfuscatedName("km")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("a")
+	@ObfuscatedName("by")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lgl;"
 	)
-	@Export("Widget_archive")
+	@Export("clientLanguage")
-	static AbstractArchive Widget_archive;
+	static Language clientLanguage;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1496749481
+		intValue = 625683847
 	)
-	public int field3623;
+	public int field3632;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Ljc;"
+		signature = "Ljz;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		signature = "(Ljc;I)V"
+		signature = "(Ljz;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.field3623 = (int)(WorldMapID.currentTimeMillis() / 1000L);
+		this.field3632 = (int)(WorldMapIcon_0.currentTimeMillis() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
-	static double method5301(double var0) {
+	public static final void method5325(long var0) {
-		return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D);
+		if (var0 > 0L) {
+			if (var0 % 10L == 0L) {
+				World.method1801(var0 - 1L);
+				World.method1801(1L);
+			} else {
+				World.method1801(var0);
+			}
+
+		}
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lcz;I)V",
+		signature = "([Ljava/lang/String;[SIII)V",
-		garbageValue = "-651295245"
+		garbageValue = "2127417563"
 	)
-	public static final void method5300(class97 var0) {
+	@Export("sortItemsByName")
-		ChatChannel.pcmPlayerProvider = var0;
+	public 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);
+		}
+
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(II)Z",
+		garbageValue = "1669041813"
+	)
+	public static boolean method5326(int var0) {
+		return (var0 >> 29 & 1) != 0;
 	}
 }

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

@@ -1,95 +1,104 @@
-import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bi")
+@ObfuscatedName("bu")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("x")
+	@ObfuscatedName("ha")
-	@Export("soundSystemExecutor")
+	@ObfuscatedGetter(
-	static ScheduledExecutorService soundSystemExecutor;
+		intValue = -1970559655
-	@ObfuscatedName("w")
+	)
+	@Export("cameraYaw")
+	static int cameraYaw;
+	@ObfuscatedName("ix")
+	@ObfuscatedGetter(
+		intValue = -1654190039
+	)
+	@Export("selectedItemWidget")
+	static int selectedItemWidget;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Lmv;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Ljr;"
+		signature = "Ljd;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Lju;"
+		signature = "Ljf;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1346758177
+		intValue = -154816357
 	)
-	int field1045;
+	int field1063;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;)V"
+		signature = "(Lmv;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1045 = 0;
+		this.field1063 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1542848201"
+		garbageValue = "-1947292888"
 	)
-	boolean method1844() {
+	boolean method1857() {
-		return this.field1045 == 2;
+		return this.field1063 == 2;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "0"
+		garbageValue = "1940001821"
 	)
-	final void method1845() {
+	final void method1858() {
-		this.field1045 = 1;
+		this.field1063 = 1;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkq;II)V",
+		signature = "(Lkp;II)V",
-		garbageValue = "818210154"
+		garbageValue = "224283434"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1045 = 2;
+		this.field1063 = 2;
-		Friend.FriendSystem_invalidateFriends();
+		WorldMapID.FriendSystem_invalidateFriends();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "64"
+		garbageValue = "291777380"
 	)
 	@Export("processFriendUpdates")
 	final void processFriendUpdates() {
 		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long)var1.field3623 < WorldMapID.currentTimeMillis() / 1000L - 5L) {
+			if ((long)var1.field3632 < WorldMapIcon_0.currentTimeMillis() / 1000L - 5L) {
 				if (var1.world > 0) {
-					class83.addGameMessage(5, "", var1.username + " has logged in.");
+					ClientPreferences.addGameMessage(5, "", var1.username + " has logged in.");
 				}
 
 				if (var1.world == 0) {
-					class83.addGameMessage(5, "", var1.username + " has logged out.");
+					ClientPreferences.addGameMessage(5, "", var1.username + " has logged out.");
 				}
 
 				var1.remove();
@@ -98,38 +107,38 @@ public class FriendSystem {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "-3"
+		garbageValue = "-1660346454"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1045 = 0;
+		this.field1063 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Ljc;ZI)Z",
+		signature = "(Ljz;ZI)Z",
-		garbageValue = "-1562604277"
+		garbageValue = "1100778689"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(Message.localPlayer.username)) {
+		} else if (var1.equals(class192.localPlayer.username)) {
 			return true;
 		} else {
 			return this.friendsList.isFriended(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Ljc;I)Z",
+		signature = "(Ljz;I)Z",
-		garbageValue = "-408948257"
+		garbageValue = "819479662"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
@@ -140,10 +149,10 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-28"
+		garbageValue = "-340804777"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
@@ -151,16 +160,16 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsListIsFull()) {
-					WorldMapRegion.method446();
+					WorldMapArea.method425();
-				} else if (Message.localPlayer.username.equals(var2)) {
+				} else if (class192.localPlayer.username.equals(var2)) {
-					Tiles.method1143("You can't add yourself to your own friend list");
+					WorldMapLabel.method439();
 				} else if (this.isFriended(var2, false)) {
-					class288.method5335(var1);
+					LoginScreenAnimation.method1837(var1);
 				} else if (this.isIgnored(var2)) {
-					Tiles.method1143("Please remove " + var1 + " from your ignore list first");
+					Calendar.method4014(var1);
 				} else {
-					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
@@ -168,20 +177,20 @@ public class FriendSystem {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1773395073"
+		garbageValue = "-1302160469"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field746 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field763 != 1;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1243376516"
+		garbageValue = "-1143439097"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
@@ -189,37 +198,34 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.canAddIgnore()) {
-					VertexNormal.method2996();
+					class60.method1188("Your ignore list is full. Max of 100 for free users, and 400 for members");
-				} else if (Message.localPlayer.username.equals(var2)) {
+				} else if (class192.localPlayer.username.equals(var2)) {
-					WorldMapCacheName.method620();
+					class80.method2097();
 				} else if (this.isIgnored(var2)) {
-					Tiles.method1143(var1 + " is already on your ignore list");
+					ModelData0.method3323(var1);
 				} else if (this.isFriended(var2, false)) {
-					class191.method3640(var1);
+					FloorDecoration.method2912(var1);
 				} else {
-					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher);
+					class43.method817(var1);
-					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
-					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-					Client.packetWriter.addNode(var3);
 				}
 			}
 		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-1684864200"
+		garbageValue = "-1820924219"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field746 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field763 != 1;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "975666104"
+		garbageValue = "561828243"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
@@ -227,22 +233,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.friendsList.removeByUsername(var2)) {
-					VertexNormal.method2995();
+					Client.field839 = Client.cycleCntr;
-					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				Friend.FriendSystem_invalidateFriends();
+				WorldMapID.FriendSystem_invalidateFriends();
 			}
 		}
 	}
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "2048585665"
+		garbageValue = "-892672688"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
@@ -250,22 +256,22 @@ public class FriendSystem {
 			Username var2 = new Username(var1, this.loginType);
 			if (var2.hasCleanName()) {
 				if (this.ignoreList.removeByUsername(var2)) {
-					VertexNormal.method2995();
+					Client.field839 = Client.cycleCntr;
-					PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
+					PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher);
-					var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
+					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
 					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
 					Client.packetWriter.addNode(var3);
 				}
 
-				GameShell.FriendSystem_invalidateIgnoreds();
+				class96.FriendSystem_invalidateIgnoreds();
 			}
 		}
 	}
 
-	@ObfuscatedName("aa")
+	@ObfuscatedName("af")
 	@ObfuscatedSignature(
-		signature = "(Ljc;I)Z",
+		signature = "(Ljz;I)Z",
-		garbageValue = "-2137551829"
+		garbageValue = "431116625"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
@@ -273,63 +279,42 @@ public class FriendSystem {
 		return var2 != null && var2.hasWorld();
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(ILce;ZB)I",
-		garbageValue = "-435303731"
+		garbageValue = "0"
 	)
-	@Export("savePreferences")
+	static int method1920(int var0, Script var1, boolean var2) {
-	static void savePreferences() {
+		int var3;
-		AccessFile var0 = null;
+		if (var0 == ScriptOpcodes.CAM_FORCEANGLE) {
-
+			class320.Interpreter_intStackSize -= 2;
-		try {
+			var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize];
-			var0 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, true);
+			int var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1];
-			Buffer var1 = Interpreter.clientPreferences.toBuffer();
+			if (!Client.isCameraLocked) {
-			var0.write(var1.array, 0, var1.offset);
+				Client.camAngleX = var3;
-		} catch (Exception var3) {
+				Client.camAngleY = var4;
-		}
-
-		try {
-			if (var0 != null) {
-				var0.closeSync(true);
-			}
-		} catch (Exception var2) {
-		}
-
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "2090172291"
-	)
-	@Export("clearItemContainer")
-	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;
 			}
 
-		}
+			return 1;
-	}
+		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) {
-
+			Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleX;
-	@ObfuscatedName("km")
+			return 1;
-	@ObfuscatedSignature(
+		} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) {
-		signature = "(Lha;IIII)V",
+			Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleY;
-		garbageValue = "688328393"
+			return 1;
-	)
+		} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) {
-	@Export("drawCompass")
+			var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
-	static final void drawCompass(Widget var0, int var1, int var2, int var3) {
+			if (var3 < 0) {
-		SpriteMask var4 = var0.getSpriteMask(false);
+				var3 = 0;
-		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);
 			}
 
+			Client.camFollowHeight = var3;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
+			Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camFollowHeight;
+			return 1;
+		} else {
+			return 2;
 		}
 	}
 }

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

@@ -1,65 +1,67 @@
-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("jr")
+@ObfuscatedName("jd")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("y")
+	@ObfuscatedName("ge")
+	@Export("regions")
+	static int[] regions;
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Lmv;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1316127355
+		intValue = -1784077363
 	)
-	int field3603;
+	int field3606;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ljw;"
+		signature = "Ljr;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		signature = "(Lll;)V"
+		signature = "(Lmv;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3603 = 1;
+		this.field3606 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)Ljy;",
+		signature = "(S)Ljk;",
-		garbageValue = "68"
+		garbageValue = "30683"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IB)[Ljy;",
+		signature = "(IB)[Ljk;",
-		garbageValue = "32"
+		garbageValue = "19"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Ljc;ZI)Z",
+		signature = "(Ljz;ZI)Z",
-		garbageValue = "-1998488053"
+		garbageValue = "-1382316514"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
@@ -71,10 +73,10 @@ public class FriendsList extends UserList {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkq;IB)V",
+		signature = "(Lkp;IB)V",
-		garbageValue = "-60"
+		garbageValue = "118"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -138,17 +140,17 @@ public class FriendsList extends UserList {
 					}
 
 					if (var6 != var11.world) {
-						var11.int2 = ++this.field3603 - 1;
+						var11.int2 = ++this.field3606 - 1;
 						if (var11.world == -1 && var6 == 0) {
-							var11.int2 = -(var11.int2 * 604472963) * 509966379;
+							var11.int2 = -(var11.int2 * 1598123503) * 179134735;
 						}
 
 						var11.world = var6;
 					}
 
 					var11.rank = var7;
-					var11.field3617 = var9;
+					var11.field3618 = var9;
-					var11.field3618 = var10;
+					var11.field3619 = var10;
 					continue;
 				}
 
@@ -159,68 +161,4 @@ 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

@@ -1,19 +1,26 @@
 import java.util.zip.Inflater;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lw")
+@ObfuscatedName("lg")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lgm;"
+		intValue = -145527417
 	)
-	@Export("midiPcmStream")
+	@Export("SpriteBuffer_spriteWidth")
-	public static MidiPcmStream midiPcmStream;
+	public static int SpriteBuffer_spriteWidth;
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 443544687
+	)
+	@Export("RunException_revision")
+	public static int RunException_revision;
+	@ObfuscatedName("c")
 	@Export("inflater")
 	Inflater inflater;
 
@@ -28,10 +35,10 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lkq;[BI)V",
+		signature = "(Lkp;[BI)V",
-		garbageValue = "367442477"
+		garbageValue = "163268169"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {

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

@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("el")
+@ObfuscatedName("ea")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1053912573
+		intValue = -940773831
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 684195751
+		intValue = 2132625949
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -2140499041
+		intValue = -2072532473
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 1955373001
+		intValue = 1479439291
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Leq;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -472959783
+		intValue = -638708115
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1045037505
+		intValue = -1848719161
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 820155369
+		intValue = 1367330545
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1317685703
+		intValue = 170965517
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1799608733
+		intValue = -281386629
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 262139045
+		intValue = 459315211
 	)
-	int field1909;
+	int field1931;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -792485469
+		intValue = 1057625291
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = -9063285699696577959L
+		longValue = 3023307687483633369L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1504732917
+		intValue = -1037464563
 	)
 	@Export("flags")
 	int flags;
@@ -96,35 +96,120 @@ public final class GameObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lgo;S)V",
+		signature = "(II)Liw;",
-		garbageValue = "-26939"
+		garbageValue = "-1799291125"
 	)
-	public static void method3296(Huffman var0) {
+	@Export("getEnum")
-		class206.huffman = var0;
+	public static EnumDefinition getEnum(int var0) {
+		EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = GrandExchangeOfferAgeComparator.EnumDefinition_archive.takeFile(8, var0);
+			var1 = new EnumDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
 	}
 
-	@ObfuscatedName("hd")
+	@ObfuscatedName("fk")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(Lip;IIII)V",
-		garbageValue = "1099485994"
+		garbageValue = "-1299121306"
 	)
-	static boolean method3298() {
+	@Export("addSequenceSoundEffect")
-		return (Client.drawPlayerNames & 1) != 0;
+	static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) {
+		if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) {
+			if (var0.soundEffects != null && var1 < var0.soundEffects.length) {
+				int var4 = var0.soundEffects[var1];
+				if (var4 != 0) {
+					int var5 = var4 >> 8;
+					int var6 = var4 >> 4 & 7;
+					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("if")
+	@ObfuscatedName("ij")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
+		signature = "(B)V",
-		garbageValue = "3"
+		garbageValue = "101"
 	)
-	static final void method3297(int var0, int var1, int var2, int var3) {
+	static void method3360() {
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
+		int var0;
-			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) {
+		int var2;
-				Client.field833[var4] = true;
+		int var3;
+		for (var0 = 0; var0 < Client.menuOptionsCount; ++var0) {
+			var2 = Client.menuOpcodes[var0];
+			boolean var1 = var2 == 57 || var2 == 58 || var2 == 1007 || var2 == 25 || var2 == 30;
+			if (var1) {
+				if (var0 < Client.menuOptionsCount - 1) {
+					for (var3 = var0; var3 < Client.menuOptionsCount - 1; ++var3) {
+						Client.menuActions[var3] = Client.menuActions[var3 + 1];
+						Client.menuTargets[var3] = Client.menuTargets[var3 + 1];
+						Client.menuOpcodes[var3] = Client.menuOpcodes[var3 + 1];
+						Client.menuIdentifiers[var3] = Client.menuIdentifiers[var3 + 1];
+						Client.menuArguments1[var3] = Client.menuArguments1[var3 + 1];
+						Client.menuArguments2[var3] = Client.menuArguments2[var3 + 1];
+						Client.menuShiftClick[var3] = Client.menuShiftClick[var3 + 1];
+					}
+				}
+
+				--var0;
+				--Client.menuOptionsCount;
 			}
 		}
 
+		var0 = InterfaceParent.menuWidth / 2 + ArchiveDiskAction.menuX;
+		int var6 = SecureRandomCallable.menuY;
+		var2 = class1.fontBold12.stringWidth("Choose Option");
+
+		int var4;
+		for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) {
+			var4 = class1.fontBold12.stringWidth(VerticalAlignment.method4426(var3));
+			if (var4 > var2) {
+				var2 = var4;
+			}
+		}
+
+		var2 += 8;
+		var3 = Client.menuOptionsCount * 15 + 22;
+		var4 = var0 - var2 / 2;
+		if (var4 + var2 > Username.canvasWidth) {
+			var4 = Username.canvasWidth - var2;
+		}
+
+		if (var4 < 0) {
+			var4 = 0;
+		}
+
+		int var5 = var6;
+		if (var3 + var6 > WorldMapData_1.canvasHeight) {
+			var5 = WorldMapData_1.canvasHeight - var3;
+		}
+
+		if (var5 < 0) {
+			var5 = 0;
+		}
+
+		ArchiveDiskAction.menuX = var4;
+		SecureRandomCallable.menuY = var5;
+		InterfaceParent.menuWidth = var2;
+		Message.menuHeight = Client.menuOptionsCount * 15 + 22;
 	}
 }

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

@@ -1,60 +1,65 @@
-import java.applet.Applet;
+import java.lang.management.GarbageCollectorMXBean;
-import java.net.URL;
+import java.lang.management.ManagementFactory;
+import java.util.Iterator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import netscape.javascript.JSObject;
 
-@ObfuscatedName("x")
+@ObfuscatedName("l")
 @Implements("GrandExchangeEvent")
 public class GrandExchangeEvent {
-	@ObfuscatedName("ss")
+	@ObfuscatedName("j")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lld;"
+		intValue = -1568217923
 	)
-	@Export("worldMap")
+	static int field45;
-	static WorldMap worldMap;
+	@ObfuscatedName("n")
-	@ObfuscatedName("bs")
+	@ObfuscatedSignature(
+		signature = "Lhe;"
+	)
+	@Export("NetCache_currentResponse")
+	public static NetFileRequest NetCache_currentResponse;
+	@ObfuscatedName("bn")
 	@ObfuscatedSignature(
 		signature = "Lli;"
 	)
 	@Export("worldSelectLeftSprite")
 	static IndexedSprite worldSelectLeftSprite;
-	@ObfuscatedName("kx")
+	@ObfuscatedName("dj")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -830703967
+		signature = "Lia;"
 	)
-	@Export("menuX")
+	@Export("archive0")
-	static int menuX;
+	static Archive archive0;
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -492844339
+		intValue = 1956147033
 	)
 	@Export("world")
 	public final int world;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = 6772397130790099757L
+		longValue = 7213176078958271683L
 	)
 	@Export("age")
 	public final long age;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Ld;"
+		signature = "Lm;"
 	)
 	@Export("grandExchangeOffer")
 	public final GrandExchangeOffer grandExchangeOffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("offerName")
 	String offerName;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("previousOfferName")
 	String previousOfferName;
 
 	@ObfuscatedSignature(
-		signature = "(Lkq;BI)V"
+		signature = "(Lkp;BI)V"
 	)
 	GrandExchangeEvent(Buffer var1, byte var2, int var3) {
 		this.offerName = var1.readStringCp1252NullTerminated();
@@ -64,8 +69,8 @@ public class GrandExchangeEvent {
 		int var4 = var1.readInt();
 		int var5 = var1.readInt();
 		this.grandExchangeOffer = new GrandExchangeOffer();
-		this.grandExchangeOffer.method99(2);
+		this.grandExchangeOffer.method120(2);
-		this.grandExchangeOffer.method100(var2);
+		this.grandExchangeOffer.method112(var2);
 		this.grandExchangeOffer.unitPrice = var4;
 		this.grandExchangeOffer.totalQuantity = var5;
 		this.grandExchangeOffer.currentQuantity = 0;
@@ -73,98 +78,145 @@ public class GrandExchangeEvent {
 		this.grandExchangeOffer.id = var3;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		signature = "(I)Ljava/lang/String;",
-		garbageValue = "-859042126"
+		garbageValue = "1646612919"
 	)
 	@Export("getOfferName")
 	public String getOfferName() {
 		return this.offerName;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)Ljava/lang/String;",
-		garbageValue = "342302982"
+		garbageValue = "-81405509"
 	)
 	@Export("getPreviousOfferName")
 	public String getPreviousOfferName() {
 		return this.previousOfferName;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("i")
+	public static int method96(long var0) {
+		return (int)(var0 >>> 0 & 127L);
+	}
+
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ILjava/lang/String;B)Z",
+		signature = "(II)I",
-		garbageValue = "-128"
+		garbageValue = "193251724"
 	)
-	static boolean method79(String var0, int var1, String var2) {
+	static int method97(int var0) {
-		if (var1 == 0) {
+		return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F));
-			try {
-				if (!class50.field410.startsWith("win")) {
-					throw new Exception();
-				} 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()};
-				Object var13 = JSObject.getWindow(var7).call(var2, var5);
-				return var13 != null;
-			} catch (Throwable var9) {
-				return false;
-			}
-		} else if (var1 == 2) {
-			try {
-				class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_blank");
-				return true;
-			} catch (Exception var10) {
-				return false;
-			}
-		} else if (var1 == 3) {
-			try {
-				Applet var3 = class50.applet;
-				JSObject.getWindow(var3).call("loggedout", (Object[])null);
-			} catch (Throwable var12) {
-			}
-
-			try {
-				class50.applet.getAppletContext().showDocument(new URL(class50.applet.getCodeBase(), var0), "_top");
-				return true;
-			} catch (Exception var11) {
-				return false;
-			}
-		} else {
-			throw new IllegalArgumentException();
-		}
 	}
 
 	@ObfuscatedName("at")
 	@ObfuscatedSignature(
-		signature = "(ILht;ZI)V",
+		signature = "(I)I",
-		garbageValue = "1641094625"
+		garbageValue = "550527389"
 	)
-	static void method80(int var0, Coord var1, boolean var2) {
+	@Export("getGcDuration")
-		WorldMapArea var3 = Canvas.getWorldMap().getMapArea(var0);
+	protected static int getGcDuration() {
-		int var4 = Message.localPlayer.plane;
+		int var0 = 0;
-		int var5 = MusicPatchPcmStream.baseX * 64 + (Message.localPlayer.x >> 7);
+		if (SecureRandomFuture.garbageCollector == null || !SecureRandomFuture.garbageCollector.isValid()) {
-		int var6 = ScriptEvent.baseY * 64 + (Message.localPlayer.y >> 7);
+			try {
-		Coord var7 = new Coord(var4, var5, var6);
+				Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator();
-		Canvas.getWorldMap().method6373(var3, var7, var1, var2);
+
+				while (var1.hasNext()) {
+					GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next();
+					if (var2.isValid()) {
+						SecureRandomFuture.garbageCollector = var2;
+						GameShell.garbageCollectorLastCheckTimeMs = -1L;
+						GameShell.garbageCollectorLastCollectionTime = -1L;
+					}
+				}
+			} catch (Throwable var11) {
+			}
+		}
+
+		if (SecureRandomFuture.garbageCollector != null) {
+			long var9 = WorldMapIcon_0.currentTimeMillis();
+			long var3 = SecureRandomFuture.garbageCollector.getCollectionTime();
+			if (-1L != GameShell.garbageCollectorLastCollectionTime) {
+				long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
+				long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
+				if (var7 != 0L) {
+					var0 = (int)(var5 * 100L / var7);
+				}
+			}
+
+			GameShell.garbageCollectorLastCollectionTime = var3;
+			GameShell.garbageCollectorLastCheckTimeMs = var9;
+		}
+
+		return var0;
+	}
+
+	@ObfuscatedName("gy")
+	@ObfuscatedSignature(
+		signature = "(Lbx;I)V",
+		garbageValue = "2089906351"
+	)
+	static final void method88(Actor var0) {
+		if (var0.field986 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GraphicsDefaults.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
+			int var1 = var0.field986 - var0.field985;
+			int var2 = Client.cycle - var0.field985;
+			int var3 = var0.field981 * 128 + var0.field942 * 2013925376;
+			int var4 = var0.field957 * 128 + var0.field942 * 2013925376;
+			int var5 = var0.field961 * 128 + var0.field942 * 2013925376;
+			int var6 = var0.field991 * 128 + var0.field942 * 2013925376;
+			var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1;
+			var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1;
+		}
+
+		var0.field997 = 0;
+		var0.orientation = var0.field987;
+		var0.rotation = var0.orientation;
+	}
+
+	@ObfuscatedName("jd")
+	@ObfuscatedSignature(
+		signature = "(Lhn;I)V",
+		garbageValue = "948929027"
+	)
+	static final void method93(Widget var0) {
+		int var1 = var0.contentType;
+		if (var1 == 324) {
+			if (Client.field910 == -1) {
+				Client.field910 = var0.spriteId2;
+				Client.field911 = var0.spriteId;
+			}
+
+			if (Client.playerAppearance.isFemale) {
+				var0.spriteId2 = Client.field910;
+			} else {
+				var0.spriteId2 = Client.field911;
+			}
+
+		} else if (var1 == 325) {
+			if (Client.field910 == -1) {
+				Client.field910 = var0.spriteId2;
+				Client.field911 = var0.spriteId;
+			}
+
+			if (Client.playerAppearance.isFemale) {
+				var0.spriteId2 = Client.field911;
+			} else {
+				var0.spriteId2 = Client.field910;
+			}
+
+		} else if (var1 == 327) {
+			var0.modelAngleX = 150;
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
+			var0.modelType = 5;
+			var0.modelId = 0;
+		} else if (var1 == 328) {
+			var0.modelAngleX = 150;
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
+			var0.modelType = 5;
+			var0.modelId = 1;
+		}
 	}
 }

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

@@ -4,56 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("d")
+@ObfuscatedName("m")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("x")
+	@ObfuscatedName("du")
+	@ObfuscatedSignature(
+		signature = "Lia;"
+	)
+	@Export("archive11")
+	static Archive archive11;
+	@ObfuscatedName("hd")
 	@ObfuscatedGetter(
-		intValue = -1279002911
+		intValue = -1999981463
 	)
-	@Export("musicTrackFileId")
+	@Export("cameraPitch")
-	static int musicTrackFileId;
+	static int cameraPitch;
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "Lli;"
-	)
-	static IndexedSprite field64;
-	@ObfuscatedName("fa")
-	@ObfuscatedSignature(
-		signature = "Lko;"
-	)
-	@Export("fontBold12")
-	static Font fontBold12;
-	@ObfuscatedName("f")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 903381877
+		intValue = 1202522813
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1525595903
+		intValue = -286950223
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -181305079
+		intValue = -191142567
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1020605845
+		intValue = -1418175861
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 824366687
+		intValue = 45465727
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -62,7 +57,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkq;Z)V",
+		signature = "(Lkp;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -74,42 +69,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-519143415"
+		garbageValue = "-51"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1944649855"
+		garbageValue = "-96"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "-26019402"
+		garbageValue = "-38"
 	)
-	void method99(int var1) {
+	void method120(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-1969903695"
+		garbageValue = "-59985742"
 	)
-	void method100(int var1) {
+	void method112(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -117,34 +112,65 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(IB)I",
-		garbageValue = "-2077652257"
+		garbageValue = "-27"
 	)
-	static final void method114(int var0, int var1, int var2, int var3) {
+	public static int method128(int var0) {
-		for (int var4 = var1; var4 <= var3 + var1; ++var4) {
+		long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
-			for (int var5 = var0; var5 <= var0 + var2; ++var5) {
+		int var1 = (int)(var2 >>> 0 & 127L);
-				if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
+		return var1;
-					Tiles.field496[0][var5][var4] = 127;
+	}
-					if (var0 == var5 && var5 > 0) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
-					}
 
-					if (var5 == var0 + var2 && var5 < 103) {
+	@ObfuscatedName("i")
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
+	@ObfuscatedSignature(
-					}
+		signature = "(I)Z",
-
+		garbageValue = "1764789679"
-					if (var4 == var1 && var4 > 0) {
+	)
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
+	public static boolean method129() {
-					}
+		try {
-
+			if (class197.field2414 == 2) {
-					if (var4 == var3 + var1 && var4 < 103) {
+				if (FileSystem.musicTrack == null) {
-						Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
+					FileSystem.musicTrack = MusicTrack.readTrack(UserComparator5.musicTrackArchive, class197.musicTrackGroupId, class83.musicTrackFileId);
+					if (FileSystem.musicTrack == null) {
+						return false;
 					}
 				}
+
+				if (class197.soundCache == null) {
+					class197.soundCache = new SoundCache(UserComparator10.soundEffectsArchive, class197.musicSamplesArchive);
+				}
+
+				if (class197.midiPcmStream.loadMusicTrack(FileSystem.musicTrack, class197.musicPatchesArchive, class197.soundCache, 22050)) {
+					class197.midiPcmStream.clearAll();
+					class197.midiPcmStream.setPcmStreamVolume(AttackOption.musicTrackVolume);
+					class197.midiPcmStream.setMusicTrack(FileSystem.musicTrack, KeyHandler.musicTrackBoolean);
+					class197.field2414 = 0;
+					FileSystem.musicTrack = null;
+					class197.soundCache = null;
+					UserComparator5.musicTrackArchive = null;
+					return true;
+				}
 			}
+		} catch (Exception var1) {
+			var1.printStackTrace();
+			class197.midiPcmStream.clear();
+			class197.field2414 = 0;
+			FileSystem.musicTrack = null;
+			class197.soundCache = null;
+			UserComparator5.musicTrackArchive = null;
 		}
 
+		return false;
+	}
+
+	@ObfuscatedName("kn")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "1055020085"
+	)
+	static void method127(int var0) {
+		Client.oculusOrbState = var0;
 	}
 }

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

@@ -7,39 +7,603 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("v")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lx;Lx;I)I",
+		signature = "Lii;"
-		garbageValue = "-119535735"
+	)
+	@Export("EnumDefinition_archive")
+	public static AbstractArchive EnumDefinition_archive;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(Ll;Ll;I)I",
+		garbageValue = "1533624032"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1);
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1);
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("f")
+	public boolean equals(Object var1) {
-	@ObfuscatedSignature(
+		return super.equals(var1);
-		signature = "(I)V",
-		garbageValue = "2135681337"
-	)
-	public static void method147() {
-		class117.reflectionChecks = new IterableNodeDeque();
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "28"
+		garbageValue = "-370455307"
 	)
-	public static void method146() {
+	public static void method162() {
-		StructDefinition.StructDefinition_cached.clear();
+		class96.reflectionChecks = new IterableNodeDeque();
+	}
+
+	@ObfuscatedName("ja")
+	@ObfuscatedSignature(
+		signature = "([Lhn;IIIIIIII)V",
+		garbageValue = "-442172669"
+	)
+	@Export("updateInterface")
+	static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+		for (int var8 = 0; var8 < var0.length; ++var8) {
+			Widget var9 = var0[var8];
+			if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapIcon_0.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
+				if (var9.isIf3) {
+					if (VarcInt.isComponentHidden(var9)) {
+						continue;
+					}
+				} else if (var9.type == 0 && var9 != GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 && VarcInt.isComponentHidden(var9)) {
+					continue;
+				}
+
+				int var10 = var9.x + var6;
+				int var11 = var7 + var9.y;
+				int var12;
+				int var13;
+				int var14;
+				int var15;
+				int var17;
+				int var18;
+				if (var9.type == 2) {
+					var12 = var2;
+					var13 = var3;
+					var14 = var4;
+					var15 = var5;
+				} else {
+					int var16;
+					if (var9.type == 9) {
+						var16 = var10;
+						var17 = var11;
+						var18 = var10 + var9.width;
+						int var19 = var11 + var9.height;
+						if (var18 < var10) {
+							var16 = var18;
+							var18 = var10;
+						}
+
+						if (var19 < var11) {
+							var17 = var19;
+							var19 = var11;
+						}
+
+						++var18;
+						++var19;
+						var12 = var16 > var2 ? var16 : var2;
+						var13 = var17 > var3 ? var17 : var3;
+						var14 = var18 < var4 ? var18 : var4;
+						var15 = var19 < var5 ? var19 : var5;
+					} else {
+						var16 = var10 + var9.width;
+						var17 = var11 + var9.height;
+						var12 = var10 > var2 ? var10 : var2;
+						var13 = var11 > var3 ? var11 : var3;
+						var14 = var16 < var4 ? var16 : var4;
+						var15 = var17 < var5 ? var17 : var5;
+					}
+				}
+
+				if (var9 == Client.clickedWidget) {
+					Client.field827 = true;
+					Client.field864 = var10;
+					Client.field829 = var11;
+				}
+
+				boolean var32 = false;
+				if (var9.field2646) {
+					switch(Client.field808) {
+					case 0:
+						var32 = true;
+					case 1:
+					default:
+						break;
+					case 2:
+						if (Client.field664 == var9.id >>> 16) {
+							var32 = true;
+						}
+						break;
+					case 3:
+						if (var9.id == Client.field664) {
+							var32 = true;
+						}
+					}
+				}
+
+				if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) {
+					if (var9.isIf3) {
+						ScriptEvent var26;
+						if (var9.noClickThrough) {
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
+									if (var26.isMouseInputEvent) {
+										var26.remove();
+										var26.widget.containsMouse = false;
+									}
+								}
+
+								if (SequenceDefinition.widgetDragDuration == 0) {
+									Client.clickedWidget = null;
+									Client.clickedWidgetParent = null;
+								}
+
+								if (!Client.isMenuOpen) {
+									class96.addCancelMenuEntry();
+								}
+							}
+						} else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+							for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
+								if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) {
+									var26.remove();
+								}
+							}
+						}
+					}
+
+					var17 = MouseHandler.MouseHandler_x;
+					var18 = MouseHandler.MouseHandler_y;
+					if (MouseHandler.MouseHandler_lastButton != 0) {
+						var17 = MouseHandler.MouseHandler_lastPressedX;
+						var18 = MouseHandler.MouseHandler_lastPressedY;
+					}
+
+					boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15;
+					if (var9.contentType == 1337) {
+						if (!Client.isLoading && !Client.isMenuOpen && var33) {
+							WorldMapSection0.addSceneMenuOptions(var17, var18, var12, var13);
+						}
+					} else if (var9.contentType == 1338) {
+						class267.checkIfMinimapClicked(var9, var10, var11);
+					} else {
+						if (var9.contentType == 1400) {
+							WorldMapIcon_0.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height);
+						}
+
+						if (!Client.isMenuOpen && var33) {
+							if (var9.contentType == 1400) {
+								WorldMapIcon_0.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18);
+							} else {
+								ViewportMouse.method3060(var9, var17 - var10, var18 - var11);
+							}
+						}
+
+						boolean var21;
+						int var23;
+						if (var32) {
+							for (int var20 = 0; var20 < var9.field2702.length; ++var20) {
+								var21 = false;
+								boolean var22 = false;
+								if (!var21 && var9.field2702[var20] != null) {
+									for (var23 = 0; var23 < var9.field2702[var20].length; ++var23) {
+										boolean var24 = false;
+										if (var9.field2711 != null) {
+											var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2702[var20][var23]];
+										}
+
+										if (MusicPatchNode.method3902(var9.field2702[var20][var23]) || var24) {
+											var21 = true;
+											if (var9.field2711 != null && var9.field2711[var20] > Client.cycle) {
+												break;
+											}
+
+											byte var25 = var9.field2648[var20][var23];
+											if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
+												var22 = true;
+												break;
+											}
+										}
+									}
+								}
+
+								if (var22) {
+									if (var20 < 10) {
+										NPC.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
+									} else if (var20 == 10) {
+										WorldMapManager.Widget_runOnTargetLeave();
+										MusicPatchNode.selectSpell(var9.id, var9.childIndex, class83.method2108(WorldMapIcon_0.getWidgetClickMask(var9)), var9.itemId);
+										Client.selectedSpellActionName = PcmPlayer.method2542(var9);
+										if (Client.selectedSpellActionName == null) {
+											Client.selectedSpellActionName = "null";
+										}
+
+										Client.selectedSpellName = var9.dataText + PacketWriter.colorStartTag(16777215);
+									}
+
+									var23 = var9.field2649[var20];
+									if (var9.field2711 == null) {
+										var9.field2711 = new int[var9.field2702.length];
+									}
+
+									if (var9.field2560 == null) {
+										var9.field2560 = new int[var9.field2702.length];
+									}
+
+									if (var23 != 0) {
+										if (var9.field2711[var20] == 0) {
+											var9.field2711[var20] = var23 + Client.cycle + var9.field2560[var20];
+										} else {
+											var9.field2711[var20] = var23 + Client.cycle;
+										}
+									} else {
+										var9.field2711[var20] = Integer.MAX_VALUE;
+									}
+								}
+
+								if (!var21 && var9.field2711 != null) {
+									var9.field2711[var20] = 0;
+								}
+							}
+						}
+
+						if (var9.isIf3) {
+							if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								var33 = true;
+							} else {
+								var33 = false;
+							}
+
+							boolean var34 = false;
+							if ((MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) {
+								var34 = true;
+							}
+
+							var21 = false;
+							if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
+								var21 = true;
+							}
+
+							if (var21) {
+								Strings.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
+							}
+
+							if (var9.contentType == 1400) {
+								WorldMapIcon_0.worldMap.method6363(var17, var18, var33 & var34, var33 & var21);
+							}
+
+							if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && GrandExchangeOfferWorldComparator.method76(WorldMapIcon_0.getWidgetClickMask(var9))) {
+								Client.draggedOnWidget = var9;
+							}
+
+							if (var9 == Client.clickedWidgetParent) {
+								Client.field824 = true;
+								Client.field919 = var10;
+								Client.field826 = var11;
+							}
+
+							if (var9.hasListener) {
+								ScriptEvent var27;
+								if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
+									var27 = new ScriptEvent();
+									var27.isMouseInputEvent = true;
+									var27.widget = var9;
+									var27.mouseY = Client.mouseWheelRotation;
+									var27.args = var9.onScroll;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (Client.clickedWidget != null || class185.dragInventoryWidget != null || Client.isMenuOpen) {
+									var21 = false;
+									var34 = false;
+									var33 = false;
+								}
+
+								if (!var9.isClicked && var21) {
+									var9.isClicked = true;
+									if (var9.onClick != null) {
+										var27 = new ScriptEvent();
+										var27.isMouseInputEvent = true;
+										var27.widget = var9;
+										var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
+										var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
+										var27.args = var9.onClick;
+										Client.scriptEvents.addFirst(var27);
+									}
+								}
+
+								if (var9.isClicked && var34 && var9.onClickRepeat != null) {
+									var27 = new ScriptEvent();
+									var27.isMouseInputEvent = true;
+									var27.widget = var9;
+									var27.mouseX = MouseHandler.MouseHandler_x - var10;
+									var27.mouseY = MouseHandler.MouseHandler_y - var11;
+									var27.args = var9.onClickRepeat;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (var9.isClicked && !var34) {
+									var9.isClicked = false;
+									if (var9.onRelease != null) {
+										var27 = new ScriptEvent();
+										var27.isMouseInputEvent = true;
+										var27.widget = var9;
+										var27.mouseX = MouseHandler.MouseHandler_x - var10;
+										var27.mouseY = MouseHandler.MouseHandler_y - var11;
+										var27.args = var9.onRelease;
+										Client.field847.addFirst(var27);
+									}
+								}
+
+								if (var34 && var9.onHold != null) {
+									var27 = new ScriptEvent();
+									var27.isMouseInputEvent = true;
+									var27.widget = var9;
+									var27.mouseX = MouseHandler.MouseHandler_x - var10;
+									var27.mouseY = MouseHandler.MouseHandler_y - var11;
+									var27.args = var9.onHold;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (!var9.containsMouse && var33) {
+									var9.containsMouse = true;
+									if (var9.onMouseOver != null) {
+										var27 = new ScriptEvent();
+										var27.isMouseInputEvent = true;
+										var27.widget = var9;
+										var27.mouseX = MouseHandler.MouseHandler_x - var10;
+										var27.mouseY = MouseHandler.MouseHandler_y - var11;
+										var27.args = var9.onMouseOver;
+										Client.scriptEvents.addFirst(var27);
+									}
+								}
+
+								if (var9.containsMouse && var33 && var9.onMouseRepeat != null) {
+									var27 = new ScriptEvent();
+									var27.isMouseInputEvent = true;
+									var27.widget = var9;
+									var27.mouseX = MouseHandler.MouseHandler_x - var10;
+									var27.mouseY = MouseHandler.MouseHandler_y - var11;
+									var27.args = var9.onMouseRepeat;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (var9.containsMouse && !var33) {
+									var9.containsMouse = false;
+									if (var9.onMouseLeave != null) {
+										var27 = new ScriptEvent();
+										var27.isMouseInputEvent = true;
+										var27.widget = var9;
+										var27.mouseX = MouseHandler.MouseHandler_x - var10;
+										var27.mouseY = MouseHandler.MouseHandler_y - var11;
+										var27.args = var9.onMouseLeave;
+										Client.field847.addFirst(var27);
+									}
+								}
+
+								if (var9.onTimer != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.onTimer;
+									Client.field846.addFirst(var27);
+								}
+
+								ScriptEvent var28;
+								int var35;
+								int var36;
+								if (var9.onVarTransmit != null && Client.field833 > var9.field2706) {
+									if (var9.varTransmitTriggers != null && Client.field833 - var9.field2706 <= 32) {
+										label849:
+										for (var35 = var9.field2706; var35 < Client.field833; ++var35) {
+											var23 = Client.field832[var35 & 31];
+
+											for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
+												if (var23 == var9.varTransmitTriggers[var36]) {
+													var28 = new ScriptEvent();
+													var28.widget = var9;
+													var28.args = var9.onVarTransmit;
+													Client.scriptEvents.addFirst(var28);
+													break label849;
+												}
+											}
+										}
+									} else {
+										var27 = new ScriptEvent();
+										var27.widget = var9;
+										var27.args = var9.onVarTransmit;
+										Client.scriptEvents.addFirst(var27);
+									}
+
+									var9.field2706 = Client.field833;
+								}
+
+								if (var9.onInvTransmit != null && Client.field835 > var9.field2570) {
+									if (var9.invTransmitTriggers != null && Client.field835 - var9.field2570 <= 32) {
+										label825:
+										for (var35 = var9.field2570; var35 < Client.field835; ++var35) {
+											var23 = Client.changedItemContainers[var35 & 31];
+
+											for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
+												if (var23 == var9.invTransmitTriggers[var36]) {
+													var28 = new ScriptEvent();
+													var28.widget = var9;
+													var28.args = var9.onInvTransmit;
+													Client.scriptEvents.addFirst(var28);
+													break label825;
+												}
+											}
+										}
+									} else {
+										var27 = new ScriptEvent();
+										var27.widget = var9;
+										var27.args = var9.onInvTransmit;
+										Client.scriptEvents.addFirst(var27);
+									}
+
+									var9.field2570 = Client.field835;
+								}
+
+								if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2708) {
+									if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2708 <= 32) {
+										label801:
+										for (var35 = var9.field2708; var35 < Client.changedSkillsCount; ++var35) {
+											var23 = Client.changedSkills[var35 & 31];
+
+											for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
+												if (var23 == var9.statTransmitTriggers[var36]) {
+													var28 = new ScriptEvent();
+													var28.widget = var9;
+													var28.args = var9.onStatTransmit;
+													Client.scriptEvents.addFirst(var28);
+													break label801;
+												}
+											}
+										}
+									} else {
+										var27 = new ScriptEvent();
+										var27.widget = var9;
+										var27.args = var9.onStatTransmit;
+										Client.scriptEvents.addFirst(var27);
+									}
+
+									var9.field2708 = Client.changedSkillsCount;
+								}
+
+								if (Client.chatCycle > var9.field2705 && var9.onChatTransmit != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.onChatTransmit;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (Client.field839 > var9.field2705 && var9.onFriendTransmit != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.onFriendTransmit;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (Client.field823 > var9.field2705 && var9.onClanTransmit != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.onClanTransmit;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (Client.field841 > var9.field2705 && var9.onStockTransmit != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.onStockTransmit;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (Client.field842 > var9.field2705 && var9.field2674 != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.field2674;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								if (Client.field795 > var9.field2705 && var9.onMiscTransmit != null) {
+									var27 = new ScriptEvent();
+									var27.widget = var9;
+									var27.args = var9.onMiscTransmit;
+									Client.scriptEvents.addFirst(var27);
+								}
+
+								var9.field2705 = Client.cycleCntr;
+								if (var9.onKey != null) {
+									for (var35 = 0; var35 < Client.field762; ++var35) {
+										ScriptEvent var29 = new ScriptEvent();
+										var29.widget = var9;
+										var29.keyTyped = Client.field869[var35];
+										var29.keyPressed = Client.field868[var35];
+										var29.args = var9.onKey;
+										Client.scriptEvents.addFirst(var29);
+									}
+								}
+							}
+						}
+
+						if (!var9.isIf3) {
+							if (Client.clickedWidget != null || class185.dragInventoryWidget != null || Client.isMenuOpen) {
+								continue;
+							}
+
+							if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								if (var9.mouseOverRedirect >= 0) {
+									GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+								} else {
+									GrandExchangeOfferUnitPriceComparator.mousedOverWidgetIf1 = var9;
+								}
+							}
+
+							if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+								VarbitDefinition.field3296 = var9;
+							}
+
+							if (var9.scrollHeight > var9.height) {
+								VarcInt.method4485(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+							}
+						}
+
+						if (var9.type == 0) {
+							updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+							if (var9.children != null) {
+								updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+							}
+
+							InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var9.id);
+							if (var30 != null) {
+								if (var30.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
+									for (ScriptEvent var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) {
+										if (var31.isMouseInputEvent) {
+											var31.remove();
+											var31.widget.containsMouse = false;
+										}
+									}
+
+									if (SequenceDefinition.widgetDragDuration == 0) {
+										Client.clickedWidget = null;
+										Client.clickedWidgetParent = null;
+									}
+
+									if (!Client.isMenuOpen) {
+										class96.addCancelMenuEntry();
+									}
+								}
+
+								WorldMapDecoration.updateRootInterface(var30.group, var12, var13, var14, var15, var10, var11);
+							}
+						}
+					}
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("kc")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "-1093482480"
+	)
+	@Export("Clan_joinChat")
+	static final void Clan_joinChat(String var0) {
+		if (!var0.equals("")) {
+			PacketBufferNode var1 = TilePaint.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher);
+			var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0));
+			var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+			Client.packetWriter.addNode(var1);
+		}
 	}
 }

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

@@ -1,291 +1,507 @@
-import java.io.File;
 import java.util.Comparator;
 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("o")
+@ObfuscatedName("h")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("i")
+	@ObfuscatedName("dg")
-	@Export("FileSystem_cacheDir")
-	static File FileSystem_cacheDir;
-	@ObfuscatedName("ef")
 	@ObfuscatedSignature(
-		signature = "Lif;"
+		signature = "Lia;"
 	)
-	@Export("archive17")
+	@Export("archive9")
-	static Archive archive17;
+	static Archive archive9;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lx;Lx;I)I",
+		signature = "(Ll;Ll;B)I",
-		garbageValue = "1230238028"
+		garbageValue = "48"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.getOfferName().compareTo(var2.getOfferName());
 	}
 
-	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("f")
+	public boolean equals(Object var1) {
-	@ObfuscatedSignature(
+		return super.equals(var1);
-		signature = "(Lhz;III)[Lls;",
-		garbageValue = "-1409771005"
-	)
-	@Export("SpriteBuffer_getSpriteArray")
-	public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) {
-		if (!HitSplatDefinition.method4586(var0, var1, var2)) {
-			return null;
-		} else {
-			Sprite[] var4 = new Sprite[class325.SpriteBuffer_spriteCount];
-
-			for (int var5 = 0; var5 < class325.SpriteBuffer_spriteCount; ++var5) {
-				Sprite var6 = var4[var5] = new Sprite();
-				var6.width = class325.SpriteBuffer_spriteWidth;
-				var6.height = class325.SpriteBuffer_spriteHeight;
-				var6.xOffset = class325.SpriteBuffer_xOffsets[var5];
-				var6.yOffset = class325.SpriteBuffer_yOffsets[var5];
-				var6.subWidth = UserComparator1.SpriteBuffer_spriteWidths[var5];
-				var6.subHeight = class325.SpriteBuffer_spriteHeights[var5];
-				int var7 = var6.subWidth * var6.subHeight;
-				byte[] var8 = class290.SpriteBuffer_pixels[var5];
-				var6.pixels = new int[var7];
-
-				for (int var9 = 0; var9 < var7; ++var9) {
-					var6.pixels[var9] = class268.SpriteBuffer_spritePalette[var8[var9] & 255];
-				}
-			}
-
-			Message.method1223();
-			return var4;
-		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(ILcu;ZB)I",
+		signature = "(Lem;[Lfv;I)V",
-		garbageValue = "-68"
+		garbageValue = "1041712074"
 	)
-	static int method134(int var0, Script var1, boolean var2) {
+	static final void method152(Scene var0, CollisionMap[] var1) {
-		Widget var3;
+		int var2;
-		if (var0 >= 2000) {
+		int var3;
-			var0 -= 1000;
+		int var4;
-			var3 = Tile.getWidget(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
+		int var5;
-		} else {
+		for (var2 = 0; var2 < 4; ++var2) {
-			var3 = var2 ? UserComparator7.field1946 : class197.field2398;
+			for (var3 = 0; var3 < 104; ++var3) {
+				for (var4 = 0; var4 < 104; ++var4) {
+					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) {
+						var5 = var2;
+						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
+							var5 = var2 - 1;
+						}
+
+						if (var5 >= 0) {
+							var1[var5].setBlockedByFloor(var3, var4);
+						}
+					}
+				}
+			}
 		}
 
-		String var4 = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize];
+		Tiles.field512 += (int)(Math.random() * 5.0D) - 2;
-		int[] var5 = null;
+		if (Tiles.field512 < -8) {
-		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
+			Tiles.field512 = -8;
-			int var6 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
+		}
-			if (var6 > 0) {
+
-				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]) {
+		if (Tiles.field512 > 8) {
+			Tiles.field512 = 8;
+		}
+
+		Tiles.field519 += (int)(Math.random() * 5.0D) - 2;
+		if (Tiles.field519 < -16) {
+			Tiles.field519 = -16;
+		}
+
+		if (Tiles.field519 > 16) {
+			Tiles.field519 = 16;
+		}
+
+		int var9;
+		int var10;
+		int var11;
+		int var12;
+		int var13;
+		int var14;
+		int var15;
+		int var16;
+		int[] var10000;
+		int var17;
+		int var18;
+		for (var2 = 0; var2 < 4; ++var2) {
+			byte[][] var42 = InterfaceParent.field565[var2];
+			var9 = (int)Math.sqrt(5100.0D);
+			var10 = var9 * 768 >> 8;
+
+			int var19;
+			int var20;
+			for (var11 = 1; var11 < 103; ++var11) {
+				for (var12 = 1; var12 < 103; ++var12) {
+					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11];
+					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1];
+					var15 = (int)Math.sqrt((double)(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][var11 + 1] >> 3) + (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11] >> 1);
+					Tiles.field509[var12][var11] = var19 - var20;
 				}
 			}
 
-			var4 = var4.substring(0, var4.length() - 1);
+			for (var11 = 0; var11 < 104; ++var11) {
-		}
+				class268.Tiles_hue[var11] = 0;
-
+				HorizontalAlignment.Tiles_saturation[var11] = 0;
-		Object[] var8 = new Object[var4.length() + 1];
+				class30.Tiles_lightness[var11] = 0;
-
+				class40.Tiles_hueMultiplier[var11] = 0;
-		int var7;
+				TileItemPile.field1529[var11] = 0;
-		for (var7 = var8.length - 1; var7 >= 1; --var7) {
-			if (var4.charAt(var7 - 1) == 's') {
-				var8[var7] = Interpreter.Interpreter_stringStack[--class65.Interpreter_stringStackSize];
-			} else {
-				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize]);
-			}
-		}
-
-		var7 = Interpreter.Interpreter_intStack[--class188.Interpreter_intStackSize];
-		if (var7 != -1) {
-			var8[0] = new Integer(var7);
-		} else {
-			var8 = null;
-		}
-
-		if (var0 == ScriptOpcodes.CC_SETONCLICK) {
-			var3.onClick = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONHOLD) {
-			var3.onHold = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) {
-			var3.onRelease = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) {
-			var3.onMouseOver = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) {
-			var3.onMouseLeave = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONDRAG) {
-			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;
 			}
 
-			var3.onResize = var8;
+			for (var11 = -5; var11 < 109; ++var11) {
-		}
+				for (var12 = 0; var12 < 104; ++var12) {
-
+					var13 = var11 + 5;
-		var3.hasListener = true;
+					int var10002;
-		return 1;
+					if (var13 >= 0 && var13 < 104) {
-	}
+						var14 = Tiles.field502[var2][var13][var12] & 255;
-
+						if (var14 > 0) {
-	@ObfuscatedName("jc")
+							FloorUnderlayDefinition var43 = GraphicsObject.method2055(var14 - 1);
-	@ObfuscatedSignature(
+							var10000 = class268.Tiles_hue;
-		signature = "(Lha;III)V",
+							var10000[var12] += var43.hue;
-		garbageValue = "527227897"
+							var10000 = HorizontalAlignment.Tiles_saturation;
-	)
+							var10000[var12] += var43.saturation;
-	@Export("clickWidget")
+							var10000 = class30.Tiles_lightness;
-	static final void clickWidget(Widget var0, int var1, int var2) {
+							var10000[var12] += var43.lightness;
-		if (Client.clickedWidget == null && !Client.isMenuOpen) {
+							var10000 = class40.Tiles_hueMultiplier;
-			if (var0 != null) {
+							var10000[var12] += var43.hueMultiplier;
-				Widget var4 = StudioGame.method4116(var0);
+							var10002 = TileItemPile.field1529[var12]++;
-				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;
+					var14 = var11 - 5;
-					Client.widgetClickX = var1;
+					if (var14 >= 0 && var14 < 104) {
-					Client.widgetClickY = var2;
+						var15 = Tiles.field502[var2][var14][var12] & 255;
-					WorldMapSection2.widgetDragDuration = 0;
+						if (var15 > 0) {
-					Client.isDraggingWidget = false;
+							FloorUnderlayDefinition var44 = GraphicsObject.method2055(var15 - 1);
-					int var5 = GrandExchangeOfferOwnWorldComparator.method1288();
+							var10000 = class268.Tiles_hue;
-					if (var5 != -1) {
+							var10000[var12] -= var44.hue;
-						BuddyRankComparator.method3361(var5);
+							var10000 = HorizontalAlignment.Tiles_saturation;
+							var10000[var12] -= var44.saturation;
+							var10000 = class30.Tiles_lightness;
+							var10000[var12] -= var44.lightness;
+							var10000 = class40.Tiles_hueMultiplier;
+							var10000[var12] -= var44.hueMultiplier;
+							var10002 = TileItemPile.field1529[var12]--;
+						}
+					}
+				}
+
+				if (var11 >= 1 && var11 < 103) {
+					var12 = 0;
+					var13 = 0;
+					var14 = 0;
+					var15 = 0;
+					var16 = 0;
+
+					for (var17 = -5; var17 < 109; ++var17) {
+						var18 = var17 + 5;
+						if (var18 >= 0 && var18 < 104) {
+							var12 += class268.Tiles_hue[var18];
+							var13 += HorizontalAlignment.Tiles_saturation[var18];
+							var14 += class30.Tiles_lightness[var18];
+							var15 += class40.Tiles_hueMultiplier[var18];
+							var16 += TileItemPile.field1529[var18];
+						}
+
+						var19 = var17 - 5;
+						if (var19 >= 0 && var19 < 104) {
+							var12 -= class268.Tiles_hue[var19];
+							var13 -= HorizontalAlignment.Tiles_saturation[var19];
+							var14 -= class30.Tiles_lightness[var19];
+							var15 -= class40.Tiles_hueMultiplier[var19];
+							var16 -= TileItemPile.field1529[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.field502[var2][var11][var17] & 255;
+							int var21 = Tiles.field514[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 = Tiles.field509[var11][var17];
+								int var27 = Tiles.field509[var11 + 1][var17];
+								int var28 = Tiles.field509[var11 + 1][var17 + 1];
+								int var29 = Tiles.field509[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 = class192.hslToRgb(var32, var33, var34);
+									var32 = var32 + Tiles.field512 & 255;
+									var34 += Tiles.field519;
+									if (var34 < 0) {
+										var34 = 0;
+									} else if (var34 > 255) {
+										var34 = 255;
+									}
+
+									var31 = class192.hslToRgb(var32, var33, var34);
+								}
+
+								if (var2 > 0) {
+									boolean var47 = true;
+									if (var20 == 0 && Tiles.field507[var2][var11][var17] != 0) {
+										var47 = false;
+									}
+
+									if (var21 > 0 && !ArchiveLoader.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) {
+										var47 = false;
+									}
+
+									if (var47 && var23 == var22 && var22 == var24 && var25 == var22) {
+										var10000 = UrlRequest.field1940[var2][var11];
+										var10000[var17] |= 2340;
+									}
+								}
+
+								var32 = 0;
+								if (var31 != -1) {
+									var32 = Rasterizer3D.Rasterizer3D_colorPalette[DynamicObject.method2286(var31, 96)];
+								}
+
+								if (var21 == 0) {
+									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, DynamicObject.method2286(var30, var26), DynamicObject.method2286(var30, var27), DynamicObject.method2286(var30, var28), DynamicObject.method2286(var30, var29), 0, 0, 0, 0, var32, 0);
+								} else {
+									var33 = Tiles.field507[var2][var11][var17] + 1;
+									byte var48 = Tiles.field518[var2][var11][var17];
+									FloorOverlayDefinition var35 = ArchiveLoader.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 = class192.hslToRgb(var35.hue, var35.saturation, var35.lightness);
+										var39 = var35.hue + Tiles.field512 & 255;
+										var40 = var35.lightness + Tiles.field519;
+										if (var40 < 0) {
+											var40 = 0;
+										} else if (var40 > 255) {
+											var40 = 255;
+										}
+
+										var38 = class192.hslToRgb(var39, var35.saturation, var40);
+									}
+
+									var39 = 0;
+									if (var38 != -2) {
+										var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapRegion.method564(var38, 96)];
+									}
+
+									if (var35.secondaryRgb != -1) {
+										var40 = var35.secondaryHue + Tiles.field512 & 255;
+										int var41 = var35.secondaryLightness + Tiles.field519;
+										if (var41 < 0) {
+											var41 = 0;
+										} else if (var41 > 255) {
+											var41 = 255;
+										}
+
+										var38 = class192.hslToRgb(var40, var35.secondarySaturation, var41);
+										var39 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapRegion.method564(var38, 96)];
+									}
+
+									var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, DynamicObject.method2286(var30, var26), DynamicObject.method2286(var30, var27), DynamicObject.method2286(var30, var28), DynamicObject.method2286(var30, var29), WorldMapRegion.method564(var37, var26), WorldMapRegion.method564(var37, var27), WorldMapRegion.method564(var37, var28), WorldMapRegion.method564(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;
 					}
 
-					return;
+					var0.setTileMinPlane(var2, var12, var11, var17);
 				}
 			}
 
+			Tiles.field502[var2] = null;
+			Tiles.field514[var2] = null;
+			Tiles.field507[var2] = null;
+			Tiles.field518[var2] = null;
+			InterfaceParent.field565[var2] = null;
 		}
-	}
 
-	@ObfuscatedName("kn")
+		var0.method3186(-50, -10, -50);
-	@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) {
+		for (var2 = 0; var2 < 104; ++var2) {
-				var2 = (var1 - 314) / 2;
+			for (var3 = 0; var3 < 104; ++var3) {
-				var3 = var1 & 1;
+				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-				Client.playerAppearance.method3978(var2, var3 == 1);
+					var0.setLinkBelow(var2, var3);
-			}
-
-			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("kl")
-	@ObfuscatedSignature(
-		signature = "(IIIILls;Lhy;I)V",
-		garbageValue = "1019176627"
-	)
-	@Export("drawSpriteOnMinimap")
-	static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-		if (var4 != null) {
-			int var6 = Client.camAngleY & 2047;
-			int var7 = var3 * var3 + var2 * var2;
-			if (var7 <= 6400) {
-				int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
-				int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
-				int var10 = var9 * var2 + var3 * var8 >> 16;
-				int var11 = var3 * var9 - var8 * var2 >> 16;
-				if (var7 > 2500) {
-					var4.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);
 				}
-
 			}
 		}
+
+		var2 = 1;
+		var3 = 2;
+		var4 = 4;
+
+		for (var5 = 0; var5 < 4; ++var5) {
+			if (var5 > 0) {
+				var2 <<= 3;
+				var3 <<= 3;
+				var4 <<= 3;
+			}
+
+			for (int var6 = 0; var6 <= var5; ++var6) {
+				for (int var7 = 0; var7 <= 104; ++var7) {
+					for (int var8 = 0; var8 <= 104; ++var8) {
+						short var46;
+						if ((UrlRequest.field1940[var6][var8][var7] & var2) != 0) {
+							var9 = var7;
+							var10 = var7;
+							var11 = var6;
+
+							for (var12 = var6; var9 > 0 && (UrlRequest.field1940[var6][var8][var9 - 1] & var2) != 0; --var9) {
+							}
+
+							while (var10 < 104 && (UrlRequest.field1940[var6][var8][var10 + 1] & var2) != 0) {
+								++var10;
+							}
+
+							label444:
+							while (var11 > 0) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((UrlRequest.field1940[var11 - 1][var8][var13] & var2) == 0) {
+										break label444;
+									}
+								}
+
+								--var11;
+							}
+
+							label433:
+							while (var12 < var5) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((UrlRequest.field1940[var12 + 1][var8][var13] & var2) == 0) {
+										break label433;
+									}
+								}
+
+								++var12;
+							}
+
+							var13 = (var10 - var9 + 1) * (var12 + 1 - var11);
+							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 = UrlRequest.field1940[var17][var8];
+										var10000[var18] &= ~var2;
+									}
+								}
+							}
+						}
+
+						if ((UrlRequest.field1940[var6][var8][var7] & var3) != 0) {
+							var9 = var8;
+							var10 = var8;
+							var11 = var6;
+
+							for (var12 = var6; var9 > 0 && (UrlRequest.field1940[var6][var9 - 1][var7] & var3) != 0; --var9) {
+							}
+
+							while (var10 < 104 && (UrlRequest.field1940[var6][var10 + 1][var7] & var3) != 0) {
+								++var10;
+							}
+
+							label497:
+							while (var11 > 0) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((UrlRequest.field1940[var11 - 1][var13][var7] & var3) == 0) {
+										break label497;
+									}
+								}
+
+								--var11;
+							}
+
+							label486:
+							while (var12 < var5) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((UrlRequest.field1940[var12 + 1][var13][var7] & var3) == 0) {
+										break label486;
+									}
+								}
+
+								++var12;
+							}
+
+							var13 = (var10 - var9 + 1) * (var12 + 1 - var11);
+							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 = UrlRequest.field1940[var17][var18];
+										var10000[var7] &= ~var3;
+									}
+								}
+							}
+						}
+
+						if ((UrlRequest.field1940[var6][var8][var7] & var4) != 0) {
+							var9 = var8;
+							var10 = var8;
+							var11 = var7;
+
+							for (var12 = var7; var11 > 0 && (UrlRequest.field1940[var6][var8][var11 - 1] & var4) != 0; --var11) {
+							}
+
+							while (var12 < 104 && (UrlRequest.field1940[var6][var8][var12 + 1] & var4) != 0) {
+								++var12;
+							}
+
+							label550:
+							while (var9 > 0) {
+								for (var13 = var11; var13 <= var12; ++var13) {
+									if ((UrlRequest.field1940[var6][var9 - 1][var13] & var4) == 0) {
+										break label550;
+									}
+								}
+
+								--var9;
+							}
+
+							label539:
+							while (var10 < 104) {
+								for (var13 = var11; var13 <= var12; ++var13) {
+									if ((UrlRequest.field1940[var6][var10 + 1][var13] & var4) == 0) {
+										break label539;
+									}
+								}
+
+								++var10;
+							}
+
+							if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) {
+								var13 = Tiles.Tiles_heights[var6][var9][var11];
+								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13);
+
+								for (var14 = var9; var14 <= var10; ++var14) {
+									for (var15 = var11; var15 <= var12; ++var15) {
+										var10000 = UrlRequest.field1940[var6][var14];
+										var10000[var15] &= ~var4;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+	}
+
+	@ObfuscatedName("je")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "1818346399"
+	)
+	static final void method150(int var0) {
+		if (ScriptFrame.loadInterface(var0)) {
+			WorldMapEvent.drawModelComponents(WorldMapLabel.Widget_interfaceComponents[var0], -1);
+		}
 	}
 }

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

@@ -1,3 +1,6 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
@@ -5,30 +8,31 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bb")
+@ObfuscatedName("bd")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("rs")
+	@ObfuscatedName("qo")
 	@ObfuscatedGetter(
-		intValue = 756915395
+		intValue = -1780442240
 	)
-	static int field623;
+	static int field640;
-	@ObfuscatedName("eu")
+	@ObfuscatedName("w")
-	static int[] field626;
+	@ObfuscatedGetter(
-	@ObfuscatedName("gf")
+		intValue = -153755923
-	@Export("regionMapArchives")
+	)
-	static byte[][] regionMapArchives;
+	@Export("cacheGamebuild")
-	@ObfuscatedName("f")
+	public static int cacheGamebuild;
+	@ObfuscatedName("c")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lx;Lx;I)I",
+		signature = "(Ll;Ll;I)I",
-		garbageValue = "-1149746990"
+		garbageValue = "231872829"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -57,12 +61,187 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("ik")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;",
-		garbageValue = "-524151860"
+		garbageValue = "295022584"
 	)
-	static final int method1288() {
+	public static File method1311(String var0, String var1, int var2) {
-		return Client.menuOptionsCount - 1;
+		String var3 = var2 == 0 ? "" : "" + var2;
+		JagexCache.JagexCache_locationFile = new File(UserComparator4.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat");
+		String var4 = null;
+		String var5 = null;
+		boolean var6 = false;
+		Buffer var8;
+		int var11;
+		File var27;
+		if (JagexCache.JagexCache_locationFile.exists()) {
+			try {
+				AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
+
+				int var9;
+				for (var8 = new Buffer((int)var7.length()); var8.offset < var8.array.length; var8.offset += var9) {
+					var9 = var7.read(var8.array, var8.offset, var8.array.length - var8.offset);
+					if (var9 == -1) {
+						throw new IOException();
+					}
+				}
+
+				var8.offset = 0;
+				var9 = var8.readUnsignedByte();
+				if (var9 < 1 || var9 > 3) {
+					throw new IOException("" + var9);
+				}
+
+				int var10 = 0;
+				if (var9 > 1) {
+					var10 = var8.readUnsignedByte();
+				}
+
+				if (var9 <= 2) {
+					var4 = var8.readStringCp1252NullCircumfixed();
+					if (var10 == 1) {
+						var5 = var8.readStringCp1252NullCircumfixed();
+					}
+				} else {
+					var4 = var8.readCESU8();
+					if (var10 == 1) {
+						var5 = var8.readCESU8();
+					}
+				}
+
+				var7.close();
+			} catch (IOException var25) {
+				var25.printStackTrace();
+			}
+
+			if (var4 != null) {
+				var27 = new File(var4);
+				if (!var27.exists()) {
+					var4 = null;
+				}
+			}
+
+			if (var4 != null) {
+				var27 = new File(var4, "test.dat");
+
+				boolean var28;
+				try {
+					RandomAccessFile var15 = new RandomAccessFile(var27, "rw");
+					var11 = var15.read();
+					var15.seek(0L);
+					var15.write(var11);
+					var15.seek(0L);
+					var15.close();
+					var27.delete();
+					var28 = true;
+				} catch (Exception var23) {
+					var28 = false;
+				}
+
+				if (!var28) {
+					var4 = null;
+				}
+			}
+		}
+
+		if (var4 == null && var2 == 0) {
+			label159:
+			for (int var16 = 0; var16 < class42.field373.length; ++var16) {
+				for (int var17 = 0; var17 < ChatChannel.field1291.length; ++var17) {
+					File var18 = new File(ChatChannel.field1291[var17] + class42.field373[var16] + File.separatorChar + var0 + File.separatorChar);
+					if (var18.exists()) {
+						File var19 = new File(var18, "test.dat");
+
+						boolean var29;
+						try {
+							RandomAccessFile var12 = new RandomAccessFile(var19, "rw");
+							int var13 = var12.read();
+							var12.seek(0L);
+							var12.write(var13);
+							var12.seek(0L);
+							var12.close();
+							var19.delete();
+							var29 = true;
+						} catch (Exception var22) {
+							var29 = false;
+						}
+
+						if (var29) {
+							var4 = var18.toString();
+							var6 = true;
+							break label159;
+						}
+					}
+				}
+			}
+		}
+
+		if (var4 == null) {
+			var4 = UserComparator4.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar;
+			var6 = true;
+		}
+
+		File var26;
+		if (var5 != null) {
+			var26 = new File(var5);
+			var27 = new File(var4);
+
+			try {
+				File[] var33 = var26.listFiles();
+				File[] var31 = var33;
+
+				for (var11 = 0; var11 < var31.length; ++var11) {
+					File var30 = var31[var11];
+					File var20 = new File(var27, var30.getName());
+					boolean var14 = var30.renameTo(var20);
+					if (!var14) {
+						throw new IOException();
+					}
+				}
+			} catch (Exception var24) {
+				var24.printStackTrace();
+			}
+
+			var6 = true;
+		}
+
+		if (var6) {
+			var26 = new File(var4);
+			var8 = null;
+
+			try {
+				AccessFile var34 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L);
+				Buffer var32 = new Buffer(500);
+				var32.writeByte(3);
+				var32.writeByte(var8 != null ? 1 : 0);
+				var32.writeCESU8(var26.getPath());
+				if (var8 != null) {
+					var32.writeCESU8("");
+				}
+
+				var34.write(var32.array, 0, var32.offset);
+				var34.close();
+			} catch (IOException var21) {
+				var21.printStackTrace();
+			}
+		}
+
+		return new File(var4);
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "110"
+	)
+	static void method1308() {
+		Players.Players_count = 0;
+
+		for (int var0 = 0; var0 < 2048; ++var0) {
+			Players.field1235[var0] = null;
+			Players.field1237[var0] = 1;
+		}
+
 	}
 }

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

@@ -1,47 +1,20 @@
-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("a")
+@ObfuscatedName("j")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("g")
+	@ObfuscatedName("at")
-	@ObfuscatedGetter(
+	@Export("hasFocus")
-		intValue = -113248427
+	protected static boolean hasFocus;
-	)
-	@Export("canvasWidth")
-	public static int canvasWidth;
-	@ObfuscatedName("dw")
-	@ObfuscatedSignature(
-		signature = "Lif;"
-	)
-	@Export("archive15")
-	static Archive archive15;
-	@ObfuscatedName("fh")
-	@ObfuscatedGetter(
-		intValue = 780531471
-	)
-	static int field47;
-	@ObfuscatedName("gv")
-	@ObfuscatedSignature(
-		signature = "Lls;"
-	)
-	@Export("compass")
-	static Sprite compass;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lx;Lx;I)I",
+		signature = "(Ll;Ll;B)I",
-		garbageValue = "-247020264"
+		garbageValue = "14"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -56,38 +29,200 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([BI)Lls;",
+		signature = "(Lkp;Ljava/lang/String;I)I",
-		garbageValue = "-146383667"
+		garbageValue = "1410846723"
 	)
-	@Export("convertJpgToSprite")
+	public static int method104(Buffer var0, String var1) {
-	public static final Sprite convertJpgToSprite(byte[] var0) {
+		int var2 = var0.offset;
-		BufferedImage var1 = null;
+		byte[] var3 = ServerPacket.method3680(var1);
-
+		var0.writeSmartByteShort(var3.length);
-		try {
+		var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset);
-			var1 = ImageIO.read(new ByteArrayInputStream(var0));
+		return var0.offset - var2;
-			int var2 = var1.getWidth();
-			int var3 = var1.getHeight();
-			int[] var4 = new int[var3 * var2];
-			PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
-			var5.grabPixels();
-			return new Sprite(var4, var2, var3);
-		} catch (IOException var7) {
-		} catch (InterruptedException var8) {
-		}
-
-		return new Sprite(0, 0);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Ljava/awt/Component;I)V",
+		signature = "(II)[B",
-		garbageValue = "-1494911511"
+		garbageValue = "-265400137"
 	)
-	static void method93(Component var0) {
+	@Export("ByteArrayPool_getArray")
-		var0.setFocusTraversalKeysEnabled(false);
+	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
-		var0.addKeyListener(KeyHandler.KeyHandler_instance);
+		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false);
-		var0.addFocusListener(KeyHandler.KeyHandler_instance);
+	}
+
+	@ObfuscatedName("jw")
+	@ObfuscatedSignature(
+		signature = "(Lhn;IB)I",
+		garbageValue = "1"
+	)
+	static final int method106(Widget var0, int var1) {
+		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
+			try {
+				int[] var2 = var0.cs1Instructions[var1];
+				int var3 = 0;
+				int var4 = 0;
+				byte var5 = 0;
+
+				while (true) {
+					int var6 = var2[var4++];
+					int var7 = 0;
+					byte var8 = 0;
+					if (var6 == 0) {
+						return var3;
+					}
+
+					if (var6 == 1) {
+						var7 = Client.currentLevels[var2[var4++]];
+					}
+
+					if (var6 == 2) {
+						var7 = Client.levels[var2[var4++]];
+					}
+
+					if (var6 == 3) {
+						var7 = Client.experience[var2[var4++]];
+					}
+
+					int var9;
+					Widget var10;
+					int var11;
+					int var12;
+					if (var6 == 4) {
+						var9 = var2[var4++] << 16;
+						var9 += var2[var4++];
+						var10 = Varps.getWidget(var9);
+						var11 = var2[var4++];
+						if (var11 != -1 && (!HealthBarDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+								if (var11 + 1 == var10.itemIds[var12]) {
+									var7 += var10.itemQuantities[var12];
+								}
+							}
+						}
+					}
+
+					if (var6 == 5) {
+						var7 = Varps.Varps_main[var2[var4++]];
+					}
+
+					if (var6 == 6) {
+						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
+					}
+
+					if (var6 == 7) {
+						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
+					}
+
+					if (var6 == 8) {
+						var7 = class192.localPlayer.combatLevel;
+					}
+
+					if (var6 == 9) {
+						for (var9 = 0; var9 < 25; ++var9) {
+							if (Skills.Skills_enabled[var9]) {
+								var7 += Client.levels[var9];
+							}
+						}
+					}
+
+					if (var6 == 10) {
+						var9 = var2[var4++] << 16;
+						var9 += var2[var4++];
+						var10 = Varps.getWidget(var9);
+						var11 = var2[var4++];
+						if (var11 != -1 && (!HealthBarDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+								if (var11 + 1 == var10.itemIds[var12]) {
+									var7 = 999999999;
+									break;
+								}
+							}
+						}
+					}
+
+					if (var6 == 11) {
+						var7 = Client.runEnergy;
+					}
+
+					if (var6 == 12) {
+						var7 = Client.weight;
+					}
+
+					if (var6 == 13) {
+						var9 = Varps.Varps_main[var2[var4++]];
+						int var13 = var2[var4++];
+						var7 = (var9 & 1 << var13) != 0 ? 1 : 0;
+					}
+
+					if (var6 == 14) {
+						var9 = var2[var4++];
+						var7 = GrandExchangeOfferUnitPriceComparator.getVarbit(var9);
+					}
+
+					if (var6 == 15) {
+						var8 = 1;
+					}
+
+					if (var6 == 16) {
+						var8 = 2;
+					}
+
+					if (var6 == 17) {
+						var8 = 3;
+					}
+
+					if (var6 == 18) {
+						var7 = Messages.baseX * 64 + (class192.localPlayer.x >> 7);
+					}
+
+					if (var6 == 19) {
+						var7 = Language.baseY * 64 + (class192.localPlayer.y >> 7);
+					}
+
+					if (var6 == 20) {
+						var7 = var2[var4++];
+					}
+
+					if (var8 == 0) {
+						if (var5 == 0) {
+							var3 += var7;
+						}
+
+						if (var5 == 1) {
+							var3 -= var7;
+						}
+
+						if (var5 == 2 && var7 != 0) {
+							var3 /= var7;
+						}
+
+						if (var5 == 3) {
+							var3 *= var7;
+						}
+
+						var5 = 0;
+					} else {
+						var5 = var8;
+					}
+				}
+			} catch (Exception var14) {
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
+
+	@ObfuscatedName("jx")
+	@ObfuscatedSignature(
+		signature = "(III)V",
+		garbageValue = "-4522127"
+	)
+	static void method105(int var0, int var1) {
+		MenuAction var2 = WorldMapRegion.tempMenuAction;
+		UserComparator10.menuAction(var2.param0, var2.param1, var2.opcode, var2.identifier, var2.action, var2.action, var0, var1);
+		WorldMapRegion.tempMenuAction = null;
 	}
 }

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

@@ -1,29 +1,26 @@
-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("c")
+@ObfuscatedName("p")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("y")
+	@ObfuscatedName("ar")
-	@ObfuscatedGetter(
+	@Export("null_string")
-		intValue = 815964443
+	protected static String null_string;
-	)
+	@ObfuscatedName("la")
-	@Export("KitDefinition_fileCount")
-	public static int KitDefinition_fileCount;
-
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(Lx;Lx;B)I",
+		signature = "Lhn;"
-		garbageValue = "114"
+	)
+	@Export("mousedOverWidgetIf1")
+	static Widget mousedOverWidgetIf1;
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(Ll;Ll;B)I",
+		garbageValue = "0"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -38,139 +35,139 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)Lit;",
+		signature = "(II)I",
-		garbageValue = "62"
+		garbageValue = "-2056490791"
 	)
-	@Export("WorldMapElement_get")
+	@Export("getVarbit")
-	public static WorldMapElement WorldMapElement_get(int var0) {
+	public static int getVarbit(int var0) {
-		return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0);
+		VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
-	}
+		VarbitDefinition var1;
-
+		if (var2 != null) {
-	@ObfuscatedName("i")
+			var1 = var2;
-	@ObfuscatedSignature(
-		signature = "(Lkq;Ljava/lang/String;B)I",
-		garbageValue = "0"
-	)
-	public static int method122(Buffer var0, String var1) {
-		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 = "";
+			byte[] var7 = class287.VarbitDefinition_archive.takeFile(14, var0);
-		}
+			var2 = new VarbitDefinition();
-
+			if (var7 != null) {
-		StringWriter var12 = new StringWriter();
+				var2.decode(new Buffer(var7));
-		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;
+			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("d")
+	@ObfuscatedName("ez")
 	@ObfuscatedSignature(
-		signature = "(Lha;IIII)V",
+		signature = "(I)Lly;",
-		garbageValue = "673237004"
+		garbageValue = "-710096744"
 	)
-	@Export("Widget_setKeyRate")
+	@Export("getWorldMap")
-	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+	static WorldMap getWorldMap() {
-		if (var0.field2631 == null) {
+		return WorldMapIcon_0.worldMap;
-			throw new RuntimeException();
-		} else {
-			var0.field2631[var1] = var2;
-			var0.field2670[var1] = var3;
-		}
 	}
 
-	@ObfuscatedName("ix")
+	@ObfuscatedName("gt")
+	@ObfuscatedSignature(
+		signature = "(IIIIZI)V",
+		garbageValue = "2147483647"
+	)
+	@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.field908;
+		} else if (var5 >= 100) {
+			var6 = Client.field897;
+		} else {
+			var6 = (Client.field897 - Client.field908) * var5 / 100 + Client.field908;
+		}
+
+		int var7 = var3 * var6 * 512 / (var2 * 334);
+		int var8;
+		int var9;
+		short var10;
+		if (var7 < Client.field819) {
+			var10 = Client.field819;
+			var6 = var10 * var2 * 334 / (var3 * 512);
+			if (var6 > Client.field673) {
+				var6 = Client.field673;
+				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.field903) {
+			var10 = Client.field903;
+			var6 = var10 * var2 * 334 / (var3 * 512);
+			if (var6 < Client.field900) {
+				var6 = Client.field900;
+				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) {
+			CollisionMap.method3650(var2, var3);
+		}
+
+		Client.viewportOffsetX = var0;
+		Client.viewportOffsetY = var1;
+		Client.viewportWidth = var2;
+		Client.viewportHeight = var3;
+	}
+
+	@ObfuscatedName("gf")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1132135504"
+		garbageValue = "-1156773916"
 	)
-	@Export("Widget_runOnTargetLeave")
+	static void method141() {
-	static void Widget_runOnTargetLeave() {
+		if (class192.localPlayer.x >> 7 == Client.destinationX && class192.localPlayer.y >> 7 == Client.destinationY) {
-		if (Client.isSpellSelected) {
+			Client.destinationX = 0;
-			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);
+
+	@ObfuscatedName("ir")
+	@ObfuscatedSignature(
+		signature = "(IIIZI)V",
+		garbageValue = "-1682009725"
+	)
+	static final void method135(int var0, int var1, int var2, boolean var3) {
+		if (ScriptFrame.loadInterface(var0)) {
+			FloorUnderlayDefinition.resizeInterface(WorldMapLabel.Widget_interfaceComponents[var0], -1, var1, var2, var3);
 		}
 	}
 }

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

@@ -4,123 +4,415 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("b")
+@ObfuscatedName("g")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("dn")
+	@ObfuscatedName("df")
 	@ObfuscatedSignature(
-		signature = "Lif;"
+		signature = "Lia;"
 	)
-	@Export("archive6")
+	@Export("archive2")
-	static Archive archive6;
+	static Archive archive2;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lx;Lx;I)I",
+		signature = "(Ll;Ll;I)I",
-		garbageValue = "1333549485"
+		garbageValue = "250420083"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1);
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("b")
+	public int compare(Object var1, Object var2) {
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+	}
+
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(II)Z",
-		garbageValue = "1794257509"
+		garbageValue = "362180230"
 	)
-	static void method70(int var0) {
+	public static boolean method76(int var0) {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		return (var0 >> 20 & 1) != 0;
-		if (var1 != null) {
+	}
-			var1.remove();
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		signature = "(Lhn;IIII)V",
+		garbageValue = "1571239297"
+	)
+	@Export("Widget_setKeyRate")
+	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		if (var0.field2649 == null) {
+			throw new RuntimeException();
+		} else {
+			var0.field2649[var1] = var2;
+			var0.field2560[var1] = var3;
 		}
 	}
 
-	@ObfuscatedName("hr")
+	@ObfuscatedName("hn")
 	@ObfuscatedSignature(
-		signature = "(ZLkl;I)V",
+		signature = "(Lgy;I)V",
-		garbageValue = "386675414"
+		garbageValue = "356089511"
 	)
-	static final void method71(boolean var0, PacketBuffer var1) {
+	static final void method77(class185 var0) {
-		while (true) {
+		PacketBuffer var1 = Client.packetWriter.packetBuffer;
-			if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
+		int var2;
-				int var2 = var1.readBits(15);
+		int var3;
-				if (var2 != 32767) {
+		int var4;
-					boolean var3 = false;
+		int var5;
-					if (Client.npcs[var2] == null) {
+		int var6;
-						Client.npcs[var2] = new NPC();
+		int var7;
-						var3 = true;
+		int var8;
-					}
+		if (class185.field2314 == var0) {
+			var2 = var1.method5771();
+			var3 = (var2 >> 4 & 7) + SecureRandomCallable.field531;
+			var4 = (var2 & 7) + FontName.field3663;
+			var5 = var1.method5606();
+			var6 = var5 >> 2;
+			var7 = var5 & 3;
+			var8 = Client.field743[var6];
+			if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+				Skills.updatePendingSpawn(Clock.Client_plane, var3, var4, var8, -1, var6, var7, 0, -1);
+			}
 
-					NPC var4 = Client.npcs[var2];
+		} else {
-					Client.npcIndices[++Client.npcCount - 1] = var2;
+			int var9;
-					var4.npcCycle = Client.cycle;
+			int var10;
-					int var5;
+			if (class185.field2327 == var0) {
-					if (var0) {
+				var2 = var1.method5740();
-						var5 = var1.readBits(8);
+				var3 = var1.method5606();
-						if (var5 > 127) {
+				var4 = var1.readUnsignedByte();
-							var5 -= 256;
+				var5 = (var4 >> 4 & 7) + SecureRandomCallable.field531;
-						}
+				var6 = (var4 & 7) + FontName.field3663;
-					} else {
+				var7 = var1.readUnsignedByte();
-						var5 = var1.readBits(5);
+				var8 = var7 >> 4 & 15;
-						if (var5 > 15) {
+				var9 = var7 & 7;
-							var5 -= 32;
+				if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
-						}
+					var10 = var8 + 1;
+					if (class192.localPlayer.pathX[0] >= var5 - var10 && class192.localPlayer.pathX[0] <= var5 + var10 && class192.localPlayer.pathY[0] >= var6 - var10 && class192.localPlayer.pathY[0] <= var6 + var10 && 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 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();
+			TileItem var32;
-			return;
+			if (class185.field2322 == var0) {
+				var2 = var1.method5762();
+				var3 = var1.method5605();
+				var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531;
+				var5 = (var3 & 7) + FontName.field3663;
+				if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+					NodeDeque var31 = Client.groundItems[Clock.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[Clock.Client_plane][var4][var5] = null;
+						}
+
+						WorldMapEvent.updateItemPile(var4, var5);
+					}
+				}
+
+			} else if (class185.field2317 == var0) {
+				var2 = var1.method5614();
+				var3 = var1.method5605();
+				var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531;
+				var5 = (var3 & 7) + FontName.field3663;
+				var6 = var1.method5614();
+				if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+					var32 = new TileItem();
+					var32.id = var2;
+					var32.quantity = var6;
+					if (Client.groundItems[Clock.Client_plane][var4][var5] == null) {
+						Client.groundItems[Clock.Client_plane][var4][var5] = new NodeDeque();
+					}
+
+					Client.groundItems[Clock.Client_plane][var4][var5].addFirst(var32);
+					WorldMapEvent.updateItemPile(var4, var5);
+				}
+
+			} else {
+				int var11;
+				if (class185.field2316 == var0) {
+					var2 = var1.readUnsignedShort();
+					var3 = var1.method5605();
+					var4 = var3 >> 2;
+					var5 = var3 & 3;
+					var6 = Client.field743[var4];
+					var7 = var1.method5606();
+					var8 = (var7 >> 4 & 7) + SecureRandomCallable.field531;
+					var9 = (var7 & 7) + FontName.field3663;
+					if (var8 >= 0 && var9 >= 0 && var8 < 103 && var9 < 103) {
+						if (var6 == 0) {
+							BoundaryObject var33 = ServerBuild.scene.method3177(Clock.Client_plane, var8, var9);
+							if (var33 != null) {
+								var11 = GrandExchangeEvents.Entity_unpackID(var33.tag);
+								if (var4 == 2) {
+									var33.entity1 = new DynamicObject(var11, 2, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var33.entity1);
+									var33.entity2 = new DynamicObject(var11, 2, var5 + 1 & 3, Clock.Client_plane, var8, var9, var2, false, var33.entity2);
+								} else {
+									var33.entity1 = new DynamicObject(var11, var4, var5, Clock.Client_plane, var8, var9, var2, false, var33.entity1);
+								}
+							}
+						}
+
+						if (var6 == 1) {
+							WallDecoration var42 = ServerBuild.scene.method3178(Clock.Client_plane, var8, var9);
+							if (var42 != null) {
+								var11 = GrandExchangeEvents.Entity_unpackID(var42.tag);
+								if (var4 != 4 && var4 != 5) {
+									if (var4 == 6) {
+										var42.entity1 = new DynamicObject(var11, 4, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1);
+									} else if (var4 == 7) {
+										var42.entity1 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1);
+									} else if (var4 == 8) {
+										var42.entity1 = new DynamicObject(var11, 4, var5 + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity1);
+										var42.entity2 = new DynamicObject(var11, 4, (var5 + 2 & 3) + 4, Clock.Client_plane, var8, var9, var2, false, var42.entity2);
+									}
+								} else {
+									var42.entity1 = new DynamicObject(var11, 4, var5, Clock.Client_plane, var8, var9, var2, false, var42.entity1);
+								}
+							}
+						}
+
+						if (var6 == 2) {
+							GameObject var43 = ServerBuild.scene.method3203(Clock.Client_plane, var8, var9);
+							if (var4 == 11) {
+								var4 = 10;
+							}
+
+							if (var43 != null) {
+								var43.entity = new DynamicObject(GrandExchangeEvents.Entity_unpackID(var43.tag), var4, var5, Clock.Client_plane, var8, var9, var2, false, var43.entity);
+							}
+						}
+
+						if (var6 == 3) {
+							FloorDecoration var44 = ServerBuild.scene.getFloorDecoration(Clock.Client_plane, var8, var9);
+							if (var44 != null) {
+								var44.entity = new DynamicObject(GrandExchangeEvents.Entity_unpackID(var44.tag), 22, var5, Clock.Client_plane, var8, var9, var2, false, var44.entity);
+							}
+						}
+					}
+
+				} else if (class185.field2323 == var0) {
+					var2 = var1.method5605();
+					var3 = var2 >> 2;
+					var4 = var2 & 3;
+					var5 = Client.field743[var3];
+					var6 = var1.method5762();
+					var7 = var1.readUnsignedByte();
+					var8 = (var7 >> 4 & 7) + SecureRandomCallable.field531;
+					var9 = (var7 & 7) + FontName.field3663;
+					if (var8 >= 0 && var9 >= 0 && var8 < 104 && var9 < 104) {
+						Skills.updatePendingSpawn(Clock.Client_plane, var8, var9, var5, var6, var3, var4, 0, -1);
+					}
+
+				} else {
+					int var12;
+					int var13;
+					int var14;
+					if (class185.field2320 == var0) {
+						var2 = var1.method5605();
+						var3 = (var2 >> 4 & 7) + SecureRandomCallable.field531;
+						var4 = (var2 & 7) + FontName.field3663;
+						byte var37 = var1.readByte();
+						var6 = var1.method5740();
+						byte var38 = var1.method5618();
+						byte var39 = var1.method5780();
+						var9 = var1.method5605();
+						var10 = var9 >> 2;
+						var11 = var9 & 3;
+						var12 = Client.field743[var10];
+						var13 = var1.method5762();
+						var14 = var1.method5614();
+						byte var15 = var1.method5618();
+						int var16 = var1.method5740();
+						Player var17;
+						if (var14 == Client.localPlayerIndex) {
+							var17 = class192.localPlayer;
+						} else {
+							var17 = Client.players[var14];
+						}
+
+						if (var17 != null) {
+							ObjectDefinition var18 = Occluder.getObjectDefinition(var16);
+							int var19;
+							int var20;
+							if (var11 != 1 && var11 != 3) {
+								var19 = var18.sizeX;
+								var20 = var18.sizeY;
+							} else {
+								var19 = var18.sizeY;
+								var20 = var18.sizeX;
+							}
+
+							int var21 = var3 + (var19 >> 1);
+							int var22 = var3 + (var19 + 1 >> 1);
+							int var23 = var4 + (var20 >> 1);
+							int var24 = var4 + (var20 + 1 >> 1);
+							int[][] var25 = Tiles.Tiles_heights[Clock.Client_plane];
+							int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2;
+							int var27 = (var3 << 7) + (var19 << 6);
+							int var28 = (var4 << 7) + (var20 << 6);
+							Model var29 = var18.getModel(var10, var11, var25, var27, var26, var28);
+							if (var29 != null) {
+								Skills.updatePendingSpawn(Clock.Client_plane, var3, var4, var12, -1, 0, 0, var6 + 1, var13 + 1);
+								var17.animationCycleStart = var6 + Client.cycle;
+								var17.animationCycleEnd = var13 + Client.cycle;
+								var17.model0 = var29;
+								var17.field622 = var3 * 128 + var19 * 64;
+								var17.field620 = var4 * 128 + var20 * 64;
+								var17.tileHeight2 = var26;
+								byte var30;
+								if (var37 > var39) {
+									var30 = var37;
+									var37 = var39;
+									var39 = var30;
+								}
+
+								if (var38 > var15) {
+									var30 = var38;
+									var38 = var15;
+									var15 = var30;
+								}
+
+								var17.field626 = var37 + var3;
+								var17.field628 = var39 + var3;
+								var17.field627 = var4 + var38;
+								var17.field629 = var4 + var15;
+							}
+						}
+					}
+
+					if (class185.field2318 == var0) {
+						var2 = var1.readShort();
+						var3 = var1.readUnsignedByte();
+						var4 = var1.method5771();
+						var5 = (var4 >> 4 & 7) + SecureRandomCallable.field531;
+						var6 = (var4 & 7) + FontName.field3663;
+						var7 = var1.method5771() * 4;
+						var8 = var1.method5762();
+						var9 = var1.method5771() * 4;
+						var10 = var1.readUnsignedShort();
+						var11 = var1.method5606();
+						byte var40 = var1.method5609();
+						byte var41 = var1.method5618();
+						var14 = var1.readUnsignedShort();
+						var13 = var41 + var5;
+						var12 = var40 + var6;
+						if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var13 >= 0 && var12 >= 0 && var13 < 104 && var12 < 104 && var14 != 65535) {
+							var5 = var5 * 128 + 64;
+							var6 = var6 * 128 + 64;
+							var13 = var13 * 128 + 64;
+							var12 = var12 * 128 + 64;
+							Projectile var34 = new Projectile(var14, Clock.Client_plane, var5, var6, WorldMapSectionType.getTileHeight(var5, var6, Clock.Client_plane) - var7, var10 + Client.cycle, var8 + Client.cycle, var11, var3, var2, var9);
+							var34.setDestination(var13, var12, WorldMapSectionType.getTileHeight(var13, var12, Clock.Client_plane) - var9, var10 + Client.cycle);
+							Client.projectiles.addFirst(var34);
+						}
+
+					} else if (class185.field2315 != var0) {
+						if (class185.field2319 == var0) {
+							var2 = var1.method5762();
+							var3 = var1.method5771();
+							var4 = (var3 >> 4 & 7) + SecureRandomCallable.field531;
+							var5 = (var3 & 7) + FontName.field3663;
+							var6 = var1.readUnsignedByte();
+							var7 = var1.method5614();
+							if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+								var4 = var4 * 128 + 64;
+								var5 = var5 * 128 + 64;
+								GraphicsObject var45 = new GraphicsObject(var7, Clock.Client_plane, var4, var5, WorldMapSectionType.getTileHeight(var4, var5, Clock.Client_plane) - var6, var2, Client.cycle);
+								Client.graphicsObjects.addFirst(var45);
+							}
+
+						}
+					} else {
+						var2 = var1.method5740();
+						var3 = var1.method5762();
+						var4 = var1.method5614();
+						var5 = var1.method5771();
+						var6 = (var5 >> 4 & 7) + SecureRandomCallable.field531;
+						var7 = (var5 & 7) + FontName.field3663;
+						if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
+							NodeDeque var35 = Client.groundItems[Clock.Client_plane][var6][var7];
+							if (var35 != null) {
+								for (TileItem var36 = (TileItem)var35.last(); var36 != null; var36 = (TileItem)var35.previous()) {
+									if ((var2 & 32767) == var36.id && var4 == var36.quantity) {
+										var36.quantity = var3;
+										break;
+									}
+								}
+
+								WorldMapEvent.updateItemPile(var6, var7);
+							}
+						}
+
+					}
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("iv")
+	@ObfuscatedSignature(
+		signature = "(IIIIIIB)V",
+		garbageValue = "-87"
+	)
+	static final void method74(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 + var6 + var13;
+			int var21 = var15 + var1;
+			int var22 = var1 - var16;
+			int var23 = var7 + var1 - var16;
+			int var24 = var15 + var7 + var1;
+			Rasterizer3D.method3066(var17, var18, var19);
+			Rasterizer3D.method3123(var21, var22, var23, var17, var18, var19, var4);
+			Rasterizer3D.method3066(var17, var19, var20);
+			Rasterizer3D.method3123(var21, var23, var24, var17, var19, var20, var4);
 		}
 	}
 }

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

@@ -1,93 +1,95 @@
+import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("kc")
+@ObfuscatedName("lj")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1707006757
+		intValue = -2019117197
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 990004197
+		intValue = 1099214959
 	)
-	public int field3803;
+	public int field3796;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -1541922539
+		intValue = 1016295027
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -1405131859
+		intValue = -153404939
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1085795545
+		intValue = 382264229
-	)
-	public int field3798;
-	@ObfuscatedName("b")
-	@ObfuscatedGetter(
-		intValue = -1754657277
-	)
-	public int field3807;
-	@ObfuscatedName("e")
-	@ObfuscatedGetter(
-		intValue = -939471917
-	)
-	public int field3804;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -773091265
-	)
-	public int field3805;
-	@ObfuscatedName("a")
-	@ObfuscatedGetter(
-		intValue = -1993061967
-	)
-	public int field3806;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = -1849016603
 	)
 	public int field3799;
-	@ObfuscatedName("c")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 735486601
+		intValue = -1961256143
 	)
-	public int field3808;
+	public int field3800;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 185996655
+	)
+	public int field3803;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 875223521
+	)
+	public int field3802;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -979917091
+	)
+	public int field3805;
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = 1753253309
+	)
+	public int field3804;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = 519795879
+	)
+	public int field3795;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3803 = -1;
+		this.field3796 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3798 = -1;
-		this.field3807 = -1;
-		this.field3804 = -1;
-		this.field3805 = -1;
-		this.field3806 = -1;
 		this.field3799 = -1;
-		this.field3808 = -1;
+		this.field3800 = -1;
+		this.field3803 = -1;
+		this.field3802 = -1;
+		this.field3805 = -1;
+		this.field3804 = -1;
+		this.field3795 = -1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lhz;B)V",
+		signature = "(Lii;I)V",
-		garbageValue = "-29"
+		garbageValue = "-1404571691"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3796.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3793.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -101,44 +103,220 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5560();
+				this.compass = var3.method5593();
-				this.field3803 = var3.method5560();
+				this.field3796 = var3.method5593();
-				this.mapScenes = var3.method5560();
+				this.mapScenes = var3.method5593();
-				this.headIconsPk = var3.method5560();
+				this.headIconsPk = var3.method5593();
-				this.field3798 = var3.method5560();
+				this.field3799 = var3.method5593();
-				this.field3807 = var3.method5560();
+				this.field3800 = var3.method5593();
-				this.field3804 = var3.method5560();
+				this.field3803 = var3.method5593();
-				this.field3805 = var3.method5560();
+				this.field3802 = var3.method5593();
-				this.field3806 = var3.method5560();
+				this.field3805 = var3.method5593();
-				this.field3799 = var3.method5560();
+				this.field3804 = var3.method5593();
-				this.field3808 = var3.method5560();
+				this.field3795 = var3.method5593();
 			}
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "([BB)V",
+		signature = "(IB)Lip;",
-		garbageValue = "-116"
+		garbageValue = "14"
 	)
-	@Export("ByteArrayPool_release")
+	@Export("SequenceDefinition_get")
-	public static synchronized void ByteArrayPool_release(byte[] var0) {
+	public static SequenceDefinition SequenceDefinition_get(int var0) {
-		if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) {
+		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
-			ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0;
+		if (var1 != null) {
-		} else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) {
+			return var1;
-			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) {
+			byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
-				for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) {
+			var1 = new SequenceDefinition();
-					if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && Interpreter.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) {
+			if (var2 != null) {
-						ByteArrayPool.ByteArrayPool_arrays[var1][Interpreter.ByteArrayPool_altSizeArrayCounts[var1]++] = var0;
+				var1.decode(new Buffer(var2));
-						return;
-					}
-				}
 			}
 
+			var1.postDecode();
+			SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("ay")
+	@ObfuscatedSignature(
+		signature = "(ILce;ZB)I",
+		garbageValue = "64"
+	)
+	static int method5955(int var0, Script var1, boolean var2) {
+		String var3;
+		int var4;
+		if (var0 == ScriptOpcodes.APPEND_NUM) {
+			var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+			var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+			Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + var4;
+			return 1;
+		} else {
+			String var9;
+			if (var0 == ScriptOpcodes.APPEND) {
+				Message.Interpreter_stringStackSize -= 2;
+				var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize];
+				var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1];
+				Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + var9;
+				return 1;
+			} else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) {
+				var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+				var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+				Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + ItemContainer.intToString(var4, true);
+				return 1;
+			} else if (var0 == ScriptOpcodes.LOWERCASE) {
+				var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+				Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.toLowerCase();
+				return 1;
+			} else {
+				int var6;
+				int var10;
+				if (var0 == ScriptOpcodes.FROMDATE) {
+					var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+					long var11 = 86400000L * ((long)var10 + 11745L);
+					Interpreter.Interpreter_calendar.setTime(new Date(var11));
+					var6 = Interpreter.Interpreter_calendar.get(5);
+					int var16 = Interpreter.Interpreter_calendar.get(2);
+					int var8 = Interpreter.Interpreter_calendar.get(1);
+					Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8;
+					return 1;
+				} else if (var0 != ScriptOpcodes.TEXT_GENDER) {
+					if (var0 == ScriptOpcodes.TOSTRING) {
+						var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+						Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = Integer.toString(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.COMPARE) {
+						Message.Interpreter_stringStackSize -= 2;
+						Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapData_1.method712(Client.compareStrings(Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1], FriendLoginUpdate.clientLanguage));
+						return 1;
+					} else {
+						int var5;
+						byte[] var13;
+						Font var14;
+						if (var0 == ScriptOpcodes.PARAHEIGHT) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							class320.Interpreter_intStackSize -= 2;
+							var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize];
+							var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1];
+							var13 = MouseHandler.archive13.takeFile(var5, 0);
+							var14 = new Font(var13);
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4);
+							return 1;
+						} else if (var0 == ScriptOpcodes.PARAWIDTH) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							class320.Interpreter_intStackSize -= 2;
+							var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize];
+							var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1];
+							var13 = MouseHandler.archive13.takeFile(var5, 0);
+							var14 = new Font(var13);
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4);
+							return 1;
+						} else if (var0 == ScriptOpcodes.TEXT_SWITCH) {
+							Message.Interpreter_stringStackSize -= 2;
+							var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize];
+							var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1];
+							if (Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize] == 1) {
+								Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3;
+							} else {
+								Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var9;
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.ESCAPE) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3);
+							return 1;
+						} else if (var0 == ScriptOpcodes.APPEND_CHAR) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3 + (char)var4;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) {
+							var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Skills.isCharPrintable((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) {
+							var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ArchiveDiskAction.isAlphaNumeric((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISALPHA) {
+							var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = ClanChat.isCharAlphabetic((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) {
+							var10 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = class14.isDigit((char)var10) ? 1 : 0;
+							return 1;
+						} else if (var0 == ScriptOpcodes.STRING_LENGTH) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							if (var3 != null) {
+								Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.length();
+							} else {
+								Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = 0;
+							}
+
+							return 1;
+						} else if (var0 == ScriptOpcodes.SUBSTRING) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							class320.Interpreter_intStackSize -= 2;
+							var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize];
+							var5 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1];
+							Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.substring(var4, var5);
+							return 1;
+						} else if (var0 == ScriptOpcodes.REMOVETAGS) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							StringBuilder var17 = new StringBuilder(var3.length());
+							boolean var15 = false;
+
+							for (var6 = 0; var6 < var3.length(); ++var6) {
+								char var7 = var3.charAt(var6);
+								if (var7 == '<') {
+									var15 = true;
+								} else if (var7 == '>') {
+									var15 = false;
+								} else if (!var15) {
+									var17.append(var7);
+								}
+							}
+
+							Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var17.toString();
+							return 1;
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							var4 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.indexOf(var4);
+							return 1;
+						} else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) {
+							Message.Interpreter_stringStackSize -= 2;
+							var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize];
+							var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1];
+							var5 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+							Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5);
+							return 1;
+						} else if (var0 == ScriptOpcodes.UPPERCASE) {
+							var3 = Interpreter.Interpreter_stringStack[--Message.Interpreter_stringStackSize];
+							Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3.toUpperCase();
+							return 1;
+						} else {
+							return 2;
+						}
+					}
+				} else {
+					Message.Interpreter_stringStackSize -= 2;
+					var3 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize];
+					var9 = Interpreter.Interpreter_stringStack[Message.Interpreter_stringStackSize + 1];
+					if (class192.localPlayer.appearance != null && class192.localPlayer.appearance.isFemale) {
+						Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var9;
+					} else {
+						Interpreter.Interpreter_stringStack[++Message.Interpreter_stringStackSize - 1] = var3;
+					}
+
+					return 1;
+				}
+			}
 		}
 	}
 }

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

@@ -1,73 +1,74 @@
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Random;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bp")
+@ObfuscatedName("br")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("gp")
+	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "[Lls;"
-	)
-	@Export("headIconPrayerSprites")
-	static Sprite[] headIconPrayerSprites;
-	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1192844989
+		intValue = 1800757053
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1714996375
+		intValue = 815583153
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		signature = "Liv;"
-	)
-	@Export("sequenceDefinition")
-	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = 1267418181
+		intValue = 497499711
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -474548897
+		intValue = -1418605465
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 60095829
+		intValue = -744262401
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 464992447
+		intValue = -1599899605
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("x")
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "Lip;"
+	)
+	@Export("sequenceDefinition")
+	SequenceDefinition sequenceDefinition;
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -945304711
+		intValue = 715957131
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 53235765
+		intValue = 1558881033
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -81,20 +82,20 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = ClientPacket.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = class65.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = WorldMapSection0.SequenceDefinition_get(var8);
+			this.sequenceDefinition = GraphicsDefaults.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "0"
+		garbageValue = "65536"
 	)
 	@Export("advance")
 	final void advance(int var1) {
@@ -113,14 +114,14 @@ public final class GraphicsObject extends Entity {
 		}
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)Ldw;",
+		signature = "(I)Ldx;",
-		garbageValue = "822221372"
+		garbageValue = "-2133076860"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = ClientPacket.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = class65.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -131,77 +132,203 @@ public final class GraphicsObject extends Entity {
 		return var2 == null ? null : var2;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lkl;I)V",
+		signature = "(B)[Lih;",
-		garbageValue = "-2045791963"
+		garbageValue = "-51"
 	)
-	@Export("updatePlayer")
+	static HorizontalAlignment[] method2064() {
-	static final void updatePlayer(PacketBuffer var0) {
+		return new HorizontalAlignment[]{HorizontalAlignment.field3454, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3451};
-		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]);
-		}
-
-		Players.Players_count = 0;
-		Players.Players_indices[++Players.Players_count - 1] = var1;
-		Players.field1230[var1] = 0;
-		Players.Players_emptyIdxCount = 0;
-
-		for (int var7 = 1; var7 < 2048; ++var7) {
-			if (var1 != var7) {
-				int var8 = var0.readBits(18);
-				int var9 = var8 >> 16;
-				int var10 = var8 >> 8 & 597;
-				int var11 = var8 & 597;
-				Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
-				Players.Players_orientations[var7] = 0;
-				Players.Players_targetIndices[var7] = -1;
-				Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7;
-				Players.field1230[var7] = 0;
-			}
-		}
-
-		var0.exportIndex();
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lkq;I)Ljava/lang/String;",
+		signature = "(Lii;B)V",
-		garbageValue = "2062021922"
+		garbageValue = "66"
 	)
-	public static String method2028(Buffer var0) {
+	public static void method2063(AbstractArchive var0) {
-		return class195.method3664(var0, 32767);
+		StructDefinition.StructDefinition_archive = var0;
 	}
 
-	@ObfuscatedName("lo")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(JLjava/lang/String;I)I",
-		garbageValue = "-1979767282"
+		garbageValue = "-2060202992"
 	)
-	static void method2030() {
+	static final int method2060(long var0, String var2) {
-		if (class215.field2534 != null) {
+		Random var3 = new Random();
-			Client.field749 = Client.cycle;
+		Buffer var4 = new Buffer(128);
-			class215.field2534.method4304();
+		Buffer var5 = new Buffer(128);
+		int[] var6 = new int[]{var3.nextInt(), var3.nextInt(), (int)(var0 >> 32), (int)var0};
+		var4.writeByte(10);
 
-			for (int var0 = 0; var0 < Client.players.length; ++var0) {
+		int var7;
-				if (Client.players[var0] != null) {
+		for (var7 = 0; var7 < 4; ++var7) {
-					class215.field2534.method4303(MusicPatchPcmStream.baseX * 64 + (Client.players[var0].x >> 7), ScriptEvent.baseY * 64 + (Client.players[var0].y >> 7));
+			var4.writeInt(var3.nextInt());
+		}
+
+		var4.writeInt(var6[0]);
+		var4.writeInt(var6[1]);
+		var4.writeLong(var0);
+		var4.writeLong(0L);
+
+		for (var7 = 0; var7 < 4; ++var7) {
+			var4.writeInt(var3.nextInt());
+		}
+
+		var4.encryptRsa(class80.field1123, class80.field1120);
+		var5.writeByte(10);
+
+		for (var7 = 0; var7 < 3; ++var7) {
+			var5.writeInt(var3.nextInt());
+		}
+
+		var5.writeLong(var3.nextLong());
+		var5.writeLongMedium(var3.nextLong());
+		if (Client.randomDatData != null) {
+			var5.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
+		} else {
+			byte[] var8 = new byte[24];
+
+			try {
+				JagexCache.JagexCache_randomDat.seek(0L);
+				JagexCache.JagexCache_randomDat.readFully(var8);
+
+				int var9;
+				for (var9 = 0; var9 < 24 && var8[var9] == 0; ++var9) {
+				}
+
+				if (var9 >= 24) {
+					throw new IOException();
+				}
+			} catch (Exception var24) {
+				for (int var10 = 0; var10 < 24; ++var10) {
+					var8[var10] = -1;
 				}
 			}
+
+			var5.writeBytes(var8, 0, var8.length);
 		}
 
+		var5.writeLong(var3.nextLong());
+		var5.encryptRsa(class80.field1123, class80.field1120);
+		var7 = Buddy.stringCp1252NullTerminatedByteSize(var2);
+		if (var7 % 8 != 0) {
+			var7 += 8 - var7 % 8;
+		}
+
+		Buffer var25 = new Buffer(var7);
+		var25.writeStringCp1252NullTerminated(var2);
+		var25.offset = var7;
+		var25.xteaEncryptAll(var6);
+		Buffer var18 = new Buffer(var25.offset + var4.offset + var5.offset + 5);
+		var18.writeByte(2);
+		var18.writeByte(var4.offset);
+		var18.writeBytes(var4.array, 0, var4.offset);
+		var18.writeByte(var5.offset);
+		var18.writeBytes(var5.array, 0, var5.offset);
+		var18.writeShort(var25.offset);
+		var18.writeBytes(var25.array, 0, var25.offset);
+		String var20 = Frames.method3340(var18.array);
+
+		try {
+			URL var11 = new URL(class42.method809("services", false) + "m=accountappeal/login.ws");
+			URLConnection var12 = var11.openConnection();
+			var12.setDoInput(true);
+			var12.setDoOutput(true);
+			var12.setConnectTimeout(5000);
+			OutputStreamWriter var13 = new OutputStreamWriter(var12.getOutputStream());
+			var13.write("data2=" + ArchiveDiskAction.method4216(var20) + "&dest=" + ArchiveDiskAction.method4216("passwordchoice.ws"));
+			var13.flush();
+			InputStream var14 = var12.getInputStream();
+			var18 = new Buffer(new byte[1000]);
+
+			do {
+				int var15 = var14.read(var18.array, var18.offset, 1000 - var18.offset);
+				if (var15 == -1) {
+					var13.close();
+					var14.close();
+					String var21 = new String(var18.array);
+					if (var21.startsWith("OFFLINE")) {
+						return 4;
+					} else if (var21.startsWith("WRONG")) {
+						return 7;
+					} else if (var21.startsWith("RELOAD")) {
+						return 3;
+					} else if (var21.startsWith("Not permitted for social network accounts.")) {
+						return 6;
+					} else {
+						var18.xteaDecryptAll(var6);
+
+						while (var18.offset > 0 && var18.array[var18.offset - 1] == 0) {
+							--var18.offset;
+						}
+
+						var21 = new String(var18.array, 0, var18.offset);
+						boolean var16;
+						if (var21 == null) {
+							var16 = false;
+						} else {
+							label107: {
+								try {
+									new URL(var21);
+								} catch (MalformedURLException var22) {
+									var16 = false;
+									break label107;
+								}
+
+								var16 = true;
+							}
+						}
+
+						if (var16) {
+							class215.openURL(var21, true, false);
+							return 2;
+						} else {
+							return 5;
+						}
+					}
+				}
+
+				var18.offset += var15;
+			} while(var18.offset < 1000);
+
+			return 5;
+		} catch (Throwable var23) {
+			var23.printStackTrace();
+			return 5;
+		}
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(IB)Lix;",
+		garbageValue = "52"
+	)
+	public static FloorUnderlayDefinition method2055(int var0) {
+		FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0);
+			var1 = new FloorUnderlayDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2), var0);
+			}
+
+			var1.postDecode();
+			FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
+
+	@ObfuscatedName("ic")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIS)V",
+		garbageValue = "3604"
+	)
+	@Export("insertMenuItemNoShift")
+	public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
+		class160.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
 	}
 }

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

@@ -3,40 +3,40 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("co")
+@ObfuscatedName("cp")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("d")
+	@ObfuscatedName("dt")
 	@ObfuscatedSignature(
-		signature = "Ldk;"
+		signature = "Lia;"
 	)
-	@Export("soundSystem")
+	@Export("archive10")
-	static SoundSystem soundSystem;
+	static Archive archive10;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Lio;"
+		signature = "Liy;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Ljl;"
+		signature = "Ljj;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		signature = "(Lio;)V"
+		signature = "(Liy;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(IIIIS)V",
-		garbageValue = "76773386"
+		garbageValue = "6521"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -69,10 +69,10 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(II)Lbu;",
+		signature = "(II)Lbh;",
-		garbageValue = "-2132773081"
+		garbageValue = "-1345078848"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
@@ -94,13 +94,13 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "1427646863"
+		garbageValue = "-818833492"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.method4843();
+		return this.updates.method4886();
 	}
 }

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

@@ -4,89 +4,88 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("io")
+@ObfuscatedName("iy")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
 	@Export("HealthBarDefinition_archive")
-	static AbstractArchive HealthBarDefinition_archive;
+	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
 	@Export("HitSplatDefinition_spritesArchive")
-	static AbstractArchive HitSplatDefinition_spritesArchive;
+	public static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("HealthBarDefinition_cached")
-	static EvictingDualNodeHashTable HealthBarDefinition_cached;
+	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
-	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
+	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1167570567
+		intValue = -1117339079
 	)
-	public int field3249;
+	public int field3275;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = 718576883
+		intValue = 1485041687
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -34727519
+		intValue = -1134400629
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1802618683
+		intValue = 1866957287
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2121240959
+		intValue = -1867870977
 	)
-	@Export("int4")
+	public int field3283;
-	public int int4;
+	@ObfuscatedName("h")
-	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 727277
+		intValue = -1689196735
 	)
 	@Export("int5")
 	public int int5;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -1886911471
+		intValue = -69680089
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 821957921
+		intValue = 2086615621
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1979565365
+		intValue = 111327577
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -158138215
+		intValue = 1970632159
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -100,7 +99,7 @@ public class HealthBarDefinition extends DualNode {
 		this.int1 = 255;
 		this.int2 = 255;
 		this.int3 = -1;
-		this.int4 = 1;
+		this.field3283 = 1;
 		this.int5 = 70;
 		this.frontSpriteID = -1;
 		this.backSpriteID = -1;
@@ -108,10 +107,10 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkq;B)V",
+		signature = "(Lkp;I)V",
-		garbageValue = "-127"
+		garbageValue = "-2130379460"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -125,10 +124,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkq;IB)V",
+		signature = "(Lkp;II)V",
-		garbageValue = "21"
+		garbageValue = "-1944435606"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -145,9 +144,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method5560();
+			this.frontSpriteID = var1.method5593();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5560();
+			this.backSpriteID = var1.method5593();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -158,10 +157,10 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(I)Lls;",
+		signature = "(B)Llt;",
-		garbageValue = "470645524"
+		garbageValue = "87"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
@@ -172,7 +171,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = WorldMapSection1.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
@@ -182,10 +181,10 @@ public class HealthBarDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Lls;",
+		signature = "(B)Llt;",
-		garbageValue = "-1178717952"
+		garbageValue = "19"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
@@ -196,7 +195,7 @@ public class HealthBarDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = WorldMapSection1.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0);
 				if (var1 != null) {
 					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
@@ -205,4 +204,65 @@ public class HealthBarDefinition extends DualNode {
 			}
 		}
 	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(IB)Lif;",
+		garbageValue = "89"
+	)
+	@Export("ItemDefinition_get")
+	public static ItemDefinition ItemDefinition_get(int var0) {
+		ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0);
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0);
+			var1 = new ItemDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.post();
+			if (var1.noteTemplate != -1) {
+				var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note));
+			}
+
+			if (var1.notedId != -1) {
+				var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId));
+			}
+
+			if (var1.placeholderTemplate != -1) {
+				var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder));
+			}
+
+			if (!class298.ItemDefinition_inMembersWorld && var1.isMembersOnly) {
+				var1.name = "Members object";
+				var1.isTradable = false;
+				var1.groundActions = null;
+				var1.inventoryActions = null;
+				var1.shiftClickIndex = -1;
+				var1.team = 0;
+				if (var1.params != null) {
+					boolean var3 = false;
+
+					for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
+						ParamDefinition var5 = PacketBufferNode.getParamDefinition((int)var4.key);
+						if (var5.autoDisable) {
+							var4.remove();
+						} else {
+							var3 = true;
+						}
+					}
+
+					if (!var3) {
+						var1.params = null;
+					}
+				}
+			}
+
+			ItemDefinition.ItemDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
+	}
 }

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

@@ -1,33 +1,35 @@
+import java.util.Date;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bu")
+@ObfuscatedName("bh")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1629160111
+		intValue = 2058375931
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 618660317
+		intValue = -309904715
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = -717144759
+		intValue = 362852511
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 938888871
+		intValue = 1829739139
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -39,10 +41,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(IIIIB)V",
-		garbageValue = "2118505733"
+		garbageValue = "-75"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -51,4 +53,62 @@ public class HealthBarUpdate extends Node {
 		this.health2 = var3;
 		this.cycleOffset = var4;
 	}
+
+	@ObfuscatedName("c")
+	static boolean method1757(long var0) {
+		return Tile.method2926(var0) == 2;
+	}
+
+	@ObfuscatedName("c")
+	public static String method1758(long var0) {
+		Calendar.Calendar_calendar.setTime(new Date(var0));
+		int var2 = Calendar.Calendar_calendar.get(7);
+		int var3 = Calendar.Calendar_calendar.get(5);
+		int var4 = Calendar.Calendar_calendar.get(2);
+		int var5 = Calendar.Calendar_calendar.get(1);
+		int var6 = Calendar.Calendar_calendar.get(11);
+		int var7 = Calendar.Calendar_calendar.get(12);
+		int var8 = Calendar.Calendar_calendar.get(13);
+		return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT";
+	}
+
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		signature = "(ILce;ZI)I",
+		garbageValue = "-601302979"
+	)
+	static int method1759(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.GETWINDOWMODE) {
+			Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Friend.getWindowedMode();
+			return 1;
+		} else {
+			int var3;
+			if (var0 == ScriptOpcodes.SETWINDOWMODE) {
+				var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+				if (var3 == 1 || var3 == 2) {
+					VertexNormal.setWindowedMode(var3);
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) {
+				Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = WorldMapSection2.clientPreferences.windowMode;
+				return 1;
+			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) {
+				if (var0 == 5310) {
+					--class320.Interpreter_intStackSize;
+					return 1;
+				} else {
+					return 2;
+				}
+			} else {
+				var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
+				if (var3 == 1 || var3 == 2) {
+					WorldMapSection2.clientPreferences.windowMode = var3;
+					WorldMapData_1.savePreferences();
+				}
+
+				return 1;
+			}
+		}
+	}
 }

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

@@ -4,119 +4,120 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("id")
+@ObfuscatedName("il")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("qv")
+	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -2106163673
-	)
-	static int field3312;
-	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
-	@Export("HitSplatDefinition_archive")
+	public static AbstractArchive field3329;
-	public static AbstractArchive HitSplatDefinition_archive;
+	@ObfuscatedName("o")
-	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lhz;"
+		signature = "Lii;"
 	)
-	public static AbstractArchive field3290;
+	@Export("HitSplatDefinition_fontsArchive")
-	@ObfuscatedName("w")
+	public static AbstractArchive HitSplatDefinition_fontsArchive;
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("HitSplatDefinition_cached")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Leb;"
+		signature = "Leh;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("o")
+	@ObfuscatedName("hs")
 	@ObfuscatedGetter(
-		intValue = 62489831
+		intValue = -1943215083
+	)
+	@Export("cameraX")
+	static int cameraX;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -36563091
 	)
 	@Export("fontId")
 	int fontId;
 	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -167444243
+		intValue = -549916475
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = 491261365
-	)
-	public int field3298;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -1424505111
-	)
-	int field3296;
-	@ObfuscatedName("l")
-	@ObfuscatedGetter(
-		intValue = -1928448761
-	)
-	int field3300;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -524634903
-	)
-	int field3291;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -930676135
-	)
-	int field3302;
 	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1984037709
+		intValue = -795329979
 	)
-	public int field3303;
+	public int field3328;
-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 2001520185
+		intValue = 2007057893
 	)
-	public int field3304;
+	int field3339;
-	@ObfuscatedName("z")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -1759745425
+		intValue = 1439710291
 	)
-	public int field3305;
+	int field3324;
-	@ObfuscatedName("h")
+	@ObfuscatedName("k")
-	String field3306;
-	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1901137879
+		intValue = -378798801
 	)
-	public int field3299;
+	int field3331;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = 411378659
-	)
-	public int field3308;
-	@ObfuscatedName("r")
-	@Export("transforms")
-	public int[] transforms;
 	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -42681817
+		intValue = -403504011
+	)
+	int field3332;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = 1748437233
+	)
+	public int field3323;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 1149201175
+	)
+	public int field3334;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -600429647
+	)
+	public int field3335;
+	@ObfuscatedName("b")
+	String field3322;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -960133159
+	)
+	public int field3337;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = 465425557
+	)
+	public int field3338;
+	@ObfuscatedName("a")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("u")
+	@ObfuscatedGetter(
+		intValue = -1372204811
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("aa")
+	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 380242275
+		intValue = 1090071963
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -127,31 +128,31 @@ public class HitSplatDefinition extends DualNode {
 		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
 	}
 
-	HitSplatDefinition() {
+	public HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3298 = 70;
+		this.field3328 = 70;
-		this.field3296 = -1;
+		this.field3339 = -1;
-		this.field3300 = -1;
+		this.field3324 = -1;
-		this.field3291 = -1;
+		this.field3331 = -1;
-		this.field3302 = -1;
+		this.field3332 = -1;
-		this.field3303 = 0;
+		this.field3323 = 0;
-		this.field3304 = 0;
+		this.field3334 = 0;
-		this.field3305 = -1;
+		this.field3335 = -1;
-		this.field3306 = "";
+		this.field3322 = "";
-		this.field3299 = -1;
+		this.field3337 = -1;
-		this.field3308 = 0;
+		this.field3338 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lkq;I)V",
+		signature = "(Lkp;I)V",
-		garbageValue = "-13234196"
+		garbageValue = "1729846192"
 	)
 	@Export("decode")
-	void decode(Buffer var1) {
+	public void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -162,41 +163,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lkq;II)V",
+		signature = "(Lkp;II)V",
-		garbageValue = "-1783175438"
+		garbageValue = "-1144577894"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5560();
+			this.fontId = var1.method5593();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3296 = var1.method5560();
+			this.field3339 = var1.method5593();
 		} else if (var2 == 4) {
-			this.field3291 = var1.method5560();
+			this.field3331 = var1.method5593();
 		} else if (var2 == 5) {
-			this.field3300 = var1.method5560();
+			this.field3324 = var1.method5593();
 		} else if (var2 == 6) {
-			this.field3302 = var1.method5560();
+			this.field3332 = var1.method5593();
 		} else if (var2 == 7) {
-			this.field3303 = var1.readShort();
+			this.field3323 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3306 = var1.readStringCp1252NullCircumfixed();
+			this.field3322 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3298 = var1.readUnsignedShort();
+			this.field3328 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3304 = var1.readShort();
+			this.field3334 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3305 = 0;
+			this.field3335 = 0;
 		} else if (var2 == 12) {
-			this.field3299 = var1.readUnsignedByte();
+			this.field3337 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3308 = var1.readShort();
+			this.field3338 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3305 = var1.readUnsignedShort();
+			this.field3335 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -231,16 +232,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(S)Lid;",
+		signature = "(B)Lil;",
-		garbageValue = "1000"
+		garbageValue = "105"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = GameShell.getVarbit(this.transformVarbit);
+			var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -252,17 +253,36 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? MusicPatchNode.method3815(var2) : null;
+		if (var2 != -1) {
+			HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
+			HitSplatDefinition var3;
+			if (var4 != null) {
+				var3 = var4;
+			} else {
+				byte[] var5 = class49.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("p")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(II)Ljava/lang/String;",
-		garbageValue = "384079116"
+		garbageValue = "1185099535"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3306;
+		String var2 = this.field3322;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -270,26 +290,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + class65.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + ItemContainer.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)Lls;",
+		signature = "(I)Llt;",
-		garbageValue = "1"
+		garbageValue = "1146038763"
 	)
-	public Sprite method4600() {
+	public Sprite method4649() {
-		if (this.field3296 < 0) {
+		if (this.field3339 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3296);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3339);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3296, 0);
+				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3339, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3296);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3339);
 				}
 
 				return var1;
@@ -297,68 +317,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(I)Lls;",
+		signature = "(B)Llt;",
-		garbageValue = "1869434079"
+		garbageValue = "127"
 	)
-	public Sprite method4576() {
+	public Sprite method4650() {
-		if (this.field3300 < 0) {
+		if (this.field3324 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3300);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3324);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3300, 0);
+				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3324, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3300);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3324);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(B)Lls;",
-		garbageValue = "-53"
-	)
-	public Sprite method4587() {
-		if (this.field3291 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3291);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3291, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3291);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "(B)Lls;",
-		garbageValue = "-100"
-	)
-	public Sprite method4596() {
-		if (this.field3302 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3302);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3302, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3302);
 				}
 
 				return var1;
@@ -368,8 +342,54 @@ public class HitSplatDefinition extends DualNode {
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(B)Lko;",
+		signature = "(B)Llt;",
-		garbageValue = "-24"
+		garbageValue = "125"
+	)
+	public Sprite method4651() {
+		if (this.field3331 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3331);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3331, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("l")
+	@ObfuscatedSignature(
+		signature = "(B)Llt;",
+		garbageValue = "-109"
+	)
+	public Sprite method4652() {
+		if (this.field3332 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3332, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(I)Lko;",
+		garbageValue = "-643633719"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -380,7 +400,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = class14.method160(field3290, class206.HitSplatDefinition_fontsArchive, this.fontId, 0);
+				var1 = FaceNormal.method3335(field3329, HitSplatDefinition_fontsArchive, this.fontId, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
 				}
@@ -389,86 +409,4 @@ 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,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iz")
+@ObfuscatedName("ih")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Lih;"
 	)
-	field3425(0, 0),
+	field3454(0, 0),
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Lih;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(2, 1),
+	HorizontalAlignment_centered(1, 1),
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Lih;"
 	)
-	field3424(1, 2);
+	field3451(2, 2);
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("p")
+	@Export("Tiles_saturation")
+	static int[] Tiles_saturation;
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -618314265
+		intValue = 1955816399
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 345899471
+		intValue = -458653859
 	)
 	@Export("id")
 	final int id;
@@ -42,173 +45,177 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-57"
+		garbageValue = "1"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(I)[Llt;",
-		garbageValue = "1134986404"
+		garbageValue = "831261948"
 	)
-	@Export("isWorldMapEvent")
+	public static Sprite[] method4783() {
-	public static boolean isWorldMapEvent(int var0) {
+		Sprite[] var0 = new Sprite[class326.SpriteBuffer_spriteCount];
-		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17;
+
+		for (int var1 = 0; var1 < class326.SpriteBuffer_spriteCount; ++var1) {
+			Sprite var2 = var0[var1] = new Sprite();
+			var2.width = GZipDecompressor.SpriteBuffer_spriteWidth;
+			var2.height = class326.SpriteBuffer_spriteHeight;
+			var2.xOffset = Huffman.SpriteBuffer_xOffsets[var1];
+			var2.yOffset = NPC.SpriteBuffer_yOffsets[var1];
+			var2.subWidth = class326.SpriteBuffer_spriteWidths[var1];
+			var2.subHeight = class326.SpriteBuffer_spriteHeights[var1];
+			int var3 = var2.subHeight * var2.subWidth;
+			byte[] var4 = class326.SpriteBuffer_pixels[var1];
+			var2.pixels = new int[var3];
+
+			for (int var5 = 0; var5 < var3; ++var5) {
+				var2.pixels[var5] = class326.SpriteBuffer_spritePalette[var4[var5] & 255];
+			}
+		}
+
+		DynamicObject.method2292();
+		return var0;
 	}
 
-	@ObfuscatedName("hv")
+	@ObfuscatedName("iu")
 	@ObfuscatedSignature(
-		signature = "(IIIIII)V",
+		signature = "(Liz;IIII)V",
-		garbageValue = "1599088353"
+		garbageValue = "1310795801"
 	)
-	@Export("drawObject")
+	@Export("addNpcToMenu")
-	static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
+	static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
-		long var5 = class14.scene.getBoundaryObjectTag(var0, var1, var2);
+		if (Client.menuOptionsCount < 400) {
-		int var7;
+			if (var0.transforms != null) {
-		int var8;
+				var0 = var0.transform();
-		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;
+			if (var0 != null) {
-			var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
+				if (var0.isInteractable) {
-			var13 = class2.Entity_unpackID(var5);
+					if (!var0.isFollower || Client.followerIndex == var1) {
-			ObjectDefinition var14 = Coord.getObjectDefinition(var13);
+						String var4 = var0.name;
-			if (var14.mapSceneId != -1) {
+						int var7;
-				IndexedSprite var15 = class162.mapSceneSprites[var14.mapSceneId];
+						int var8;
-				if (var15 != null) {
+						if (var0.combatLevel != 0) {
-					int var16 = (var14.sizeX * 4 - var15.subWidth) / 2;
+							var7 = var0.combatLevel;
-					int var17 = (var14.sizeY * 4 - var15.subHeight) / 2;
+							var8 = class192.localPlayer.combatLevel;
-					var15.drawAt(var16 + var1 * 4 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48);
+							int var9 = var8 - var7;
-				}
+							String var6;
-			} else {
+							if (var9 < -9) {
-				if (var9 == 0 || var9 == 2) {
+								var6 = PacketWriter.colorStartTag(16711680);
-					if (var8 == 0) {
+							} else if (var9 < -6) {
-						var11[var12] = var10;
+								var6 = PacketWriter.colorStartTag(16723968);
-						var11[var12 + 512] = var10;
+							} else if (var9 < -3) {
-						var11[var12 + 1024] = var10;
+								var6 = PacketWriter.colorStartTag(16740352);
-						var11[var12 + 1536] = var10;
+							} else if (var9 < 0) {
-					} else if (var8 == 1) {
+								var6 = PacketWriter.colorStartTag(16756736);
-						var11[var12] = var10;
+							} else if (var9 > 9) {
-						var11[var12 + 1] = var10;
+								var6 = PacketWriter.colorStartTag(65280);
-						var11[var12 + 2] = var10;
+							} else if (var9 > 6) {
-						var11[var12 + 3] = var10;
+								var6 = PacketWriter.colorStartTag(4259584);
-					} else if (var8 == 2) {
+							} else if (var9 > 3) {
-						var11[var12 + 3] = var10;
+								var6 = PacketWriter.colorStartTag(8453888);
-						var11[var12 + 512 + 3] = var10;
+							} else if (var9 > 0) {
-						var11[var12 + 1024 + 3] = var10;
+								var6 = PacketWriter.colorStartTag(12648192);
-						var11[var12 + 1536 + 3] = var10;
+							} else {
-					} else if (var8 == 3) {
+								var6 = PacketWriter.colorStartTag(16776960);
-						var11[var12 + 1536] = var10;
+							}
-						var11[var12 + 1536 + 1] = var10;
-						var11[var12 + 1536 + 2] = var10;
-						var11[var12 + 1536 + 3] = var10;
-					}
-				}
 
-				if (var9 == 3) {
+							var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
-					if (var8 == 0) {
+						}
-						var11[var12] = var10;
+
-					} else if (var8 == 1) {
+						if (var0.isFollower && Client.followerOpsLowPriority) {
-						var11[var12 + 3] = var10;
+							GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
-					} else if (var8 == 2) {
+						}
-						var11[var12 + 1536 + 3] = var10;
+
-					} else if (var8 == 3) {
+						if (Client.isItemSelected == 1) {
-						var11[var12 + 1536] = var10;
+							GraphicsObject.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + PacketWriter.colorStartTag(16776960) + var4, 7, var1, var2, var3);
-					}
+						} else if (Client.isSpellSelected) {
-				}
+							if ((NetSocket.selectedSpellFlags & 2) == 2) {
+								GraphicsObject.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + PacketWriter.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;
+										}
+
+										GraphicsObject.insertMenuItemNoShift(var11[var7], PacketWriter.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 (AttackOption.AttackOption_hidden != Client.npcAttackOption) {
+											if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class192.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;
+											}
+
+											GraphicsObject.insertMenuItemNoShift(var11[var7], PacketWriter.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+										}
+									}
+								}
+							}
+
+							if (!var0.isFollower || !Client.followerOpsLowPriority) {
+								GraphicsObject.insertMenuItemNoShift("Examine", PacketWriter.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
+							}
+						}
 
-				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,19 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("go")
+@ObfuscatedName("hc")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("f")
+	@ObfuscatedName("e")
+	@Export("SpriteBuffer_xOffsets")
+	public static int[] SpriteBuffer_xOffsets;
+	@ObfuscatedName("c")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("keys")
 	int[] keys;
 
@@ -41,7 +44,7 @@ public class Huffman {
 
 					for (var10 = var6 - 1; var10 >= 1; --var10) {
 						var11 = var3[var10];
-						if (var8 != var11) {
+						if (var11 != var8) {
 							break;
 						}
 
@@ -99,10 +102,10 @@ public class Huffman {
 
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "([BII[BII)I",
+		signature = "([BII[BIS)I",
-		garbageValue = "918574893"
+		garbageValue = "4203"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -120,7 +123,7 @@ public class Huffman {
 			int var11 = var7 >> 3;
 			int var12 = var7 & 7;
 			var6 &= -var12 >> 31;
-			int var13 = (var12 + var10 - 1 >> 3) + var11;
+			int var13 = (var10 + var12 - 1 >> 3) + var11;
 			var12 += 24;
 			var4[var11] = (byte)(var6 |= var9 >>> var12);
 			if (var11 < var13) {
@@ -150,10 +153,10 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "([BI[BIII)I",
-		garbageValue = "273462814"
+		garbageValue = "275908175"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
@@ -293,213 +296,4 @@ public class Huffman {
 			return var7 + 1 - var2;
 		}
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "2034773594"
-	)
-	public static void method3917() {
-		VarbitDefinition.VarbitDefinition_cached.clear();
-	}
-
-	@ObfuscatedName("ig")
-	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
-		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);
-		}
-
-		long var4 = -1L;
-		long var6 = -1L;
-
-		int var8;
-		for (var8 = 0; var8 < class192.method3654(); ++var8) {
-			long var9 = class14.method152(var8);
-			if (var9 != var6) {
-				var6 = var9;
-				int var23 = class288.method5334(ViewportMouse.ViewportMouse_entityTags[var8]);
-				int var12 = var23;
-				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 (var16 == null) {
-						continue;
-					}
-
-					if (Client.isItemSelected == 1) {
-						class1.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 1, var15, var23, var13);
-					} else if (Client.isSpellSelected) {
-						if ((ReflectionCheck.selectedSpellFlags & 4) == 4) {
-							class1.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + NPC.colorStartTag(65535) + var16.name, 2, var15, var23, var13);
-						}
-					} else {
-						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);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (-1L != var4) {
-			var8 = class288.method5334(var4);
-			int var22 = (int)(var4 >>> 7 & 127L);
-			Player var11 = Client.players[Client.combatTargetPlayerIndex];
-			class30.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var22);
-		}
-
-	}
 }

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

@@ -1,62 +1,50 @@
 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")
+@ObfuscatedName("jf")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("ac")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Llk;"
+		signature = "Lmv;"
-	)
-	@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 = "(Lll;)V"
+		signature = "(Lmv;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(B)Ljy;",
+		signature = "(S)Ljk;",
-		garbageValue = "68"
+		garbageValue = "30683"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(IB)[Ljy;",
+		signature = "(IB)[Ljk;",
-		garbageValue = "32"
+		garbageValue = "19"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkq;II)V",
+		signature = "(Lkp;II)V",
-		garbageValue = "1755489735"
+		garbageValue = "1147655369"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {

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

@@ -4,17 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("je")
+@ObfuscatedName("jp")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("rq")
+	@ObfuscatedName("gg")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 220663936
+		signature = "[Llt;"
 	)
-	static int field3589;
+	@Export("headIconPkSprites")
-	@ObfuscatedName("f")
+	static Sprite[] headIconPkSprites;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 53560497
+		intValue = -1391988611
 	)
 	@Export("id")
 	int id;
@@ -22,20 +23,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Lje;I)I",
+		signature = "(Ljp;I)I",
-		garbageValue = "1201655164"
+		garbageValue = "-2090061914"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("az")
 	@ObfuscatedSignature(
-		signature = "(Ljy;S)I",
+		signature = "(Ljk;I)I",
-		garbageValue = "9221"
+		garbageValue = "-746331144"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -45,4 +46,31 @@ public class Ignored extends User {
 	public int compareTo(Object var1) {
 		return this.compareTo_ignored((Ignored)var1);
 	}
+
+	@ObfuscatedName("ho")
+	@ObfuscatedSignature(
+		signature = "(IIB)V",
+		garbageValue = "5"
+	)
+	static final void method5213(int var0, int var1) {
+		if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) {
+			if (Client.showMouseOverText) {
+				int var2 = Client.menuOptionsCount - 1;
+				String var4;
+				if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
+					var4 = "Use" + " " + Client.selectedItemName + " " + "->";
+				} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) {
+					var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+				} else {
+					var4 = VerticalAlignment.method4426(var2);
+				}
+
+				if (Client.menuOptionsCount > 2) {
+					var4 = var4 + PacketWriter.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+				}
+
+				class1.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000);
+			}
+		}
+	}
 }

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

@@ -5,32 +5,32 @@ import net.runelite.mapping.ObfuscatedName;
 @ObfuscatedName("li")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("height")
 	public int height;
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("normalize")
 	public void normalize() {
 		if (this.subWidth != this.width || this.subHeight != this.height) {
@@ -51,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("shiftColors")
 	public void shiftColors(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.palette.length; ++var4) {
@@ -84,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
-	public void method6124(int var1, int var2, int var3, int var4) {
+	public void method6162(int var1, int var2, int var3, int var4) {
 		int var5 = this.subWidth;
 		int var6 = this.subHeight;
 		int var7 = 0;
@@ -192,7 +192,7 @@ public final class IndexedSprite extends Rasterizer2D {
 		IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@Export("IndexedSprite_two")
 	static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) {
 		int var9 = -(var5 >> 2);
@@ -246,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@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("dp")
+@ObfuscatedName("dq")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("j")
+	@ObfuscatedName("q")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("n")
+	@ObfuscatedName("z")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("u")
+	@ObfuscatedName("y")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("m")
+	@ObfuscatedName("r")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("g")
+	@ObfuscatedName("s")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("r")
+	@ObfuscatedName("a")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("w")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("e")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("a")
+	@ObfuscatedName("j")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("d")
+	@ObfuscatedName("m")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("o")
+	@ObfuscatedName("h")
 	@Export("delayTime")
 	int delayTime;
 	@ObfuscatedName("v")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ldh;"
+		signature = "Ldf;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("s")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Ldo;"
+		signature = "Lds;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("l")
+	@ObfuscatedName("w")
 	@Export("duration")
 	int duration;
-	@ObfuscatedName("t")
+	@ObfuscatedName("k")
 	@Export("offset")
 	int offset;
 
@@ -146,10 +146,10 @@ public class Instrument {
 		this.offset = 0;
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("c")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
-		class300.clearIntArray(Instrument_samples, 0, var1);
+		class301.clearIntArray(Instrument_samples, 0, var1);
 		if (var2 < 10) {
 			return Instrument_samples;
 		} else {
@@ -353,7 +353,7 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
@@ -367,9 +367,9 @@ public class Instrument {
 		}
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		signature = "(Lkq;)V"
+		signature = "(Lkp;)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.method2713(var1, this.filterEnvelope);
+		this.filter.method2769(var1, this.filterEnvelope);
 	}
 }

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

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