project: Rev 182

build.gradle

@@ -88,7 +88,7 @@ allprojects {
     version = '1.5.32-SNAPSHOT'
 
     ext {
-        rsversion = 181
+        rsversion = 182
         cacheversion = 165
         plusVersion = '2.1.4.0'
 

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

@@ -3,75 +3,223 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gz")
+@ObfuscatedName("gl")
 @Implements("AbstractByteArrayCopier")
 public abstract class AbstractByteArrayCopier {
 	AbstractByteArrayCopier() {
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)[B",
-		garbageValue = "1071129091"
+		garbageValue = "-1040345200"
 	)
 	@Export("get")
 	abstract byte[] get();
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "594076777"
+		garbageValue = "38240743"
 	)
 	@Export("set")
-	public abstract void set(byte[] var1);
+	abstract void set(byte[] var1);
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("gq")
 	@ObfuscatedSignature(
-		signature = "([BIILer;[Lfv;I)V",
+		signature = "(B)V",
-		garbageValue = "95070993"
+		garbageValue = "53"
 	)
-	static final void method3933(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) {
+	static void method3878() {
-		Buffer var5 = new Buffer(var0);
+		if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
-		int var6 = -1;
+			class80.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false);
+		}
 
-		while (true) {
+	}
-			int var7 = var5.method5509();
-			if (var7 == 0) {
-				return;
-			}
 
-			var6 += var7;
+	@ObfuscatedName("jf")
-			int var8 = 0;
+	@ObfuscatedSignature(
+		signature = "(Lhp;II)I",
+		garbageValue = "-706781687"
+	)
+	static final int method3868(Widget var0, int var1) {
+		if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
+			try {
+				int[] var2 = var0.cs1Instructions[var1];
+				int var3 = 0;
+				int var4 = 0;
+				byte var5 = 0;
 
-			while (true) {
+				while (true) {
-				int var9 = var5.readUShortSmart();
+					int var6 = var2[var4++];
-				if (var9 == 0) {
+					int var7 = 0;
-					break;
+					byte var8 = 0;
-				}
+					if (var6 == 0) {
-
+						return var3;
-				var8 += var9 - 1;
-				int var10 = var8 & 63;
-				int var11 = var8 >> 6 & 63;
-				int var12 = var8 >> 12;
-				int var13 = var5.readUnsignedByte();
-				int var14 = var13 >> 2;
-				int var15 = var13 & 3;
-				int var16 = var11 + var1;
-				int var17 = var10 + var2;
-				if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) {
-					int var18 = var12;
-					if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) {
-						var18 = var12 - 1;
 					}
 
-					CollisionMap var19 = null;
+					if (var6 == 1) {
-					if (var18 >= 0) {
+						var7 = Client.currentLevels[var2[var4++]];
-						var19 = var4[var18];
 					}
 
-					GrandExchangeOfferOwnWorldComparator.method1236(var12, var16, var17, var6, var15, var14, var3, var19);
+					if (var6 == 2) {
+						var7 = Client.levels[var2[var4++]];
+					}
+
+					if (var6 == 3) {
+						var7 = Client.experience[var2[var4++]];
+					}
+
+					int var9;
+					Widget var10;
+					int var11;
+					int var12;
+					if (var6 == 4) {
+						var9 = var2[var4++] << 16;
+						var9 += var2[var4++];
+						var10 = WorldMapElement.getWidget(var9);
+						var11 = var2[var4++];
+						if (var11 != -1 && (!WorldMapData_0.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+								if (var11 + 1 == var10.itemIds[var12]) {
+									var7 += var10.itemQuantities[var12];
+								}
+							}
+						}
+					}
+
+					if (var6 == 5) {
+						var7 = Varps.Varps_main[var2[var4++]];
+					}
+
+					if (var6 == 6) {
+						var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
+					}
+
+					if (var6 == 7) {
+						var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
+					}
+
+					if (var6 == 8) {
+						var7 = WorldMapIcon_1.localPlayer.combatLevel;
+					}
+
+					if (var6 == 9) {
+						for (var9 = 0; var9 < 25; ++var9) {
+							if (Skills.Skills_enabled[var9]) {
+								var7 += Client.levels[var9];
+							}
+						}
+					}
+
+					if (var6 == 10) {
+						var9 = var2[var4++] << 16;
+						var9 += var2[var4++];
+						var10 = WorldMapElement.getWidget(var9);
+						var11 = var2[var4++];
+						if (var11 != -1 && (!WorldMapData_0.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) {
+							for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+								if (var11 + 1 == var10.itemIds[var12]) {
+									var7 = 999999999;
+									break;
+								}
+							}
+						}
+					}
+
+					if (var6 == 11) {
+						var7 = Client.runEnergy;
+					}
+
+					if (var6 == 12) {
+						var7 = Client.weight;
+					}
+
+					if (var6 == 13) {
+						var9 = Varps.Varps_main[var2[var4++]];
+						int var13 = var2[var4++];
+						var7 = (var9 & 1 << var13) != 0 ? 1 : 0;
+					}
+
+					if (var6 == 14) {
+						var9 = var2[var4++];
+						var7 = class208.getVarbit(var9);
+					}
+
+					if (var6 == 15) {
+						var8 = 1;
+					}
+
+					if (var6 == 16) {
+						var8 = 2;
+					}
+
+					if (var6 == 17) {
+						var8 = 3;
+					}
+
+					if (var6 == 18) {
+						var7 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7);
+					}
+
+					if (var6 == 19) {
+						var7 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7);
+					}
+
+					if (var6 == 20) {
+						var7 = var2[var4++];
+					}
+
+					if (var8 == 0) {
+						if (var5 == 0) {
+							var3 += var7;
+						}
+
+						if (var5 == 1) {
+							var3 -= var7;
+						}
+
+						if (var5 == 2 && var7 != 0) {
+							var3 /= var7;
+						}
+
+						if (var5 == 3) {
+							var3 *= var7;
+						}
+
+						var5 = 0;
+					} else {
+						var5 = var8;
+					}
+				}
+			} catch (Exception var14) {
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
+
+	@ObfuscatedName("ky")
+	@ObfuscatedSignature(
+		signature = "(Lhp;I)Lhp;",
+		garbageValue = "-1890509802"
+	)
+	static Widget method3871(Widget var0) {
+		int var2 = ParamDefinition.getWidgetClickMask(var0);
+		int var1 = var2 >> 17 & 7;
+		int var3 = var1;
+		if (var1 == 0) {
+			return null;
+		} else {
+			for (int var4 = 0; var4 < var3; ++var4) {
+				var0 = WorldMapElement.getWidget(var0.parentId);
+				if (var0 == null) {
+					return null;
 				}
 			}
+
+			return var0;
 		}
 	}
 }

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

@@ -4,27 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lt")
+@ObfuscatedName("lg")
 @Implements("AbstractRasterProvider")
 public abstract class AbstractRasterProvider {
-	@ObfuscatedName("t")
+	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "Lkf;"
-	)
-	@Export("NetCache_reference")
-	static Buffer NetCache_reference;
-	@ObfuscatedName("e")
 	@Export("pixels")
 	public int[] pixels;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1276568955
+		intValue = -436554829
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1637041543
+		intValue = -1168028289
 	)
 	@Export("height")
 	public int height;
@@ -32,26 +26,26 @@ public abstract class AbstractRasterProvider {
 	protected AbstractRasterProvider() {
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-1942972544"
+		garbageValue = "314023161"
 	)
 	@Export("drawFull")
 	public abstract void drawFull(int var1, int var2);
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "1902391505"
+		garbageValue = "333545527"
 	)
 	@Export("draw")
 	public abstract void draw(int var1, int var2, int var3, int var4);
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "106"
+		garbageValue = "1451326676"
 	)
 	@Export("apply")
 	public final void apply() {

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

@@ -4,57 +4,67 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ky")
+@ObfuscatedName("kg")
 @Implements("AbstractSocket")
 public abstract class AbstractSocket {
 	protected AbstractSocket() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1144636612"
+		garbageValue = "-1798752769"
 	)
 	@Export("close")
 	public abstract void close();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "2"
+		garbageValue = "547465689"
 	)
 	@Export("readUnsignedByte")
 	public abstract int readUnsignedByte() throws IOException;
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "55"
+		garbageValue = "83"
 	)
 	@Export("available")
 	public abstract int available() throws IOException;
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "1948150862"
+		garbageValue = "156087109"
 	)
 	@Export("isAvailable")
 	public abstract boolean isAvailable(int var1) throws IOException;
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "([BIIB)I",
-		garbageValue = "26"
+		garbageValue = "100"
 	)
 	@Export("read")
 	public abstract int read(byte[] var1, int var2, int var3) throws IOException;
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-1696227994"
+		garbageValue = "638463675"
 	)
 	@Export("write")
 	public abstract void write(byte[] var1, int var2, int var3) throws IOException;
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(I)[Lkk;",
+		garbageValue = "2143260840"
+	)
+	@Export("ChatMode_values")
+	static PrivateChatMode[] ChatMode_values() {
+		return new PrivateChatMode[]{PrivateChatMode.field3790, PrivateChatMode.field3788, PrivateChatMode.field3793};
+	}
 }

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("du")
+@ObfuscatedName("ds")
 @Implements("AbstractSound")
 public abstract class AbstractSound extends Node {
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@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("ja")
+@ObfuscatedName("je")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;I)V",
+		signature = "(Ljava/util/Comparator;B)V",
-		garbageValue = "-6206068"
+		garbageValue = "102"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljd;Ljd;I)I",
+		signature = "(Lju;Lju;I)I",
-		garbageValue = "191415789"
+		garbageValue = "760812985"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {

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

@@ -5,113 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("o")
+@ObfuscatedName("l")
 @Implements("AbstractWorldMapData")
 public abstract class AbstractWorldMapData {
-	@ObfuscatedName("el")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -1739932713
+		intValue = -136523776
-	)
-	static int field155;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = -680308736
 	)
 	@Export("regionXLow")
 	int regionXLow;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1014181888
+		intValue = 1537560576
 	)
 	@Export("regionYLow")
 	int regionYLow;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 421939525
+		intValue = -756440995
 	)
 	@Export("regionX")
 	int regionX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1418471835
+		intValue = 2087702297
 	)
 	@Export("regionY")
 	int regionY;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1513175747
+		intValue = -489051341
 	)
 	@Export("minPlane")
 	int minPlane;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -402229247
+		intValue = -1972038717
 	)
 	@Export("planes")
 	int planes;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -376642433
+		intValue = 156978213
 	)
 	@Export("groupId")
 	int groupId;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1618366577
+		intValue = 1797648451
 	)
 	@Export("fileId")
 	int fileId;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("floorUnderlayIds")
 	short[][][] floorUnderlayIds;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("floorOverlayIds")
 	short[][][] floorOverlayIds;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
-	byte[][][] field165;
+	byte[][][] field145;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
-	byte[][][] field166;
+	byte[][][] field156;
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "[[[[Lz;"
+		signature = "[[[[Lo;"
 	)
 	@Export("decorations")
 	WorldMapDecoration[][][][] decorations;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
-	boolean field168;
+	boolean field158;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
-	boolean field169;
+	boolean field159;
 
 	AbstractWorldMapData() {
 		this.groupId = -1;
 		this.fileId = -1;
 		new LinkedList();
-		this.field168 = false;
+		this.field158 = false;
-		this.field169 = false;
+		this.field159 = false;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkf;I)V",
+		signature = "(Lky;B)V",
-		garbageValue = "-1951934103"
+		garbageValue = "120"
 	)
 	@Export("readGeography")
 	abstract void readGeography(Buffer var1);
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-613524686"
+		garbageValue = "-103"
 	)
 	@Export("isFullyLoaded")
 	boolean isFullyLoaded() {
-		return this.field168 && this.field169;
+		return this.field158 && this.field159;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lhp;I)V",
+		signature = "(Lhz;I)V",
-		garbageValue = "1963301304"
+		garbageValue = "-1580621275"
 	)
 	@Export("loadGeography")
 	void loadGeography(AbstractArchive var1) {
@@ -119,53 +114,53 @@ public abstract class AbstractWorldMapData {
 			byte[] var2 = var1.takeFile(this.groupId, this.fileId);
 			if (var2 != null) {
 				this.readGeography(new Buffer(var2));
-				this.field168 = true;
+				this.field158 = true;
-				this.field169 = true;
+				this.field159 = true;
 			}
 
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1146093408"
+		garbageValue = "2145144649"
 	)
 	@Export("reset")
 	void reset() {
 		this.floorUnderlayIds = null;
 		this.floorOverlayIds = null;
-		this.field165 = null;
+		this.field145 = null;
-		this.field166 = null;
+		this.field156 = null;
 		this.decorations = null;
-		this.field168 = false;
+		this.field158 = false;
-		this.field169 = false;
+		this.field159 = false;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IILkf;I)V",
+		signature = "(IILky;I)V",
-		garbageValue = "-1521348339"
+		garbageValue = "1320309065"
 	)
 	@Export("readTile")
 	void readTile(int var1, int var2, Buffer var3) {
 		int var4 = var3.readUnsignedByte();
 		if (var4 != 0) {
 			if ((var4 & 1) != 0) {
-				this.method258(var1, var2, var3, var4);
+				this.method247(var1, var2, var3, var4);
 			} else {
-				this.method253(var1, var2, var3, var4);
+				this.method259(var1, var2, var3, var4);
 			}
 
 		}
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(IILkf;IB)V",
+		signature = "(IILky;IB)V",
-		garbageValue = "0"
+		garbageValue = "85"
 	)
-	void method258(int var1, int var2, Buffer var3, int var4) {
+	void method247(int var1, int var2, Buffer var3, int var4) {
 		boolean var5 = (var4 & 2) != 0;
 		if (var5) {
 			this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
@@ -174,12 +169,12 @@ public abstract class AbstractWorldMapData {
 		this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte();
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(IILkf;IB)V",
+		signature = "(IILky;IS)V",
-		garbageValue = "44"
+		garbageValue = "320"
 	)
-	void method253(int var1, int var2, Buffer var3, int var4) {
+	void method259(int var1, int var2, Buffer var3, int var4) {
 		int var5 = ((var4 & 24) >> 3) + 1;
 		boolean var6 = (var4 & 2) != 0;
 		boolean var7 = (var4 & 4) != 0;
@@ -195,8 +190,8 @@ public abstract class AbstractWorldMapData {
 				if (var10 != 0) {
 					this.floorOverlayIds[var9][var1][var2] = (short)var10;
 					var11 = var3.readUnsignedByte();
-					this.field165[var9][var1][var2] = (byte)(var11 >> 2);
+					this.field145[var9][var1][var2] = (byte)(var11 >> 2);
-					this.field166[var9][var1][var2] = (byte)(var11 & 3);
+					this.field156[var9][var1][var2] = (byte)(var11 & 3);
 				}
 			}
 		}
@@ -208,7 +203,7 @@ public abstract class AbstractWorldMapData {
 					WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
 
 					for (var11 = 0; var11 < var9; ++var11) {
-						int var12 = var3.method5511();
+						int var12 = var3.method5602();
 						int var13 = var3.readUnsignedByte();
 						var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
 					}
@@ -218,178 +213,111 @@ public abstract class AbstractWorldMapData {
 
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-121424149"
+		garbageValue = "-88"
 	)
 	@Export("getRegionX")
 	int getRegionX() {
 		return this.regionX;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1967751745"
+		garbageValue = "-79"
 	)
 	@Export("getRegionY")
 	int getRegionY() {
 		return this.regionY;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IIB)I",
+		signature = "(IS)Ljava/lang/String;",
-		garbageValue = "-108"
+		garbageValue = "30202"
 	)
-	static int method274(int var0, int var1) {
+	static String method278(int var0) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		return "<img=" + var0 + ">";
-		if (var2 == null) {
-			return -1;
-		}
-		return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
 	}
 
-	@ObfuscatedName("gj")
+	@ObfuscatedName("gb")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(II)V",
-		garbageValue = "-2108015148"
+		garbageValue = "1514757872"
 	)
-	static final void method273(int var0, int var1, int var2, int var3) {
+	static final void method264(int var0) {
-		ObjectSound.method1826();
+		int[] var1 = ParamDefinition.sceneMinimapSprite.pixels;
+		int var2 = var1.length;
+
+		int var3;
+		for (var3 = 0; var3 < var2; ++var3) {
+			var1[var3] = 0;
+		}
+
+		int var4;
+		int var5;
+		for (var3 = 1; var3 < 103; ++var3) {
+			var4 = (103 - var3) * 2048 + 24628;
+
+			for (var5 = 1; var5 < 103; ++var5) {
+				if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) {
+					Player.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
+				}
+
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
+					Player.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
+				}
+
+				var4 += 4;
+			}
+		}
+
+		var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10);
+		var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16;
+		ParamDefinition.sceneMinimapSprite.setRaster();
+
+		int var6;
+		for (var5 = 1; var5 < 103; ++var5) {
+			for (var6 = 1; var6 < 103; ++var6) {
+				if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) {
+					UserComparator10.drawObject(var0, var6, var5, var3, var4);
+				}
+
+				if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) {
+					UserComparator10.drawObject(var0 + 1, var6, var5, var3, var4);
+				}
+			}
+		}
+
+		Client.mapIconCount = 0;
+
+		for (var5 = 0; var5 < 104; ++var5) {
+			for (var6 = 0; var6 < 104; ++var6) {
+				long var7 = Player.scene.getFloorDecorationTag(ItemContainer.plane, var5, var6);
+				if (var7 != 0L) {
+					int var9 = BoundaryObject.Entity_unpackID(var7);
+					int var10 = class215.getObjectDefinition(var9).mapIconId;
+					if (var10 >= 0) {
+						Client.mapIcons[Client.mapIconCount] = WorldMapData_0.WorldMapElement_get(var10).getSpriteBool(false);
+						Client.mapIconXs[Client.mapIconCount] = var5;
+						Client.mapIconYs[Client.mapIconCount] = var6;
+						++Client.mapIconCount;
+					}
+				}
+			}
+		}
+
+		SpotAnimationDefinition.rasterProvider.apply();
 	}
 
-	@ObfuscatedName("hp")
+	@ObfuscatedName("kp")
 	@ObfuscatedSignature(
-		signature = "(Lij;IIII)V",
+		signature = "(IB)V",
-		garbageValue = "566580282"
+		garbageValue = "-61"
 	)
-	@Export("addNpcToMenu")
+	static void method272(int var0) {
-	static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
+		Client.oculusOrbState = var0;
-		if (Client.menuOptionsCount >= 400) {
-			return;
-		}
-		if (var0.transforms != null) {
-			var0 = var0.transform();
-		}
-
-		if (var0 == null || !var0.isInteractable || (var0.isFollower && Client.followerIndex != var1)) {
-			return;
-		}
-		String var4 = var0.name;
-		if (var0.combatLevel != 0) {
-			int var7 = var0.combatLevel;
-			int var8 = Client.localPlayer.combatLevel;
-			int var9 = var8 - var7;
-			String var6;
-			if (var9 < -9) {
-				var6 = ClientPreferences.colorStartTag(0xff0000);
-			} else if (var9 < -6) {
-				var6 = ClientPreferences.colorStartTag(0xff3000);
-			} else if (var9 < -3) {
-				var6 = ClientPreferences.colorStartTag(0xff7000);
-			} else if (var9 < 0) {
-				var6 = ClientPreferences.colorStartTag(0xffb000);
-			} else if (var9 > 9) {
-				var6 = ClientPreferences.colorStartTag(0xff00);
-			} else if (var9 > 6) {
-				var6 = ClientPreferences.colorStartTag(0x40ff00);
-			} else if (var9 > 3) {
-				var6 = ClientPreferences.colorStartTag(0x80ff00);
-			} else if (var9 > 0) {
-				var6 = ClientPreferences.colorStartTag(0xc0ff00);
-			} else {
-				var6 = ClientPreferences.colorStartTag(0xffff00);
-			}
-
-			var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
-		}
-
-		if (var0.isFollower && Client.followerOpsLowPriority) {
-			class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
-		}
-
-		if (Client.isItemSelected == 1) {
-			class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 7, var1, var2, var3);
-			return;
-		} else if (Client.isSpellSelected) {
-			if ((WorldMapCacheName.selectedSpellFlags & 2) == 2) {
-				class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 8, var1, var2, var3);
-			}
-			return;
-		}
-		String[] var11 = var0.actions;
-		if (var11 != null) {
-			for (int var7 = 4; var7 >= 0; --var7) {
-				if (var11[var7] == null || var11[var7].equalsIgnoreCase("Attack")) {
-					continue;
-				}
-				int var8 = 0;
-				int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 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;
-				}
-
-				class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
-			}
-
-			for (int var7 = 4; var7 >= 0; --var7) {
-				if (var11[var7] == null || !var11[var7].equalsIgnoreCase("Attack")) {
-					continue;
-				}
-				short var12 = 0;
-				if (AttackOption.AttackOption_hidden == Client.npcAttackOption) {
-					continue;
-				}
-				if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Client.localPlayer.combatLevel) {
-					var12 = 2000;
-				}
-
-				int 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;
-				}
-
-				class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
-			}
-		}
-
-		if (!var0.isFollower || !Client.followerOpsLowPriority) {
-			class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
-		}
-
 	}
 }

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

@@ -4,183 +4,184 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("az")
+@ObfuscatedName("as")
 @Implements("AbstractWorldMapIcon")
 public abstract class AbstractWorldMapIcon {
-	@ObfuscatedName("b")
+	@ObfuscatedName("bi")
 	@ObfuscatedSignature(
-		signature = "Lhv;"
+		signature = "Llq;"
+	)
+	@Export("worldSelectLeftSprite")
+	static IndexedSprite worldSelectLeftSprite;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "Lhd;"
 	)
 	@Export("coord2")
 	public final Coord coord2;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lhv;"
+		signature = "Lhd;"
 	)
 	@Export("coord1")
 	public final Coord coord1;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1277861537
+		intValue = 318036895
 	)
 	@Export("screenX")
 	int screenX;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -946812135
+		intValue = 1985838427
 	)
 	@Export("screenY")
 	int screenY;
 
 	@ObfuscatedSignature(
-		signature = "(Lhv;Lhv;)V"
+		signature = "(Lhd;Lhd;)V"
 	)
 	AbstractWorldMapIcon(Coord var1, Coord var2) {
 		this.coord1 = var1;
 		this.coord2 = var2;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-229566020"
+		garbageValue = "78"
 	)
 	@Export("getElement")
 	public abstract int getElement();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)Las;",
+		signature = "(B)Lai;",
-		garbageValue = "1426074195"
+		garbageValue = "1"
 	)
 	@Export("getLabel")
 	abstract WorldMapLabel getLabel();
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "14"
+		garbageValue = "1930584854"
 	)
 	@Export("getSubWidth")
 	abstract int getSubWidth();
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "1"
+		garbageValue = "-56"
 	)
 	@Export("getSubHeight")
 	abstract int getSubHeight();
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(IIB)Z",
+		signature = "(III)Z",
-		garbageValue = "-101"
+		garbageValue = "505598061"
 	)
 	@Export("fitsScreen")
 	boolean fitsScreen(int var1, int var2) {
 		if (this.elementFitsScreen(var1, var2)) {
 			return true;
+		} else {
+			return this.labelFitsScreen(var1, var2);
 		}
-		return this.labelFitsScreen(var1, var2);
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(S)Z",
-		garbageValue = "-1274004046"
+		garbageValue = "256"
 	)
 	@Export("hasValidElement")
 	boolean hasValidElement() {
 		return this.getElement() >= 0;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(III)Z",
+		signature = "(IIS)Z",
-		garbageValue = "406020312"
+		garbageValue = "-26498"
 	)
 	@Export("elementFitsScreen")
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
-		}
+		} else {
-		WorldMapElement var3 = class222.WorldMapElement_get(this.getElement());
+			WorldMapElement var3 = WorldMapData_0.WorldMapElement_get(this.getElement());
-		int var4 = this.getSubWidth();
+			int var4 = this.getSubWidth();
-		int var5 = this.getSubHeight();
+			int var5 = this.getSubHeight();
-		switch(var3.horizontalAlignment.value) {
+			switch(var3.horizontalAlignment.value) {
-		case 0:
+			case 0:
-			if (var1 <= this.screenX - var4 || var1 > this.screenX) {
+				if (var1 >= this.screenX && var1 < var4 + this.screenX) {
+					break;
+				}
+
 				return false;
+			case 1:
+				if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
+					break;
+				}
+
+				return false;
+			case 2:
+				if (var1 <= this.screenX - var4 || var1 > this.screenX) {
+					return false;
+				}
 			}
-			break;
+
-		case 1:
+			switch(var3.verticalAlignment.value) {
-			if (var1 >= this.screenX && var1 < var4 + this.screenX) {
+			case 0:
+				if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) {
+					break;
+				}
+
+				return false;
+			case 1:
+				if (var2 <= this.screenY - var5 || var2 > this.screenY) {
+					return false;
+				}
 				break;
+			case 2:
+				if (var2 < this.screenY || var2 >= var5 + this.screenY) {
+					return false;
+				}
 			}
 
-			return false;
+			return true;
-		case 2:
-			if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) {
-				return false;
-			}
 		}
-
-		switch(var3.verticalAlignment.value) {
-		case 0:
-			if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
-				return false;
-			}
-			break;
-		case 1:
-			if (var2 <= this.screenY - var5 || var2 > this.screenY) {
-				return false;
-			}
-			break;
-		case 2:
-			if (var2 < this.screenY || var2 >= var5 + this.screenY) {
-				return false;
-			}
-		}
-
-		return true;
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(III)Z",
+		signature = "(IIB)Z",
-		garbageValue = "-1252480817"
+		garbageValue = "66"
 	)
 	@Export("labelFitsScreen")
 	boolean labelFitsScreen(int var1, int var2) {
 		WorldMapLabel var3 = this.getLabel();
 		if (var3 == null) {
 			return false;
-		}
+		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
-		if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
 			return var2 >= this.screenY && var2 <= this.screenY + var3.height;
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1908697951"
+		garbageValue = "261353448"
 	)
-	@Export("NpcDefinition_clearCached")
+	static final void method591(String var0) {
-	public static void NpcDefinition_clearCached() {
+		StringBuilder var10000 = (new StringBuilder()).append(var0);
-		NPCDefinition.NpcDefinition_cached.clear();
+		Object var10001 = null;
-		NPCDefinition.NpcDefinition_cachedModels.clear();
+		String var1 = var10000.append(" is already on your ignore list").toString();
-	}
+		DirectByteArrayCopier.addGameMessage(30, "", var1);
-
-	@ObfuscatedName("fb")
-	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "-108"
-	)
-	@Export("getWindowedMode")
-	static int getWindowedMode() {
-		return Client.isResizable ? 2 : 1;
 	}
 }

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

@@ -9,27 +9,29 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ma")
+@ObfuscatedName("mm")
 @Implements("AccessFile")
 public final class AccessFile {
-	@ObfuscatedName("q")
+	@ObfuscatedName("u")
+	static byte[][][] field4061;
+	@ObfuscatedName("s")
 	@Export("file")
 	RandomAccessFile file;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		longValue = -4859377869140643535L
+		longValue = 6204556434071022947L
 	)
 	@Export("maxSize")
 	final long maxSize;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		longValue = -5982883315607554345L
+		longValue = 5275749299961116233L
 	)
 	@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,43 +51,44 @@ public final class AccessFile {
 		this.file.seek(0L);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("seek")
 	final void seek(long var1) throws IOException {
 		this.file.seek(var1);
 		this.offset = var1;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "793801547"
+		garbageValue = "160189816"
 	)
 	@Export("write")
 	public final void write(byte[] var1, int var2, int var3) throws IOException {
-		if ((long)var3 + this.offset > this.maxSize) {
+		if (this.offset + (long)var3 > this.maxSize) {
 			this.file.seek(this.maxSize);
 			this.file.write(1);
 			throw new EOFException();
+		} else {
+			this.file.write(var1, var2, var3);
+			this.offset += (long)var3;
 		}
-		this.file.write(var1, var2, var3);
-		this.offset += (long)var3;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1602757440"
+		garbageValue = "18"
 	)
 	@Export("close")
 	public final void close() throws IOException {
 		this.closeSync(false);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(ZI)V",
-		garbageValue = "978888846"
+		garbageValue = "1818151820"
 	)
 	@Export("closeSync")
 	public final void closeSync(boolean var1) throws IOException {
@@ -103,20 +106,20 @@ public final class AccessFile {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(I)J",
-		garbageValue = "1189798798"
+		garbageValue = "2071750719"
 	)
 	@Export("length")
 	public final long length() throws IOException {
 		return this.file.length();
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "([BIII)I",
-		garbageValue = "701557643"
+		garbageValue = "1749187322"
 	)
 	@Export("read")
 	public final int read(byte[] var1, int var2, int var3) throws IOException {
@@ -128,6 +131,22 @@ public final class AccessFile {
 		return var4;
 	}
 
+	protected void abi() throws Throwable {
+		if (this.file != null) {
+			System.out.println("");
+			this.close();
+		}
+
+	}
+
+	protected void abt() throws Throwable {
+		if (this.file != null) {
+			System.out.println("");
+			this.close();
+		}
+
+	}
+
 	protected void finalize() throws Throwable {
 		if (this.file != null) {
 			System.out.println("");

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

@@ -4,319 +4,327 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("bq")
+@ObfuscatedName("bu")
 @Implements("Actor")
 public abstract class Actor extends Entity {
-	@ObfuscatedName("aw")
+	@ObfuscatedName("jm")
+	@ObfuscatedSignature(
+		signature = "Lhp;"
+	)
+	static Widget field978;
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = 1528091447
+		intValue = 1884598383
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = -390280385
+		intValue = -1632465489
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = 1236559867
+		intValue = -1372261855
 	)
 	@Export("rotation")
 	int rotation;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("an")
 	@Export("isWalking")
 	boolean isWalking;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("at")
+	@ObfuscatedGetter(
+		intValue = -1570594880
+	)
 	@Export("size")
 	int size;
-	@ObfuscatedName("az")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 990710297
+		intValue = 608219797
 	)
 	@Export("playerCycle")
 	int playerCycle;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = 2081393933
+		intValue = -1134168353
 	)
 	@Export("readySequence")
 	int readySequence;
 	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1431486431
+		intValue = -1794207509
 	)
 	@Export("turnLeftSequence")
 	int turnLeftSequence;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = 2143634015
+		intValue = 1807906031
 	)
 	@Export("turnRightSequence")
 	int turnRightSequence;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -1300778473
+		intValue = 821150937
 	)
 	@Export("walkSequence")
 	int walkSequence;
-	@ObfuscatedName("ac")
+	@ObfuscatedName("au")
 	@ObfuscatedGetter(
-		intValue = 415761655
+		intValue = -346334565
 	)
 	@Export("walkBackSequence")
 	int walkBackSequence;
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ax")
 	@ObfuscatedGetter(
-		intValue = -1586227603
+		intValue = 2122224863
 	)
 	@Export("walkLeftSequence")
 	int walkLeftSequence;
-	@ObfuscatedName("aq")
+	@ObfuscatedName("ag")
 	@ObfuscatedGetter(
-		intValue = -510900587
+		intValue = -1158599439
 	)
 	@Export("walkRightSequence")
 	int walkRightSequence;
 	@ObfuscatedName("aa")
 	@ObfuscatedGetter(
-		intValue = 1475013463
+		intValue = 1650224251
 	)
 	@Export("runSequence")
 	int runSequence;
-	@ObfuscatedName("an")
+	@ObfuscatedName("ap")
 	@Export("overheadText")
 	String overheadText;
-	@ObfuscatedName("au")
+	@ObfuscatedName("aq")
 	@Export("isAutoChatting")
 	boolean isAutoChatting;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("ay")
-	boolean field998;
+	boolean field926;
-	@ObfuscatedName("ak")
+	@ObfuscatedName("ad")
 	@ObfuscatedGetter(
-		intValue = 1272238473
+		intValue = 319208211
 	)
 	@Export("overheadTextCyclesRemaining")
 	int overheadTextCyclesRemaining;
-	@ObfuscatedName("ah")
+	@ObfuscatedName("al")
 	@ObfuscatedGetter(
-		intValue = 22112303
+		intValue = -1527605305
 	)
 	@Export("overheadTextColor")
 	int overheadTextColor;
-	@ObfuscatedName("am")
+	@ObfuscatedName("ah")
 	@ObfuscatedGetter(
-		intValue = 1107006481
+		intValue = 611459225
 	)
 	@Export("overheadTextEffect")
 	int overheadTextEffect;
-	@ObfuscatedName("af")
+	@ObfuscatedName("aw")
 	@Export("hitSplatCount")
 	byte hitSplatCount;
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ae")
 	@Export("hitSplatTypes")
 	int[] hitSplatTypes;
-	@ObfuscatedName("bp")
+	@ObfuscatedName("bk")
 	@Export("hitSplatValues")
 	int[] hitSplatValues;
-	@ObfuscatedName("bz")
+	@ObfuscatedName("bw")
 	@Export("hitSplatCycles")
 	int[] hitSplatCycles;
-	@ObfuscatedName("bi")
+	@ObfuscatedName("bo")
 	@Export("hitSplatTypes2")
 	int[] hitSplatTypes2;
-	@ObfuscatedName("bg")
+	@ObfuscatedName("bn")
 	@Export("hitSplatValues2")
 	int[] hitSplatValues2;
-	@ObfuscatedName("bh")
+	@ObfuscatedName("bp")
 	@ObfuscatedSignature(
-		signature = "Lju;"
+		signature = "Ljp;"
 	)
 	@Export("healthBars")
 	IterableNodeDeque healthBars;
-	@ObfuscatedName("bm")
+	@ObfuscatedName("bz")
 	@ObfuscatedGetter(
-		intValue = 1587933085
+		intValue = -666406559
 	)
 	@Export("targetIndex")
 	int targetIndex;
-	@ObfuscatedName("bn")
+	@ObfuscatedName("bh")
 	@Export("false0")
 	boolean false0;
-	@ObfuscatedName("bc")
+	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
-		intValue = -2012515929
+		intValue = 1338126615
 	)
-	int field976;
+	int field946;
-	@ObfuscatedName("bx")
+	@ObfuscatedName("bj")
 	@ObfuscatedGetter(
-		intValue = 1552753251
+		intValue = 221299857
 	)
 	@Export("movementSequence")
 	int movementSequence;
-	@ObfuscatedName("bo")
+	@ObfuscatedName("bq")
 	@ObfuscatedGetter(
-		intValue = 1656230573
+		intValue = 669631645
 	)
 	@Export("movementFrame")
 	int movementFrame;
-	@ObfuscatedName("bb")
+	@ObfuscatedName("by")
 	@ObfuscatedGetter(
-		intValue = 789237355
+		intValue = 1550152873
 	)
 	@Export("movementFrameCycle")
 	int movementFrameCycle;
 	@ObfuscatedName("bs")
 	@ObfuscatedGetter(
-		intValue = -1029202699
+		intValue = 236934275
 	)
 	@Export("sequence")
 	int sequence;
-	@ObfuscatedName("bj")
+	@ObfuscatedName("bi")
 	@ObfuscatedGetter(
-		intValue = 1698363493
+		intValue = 1446546153
 	)
 	@Export("sequenceFrame")
 	int sequenceFrame;
-	@ObfuscatedName("bl")
+	@ObfuscatedName("bf")
 	@ObfuscatedGetter(
-		intValue = -1057767495
+		intValue = 1633380255
 	)
 	@Export("sequenceFrameCycle")
 	int sequenceFrameCycle;
 	@ObfuscatedName("bd")
 	@ObfuscatedGetter(
-		intValue = -1679741685
+		intValue = -159449897
 	)
 	@Export("sequenceDelay")
 	int sequenceDelay;
-	@ObfuscatedName("by")
+	@ObfuscatedName("br")
 	@ObfuscatedGetter(
-		intValue = 1192767673
+		intValue = 1360808075
 	)
-	int field985;
+	int field964;
-	@ObfuscatedName("bt")
+	@ObfuscatedName("bm")
 	@ObfuscatedGetter(
-		intValue = 606261849
+		intValue = -1209932375
 	)
 	@Export("spotAnimation")
 	int spotAnimation;
-	@ObfuscatedName("bq")
+	@ObfuscatedName("bu")
 	@ObfuscatedGetter(
-		intValue = 47256047
+		intValue = 1531272561
 	)
 	@Export("spotAnimationFrame")
 	int spotAnimationFrame;
-	@ObfuscatedName("bu")
+	@ObfuscatedName("bb")
 	@ObfuscatedGetter(
-		intValue = -50887377
+		intValue = 1785825301
 	)
 	@Export("spotAnimationFrameCycle")
 	int spotAnimationFrameCycle;
-	@ObfuscatedName("bw")
+	@ObfuscatedName("bl")
 	@ObfuscatedGetter(
-		intValue = -2008312019
+		intValue = -63871325
 	)
-	int field989;
+	int field958;
-	@ObfuscatedName("br")
+	@ObfuscatedName("bt")
 	@ObfuscatedGetter(
-		intValue = -21231063
+		intValue = 130403319
 	)
 	@Export("heightOffset")
 	int heightOffset;
-	@ObfuscatedName("bk")
+	@ObfuscatedName("bx")
 	@ObfuscatedGetter(
-		intValue = 67427601
+		intValue = -446723661
 	)
-	int field991;
+	int field960;
-	@ObfuscatedName("bf")
-	@ObfuscatedGetter(
-		intValue = 1057554273
-	)
-	int field992;
-	@ObfuscatedName("bv")
-	@ObfuscatedGetter(
-		intValue = 1321176455
-	)
-	int field993;
-	@ObfuscatedName("be")
-	@ObfuscatedGetter(
-		intValue = -1276485965
-	)
-	int field983;
 	@ObfuscatedName("ba")
 	@ObfuscatedGetter(
-		intValue = -851079763
+		intValue = 1274756773
 	)
-	int field995;
+	int field961;
-	@ObfuscatedName("cr")
+	@ObfuscatedName("bg")
 	@ObfuscatedGetter(
-		intValue = -352767789
+		intValue = 1683717067
 	)
-	int field996;
+	int field954;
-	@ObfuscatedName("cf")
+	@ObfuscatedName("be")
 	@ObfuscatedGetter(
-		intValue = -342620369
+		intValue = -1907051737
 	)
-	int field997;
+	int field963;
-	@ObfuscatedName("cj")
+	@ObfuscatedName("bc")
 	@ObfuscatedGetter(
-		intValue = 1247160827
+		intValue = -356117007
+	)
+	int field941;
+	@ObfuscatedName("ce")
+	@ObfuscatedGetter(
+		intValue = -1458171567
+	)
+	int field965;
+	@ObfuscatedName("ci")
+	@ObfuscatedGetter(
+		intValue = 716061265
+	)
+	int field966;
+	@ObfuscatedName("ck")
+	@ObfuscatedGetter(
+		intValue = -1132398517
 	)
 	@Export("npcCycle")
 	int npcCycle;
-	@ObfuscatedName("cl")
+	@ObfuscatedName("cc")
 	@ObfuscatedGetter(
-		intValue = 1753110543
+		intValue = -2023452361
 	)
 	@Export("defaultHeight")
 	int defaultHeight;
-	@ObfuscatedName("cn")
+	@ObfuscatedName("cd")
 	@ObfuscatedGetter(
-		intValue = 1217852897
+		intValue = 1438228269
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("cy")
+	@ObfuscatedName("cf")
 	@ObfuscatedGetter(
-		intValue = -146454839
+		intValue = 1512808789
 	)
-	int field1009;
+	int field970;
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cw")
 	@ObfuscatedGetter(
-		intValue = 1670871863
+		intValue = -1629005053
 	)
-	int field948;
+	int field971;
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cj")
 	@ObfuscatedGetter(
-		intValue = 1967067825
+		intValue = -1777881517
 	)
 	@Export("pathLength")
 	int pathLength;
 	@ObfuscatedName("cp")
 	@Export("pathX")
 	int[] pathX;
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cu")
 	@Export("pathY")
 	int[] pathY;
-	@ObfuscatedName("co")
+	@ObfuscatedName("cm")
 	@Export("pathTraversed")
 	byte[] pathTraversed;
-	@ObfuscatedName("cw")
+	@ObfuscatedName("cb")
 	@ObfuscatedGetter(
-		intValue = -615012941
+		intValue = -1405217673
 	)
-	int field1007;
+	int field976;
-	@ObfuscatedName("ca")
+	@ObfuscatedName("ch")
 	@ObfuscatedGetter(
-		intValue = 829354671
+		intValue = -1913917699
 	)
-	int field1008;
+	int field947;
 
 	Actor() {
 		this.isWalking = false;
-		this.size = 78073455;
+		this.size = 64;
 		this.readySequence = -1;
 		this.turnLeftSequence = -1;
 		this.turnRightSequence = -1;
@@ -326,7 +334,7 @@ public abstract class Actor extends Entity {
 		this.walkRightSequence = -1;
 		this.runSequence = -1;
 		this.overheadText = null;
-		this.field998 = false;
+		this.field926 = false;
 		this.overheadTextCyclesRemaining = 100;
 		this.overheadTextColor = 0;
 		this.overheadTextEffect = 0;
@@ -339,7 +347,7 @@ public abstract class Actor extends Entity {
 		this.healthBars = new IterableNodeDeque();
 		this.targetIndex = -1;
 		this.false0 = false;
-		this.field976 = -1;
+		this.field946 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
 		this.movementFrameCycle = 0;
@@ -347,46 +355,46 @@ public abstract class Actor extends Entity {
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
 		this.sequenceDelay = 0;
-		this.field985 = 0;
+		this.field964 = 0;
 		this.spotAnimation = -1;
 		this.spotAnimationFrame = 0;
 		this.spotAnimationFrameCycle = 0;
 		this.npcCycle = 0;
 		this.defaultHeight = 200;
-		this.field1009 = 0;
+		this.field970 = 0;
-		this.field948 = 32;
+		this.field971 = 32;
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
 		this.pathTraversed = new byte[10];
-		this.field1007 = 0;
+		this.field976 = 0;
-		this.field1008 = 0;
+		this.field947 = 0;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-1461786701"
+		garbageValue = "-110"
 	)
 	@Export("isVisible")
 	boolean isVisible() {
 		return false;
 	}
 
-	@ObfuscatedName("bp")
+	@ObfuscatedName("aa")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1575805976"
+		garbageValue = "-1059295249"
 	)
-	final void method1658() {
+	final void method1671() {
 		this.pathLength = 0;
-		this.field1008 = 0;
+		this.field947 = 0;
 	}
 
-	@ObfuscatedName("bz")
+	@ObfuscatedName("ap")
 	@ObfuscatedSignature(
 		signature = "(IIIIIII)V",
-		garbageValue = "295125263"
+		garbageValue = "888431256"
 	)
 	@Export("addHitSplat")
 	final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -406,9 +414,9 @@ public abstract class Actor extends Entity {
 		int var10 = -1;
 		int var11 = 0;
 		if (var1 >= 0) {
-			HitSplatDefinition var12 = Projectile.HitSplatDefinition_get(var1);
+			HitSplatDefinition var12 = StructDefinition.HitSplatDefinition_get(var1);
-			var10 = var12.field3348;
+			var10 = var12.field3323;
-			var11 = var12.field3344;
+			var11 = var12.field3314;
 		}
 
 		int var14;
@@ -464,14 +472,14 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bi")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
-		signature = "(IIIIIIB)V",
+		signature = "(IIIIIIS)V",
-		garbageValue = "15"
+		garbageValue = "-25412"
 	)
 	@Export("addHealthBar")
 	final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-		HealthBarDefinition var7 = class51.HealthBarDefinition_get(var1);
+		HealthBarDefinition var7 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1);
 		HealthBar var8 = null;
 		HealthBar var9 = null;
 		int var10 = var7.int2;
@@ -480,7 +488,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.field3279 == var7.field3279) {
+			if (var12.definition.field3264 == var7.field3264) {
 				var12.put(var2 + var4, var5, var6, var3);
 				return;
 			}
@@ -511,14 +519,14 @@ public abstract class Actor extends Entity {
 		}
 	}
 
-	@ObfuscatedName("bg")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(IB)V",
-		garbageValue = "1541896355"
+		garbageValue = "1"
 	)
 	@Export("removeHealthBar")
 	final void removeHealthBar(int var1) {
-		HealthBarDefinition var2 = class51.HealthBarDefinition_get(var1);
+		HealthBarDefinition var2 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1);
 
 		for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) {
 			if (var2 == var3.definition) {
@@ -529,15 +537,25 @@ public abstract class Actor extends Entity {
 
 	}
 
-	@ObfuscatedName("kh")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(II)Liz;",
-		garbageValue = "-105"
+		garbageValue = "505249630"
 	)
-	static void method1670() {
+	@Export("getInvDefinition")
-		if (Client.oculusOrbState == 1) {
+	public static InvDefinition getInvDefinition(int var0) {
-			Client.field736 = true;
+		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
-		}
+		if (var1 != null) {
+			return var1;
+		} else {
+			byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
+			var1 = new InvDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
 
+			InvDefinition.InvDefinition_cached.put(var1, (long)var0);
+			return 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("da")
+@ObfuscatedName("di")
 @Implements("Animation")
 public class Animation {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
-	static int[] field1638;
+	static int[] field1619;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
-	static int[] field1639;
+	static int[] field1615;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
-	static int[] field1636;
+	static int[] field1624;
-	@ObfuscatedName("p")
-	static int[] field1635;
 	@ObfuscatedName("k")
+	static int[] field1617;
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lej;"
+		signature = "Lex;"
 	)
 	@Export("skeleton")
 	Skeleton skeleton;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("transformCount")
 	int transformCount;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("transformSkeletonLabels")
 	int[] transformSkeletonLabels;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@Export("transformXs")
 	int[] transformXs;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("transformYs")
 	int[] transformYs;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("transformZs")
 	int[] transformZs;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@Export("hasAlphaTransform")
 	boolean hasAlphaTransform;
 
 	static {
-		field1638 = new int[500];
+		field1619 = new int[500];
-		field1639 = new int[500];
+		field1615 = new int[500];
-		field1636 = new int[500];
+		field1624 = new int[500];
-		field1635 = new int[500];
+		field1617 = new int[500];
 	}
 
 	@ObfuscatedSignature(
-		signature = "([BLej;)V"
+		signature = "([BLex;)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) {
-							field1638[var7] = var10;
+							field1619[var7] = var10;
-							field1639[var7] = 0;
+							field1615[var7] = 0;
-							field1636[var7] = 0;
+							field1624[var7] = 0;
-							field1635[var7] = 0;
+							field1617[var7] = 0;
 							++var7;
 							break;
 						}
 					}
 				}
 
-				field1638[var7] = var8;
+				field1619[var7] = var8;
 				short var11 = 0;
 				if (this.skeleton.transformTypes[var8] == 3) {
 					var11 = 128;
 				}
 
 				if ((var9 & 1) != 0) {
-					field1639[var7] = var4.readShortSmart();
+					field1615[var7] = var4.readShortSmart();
 				} else {
-					field1639[var7] = var11;
+					field1615[var7] = var11;
 				}
 
 				if ((var9 & 2) != 0) {
-					field1636[var7] = var4.readShortSmart();
+					field1624[var7] = var4.readShortSmart();
 				} else {
-					field1636[var7] = var11;
+					field1624[var7] = var11;
 				}
 
 				if ((var9 & 4) != 0) {
-					field1635[var7] = var4.readShortSmart();
+					field1617[var7] = var4.readShortSmart();
 				} else {
-					field1635[var7] = var11;
+					field1617[var7] = var11;
 				}
 
 				var6 = var8;
@@ -113,19 +113,20 @@ public class Animation {
 
 		if (var1.length != var4.offset) {
 			throw new RuntimeException();
-		}
+		} else {
-		this.transformCount = var7;
+			this.transformCount = var7;
-		this.transformSkeletonLabels = new int[var7];
+			this.transformSkeletonLabels = new int[var7];
-		this.transformXs = new int[var7];
+			this.transformXs = new int[var7];
-		this.transformYs = new int[var7];
+			this.transformYs = new int[var7];
-		this.transformZs = new int[var7];
+			this.transformZs = new int[var7];
 
-		for (var8 = 0; var8 < var7; ++var8) {
+			for (var8 = 0; var8 < var7; ++var8) {
-			this.transformSkeletonLabels[var8] = field1638[var8];
+				this.transformSkeletonLabels[var8] = field1619[var8];
-			this.transformXs[var8] = field1639[var8];
+				this.transformXs[var8] = field1615[var8];
-			this.transformYs[var8] = field1636[var8];
+				this.transformYs[var8] = field1624[var8];
-			this.transformZs[var8] = field1635[var8];
+				this.transformZs[var8] = field1617[var8];
-		}
+			}
 
+		}
 	}
 }

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

@@ -5,183 +5,201 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iu")
+@ObfuscatedName("id")
 @Implements("Archive")
 public class Archive extends AbstractArchive {
-	@ObfuscatedName("as")
+	@ObfuscatedName("ai")
 	@Export("Archive_crc")
 	static CRC32 Archive_crc;
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		signature = "Lkm;"
+		signature = "Lkv;"
 	)
 	@Export("archiveDisk")
 	ArchiveDisk archiveDisk;
-	@ObfuscatedName("d")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Lkm;"
+		signature = "Lkv;"
 	)
 	@Export("masterDisk")
 	ArchiveDisk masterDisk;
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = 1121640995
+		intValue = -1228227843
 	)
 	@Export("index")
 	int index;
-	@ObfuscatedName("z")
+	@ObfuscatedName("o")
-	volatile boolean field3155;
+	volatile boolean field3132;
-	@ObfuscatedName("al")
-	boolean field3157;
 	@ObfuscatedName("av")
+	boolean field3133;
+	@ObfuscatedName("am")
 	@Export("validGroups")
 	volatile boolean[] validGroups;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = -150911311
+		intValue = 1456312337
 	)
 	@Export("indexCrc")
 	int indexCrc;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("az")
 	@ObfuscatedGetter(
-		intValue = 196530351
+		intValue = -1798815125
 	)
 	@Export("indexVersion")
 	int indexVersion;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("aj")
 	@ObfuscatedGetter(
-		intValue = -1519910241
+		intValue = -1710593501
 	)
-	int field3152;
+	int field3131;
 
 	static {
 		Archive_crc = new CRC32();
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkm;Lkm;IZZZ)V"
+		signature = "(Lkv;Lkv;IZZZ)V"
 	)
 	public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) {
 		super(var4, var5);
-		this.field3155 = false;
+		this.field3132 = false;
-		this.field3157 = false;
+		this.field3133 = false;
-		this.field3152 = -1;
+		this.field3131 = -1;
 		this.archiveDisk = var1;
 		this.masterDisk = var2;
 		this.index = var3;
-		this.field3157 = var6;
+		this.field3133 = var6;
 		int var8 = this.index;
-		if (AbstractRasterProvider.NetCache_reference != null) {
+		if (Decimator.NetCache_reference != null) {
-			AbstractRasterProvider.NetCache_reference.offset = var8 * 8 + 5;
+			Decimator.NetCache_reference.offset = var8 * 8 + 5;
-			int var9 = AbstractRasterProvider.NetCache_reference.readInt();
+			int var9 = Decimator.NetCache_reference.readInt();
-			int var10 = AbstractRasterProvider.NetCache_reference.readInt();
+			int var10 = Decimator.NetCache_reference.readInt();
 			this.loadIndex(var9, var10);
 		} else {
-			ViewportMouse.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
+			BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
 			NetCache.NetCache_archives[var8] = this;
 		}
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "2144523901"
+		garbageValue = "502266240"
 	)
 	@Export("loadRegionFromGroup")
 	void loadRegionFromGroup(int var1) {
-		PendingSpawn.method1653(this.index, var1);
+		int var2 = this.index;
+		long var3 = (long)((var2 << 16) + var1);
+		NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
+		if (var5 != null) {
+			NetCache.NetCache_pendingWritesQueue.addLast(var5);
+		}
+
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(IB)I",
+		signature = "(II)I",
-		garbageValue = "0"
+		garbageValue = "-1902634670"
 	)
 	@Export("groupLoadPercent")
 	int groupLoadPercent(int var1) {
 		if (super.groups[var1] != null) {
 			return 100;
+		} else if (this.validGroups[var1]) {
+			return 100;
+		} else {
+			int var3 = this.index;
+			long var4 = (long)((var3 << 16) + var1);
+			int var2;
+			if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) {
+				var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1;
+			} else {
+				var2 = 0;
+			}
+
+			return var2;
 		}
-		return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1);
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "(IS)V",
+		signature = "(II)V",
-		garbageValue = "3211"
+		garbageValue = "1800831619"
 	)
 	@Export("loadGroup")
 	void loadGroup(int var1) {
 		if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) {
-			SecureRandomFuture.method2056(var1, this.archiveDisk, this);
+			WorldMapIcon_0.method191(var1, this.archiveDisk, this);
 		} else {
-			ViewportMouse.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
+			BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true);
 		}
 
 	}
 
-	@ObfuscatedName("dg")
+	@ObfuscatedName("cs")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "44"
+		garbageValue = "581718104"
 	)
-	public boolean method4258() {
+	public boolean method4177() {
-		return this.field3155;
+		return this.field3132;
 	}
 
-	@ObfuscatedName("df")
+	@ObfuscatedName("co")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-249697380"
+		garbageValue = "-35"
 	)
 	@Export("percentage")
 	public int percentage() {
-		if (this.field3155) {
+		if (this.field3132) {
 			return 100;
-		}
+		} else if (super.groups != null) {
-		if (super.groups != null) {
 			return 99;
-		}
+		} else {
-		int var1 = Huffman.method3948(255, this.index);
+			int var1 = class160.method3383(255, this.index);
-		if (var1 >= 100) {
+			if (var1 >= 100) {
-			var1 = 99;
+				var1 = 99;
-		}
+			}
 
-		return var1;
+			return var1;
+		}
 	}
 
-	@ObfuscatedName("dt")
+	@ObfuscatedName("dr")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIB)V",
-		garbageValue = "1381214916"
+		garbageValue = "-1"
 	)
 	@Export("loadIndex")
 	void loadIndex(int var1, int var2) {
 		this.indexCrc = var1;
 		this.indexVersion = var2;
 		if (this.masterDisk != null) {
-			SecureRandomFuture.method2056(this.index, this.masterDisk, this);
+			WorldMapIcon_0.method191(this.index, this.masterDisk, this);
 		} else {
-			ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+			BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
 		}
 
 	}
 
-	@ObfuscatedName("dj")
+	@ObfuscatedName("dd")
 	@ObfuscatedSignature(
 		signature = "(I[BZZB)V",
-		garbageValue = "-36"
+		garbageValue = "-44"
 	)
 	@Export("write")
 	void write(int var1, byte[] var2, boolean var3, boolean var4) {
 		if (var3) {
-			if (this.field3155) {
+			if (this.field3132) {
 				throw new RuntimeException();
 			}
 
 			if (this.masterDisk != null) {
-				class294.method5328(this.index, var2, this.masterDisk);
+				GameShell.method1005(this.index, var2, this.masterDisk);
 			}
 
 			this.decodeIndex(var2);
@@ -190,124 +208,93 @@ 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) {
-				class294.method5328(var1, var2, this.archiveDisk);
+				GameShell.method1005(var1, var2, this.archiveDisk);
 				this.validGroups[var1] = true;
 			}
 
 			if (var4) {
-				Object[] var5 = super.groups;
+				super.groups[var1] = Entity.method3209(var2, false);
-				Object var7;
-				if (var2 == null) {
-					var7 = null;
-				} else if (var2.length > 136) {
-					DirectByteArrayCopier var8 = new DirectByteArrayCopier();
-					var8.set(var2);
-					var7 = var8;
-				} else {
-					var7 = var2;
-				}
-
-				var5[var1] = var7;
 			}
 		}
 
 	}
 
-	@ObfuscatedName("dl")
+	@ObfuscatedName("dv")
 	@ObfuscatedSignature(
-		signature = "(Lkm;I[BZI)V",
+		signature = "(Lkv;I[BZI)V",
-		garbageValue = "-1554685282"
+		garbageValue = "54929376"
 	)
 	@Export("load")
-	public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
+	void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) {
 		int var5;
 		if (var1 == this.masterDisk) {
-			if (this.field3155) {
+			if (this.field3132) {
 				throw new RuntimeException();
-			}
+			} else if (var3 == null) {
-
+				BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-			if (var3 == null) {
+			} else {
-				ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+				Archive_crc.reset();
-				return;
+				Archive_crc.update(var3, 0, var3.length);
-			}
+				var5 = (int)Archive_crc.getValue();
-
+				if (var5 != this.indexCrc) {
-			Archive_crc.reset();
+					BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-			Archive_crc.update(var3, 0, var3.length);
-			var5 = (int)Archive_crc.getValue();
-			if (var5 != this.indexCrc) {
-				ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-				return;
-			}
-
-			Buffer var11 = new Buffer(HealthBarUpdate.decompressBytes(var3));
-			int var12 = var11.readUnsignedByte();
-			if (var12 != 5 && var12 != 6) {
-				throw new RuntimeException(var12 + "," + this.index + "," + var2);
-			}
-
-			int var8 = 0;
-			if (var12 >= 6) {
-				var8 = var11.readInt();
-			}
-
-			if (var8 != this.indexVersion) {
-				ViewportMouse.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
-				return;
-			}
-
-			this.decodeIndex(var3);
-			this.loadAllLocal();
-		} else {
-			if (!var4 && var2 == this.field3152) {
-				this.field3155 = true;
-			}
-
-			if (var3 == null || var3.length <= 2) {
-				this.validGroups[var2] = false;
-				if (this.field3157 || var4) {
-					ViewportMouse.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
-				}
-
-				return;
-			}
-
-			Archive_crc.reset();
-			Archive_crc.update(var3, 0, var3.length - 2);
-			var5 = (int)Archive_crc.getValue();
-			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.field3157 || var4) {
-					ViewportMouse.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
-				}
-
-				return;
-			}
-
-			this.validGroups[var2] = true;
-			if (var4) {
-				Object[] var7 = super.groups;
-				Object var9;
-				if (var3 == null) {
-					var9 = null;
-				} else if (var3.length > 136) {
-					DirectByteArrayCopier var10 = new DirectByteArrayCopier();
-					var10.set(var3);
-					var9 = var10;
 				} else {
-					var9 = var3;
+					Buffer var9 = new Buffer(Player.decompressBytes(var3));
+					int var7 = var9.readUnsignedByte();
+					if (var7 != 5 && var7 != 6) {
+						throw new RuntimeException(var7 + "," + this.index + "," + var2);
+					} else {
+						int var8 = 0;
+						if (var7 >= 6) {
+							var8 = var9.readInt();
+						}
+
+						if (var8 != this.indexVersion) {
+							BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+						} else {
+							this.decodeIndex(var3);
+							this.loadAllLocal();
+						}
+					}
+				}
+			}
+		} else {
+			if (!var4 && var2 == this.field3131) {
+				this.field3132 = true;
+			}
+
+			if (var3 != null && var3.length > 2) {
+				Archive_crc.reset();
+				Archive_crc.update(var3, 0, var3.length - 2);
+				var5 = (int)Archive_crc.getValue();
+				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] = true;
+					if (var4) {
+						super.groups[var2] = Entity.method3209(var3, false);
+					}
+
+				} else {
+					this.validGroups[var2] = false;
+					if (this.field3133 || var4) {
+						BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
+					}
+
+				}
+			} else {
+				this.validGroups[var2] = false;
+				if (this.field3133 || var4) {
+					BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4);
 				}
 
-				var7[var2] = var9;
 			}
 		}
-
 	}
 
-	@ObfuscatedName("dz")
+	@ObfuscatedName("da")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-72081442"
+		garbageValue = "-1518016463"
 	)
 	@Export("loadAllLocal")
 	void loadAllLocal() {
@@ -319,39 +306,19 @@ public class Archive extends AbstractArchive {
 		}
 
 		if (this.archiveDisk == null) {
-			this.field3155 = true;
+			this.field3132 = true;
 		} else {
-			this.field3152 = -1;
+			this.field3131 = -1;
 
 			for (var1 = 0; var1 < this.validGroups.length; ++var1) {
 				if (super.fileCounts[var1] > 0) {
-					ArchiveDisk var2 = this.archiveDisk;
+					BuddyRankComparator.method3376(var1, this.archiveDisk, this);
-					ArchiveDiskAction var4 = new ArchiveDiskAction();
+					this.field3131 = var1;
-					var4.type = 1;
-					var4.key = (long)var1;
-					var4.archiveDisk = var2;
-					var4.archive = this;
-					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-						ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var4);
-					}
-
-					synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
-						if (ArchiveDiskActionHandler.field3144 == 0) {
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true);
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start();
-							ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5);
-						}
-
-						ArchiveDiskActionHandler.field3144 = 600;
-					}
-
-					this.field3152 = var1;
 				}
 			}
 
-			if (this.field3152 == -1) {
+			if (this.field3131 == -1) {
-				this.field3155 = true;
+				this.field3132 = true;
 			}
 
 		}
@@ -360,25 +327,25 @@ public class Archive extends AbstractArchive {
 	@ObfuscatedName("dh")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "2032179519"
+		garbageValue = "512289174"
 	)
-	public boolean method4267(int var1) {
+	public boolean method4185(int var1) {
 		return this.validGroups[var1];
 	}
 
-	@ObfuscatedName("dy")
+	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
 		signature = "(IB)Z",
-		garbageValue = "0"
+		garbageValue = "-5"
 	)
-	public boolean method4268(int var1) {
+	public boolean method4199(int var1) {
 		return this.getGroupFileIds(var1) != null;
 	}
 
-	@ObfuscatedName("dx")
+	@ObfuscatedName("dj")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "889991726"
+		garbageValue = "119"
 	)
 	@Export("loadPercent")
 	public int loadPercent() {
@@ -395,54 +362,9 @@ public class Archive extends AbstractArchive {
 
 		if (var1 == 0) {
 			return 100;
-		}
-		var3 = var2 * 100 / var1;
-		return var3;
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(Lgx;Llv;I)Lgb;",
-		garbageValue = "1775123545"
-	)
-	@Export("getPacketBufferNode")
-	public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) {
-		PacketBufferNode var2;
-		if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) {
-			var2 = new PacketBufferNode();
 		} else {
-			var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount];
+			var3 = var2 * 100 / var1;
-		}
+			return var3;
-
-		var2.clientPacket = var0;
-		var2.clientPacketLength = var0.length;
-		if (var2.clientPacketLength == -1) {
-			var2.packetBuffer = new PacketBuffer(260);
-		} else if (var2.clientPacketLength == -2) {
-			var2.packetBuffer = new PacketBuffer(10000);
-		} else if (var2.clientPacketLength <= 18) {
-			var2.packetBuffer = new PacketBuffer(20);
-		} else if (var2.clientPacketLength <= 98) {
-			var2.packetBuffer = new PacketBuffer(100);
-		} else {
-			var2.packetBuffer = new PacketBuffer(260);
-		}
-
-		var2.packetBuffer.setIsaacCipher(var1);
-		var2.packetBuffer.writeByteIsaac(var2.clientPacket.id);
-		var2.index = 0;
-		return var2;
-	}
-
-	@ObfuscatedName("jn")
-	@ObfuscatedSignature(
-		signature = "(IB)V",
-		garbageValue = "35"
-	)
-	@Export("drawInterfaceModelComponents")
-	static final void drawInterfaceModelComponents(int var0) {
-		if (class162.loadInterface(var0)) {
-			class225.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1);
 		}
 	}
 }

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

@@ -1,38 +1,40 @@
 import java.io.EOFException;
 import java.io.IOException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("km")
+@ObfuscatedName("kv")
 @Implements("ArchiveDisk")
 public final class ArchiveDisk {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("ArchiveDisk_buffer")
 	static byte[] ArchiveDisk_buffer;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lmn;"
+		signature = "Lmw;"
 	)
 	@Export("datFile")
 	BufferedFile datFile;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "Lmn;"
-	)
-	@Export("idxFile")
-	BufferedFile idxFile;
-	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -2081269841
+		intValue = -1905715445
 	)
 	@Export("archive")
 	int archive;
 	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		signature = "Lmw;"
+	)
+	@Export("idxFile")
+	BufferedFile idxFile;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -609307423
+		intValue = 1039930471
 	)
 	@Export("maxEntrySize")
 	int maxEntrySize;
@@ -42,7 +44,7 @@ public final class ArchiveDisk {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(ILmn;Lmn;I)V"
+		signature = "(ILmw;Lmw;I)V"
 	)
 	public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
 		this.datFile = null;
@@ -54,132 +56,144 @@ public final class ArchiveDisk {
 		this.maxEntrySize = var4;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(II)[B",
+		signature = "(IB)[B",
-		garbageValue = "-8739933"
+		garbageValue = "93"
 	)
 	@Export("read")
 	public byte[] read(int var1) {
 		synchronized(this.datFile) {
 			try {
+				Object var10000;
 				if (this.idxFile.length() < (long)(var1 * 6 + 6)) {
-					return null;
+					var10000 = null;
-				}
+					return (byte[])var10000;
-				this.idxFile.seek((long)(var1 * 6));
+				} else {
-				this.idxFile.read(ArchiveDisk_buffer, 0, 6);
+					this.idxFile.seek((long)(var1 * 6));
-				int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
+					this.idxFile.read(ArchiveDisk_buffer, 0, 6);
-				int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
+					int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
-				if (var3 < 0 || var3 > this.maxEntrySize) {
+					int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
-					return null;
+					if (var3 < 0 || var3 > this.maxEntrySize) {
-				}
+						var10000 = null;
-				if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) {
+						return (byte[])var10000;
-					return null;
+					} else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) {
-				}
+						var10000 = null;
-				byte[] var5 = new byte[var3];
+						return (byte[])var10000;
-				int var6 = 0;
-
-				for (int var7 = 0; var6 < var3; ++var7) {
-					if (var4 == 0) {
-						return null;
-					}
-
-					this.datFile.seek(520L * (long)var4);
-					int var8 = var3 - var6;
-					int var9;
-					int var10;
-					int var11;
-					int var12;
-					byte var13;
-					if (var1 > 0xffff) {
-						if (var8 > 510) {
-							var8 = 510;
-						}
-
-						var13 = 10;
-						this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
-						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);
-						var12 = ArchiveDisk_buffer[9] & 255;
 					} else {
-						if (var8 > 512) {
+						byte[] var5 = new byte[var3];
-							var8 = 512;
+						int var6 = 0;
+
+						for (int var7 = 0; var6 < var3; ++var7) {
+							if (var4 == 0) {
+								var10000 = null;
+								return (byte[])var10000;
+							}
+
+							this.datFile.seek(520L * (long)var4);
+							int var8 = var3 - var6;
+							int var9;
+							int var10;
+							int var11;
+							int var12;
+							byte var13;
+							if (var1 > 65535) {
+								if (var8 > 510) {
+									var8 = 510;
+								}
+
+								var13 = 10;
+								this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13);
+								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);
+								var12 = ArchiveDisk_buffer[9] & 255;
+							} else {
+								if (var8 > 512) {
+									var8 = 512;
+								}
+
+								var13 = 8;
+								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) {
+								var10000 = null;
+								return (byte[])var10000;
+							}
+
+							if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) {
+								var10000 = null;
+								return (byte[])var10000;
+							}
+
+							int var14 = var13 + var8;
+
+							for (int var15 = var13; var15 < var14; ++var15) {
+								var5[var6++] = ArchiveDisk_buffer[var15];
+							}
+
+							var4 = var11;
 						}
 
-						var13 = 8;
+						byte[] var20 = var5;
-						this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8);
+						return var20;
-						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) {
-						return null;
-					}
-
-					if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) {
-						return null;
-					}
-
-					int var14 = var8 + var13;
-
-					for (int var15 = var13; var15 < var14; ++var15) {
-						var5[var6++] = ArchiveDisk_buffer[var15];
-					}
-
-					var4 = var11;
 				}
-
-				byte[] var20 = var5;
-				return var20;
 			} catch (IOException var18) {
 				return null;
 			}
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I[BII)Z",
-		garbageValue = "-1155409189"
+		garbageValue = "1937661421"
 	)
 	@Export("write")
 	public boolean write(int var1, byte[] var2, int var3) {
 		synchronized(this.datFile) {
-			if (var3 < 0 || var3 > this.maxEntrySize) {
+			if (var3 >= 0 && var3 <= this.maxEntrySize) {
+				boolean var5 = this.write0(var1, var2, var3, true);
+				if (!var5) {
+					var5 = this.write0(var1, var2, var3, false);
+				}
+
+				return var5;
+			} else {
 				throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3);
 			}
-			boolean var5 = this.write0(var1, var2, var3, true);
-			if (!var5) {
-				var5 = this.write0(var1, var2, var3, false);
-			}
-
-			return var5;
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I[BIZB)Z",
-		garbageValue = "64"
+		garbageValue = "16"
 	)
 	@Export("write0")
 	boolean write0(int var1, byte[] var2, int var3, boolean var4) {
 		synchronized(this.datFile) {
 			try {
 				int var6;
+				boolean var10000;
 				if (var4) {
 					if (this.idxFile.length() < (long)(var1 * 6 + 6)) {
-						return false;
+						var10000 = false;
+						return var10000;
 					}
 
 					this.idxFile.seek((long)(var1 * 6));
 					this.idxFile.read(ArchiveDisk_buffer, 0, 6);
 					var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
 					if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) {
-						return false;
+						var10000 = false;
+						return var10000;
 					}
 				} else {
 					var6 = (int)((this.datFile.length() + 519L) / 520L);
@@ -199,19 +213,20 @@ public final class ArchiveDisk {
 				int var7 = 0;
 				int var8 = 0;
 
-				while (var7 < var3) {
+				while (true) {
+					if (var7 < var3) {
 						label171: {
 							int var9 = 0;
 							int var10;
 							if (var4) {
-								this.datFile.seek((long)var6 * 520L);
+								this.datFile.seek(520L * (long)var6);
 								int var11;
 								int var12;
-								if (var1 > 0xffff) {
+								if (var1 > 65535) {
 									try {
 										this.datFile.read(ArchiveDisk_buffer, 0, 10);
 									} catch (EOFException var17) {
-										continue;
+										break label171;
 									}
 
 									var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
@@ -231,12 +246,14 @@ 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) {
-									return false;
+									var10000 = false;
+									return var10000;
 								}
 
 								if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) {
-									return false;
+									var10000 = false;
+									return var10000;
 								}
 							}
 
@@ -252,7 +269,7 @@ public final class ArchiveDisk {
 								}
 							}
 
-							if (var1 > 0xffff) {
+							if (var1 > 65535) {
 								if (var3 - var7 <= 510) {
 									var9 = 0;
 								}
@@ -267,7 +284,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) {
@@ -306,41 +323,71 @@ public final class ArchiveDisk {
 						}
 					}
 
-					return true;
+					var10000 = true;
+					return var10000;
+				}
 			} catch (IOException var18) {
 				return false;
 			}
 		}
 	}
 
+	public String abd() {
+		return "" + this.archive;
+	}
+
+	public String abb() {
+		return "" + this.archive * 1098163870;
+	}
+
 	public String toString() {
 		return "" + this.archive;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/Object;ZI)[B",
+		signature = "(Lfu;III)Ldd;",
-		garbageValue = "991854443"
+		garbageValue = "670296930"
 	)
-	@Export("serialize")
+	public static final PcmPlayer method5757(TaskHandler var0, int var1, int var2) {
-	public static byte[] serialize(Object var0, boolean var1) {
+		if (PcmPlayer.PcmPlayer_sampleRate == 0) {
-		if (var0 == null) {
+			throw new IllegalStateException();
-			return null;
+		} else if (var1 >= 0 && var1 < 2) {
-		}
+			if (var2 < 256) {
-		if (var0 instanceof byte[]) {
+				var2 = 256;
-			byte[] var6 = ((byte[]) var0);
-			if (var1) {
-				int var4 = var6.length;
-				byte[] var5 = new byte[var4];
-				System.arraycopy(var6, 0, var5, 0, var4);
-				return var5;
 			}
-			return var6;
+
-		}
+			try {
-		if (!(var0 instanceof AbstractByteArrayCopier)) {
+				PcmPlayer var3 = SecureRandomCallable.pcmPlayerProvider.player();
+				var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256];
+				var3.field1399 = var2;
+				var3.init();
+				var3.capacity = (var2 & -1024) + 1024;
+				if (var3.capacity > 16384) {
+					var3.capacity = 16384;
+				}
+
+				var3.open(var3.capacity);
+				if (FloorDecoration.PcmPlayer_count > 0 && PacketBufferNode.soundSystem == null) {
+					PacketBufferNode.soundSystem = new SoundSystem();
+					GrandExchangeOfferWorldComparator.soundSystemExecutor = Executors.newScheduledThreadPool(1);
+					GrandExchangeOfferWorldComparator.soundSystemExecutor.scheduleAtFixedRate(PacketBufferNode.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
+				}
+
+				if (PacketBufferNode.soundSystem != null) {
+					if (PacketBufferNode.soundSystem.players[var1] != null) {
+						throw new IllegalArgumentException();
+					}
+
+					PacketBufferNode.soundSystem.players[var1] = var3;
+				}
+
+				return var3;
+			} catch (Throwable var4) {
+				return new PcmPlayer();
+			}
+		} else {
 			throw new IllegalArgumentException();
 		}
-		AbstractByteArrayCopier var2 = (AbstractByteArrayCopier) var0;
-		return var2.get();
 	}
 }

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

@@ -4,52 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hc")
+@ObfuscatedName("hn")
 @Implements("ArchiveDiskAction")
 public class ArchiveDiskAction extends Node {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -907427363
+		intValue = 1794438743
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("data")
-	public byte[] data;
+	byte[] data;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lkm;"
+		signature = "Lkv;"
 	)
 	@Export("archiveDisk")
-	public ArchiveDisk archiveDisk;
+	ArchiveDisk archiveDisk;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Liu;"
+		signature = "Lid;"
 	)
 	@Export("archive")
-	public Archive archive;
+	Archive archive;
 
 	ArchiveDiskAction() {
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(II)Lim;",
-		garbageValue = "-738252140"
-	)
-	@Export("KitDefinition_get")
-	public static KitDefinition KitDefinition_get(int var0) {
-		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		}
-		byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
-		var1 = new KitDefinition();
-		if (var2 != null) {
-			var1.decode(new Buffer(var2));
-		}
-
-		KitDefinition.KitDefinition_cached.put(var1, (long)var0);
-		return var1;
-	}
 }

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

@@ -1,42 +1,37 @@
-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("ir")
+@ObfuscatedName("iw")
 @Implements("ArchiveDiskActionHandler")
 public class ArchiveDiskActionHandler implements Runnable {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Ljh;"
+		signature = "Ljc;"
 	)
 	@Export("ArchiveDiskActionHandler_requestQueue")
-	public static NodeDeque ArchiveDiskActionHandler_requestQueue;
+	static NodeDeque ArchiveDiskActionHandler_requestQueue;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Ljh;"
+		signature = "Ljc;"
 	)
 	@Export("ArchiveDiskActionHandler_responseQueue")
-	public static NodeDeque ArchiveDiskActionHandler_responseQueue;
+	static NodeDeque ArchiveDiskActionHandler_responseQueue;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1331634311
+		intValue = 587142169
 	)
-	static int field3144;
+	static int field3124;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("ArchiveDiskActionHandler_lock")
 	static Object ArchiveDiskActionHandler_lock;
-	@ObfuscatedName("k")
-	@Export("ArchiveDiskActionHandler_thread")
-	static Thread ArchiveDiskActionHandler_thread;
 
 	static {
 		ArchiveDiskActionHandler_requestQueue = new NodeDeque();
 		ArchiveDiskActionHandler_responseQueue = new NodeDeque();
-		field3144 = 0;
+		field3124 = 0;
 		ArchiveDiskActionHandler_lock = new Object();
 	}
 
@@ -65,76 +60,45 @@ public class ArchiveDiskActionHandler implements Runnable {
 					}
 
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3144 <= 1) {
+						if (field3124 <= 1) {
-							field3144 = 0;
+							field3124 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						field3144 = 600;
+						field3124 = 600;
 					}
 				} else {
-					EnumDefinition.sleepMillis(100L);
+					UserList.sleepMillis(100L);
 					synchronized(ArchiveDiskActionHandler_lock) {
-						if (field3144 <= 1) {
+						if (field3124 <= 1) {
-							field3144 = 0;
+							field3124 = 0;
 							ArchiveDiskActionHandler_lock.notifyAll();
 							return;
 						}
 
-						--field3144;
+						--field3124;
 					}
 				}
 			}
 		} catch (Exception var13) {
-			HitSplatDefinition.RunException_sendStackTrace((String)null, var13);
+			class3.RunException_sendStackTrace((String)null, var13);
 		}
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "(Lfs;III)Ldn;",
+		signature = "(CB)Z",
-		garbageValue = "2015059645"
+		garbageValue = "-108"
 	)
-	public static final PcmPlayer method4256(TaskHandler var0, int var1, int var2) {
+	@Export("isCharPrintable")
-		if (CollisionMap.PcmPlayer_sampleRate == 0) {
+	public static boolean isCharPrintable(char var0) {
-			throw new IllegalStateException();
+		if (var0 >= ' ' && var0 <= '~') {
+			return true;
+		} else if (var0 >= 160 && var0 <= 255) {
+			return true;
+		} else {
+			return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
 		}
-		if (var1 >= 0 && var1 < 2) {
-			if (var2 < 256) {
-				var2 = 256;
-			}
-
-			try {
-				PcmPlayer var3 = class32.pcmPlayerProvider.player();
-				var3.samples = new int[256 * (FileSystem.PcmPlayer_stereo ? 2 : 1)];
-				var3.field1414 = var2;
-				var3.init();
-				var3.capacity = (var2 & -1024) + 1024;
-				if (var3.capacity > 16384) {
-					var3.capacity = 16384;
-				}
-
-				var3.open(var3.capacity);
-				if (PcmPlayer.PcmPlayer_count > 0 && SecureRandomFuture.soundSystem == null) {
-					SecureRandomFuture.soundSystem = new SoundSystem();
-					class14.soundSystemExecutor = Executors.newScheduledThreadPool(1);
-					class14.soundSystemExecutor.scheduleAtFixedRate(SecureRandomFuture.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
-				}
-
-				if (SecureRandomFuture.soundSystem != null) {
-					if (SecureRandomFuture.soundSystem.players[var1] != null) {
-						throw new IllegalArgumentException();
-					}
-
-					SecureRandomFuture.soundSystem.players[var1] = var3;
-				}
-
-				return var3;
-			} catch (Throwable var4) {
-				return new PcmPlayer();
-			}
-		}
-		throw new IllegalArgumentException();
 	}
 }

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

@@ -3,38 +3,37 @@ 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("bn")
+@ObfuscatedName("bh")
 @Implements("ArchiveLoader")
 public class ArchiveLoader {
-	@ObfuscatedName("rz")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		signature = "Lbf;"
+		signature = "Lkb;"
 	)
-	@Export("friendSystem")
+	@Export("ItemDefinition_fontPlain11")
-	public static FriendSystem friendSystem;
+	static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "Liu;"
-	)
-	@Export("archive")
-	final Archive archive;
-	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -637612403
+		intValue = -1407926591
 	)
 	@Export("groupCount")
 	final int groupCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Lid;"
+	)
+	@Export("archive")
+	final Archive archive;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1413706037
+		intValue = 2082038361
 	)
 	@Export("loadedCount")
 	int loadedCount;
 
 	@ObfuscatedSignature(
-		signature = "(Liu;Ljava/lang/String;)V"
+		signature = "(Lid;Ljava/lang/String;)V"
 	)
 	ArchiveLoader(Archive var1, String var2) {
 		this.loadedCount = 0;
@@ -42,17 +41,17 @@ public class ArchiveLoader {
 		this.groupCount = var1.getGroupCount();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "-30"
+		garbageValue = "273857318"
 	)
 	@Export("isLoaded")
 	boolean isLoaded() {
 		this.loadedCount = 0;
 
 		for (int var1 = 0; var1 < this.groupCount; ++var1) {
-			if (!this.archive.method4268(var1) || this.archive.method4267(var1)) {
+			if (!this.archive.method4199(var1) || this.archive.method4185(var1)) {
 				++this.loadedCount;
 			}
 		}
@@ -60,205 +59,53 @@ public class ArchiveLoader {
 		return this.loadedCount >= this.groupCount;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;Lhp;Lga;B)Z",
+		signature = "(II)Lcr;",
-		garbageValue = "14"
+		garbageValue = "-332369983"
 	)
-	@Export("setAudioArchives")
+	@Export("getScript")
-	public static boolean setAudioArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
+	static Script getScript(int var0) {
-		class197.musicPatchesArchive = var0;
+		Script var1 = (Script)Script.Script_cached.get((long)var0);
-		class197.musicSamplesArchive = var1;
+		if (var1 != null) {
-		class197.soundEffectsArchive = var2;
+			return var1;
-		Interpreter.midiPcmStream = var3;
+		} else {
-		return true;
+			byte[] var2 = GameShell.archive12.takeFile(var0, 0);
+			if (var2 == null) {
+				return null;
+			} else {
+				var1 = DesktopPlatformInfoProvider.newScript(var2);
+				Script.Script_cached.put(var1, (long)var0);
+				return var1;
+			}
+		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(ILcx;ZB)I",
+		signature = "(B)V",
-		garbageValue = "65"
+		garbageValue = "114"
 	)
-	static int method1100(int var0, Script var1, boolean var2) {
+	@Export("NpcDefinition_clearCached")
-		Widget var3;
+	public static void NpcDefinition_clearCached() {
-		if (var0 >= 2000) {
+		NPCDefinition.NpcDefinition_cached.clear();
-			var0 -= 1000;
+		NPCDefinition.NpcDefinition_cachedModels.clear();
-			var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? Interpreter.field1111 : Calendar.field2507;
-		}
-
-		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
-			if (Interpreter.field1106 >= 10) {
-				throw new RuntimeException();
-			}
-			if (var3.onResize == null) {
-				return 0;
-			}
-			ScriptEvent var4 = new ScriptEvent();
-			var4.widget = var3;
-			var4.args = var3.onResize;
-			var4.field583 = Interpreter.field1106 + 1;
-			Client.scriptEvents.addFirst(var4);
-			return 1;
-		}
-		return 2;
 	}
 
-	@ObfuscatedName("jk")
+	@ObfuscatedName("gh")
 	@ObfuscatedSignature(
-		signature = "(Lhj;I)Lhj;",
+		signature = "(III)I",
-		garbageValue = "1227786783"
+		garbageValue = "1464962568"
 	)
-	static Widget method1099(Widget var0) {
+	static int method1100(int var0, int var1) {
-		Widget var2 = var0;
+		int var2 = var1 - 334;
-		int var3 = class32.method545(class268.getWidgetClickMask(var0));
+		if (var2 < 0) {
-		Widget var1;
+			var2 = 0;
-		if (var3 == 0) {
+		} else if (var2 > 100) {
-			var1 = null;
+			var2 = 100;
-		} else {
-			for (int var4 = 0; var4 < var3; var4++) {
-				var2 = class80.getWidget(var2.parentId);
-				if (var2 == null) {
-					break;
-				}
-			}
-
-			var1 = var2;
 		}
 
-		Widget var5 = var1;
+		int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight;
-		if (var1 == null) {
+		return var0 * var3 / 256;
-			var5 = var0.parent;
-		}
-
-		return var5;
-	}
-
-	@ObfuscatedName("ja")
-	@ObfuscatedSignature(
-		signature = "(Lhj;IIIB)V",
-		garbageValue = "94"
-	)
-	@Export("drawMinimap")
-	static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
-		class186.playPcmPlayers();
-		SpriteMask var4 = var0.getSpriteMask(false);
-		if (var4 == null) {
-			return;
-		}
-		Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
-		if (Client.minimapState == 2 || Client.minimapState == 5) {
-			Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
-		} else {
-			int var5 = Client.camAngleY & 2047;
-			int var6 = Client.localPlayer.x / 32 + 48;
-			int var7 = 464 - Client.localPlayer.y / 32;
-			RouteStrategy.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
-
-			int var8;
-			int var9;
-			int var10;
-			for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
-				var9 = Client.mapIconXs[var8] * 4 + 2 - Client.localPlayer.x / 32;
-				var10 = Client.mapIconYs[var8] * 4 + 2 - Client.localPlayer.y / 32;
-				Interpreter.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4);
-			}
-
-			int var11;
-			int var12;
-			for (var8 = 0; var8 < 104; ++var8) {
-				for (var9 = 0; var9 < 104; ++var9) {
-					NodeDeque var15 = Client.groundItems[class42.plane][var8][var9];
-					if (var15 == null) {
-						continue;
-					}
-					var11 = var8 * 4 + 2 - Client.localPlayer.x / 32;
-					var12 = var9 * 4 + 2 - Client.localPlayer.y / 32;
-					Interpreter.drawSpriteOnMinimap(var1, var2, var11, var12, Skills.mapDotSprites[0], var4);
-				}
-			}
-
-			for (var8 = 0; var8 < Client.npcCount; ++var8) {
-				NPC var16 = Client.npcs[Client.npcIndices[var8]];
-				if (var16 == null || !var16.isVisible()) {
-					continue;
-				}
-				NPCDefinition var18 = var16.definition;
-				if (var18 != null && var18.transforms != null) {
-					var18 = var18.transform();
-				}
-
-				if (var18 != null && var18.drawMapDot && var18.isInteractable) {
-					var11 = var16.x / 32 - Client.localPlayer.x / 32;
-					var12 = var16.y / 32 - Client.localPlayer.y / 32;
-					Interpreter.drawSpriteOnMinimap(var1, var2, var11, var12, Skills.mapDotSprites[1], var4);
-				}
-			}
-
-			var8 = Players.Players_count;
-			int[] var19 = Players.Players_indices;
-
-			for (var10 = 0; var10 < var8; ++var10) {
-				Player var17 = Client.players[var19[var10]];
-				if (var17 == null || !var17.isVisible() || var17.isHidden || var17 == Client.localPlayer) {
-					continue;
-				}
-				var12 = var17.x / 32 - Client.localPlayer.x / 32;
-				int var13 = var17.y / 32 - Client.localPlayer.y / 32;
-				boolean var14 = false;
-				if (Client.localPlayer.team != 0 && var17.team != 0 && var17.team == Client.localPlayer.team) {
-					var14 = true;
-				}
-
-				if (var17.isFriend()) {
-					Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[3], var4);
-				} else if (var14) {
-					Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[4], var4);
-				} else if (var17.isClanMember()) {
-					Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[5], var4);
-				} else {
-					Interpreter.drawSpriteOnMinimap(var1, var2, var12, var13, Skills.mapDotSprites[2], var4);
-				}
-			}
-
-			if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
-				if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
-					NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
-					if (var20 != null) {
-						var11 = var20.x / 32 - Client.localPlayer.x / 32;
-						var12 = var20.y / 32 - Client.localPlayer.y / 32;
-						Canvas.worldToMinimap(var1, var2, var11, var12, WorldMapData_1.mapMarkerSprites[1], var4);
-					}
-				}
-
-				if (Client.hintArrowType == 2) {
-					var10 = Client.hintArrowX * 4 - MusicPatchNode2.baseX * 256 + 2 - Client.localPlayer.x / 32;
-					var11 = Client.hintArrowY * 4 - class1.baseY * 256 + 2 - Client.localPlayer.y / 32;
-					Canvas.worldToMinimap(var1, var2, var10, var11, WorldMapData_1.mapMarkerSprites[1], var4);
-				}
-
-				if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
-					Player var21 = Client.players[Client.hintArrowPlayerIndex];
-					if (var21 != null) {
-						var11 = var21.x / 32 - Client.localPlayer.x / 32;
-						var12 = var21.y / 32 - Client.localPlayer.y / 32;
-						Canvas.worldToMinimap(var1, var2, var11, var12, WorldMapData_1.mapMarkerSprites[1], var4);
-					}
-				}
-			}
-
-			if (Client.destinationX != 0) {
-				var10 = Client.destinationX * 4 + 2 - Client.localPlayer.x / 32;
-				var11 = Client.destinationY * 4 + 2 - Client.localPlayer.y / 32;
-				Interpreter.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapData_1.mapMarkerSprites[0], var4);
-			}
-
-			if (!Client.localPlayer.isHidden) {
-				Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 0xffffff);
-			}
-		}
-
-		Client.field861[var3] = true;
 	}
 }

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

@@ -4,43 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ct")
+@ObfuscatedName("cw")
 @Implements("AttackOption")
 public enum AttackOption implements Enumerated {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lct;"
+		signature = "Lcw;"
 	)
 	@Export("AttackOption_dependsOnCombatLevels")
 	AttackOption_dependsOnCombatLevels(0),
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lct;"
+		signature = "Lcw;"
 	)
 	@Export("AttackOption_alwaysRightClick")
 	AttackOption_alwaysRightClick(1),
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lct;"
+		signature = "Lcw;"
 	)
 	@Export("AttackOption_leftClickWhereAvailable")
 	AttackOption_leftClickWhereAvailable(2),
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lct;"
+		signature = "Lcw;"
 	)
 	@Export("AttackOption_hidden")
 	AttackOption_hidden(3);
 
-	@ObfuscatedName("qz")
+	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Ldz;"
-	)
-	@Export("decimator")
-	static Decimator decimator;
-	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 52026669
+		intValue = -2103853983
 	)
 	@Export("id")
 	final int id;
@@ -49,10 +43,10 @@ public enum AttackOption implements Enumerated {
 		this.id = var3;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "320353268"
+		garbageValue = "-32"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {

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

@@ -3,147 +3,154 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dy")
+@ObfuscatedName("dp")
 @Implements("AudioFilter")
 public class AudioFilter {
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
-	static float[][] field1488;
+	static float[][] field1475;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("coefficients")
 	static int[][] coefficients;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
-	static float field1491;
+	static float field1468;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("forwardMultiplier")
 	static int forwardMultiplier;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("pairs")
 	int[] pairs;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
-	int[][][] field1494;
+	int[][][] field1467;
-	@ObfuscatedName("p")
-	int[][][] field1486;
 	@ObfuscatedName("k")
-	int[] field1487;
+	int[][][] field1470;
+	@ObfuscatedName("u")
+	int[] field1469;
 
 	static {
-		field1488 = new float[2][8];
+		field1475 = new float[2][8];
 		coefficients = new int[2][8];
 	}
 
 	AudioFilter() {
 		this.pairs = new int[2];
-		this.field1494 = new int[2][2][4];
+		this.field1467 = new int[2][2][4];
-		this.field1486 = new int[2][2][4];
+		this.field1470 = new int[2][2][4];
-		this.field1487 = new int[2];
+		this.field1469 = new int[2];
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
-	float method2668(int var1, int var2, float var3) {
+	float method2622(int var1, int var2, float var3) {
-		float var4 = (float)this.field1486[var1][0][var2] + var3 * (float)(this.field1486[var1][1][var2] - this.field1486[var1][0][var2]);
+		float var4 = (float)this.field1470[var1][0][var2] + var3 * (float)(this.field1470[var1][1][var2] - this.field1470[var1][0][var2]);
 		var4 *= 0.0015258789F;
 		return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
-	float method2683(int var1, int var2, float var3) {
+	float method2629(int var1, int var2, float var3) {
-		float var4 = (float)this.field1494[var1][0][var2] + var3 * (float)(this.field1494[var1][1][var2] - this.field1494[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("p")
+	@ObfuscatedName("k")
 	@Export("compute")
 	int compute(int var1, float var2) {
 		float var3;
 		if (var1 == 0) {
-			var3 = (float)this.field1487[0] + (float)(this.field1487[1] - this.field1487[0]) * var2;
+			var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2;
 			var3 *= 0.0030517578F;
-			field1491 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+			field1468 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-			forwardMultiplier = (int)(field1491 * 65536.0F);
+			forwardMultiplier = (int)(field1468 * 65536.0F);
 		}
 
 		if (this.pairs[var1] == 0) {
 			return 0;
-		}
+		} else {
-		var3 = this.method2668(var1, 0, var2);
+			var3 = this.method2622(var1, 0, var2);
-		field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2));
+			field1475[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, 0, var2));
-		field1488[var1][1] = var3 * var3;
+			field1475[var1][1] = var3 * var3;
 
-		int var4;
+			float[] var10000;
-		for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
+			int var4;
-			var3 = this.method2668(var1, var4, var2);
+			for (var4 = 1; var4 < this.pairs[var1]; ++var4) {
-			float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, var4, var2));
+				var3 = this.method2622(var1, var4, var2);
-			float var6 = var3 * var3;
+				float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, var4, var2));
-			field1488[var1][var4 * 2 + 1] = field1488[var1][var4 * 2 - 1] * var6;
+				float var6 = var3 * var3;
-			field1488[var1][var4 * 2] = field1488[var1][var4 * 2 - 1] * var5 + field1488[var1][var4 * 2 - 2] * var6;
+				field1475[var1][var4 * 2 + 1] = field1475[var1][var4 * 2 - 1] * var6;
+				field1475[var1][var4 * 2] = field1475[var1][var4 * 2 - 1] * var5 + field1475[var1][var4 * 2 - 2] * var6;
 
-			for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
+				for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-				field1488[var1][var7] += field1488[var1][var7 - 1] * var5 + field1488[var1][var7 - 2] * var6;
+					var10000 = field1475[var1];
+					var10000[var7] += field1475[var1][var7 - 1] * var5 + field1475[var1][var7 - 2] * var6;
+				}
+
+				var10000 = field1475[var1];
+				var10000[1] += field1475[var1][0] * var5 + var6;
+				var10000 = field1475[var1];
+				var10000[0] += var5;
 			}
 
-			field1488[var1][1] += field1488[var1][0] * var5 + var6;
+			if (var1 == 0) {
-			field1488[var1][0] += var5;
+				for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-		}
+					var10000 = field1475[0];
-
+					var10000[var4] *= field1468;
-		if (var1 == 0) {
+				}
-			for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) {
-				field1488[0][var4] *= field1491;
 			}
-		}
 
-		for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
+			for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) {
-			coefficients[var1][var4] = (int)(field1488[var1][var4] * 65536.0F);
+				coefficients[var1][var4] = (int)(field1475[var1][var4] * 65536.0F);
-		}
+			}
 
-		return this.pairs[var1] * 2;
+			return this.pairs[var1] * 2;
+		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lkf;Ldw;)V"
+		signature = "(Lky;Ldv;)V"
 	)
-	final void method2680(Buffer var1, SoundEnvelope var2) {
+	final void method2637(Buffer var1, SoundEnvelope var2) {
 		int var3 = var1.readUnsignedByte();
 		this.pairs[0] = var3 >> 4;
 		this.pairs[1] = var3 & 15;
-		if (var3 == 0) {
+		if (var3 != 0) {
-			this.field1487[0] = 0;
+			this.field1469[0] = var1.readUnsignedShort();
-			this.field1487[1] = 0;
+			this.field1469[1] = var1.readUnsignedShort();
-			return;
+			int var4 = var1.readUnsignedByte();
-		}
-		this.field1487[0] = var1.readUnsignedShort();
-		this.field1487[1] = var1.readUnsignedShort();
-		int var4 = var1.readUnsignedByte();
 
-		int var5;
+			int var5;
-		int var6;
+			int var6;
-		for (var5 = 0; var5 < 2; ++var5) {
+			for (var5 = 0; var5 < 2; ++var5) {
-			for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
+				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
-				this.field1494[var5][0][var6] = var1.readUnsignedShort();
+					this.field1467[var5][0][var6] = var1.readUnsignedShort();
-				this.field1486[var5][0][var6] = var1.readUnsignedShort();
+					this.field1470[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.field1494[var5][1][var6] = var1.readUnsignedShort();
-					this.field1486[var5][1][var6] = var1.readUnsignedShort();
-				} else {
-					this.field1494[var5][1][var6] = this.field1494[var5][0][var6];
-					this.field1486[var5][1][var6] = this.field1486[var5][0][var6];
 				}
 			}
-		}
 
-		if (var4 != 0 || this.field1487[1] != this.field1487[0]) {
+			for (var5 = 0; var5 < 2; ++var5) {
-			var2.decodeSegments(var1);
+				for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
+					if ((var4 & 1 << var5 * 4 << var6) != 0) {
+						this.field1467[var5][1][var6] = var1.readUnsignedShort();
+						this.field1470[var5][1][var6] = var1.readUnsignedShort();
+					} else {
+						this.field1467[var5][1][var6] = this.field1467[var5][0][var6];
+						this.field1470[var5][1][var6] = this.field1470[var5][0][var6];
+					}
+				}
+			}
+
+			if (var4 != 0 || this.field1469[1] != this.field1469[0]) {
+				var2.decodeSegments(var1);
+			}
+		} else {
+			int[] var7 = this.field1469;
+			this.field1469[1] = 0;
+			var7[0] = 0;
 		}
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@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("kg")
+@ObfuscatedName("ku")
 @Implements("BZip2Decompressor")
 public final class BZip2Decompressor {
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lki;"
+		signature = "Lkw;"
 	)
 	@Export("BZip2Decompressor_state")
 	static BZip2State BZip2Decompressor_state;
@@ -17,7 +17,7 @@ public final class BZip2Decompressor {
 		BZip2Decompressor_state = new BZip2State();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@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.field3753 = 0;
+			BZip2Decompressor_state.field3721 = 0;
 			BZip2Decompressor_decompress(BZip2Decompressor_state);
 			var1 -= BZip2Decompressor_state.outputLength;
 			BZip2Decompressor_state.inputArray = null;
@@ -38,21 +38,21 @@ public final class BZip2Decompressor {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lki;)V"
+		signature = "(Lkw;)V"
 	)
-	static void method5773(BZip2State var0) {
+	static void method5667(BZip2State var0) {
 		byte var2 = var0.out_char;
 		int var3 = var0.su_rNToGo;
 		int var4 = var0.nblocks_used;
 		int var5 = var0.su_ch2;
-		int[] var6 = VarbitDefinition.BZip2Decompressor_block;
+		int[] var6 = Coord.BZip2Decompressor_block;
-		int var7 = var0.field3760;
+		int var7 = var0.field3736;
 		byte[] var8 = var0.outputArray;
 		int var9 = var0.next_out;
 		int var10 = var0.outputLength;
-		int var12 = var0.field3776 + 1;
+		int var12 = var0.field3754 + 1;
 
 		label61:
 		while (true) {
@@ -148,25 +148,25 @@ public final class BZip2Decompressor {
 			break;
 		}
 
-		int var13 = var0.field3753;
+		int var13 = var0.field3721;
-		var0.field3753 += var10 - var10;
+		var0.field3721 += var10 - var10;
-		if (var0.field3753 < var13) {
+		if (var0.field3721 < var13) {
 		}
 
 		var0.out_char = var2;
 		var0.su_rNToGo = var3;
 		var0.nblocks_used = var4;
 		var0.su_ch2 = var5;
-		VarbitDefinition.BZip2Decompressor_block = var6;
+		Coord.BZip2Decompressor_block = var6;
-		var0.field3760 = var7;
+		var0.field3736 = var7;
 		var0.outputArray = var8;
 		var0.next_out = var9;
 		var0.outputLength = var10;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lki;)V"
+		signature = "(Lkw;)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 (VarbitDefinition.BZip2Decompressor_block == null) {
+		if (Coord.BZip2Decompressor_block == null) {
-			VarbitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * 100000];
+			Coord.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]++;
-							VarbitDefinition.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255;
+							Coord.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) {
-								VarbitDefinition.BZip2Decompressor_block[var47] = var1 & 255;
+								Coord.BZip2Decompressor_block[var47] = var1 & 255;
 								++var47;
 							}
 						}
@@ -509,22 +509,22 @@ public final class BZip2Decompressor {
 					}
 
 					for (var36 = 0; var36 < var47; ++var36) {
-						var1 = (byte)(VarbitDefinition.BZip2Decompressor_block[var36] & 255);
+						var1 = (byte)(Coord.BZip2Decompressor_block[var36] & 255);
-						var10000 = VarbitDefinition.BZip2Decompressor_block;
+						var10000 = Coord.BZip2Decompressor_block;
 						int var10001 = var0.cftab[var1 & 255];
 						var10000[var10001] |= var36 << 8;
 						var10002 = var0.cftab[var1 & 255]++;
 					}
 
-					var0.field3760 = VarbitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8;
+					var0.field3736 = Coord.BZip2Decompressor_block[var0.originalPointer] >> 8;
 					var0.nblocks_used = 0;
-					var0.field3760 = VarbitDefinition.BZip2Decompressor_block[var0.field3760];
+					var0.field3736 = Coord.BZip2Decompressor_block[var0.field3736];
-					var0.su_ch2 = (byte)(var0.field3760 & 255);
+					var0.su_ch2 = (byte)(var0.field3736 & 255);
-					var0.field3760 >>= 8;
+					var0.field3736 >>= 8;
 					++var0.nblocks_used;
-					var0.field3776 = var47;
+					var0.field3754 = var47;
-					method5773(var0);
+					method5667(var0);
-					if (var0.field3776 + 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("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Lki;)B"
+		signature = "(Lkw;)B"
 	)
 	@Export("BZip2Decompressor_readNextByte")
 	static byte BZip2Decompressor_readNextByte(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(8, var0);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lki;)B"
+		signature = "(Lkw;)B"
 	)
 	@Export("BZip2Decompressor_readNextBit")
 	static byte BZip2Decompressor_readNextBit(BZip2State var0) {
 		return (byte)BZip2Decompressor_readBits(1, var0);
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(ILki;)I"
+		signature = "(ILkw;)I"
 	)
 	@Export("BZip2Decompressor_readBits")
 	static int BZip2Decompressor_readBits(int var0, BZip2State var1) {
@@ -576,9 +576,9 @@ public final class BZip2Decompressor {
 		return var2;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Lki;)V"
+		signature = "(Lkw;)V"
 	)
 	@Export("makeMaps")
 	static void makeMaps(BZip2State var0) {
@@ -593,7 +593,7 @@ public final class BZip2Decompressor {
 
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@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

@@ -1,172 +1,170 @@
-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("ki")
+@ObfuscatedName("kw")
 @Implements("BZip2State")
 public final class BZip2State {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
-	final int field3748;
+	final int field3737;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
-	final int field3743;
-	@ObfuscatedName("e")
-	final int field3779;
-	@ObfuscatedName("p")
-	final int field3778;
-	@ObfuscatedName("k")
 	final int field3745;
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	final int field3746;
-	@ObfuscatedName("b")
+	@ObfuscatedName("k")
+	final int field3722;
+	@ObfuscatedName("u")
+	final int field3735;
+	@ObfuscatedName("n")
+	final int field3717;
+	@ObfuscatedName("t")
 	@Export("inputArray")
 	byte[] inputArray;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1049906743
+		intValue = 1249128023
 	)
 	@Export("nextByte")
 	int nextByte;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1743451477
+		intValue = -423174679
 	)
 	@Export("nextBit_unused")
 	int nextBit_unused;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("outputArray")
 	byte[] outputArray;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1528977191
+		intValue = 1450954735
 	)
 	@Export("next_out")
 	int next_out;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1616991267
+		intValue = 875649401
 	)
 	@Export("outputLength")
 	int outputLength;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 1607838751
-	)
-	int field3753;
 	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1562015159
+	)
+	int field3721;
+	@ObfuscatedName("y")
 	@Export("out_char")
 	byte out_char;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 236002095
+		intValue = 1013295897
 	)
 	@Export("su_rNToGo")
 	int su_rNToGo;
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 145021143
+		intValue = 2065373853
 	)
 	@Export("bsBuff")
 	int bsBuff;
 	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = 964245035
+		intValue = -322433333
 	)
 	@Export("bsLive")
 	int bsLive;
-	@ObfuscatedName("a")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = 738319360
+		intValue = 1084513280
 	)
 	@Export("blockSize100k")
 	int blockSize100k;
-	@ObfuscatedName("j")
+	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 826030823
+		intValue = -1304598549
 	)
 	@Export("originalPointer")
 	int originalPointer;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = -300117779
+		intValue = 293823581
 	)
-	int field3760;
+	int field3736;
-	@ObfuscatedName("h")
+	@ObfuscatedName("w")
 	@ObfuscatedGetter(
-		intValue = -284126821
+		intValue = -545729875
 	)
 	@Export("su_ch2")
 	int su_ch2;
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@Export("unzftab")
 	int[] unzftab;
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -485705465
+		intValue = 1751111105
 	)
 	@Export("nblocks_used")
 	int nblocks_used;
-	@ObfuscatedName("d")
+	@ObfuscatedName("v")
 	@Export("cftab")
 	int[] cftab;
-	@ObfuscatedName("z")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 386581291
+		intValue = 463275141
 	)
 	@Export("nInUse")
 	int nInUse;
-	@ObfuscatedName("al")
+	@ObfuscatedName("av")
 	@Export("inUse")
 	boolean[] inUse;
-	@ObfuscatedName("av")
+	@ObfuscatedName("am")
 	@Export("inUse16")
 	boolean[] inUse16;
-	@ObfuscatedName("as")
+	@ObfuscatedName("ai")
 	@Export("seqToUnseq")
 	byte[] seqToUnseq;
-	@ObfuscatedName("aw")
+	@ObfuscatedName("af")
 	@Export("ll8")
 	byte[] ll8;
-	@ObfuscatedName("ad")
+	@ObfuscatedName("az")
 	@Export("getAndMoveToFrontDecode_yy")
 	int[] getAndMoveToFrontDecode_yy;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("aj")
 	@Export("selector")
 	byte[] selector;
-	@ObfuscatedName("ar")
+	@ObfuscatedName("an")
 	@Export("selectorMtf")
 	byte[] selectorMtf;
-	@ObfuscatedName("ax")
+	@ObfuscatedName("at")
 	@Export("temp_charArray2d")
 	byte[][] temp_charArray2d;
-	@ObfuscatedName("az")
+	@ObfuscatedName("as")
 	@Export("limit")
 	int[][] limit;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ak")
 	@Export("base")
 	int[][] base;
 	@ObfuscatedName("ao")
 	@Export("perm")
 	int[][] perm;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ac")
 	@Export("minLens")
 	int[] minLens;
-	@ObfuscatedName("at")
+	@ObfuscatedName("ar")
 	@ObfuscatedGetter(
-		intValue = -590888097
+		intValue = -716853171
 	)
-	int field3776;
+	int field3754;
 
 	BZip2State() {
-		this.field3748 = 4096;
+		this.field3737 = 4096;
-		this.field3743 = 16;
+		this.field3745 = 16;
-		this.field3779 = 258;
+		this.field3746 = 258;
-		this.field3778 = 6;
+		this.field3722 = 6;
-		this.field3745 = 50;
+		this.field3735 = 50;
-		this.field3746 = 18002;
+		this.field3717 = 18002;
 		this.nextByte = 0;
 		this.next_out = 0;
 		this.unzftab = new int[256];
@@ -185,13 +183,12 @@ public final class BZip2State {
 		this.minLens = new int[6];
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		signature = "(Ljava/net/Socket;IIB)Lky;",
+		signature = "(II)I",
-		garbageValue = "10"
+		garbageValue = "-3321312"
 	)
-	@Export("newBufferedNetSocket")
+	static int method5664(int var0) {
-	public static AbstractSocket newBufferedNetSocket(Socket var0, int var1, int var2) throws IOException {
+		return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F));
-		return new BufferedNetSocket(var0, var1, var2);
 	}
 }

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

@@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("em")
+@ObfuscatedName("ey")
 @Implements("BoundaryObject")
 public final class BoundaryObject {
-	@ObfuscatedName("sx")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Llw;"
+		signature = "[Llq;"
 	)
-	@Export("worldMap")
+	@Export("title_muteSprite")
-	static WorldMap worldMap;
+	static IndexedSprite[] title_muteSprite;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 2097561189
+		intValue = -557020941
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1949359765
+		intValue = -308845337
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1661311189
+		intValue = -808193817
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 258723163
+		intValue = -1993098605
 	)
 	@Export("orientationA")
 	int orientationA;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -321030007
+		intValue = -1270638241
 	)
 	@Export("orientationB")
 	int orientationB;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Leo;"
+		signature = "Len;"
 	)
 	@Export("entity1")
 	public Entity entity1;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Leo;"
+		signature = "Len;"
 	)
 	@Export("entity2")
 	public Entity entity2;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		longValue = 7136672908246986663L
+		longValue = 1081854748204039869L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -77784117
+		intValue = 1627431525
 	)
 	@Export("flags")
 	int flags;
@@ -73,62 +73,252 @@ public final class BoundaryObject {
 		this.flags = 0;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;IZB)Lek;",
+		signature = "(Lhz;Lhz;ZII)V",
-		garbageValue = "103"
+		garbageValue = "1558921351"
 	)
-	public static Frames method3262(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) {
+	static void method3213(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-		boolean var4 = true;
+		if (Login.field1146) {
-		int[] var5 = var0.getGroupFileIds(var2);
+			if (var3 == 4) {
+				Login.loginIndex = 4;
+			}
 
-		for (int var6 = 0; var6 < var5.length; ++var6) {
+		} else {
-			byte[] var7 = var0.getFile(var2, var5[var6]);
+			Login.loginIndex = var3;
-			if (var7 == null) {
+			Rasterizer2D.Rasterizer2D_clear();
-				var4 = false;
+			byte[] var4 = var0.takeFileByNames("title.jpg", "");
+			Login.leftTitleSprite = WorldMapIcon_0.convertJpgToSprite(var4);
+			Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally();
+			if ((Client.worldProperties & 536870912) != 0) {
+				class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
 			} else {
-				int var8 = (var7[0] & 255) << 8 | var7[1] & 255;
+				class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
-				byte[] var9;
+			}
-				if (var3) {
+
-					var9 = var1.getFile(0, var8);
+			Login.titleboxSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
-				} else {
+			Login.titlebuttonSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
-					var9 = var1.getFile(var8, 0);
+			int var6 = var1.getGroupId("runes");
+			int var7 = var1.getFileId(var6, "");
+			IndexedSprite[] var8;
+			if (!World.SpriteBuffer_bufferFile(var1, var6, var7)) {
+				var8 = null;
+			} else {
+				IndexedSprite[] var10 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
+
+				for (int var11 = 0; var11 < class325.SpriteBuffer_spriteCount; ++var11) {
+					IndexedSprite var12 = var10[var11] = new IndexedSprite();
+					var12.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
+					var12.height = class325.SpriteBuffer_spriteHeight;
+					var12.xOffset = class325.SpriteBuffer_xOffsets[var11];
+					var12.yOffset = class325.SpriteBuffer_yOffsets[var11];
+					var12.subWidth = class325.SpriteBuffer_spriteWidths[var11];
+					var12.subHeight = class225.SpriteBuffer_spriteHeights[var11];
+					var12.palette = class325.SpriteBuffer_spritePalette;
+					var12.pixels = WorldMapSection1.SpriteBuffer_pixels[var11];
 				}
 
-				if (var9 == null) {
+				UserComparator7.SpriteBuffer_clear();
-					var4 = false;
+				var8 = var10;
+			}
+
+			ItemDefinition.runesSprite = var8;
+			var7 = var1.getGroupId("title_mute");
+			int var14 = var1.getFileId(var7, "");
+			IndexedSprite[] var9;
+			if (!World.SpriteBuffer_bufferFile(var1, var7, var14)) {
+				var9 = null;
+			} else {
+				IndexedSprite[] var18 = new IndexedSprite[class325.SpriteBuffer_spriteCount];
+
+				for (int var19 = 0; var19 < class325.SpriteBuffer_spriteCount; ++var19) {
+					IndexedSprite var13 = var18[var19] = new IndexedSprite();
+					var13.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
+					var13.height = class325.SpriteBuffer_spriteHeight;
+					var13.xOffset = class325.SpriteBuffer_xOffsets[var19];
+					var13.yOffset = class325.SpriteBuffer_yOffsets[var19];
+					var13.subWidth = class325.SpriteBuffer_spriteWidths[var19];
+					var13.subHeight = class225.SpriteBuffer_spriteHeights[var19];
+					var13.palette = class325.SpriteBuffer_spritePalette;
+					var13.pixels = WorldMapSection1.SpriteBuffer_pixels[var19];
+				}
+
+				UserComparator7.SpriteBuffer_clear();
+				var9 = var18;
+			}
+
+			title_muteSprite = var9;
+			Login.options_buttons_0Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
+			class83.field1136 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
+			Login.options_buttons_2Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
+			class96.field1303 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
+			UserComparator8.field1957 = Login.options_buttons_0Sprite.subWidth;
+			class173.field2079 = Login.options_buttons_0Sprite.subHeight;
+			Bounds.loginScreenRunesAnimation = new LoginScreenAnimation(ItemDefinition.runesSprite);
+			if (var2) {
+				Login.Login_username = "";
+				Login.Login_password = "";
+			}
+
+			SecureRandomCallable.field500 = 0;
+			WorldMapSection1.otp = "";
+			Login.field1171 = true;
+			Login.worldSelectOpen = false;
+			if (!GrandExchangeOffer.clientPreferences.titleMusicDisabled) {
+				Archive var16 = GrandExchangeEvent.archive6;
+				var14 = var16.getGroupId("scape main");
+				int var17 = var16.getFileId(var14, "");
+				Projectile.method2040(2, var16, var14, var17, 255, false);
+			} else {
+				DevicePcmPlayerProvider.method793(2);
+			}
+
+			NPC.method1977(false);
+			Login.field1146 = true;
+			Login.xPadding = (KitDefinition.canvasWidth - 765) / 2;
+			Login.loginBoxX = Login.xPadding + 202;
+			Login.loginBoxCenter = Login.loginBoxX + 180;
+			Login.leftTitleSprite.drawAt(Login.xPadding, 0);
+			Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+			class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18);
+		}
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		signature = "(II)I",
+		garbageValue = "1412728541"
+	)
+	@Export("Messages_getHistorySize")
+	static int Messages_getHistorySize(int var0) {
+		ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0);
+		return var1 == null ? 0 : var1.size();
+	}
+
+	@ObfuscatedName("t")
+	@Export("Entity_unpackID")
+	public static int Entity_unpackID(long var0) {
+		return (int)(var0 >>> 17 & 4294967295L);
+	}
+
+	@ObfuscatedName("g")
+	@ObfuscatedSignature(
+		signature = "(IIIB)I",
+		garbageValue = "64"
+	)
+	@Export("hslToRgb")
+	static final int hslToRgb(int var0, int var1, int var2) {
+		if (var2 > 179) {
+			var1 /= 2;
+		}
+
+		if (var2 > 192) {
+			var1 /= 2;
+		}
+
+		if (var2 > 217) {
+			var1 /= 2;
+		}
+
+		if (var2 > 243) {
+			var1 /= 2;
+		}
+
+		int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
+		return var3;
+	}
+
+	@ObfuscatedName("hk")
+	@ObfuscatedSignature(
+		signature = "(ZLkx;B)V",
+		garbageValue = "-77"
+	)
+	static final void method3216(boolean var0, PacketBuffer var1) {
+		while (true) {
+			if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) {
+				int var2 = var1.readBits(15);
+				if (var2 != 32767) {
+					boolean var3 = false;
+					if (Client.npcs[var2] == null) {
+						Client.npcs[var2] = new NPC();
+						var3 = true;
+					}
+
+					NPC var4 = Client.npcs[var2];
+					Client.npcIndices[++Client.npcCount - 1] = var2;
+					var4.npcCycle = Client.cycle;
+					int var5;
+					if (var0) {
+						var5 = var1.readBits(8);
+						if (var5 > 127) {
+							var5 -= 256;
+						}
+					} else {
+						var5 = var1.readBits(5);
+						if (var5 > 15) {
+							var5 -= 32;
+						}
+					}
+
+					int var6 = var1.readBits(1);
+					int var7 = Client.defaultRotations[var1.readBits(3)];
+					if (var3) {
+						var4.orientation = var4.rotation = var7;
+					}
+
+					int var8 = var1.readBits(1);
+					if (var8 == 1) {
+						Client.field669[++Client.field861 - 1] = var2;
+					}
+
+					int var9;
+					if (var0) {
+						var9 = var1.readBits(8);
+						if (var9 > 127) {
+							var9 -= 256;
+						}
+					} else {
+						var9 = var1.readBits(5);
+						if (var9 > 15) {
+							var9 -= 32;
+						}
+					}
+
+					var4.definition = ViewportMouse.getNpcDefinition(var1.readBits(14));
+					var4.size = var4.definition.size * 64;
+					var4.field971 = var4.definition.rotation;
+					if (var4.field971 == 0) {
+						var4.rotation = 0;
+					}
+
+					var4.walkSequence = var4.definition.walkSequence;
+					var4.walkBackSequence = var4.definition.walkBackSequence;
+					var4.walkLeftSequence = var4.definition.walkLeftSequence;
+					var4.walkRightSequence = var4.definition.walkRightSequence;
+					var4.readySequence = var4.definition.readySequence;
+					var4.turnLeftSequence = var4.definition.turnLeftSequence;
+					var4.turnRightSequence = var4.definition.turnRightSequence;
+					var4.method1970(WorldMapIcon_1.localPlayer.pathX[0] + var5, WorldMapIcon_1.localPlayer.pathY[0] + var9, var6 == 1);
+					continue;
 				}
 			}
-		}
 
-		if (!var4) {
+			var1.exportIndex();
-			return null;
+			return;
-		}
-		try {
-			return new Frames(var0, var1, var2, var3);
-		} catch (Exception var11) {
-			return null;
 		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("ka")
 	@ObfuscatedSignature(
-		signature = "(II)Liv;",
+		signature = "(IIIZI)V",
-		garbageValue = "-497669049"
+		garbageValue = "-1395440174"
 	)
-	@Export("getEnum")
+	public static void method3215(int var0, int var1, int var2, boolean var3) {
-	public static EnumDefinition getEnum(int var0) {
+		PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher);
-		EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
+		var4.packetBuffer.writeIntME(var3 ? Client.field705 : 0);
-		if (var1 != null) {
+		var4.packetBuffer.writeShortLE(var1);
-			return var1;
+		var4.packetBuffer.method5545(var2);
-		}
+		var4.packetBuffer.writeShort(var0);
-		byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0);
+		Client.packetWriter.addNode(var4);
-		var1 = new EnumDefinition();
-		if (var2 != null) {
-			var1.decode(new Buffer(var2));
-		}
-
-		EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
-		return var1;
 	}
 }

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

@@ -4,30 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ls")
+@ObfuscatedName("lh")
 @Implements("Bounds")
 public class Bounds {
-	@ObfuscatedName("q")
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		signature = "Lbt;"
+	)
+	@Export("loginScreenRunesAnimation")
+	static LoginScreenAnimation loginScreenRunesAnimation;
+	@ObfuscatedName("fv")
+	@ObfuscatedSignature(
+		signature = "Lkg;"
+	)
+	static AbstractSocket field3845;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1186074789
+		intValue = 927119221
 	)
 	@Export("lowX")
 	public int lowX;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -198324779
+		intValue = 1883471895
 	)
 	@Export("lowY")
 	public int lowY;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -574576823
+		intValue = 482662949
 	)
 	@Export("highX")
 	public int highX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 833436879
+		intValue = 1342895921
 	)
 	@Export("highY")
 	public int highY;
@@ -41,10 +52,10 @@ public class Bounds {
 		this(0, 0, var1, var2);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(IIB)V",
-		garbageValue = "-102"
+		garbageValue = "-92"
 	)
 	@Export("setLow")
 	public void setLow(int var1, int var2) {
@@ -52,10 +63,10 @@ public class Bounds {
 		this.lowY = var2;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "12"
+		garbageValue = "638104028"
 	)
 	@Export("setHigh")
 	public void setHigh(int var1, int var2) {
@@ -63,22 +74,22 @@ public class Bounds {
 		this.highY = var2;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lls;Lls;I)V",
+		signature = "(Llh;Llh;B)V",
-		garbageValue = "799718452"
+		garbageValue = "15"
 	)
-	public void method5980(Bounds var1, Bounds var2) {
+	public void method5846(Bounds var1, Bounds var2) {
-		this.method5968(var1, var2);
+		this.method5867(var1, var2);
-		this.method5964(var1, var2);
+		this.method5848(var1, var2);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Lls;Lls;B)V",
+		signature = "(Llh;Llh;I)V",
-		garbageValue = "-20"
+		garbageValue = "-157171607"
 	)
-	void method5968(Bounds var1, Bounds var2) {
+	void method5867(Bounds var1, Bounds var2) {
 		var2.lowX = this.lowX;
 		var2.highX = this.highX;
 		if (this.lowX < var1.lowX) {
@@ -86,8 +97,8 @@ public class Bounds {
 			var2.lowX = var1.lowX;
 		}
 
-		if (var2.method5976() > var1.method5976()) {
+		if (var2.method5847() > var1.method5847()) {
-			var2.highX -= var2.method5976() - var1.method5976();
+			var2.highX -= var2.method5847() - var1.method5847();
 		}
 
 		if (var2.highX < 0) {
@@ -96,12 +107,12 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lls;Lls;I)V",
+		signature = "(Llh;Llh;I)V",
-		garbageValue = "182983589"
+		garbageValue = "-2140694621"
 	)
-	void method5964(Bounds var1, Bounds var2) {
+	void method5848(Bounds var1, Bounds var2) {
 		var2.lowY = this.lowY;
 		var2.highY = this.highY;
 		if (this.lowY < var1.lowY) {
@@ -109,8 +120,8 @@ public class Bounds {
 			var2.lowY = var1.lowY;
 		}
 
-		if (var2.method5965() > var1.method5965()) {
+		if (var2.method5842() > var1.method5842()) {
-			var2.highY -= var2.method5965() - var1.method5965();
+			var2.highY -= var2.method5842() - var1.method5842();
 		}
 
 		if (var2.highY < 0) {
@@ -119,25 +130,47 @@ public class Bounds {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1428102724"
+		garbageValue = "134601683"
 	)
-	int method5976() {
+	int method5847() {
 		return this.highX + this.lowX;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "185439342"
+		garbageValue = "-901412341"
 	)
-	int method5965() {
+	int method5842() {
 		return this.highY + this.lowY;
 	}
 
+	public String abb() {
+		return null;
+	}
+
+	public String abd() {
+		return null;
+	}
+
 	public String toString() {
 		return null;
 	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "(I)Lfs;",
+		garbageValue = "-2037238373"
+	)
+	@Export("newClock")
+	public static Clock newClock() {
+		try {
+			return new NanoClock();
+		} catch (Throwable var1) {
+			return new MilliClock();
+		}
+	}
 }

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

@@ -4,29 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jz")
+@ObfuscatedName("jt")
 @Implements("Buddy")
 public class Buddy extends User {
-	@ObfuscatedName("ss")
+	@ObfuscatedName("c")
+	@Export("Tiles_lightness")
+	static int[] Tiles_lightness;
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		longValue = 7424240758646581017L
+		intValue = 453016847
-	)
-	static long field3632;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = 90340793
 	)
 	@Export("world")
 	public int world;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1246846103
+		intValue = 1487463363
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -247571967
+		intValue = -838100941
 	)
 	@Export("rank")
 	public int rank;
@@ -35,10 +33,10 @@ public class Buddy extends User {
 		this.world = -1;
 	}
 
-	@ObfuscatedName("ah")
+	@ObfuscatedName("aq")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-1729653997"
+		garbageValue = "-1748427179"
 	)
 	@Export("set")
 	void set(int var1, int var2) {
@@ -46,53 +44,33 @@ public class Buddy extends User {
 		this.int2 = var2;
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ay")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "212736889"
+		garbageValue = "-1469335924"
 	)
 	@Export("getWorld")
 	public int getWorld() {
 		return this.world;
 	}
 
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "-4"
+		garbageValue = "-1595892037"
 	)
 	@Export("hasWorld")
 	public boolean hasWorld() {
 		return this.world > 0;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("bk")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(Ljava/lang/String;I)I",
-		garbageValue = "1131109761"
+		garbageValue = "1544989297"
 	)
-	@Export("ViewportMouse_unpackX")
+	@Export("stringCp1252NullTerminatedByteSize")
-	public static int ViewportMouse_unpackX(int var0) {
+	public static int stringCp1252NullTerminatedByteSize(String var0) {
-		long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
+		return var0.length() + 1;
-		int var1 = (int)(var2 >>> 0 & 127L);
-		return var1;
-	}
-
-	@ObfuscatedName("eq")
-	@ObfuscatedSignature(
-		signature = "(B)I",
-		garbageValue = "0"
-	)
-	static int method5176() {
-		if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
-			int var0 = 0;
-
-			for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) {
-				var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount;
-			}
-
-			return var0 * 10000 / Client.field927;
-		}
-		return 10000;
 	}
 }

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

@@ -1,20 +1,12 @@
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import javax.imageio.ImageIO;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fg")
+@ObfuscatedName("fi")
 @Implements("BuddyRankComparator")
 public class BuddyRankComparator extends AbstractUserComparator {
-	@ObfuscatedName("m")
+	@ObfuscatedName("s")
-	@Export("musicTrackBoolean")
-	public static boolean musicTrackBoolean;
-	@ObfuscatedName("q")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -22,44 +14,156 @@ public class BuddyRankComparator extends AbstractUserComparator {
 		this.reversed = var1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljz;Ljz;I)I",
+		signature = "(Ljt;Ljt;I)I",
-		garbageValue = "-813496584"
+		garbageValue = "1327154519"
 	)
 	@Export("compareBuddy")
 	int compareBuddy(Buddy var1, Buddy var2) {
 		if (var2.rank != var1.rank) {
 			return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank;
+		} else {
+			return this.compareUser(var1, var2);
 		}
-		return this.compareUser(var1, var2);
 	}
 
 	public int compare(Object var1, Object var2) {
 		return this.compareBuddy((Buddy)var1, (Buddy)var2);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "([BB)Lly;",
+		signature = "(ILkv;Lid;I)V",
-		garbageValue = "-3"
+		garbageValue = "1244891024"
 	)
-	@Export("convertJpgToSprite")
+	static void method3376(int var0, ArchiveDisk var1, Archive var2) {
-	public static final Sprite convertJpgToSprite(byte[] var0) {
+		ArchiveDiskAction var3 = new ArchiveDiskAction();
-		BufferedImage var1 = null;
+		var3.type = 1;
-
+		var3.key = (long)var0;
-		try {
+		var3.archiveDisk = var1;
-			var1 = ImageIO.read(new ByteArrayInputStream(var0));
+		var3.archive = var2;
-			int var2 = var1.getWidth();
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
-			int var3 = var1.getHeight();
+			ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
-			int[] var4 = new int[var2 * var3];
-			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);
+		synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+			if (ArchiveDiskActionHandler.field3124 == 0) {
+				class13.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+				class13.ArchiveDiskActionHandler_thread.setDaemon(true);
+				class13.ArchiveDiskActionHandler_thread.start();
+				class13.ArchiveDiskActionHandler_thread.setPriority(5);
+			}
+
+			ArchiveDiskActionHandler.field3124 = 600;
+		}
+	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		signature = "(Lid;IIIBZI)V",
+		garbageValue = "-800902094"
+	)
+	@Export("requestNetFile")
+	static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) {
+		long var6 = (long)((var1 << 16) + var2);
+		NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
+		if (var8 == null) {
+			var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
+			if (var8 == null) {
+				var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
+				if (var8 != null) {
+					if (var5) {
+						var8.removeDual();
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
+						--NetCache.NetCache_pendingWritesCount;
+						++NetCache.NetCache_pendingPriorityWritesCount;
+					}
+
+				} else {
+					if (!var5) {
+						var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
+						if (var8 != null) {
+							return;
+						}
+					}
+
+					var8 = new NetFileRequest();
+					var8.archive = var0;
+					var8.crc = var3;
+					var8.padding = var4;
+					if (var5) {
+						NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
+						++NetCache.NetCache_pendingPriorityWritesCount;
+					} else {
+						NetCache.NetCache_pendingWritesQueue.addFirst(var8);
+						NetCache.NetCache_pendingWrites.put(var8, var6);
+						++NetCache.NetCache_pendingWritesCount;
+					}
+
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("fs")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "124595109"
+	)
+	@Export("doCheat")
+	static final void doCheat(String var0) {
+		if (var0.equalsIgnoreCase("toggleroof")) {
+			GrandExchangeOffer.clientPreferences.roofsHidden = !GrandExchangeOffer.clientPreferences.roofsHidden;
+			GrandExchangeOfferAgeComparator.savePreferences();
+			if (GrandExchangeOffer.clientPreferences.roofsHidden) {
+				DirectByteArrayCopier.addGameMessage(99, "", "Roofs are now all hidden");
+			} else {
+				DirectByteArrayCopier.addGameMessage(99, "", "Roofs will only be removed selectively");
+			}
+		}
+
+		if (var0.equalsIgnoreCase("displayfps")) {
+			Client.displayFps = !Client.displayFps;
+		}
+
+		if (var0.equalsIgnoreCase("renderself")) {
+			Client.renderSelf = !Client.renderSelf;
+		}
+
+		if (var0.equalsIgnoreCase("mouseovertext")) {
+			Client.showMouseOverText = !Client.showMouseOverText;
+		}
+
+		if (Client.staffModLevel >= 2) {
+			if (var0.equalsIgnoreCase("errortest")) {
+				throw new RuntimeException();
+			}
+
+			if (var0.equalsIgnoreCase("showcoord")) {
+				WorldMapCacheName.worldMap.showCoord = !WorldMapCacheName.worldMap.showCoord;
+			}
+
+			if (var0.equalsIgnoreCase("fpson")) {
+				Client.displayFps = true;
+			}
+
+			if (var0.equalsIgnoreCase("fpsoff")) {
+				Client.displayFps = false;
+			}
+
+			if (var0.equalsIgnoreCase("gc")) {
+				System.gc();
+			}
+
+			if (var0.equalsIgnoreCase("clientdrop")) {
+				class2.method31();
+			}
+		}
+
+		PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
+		var1.packetBuffer.writeByte(var0.length() + 1);
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+		Client.packetWriter.addNode(var1);
 	}
 }

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("mn")
+@ObfuscatedName("mw")
 @Implements("BufferedFile")
 public class BufferedFile {
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lma;"
+		signature = "Lmm;"
 	)
 	@Export("accessFile")
 	AccessFile accessFile;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("readBuffer")
 	byte[] readBuffer;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		longValue = -5630904549833157093L
+		longValue = 6930797311862622501L
 	)
 	@Export("readBufferOffset")
 	long readBufferOffset;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1225882999
+		intValue = 324861765
 	)
 	@Export("readBufferLength")
 	int readBufferLength;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("writeBuffer")
 	byte[] writeBuffer;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		longValue = 225596692322175817L
+		longValue = 2678508088338929319L
 	)
 	@Export("writeBufferOffset")
 	long writeBufferOffset;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -299149629
+		intValue = -1286336757
 	)
 	@Export("writeBufferLength")
 	int writeBufferLength;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		longValue = -8683938208221515491L
+		longValue = -1907180336926601455L
 	)
 	@Export("offset")
 	long offset;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		longValue = 6190164439722426599L
+		longValue = 4723760243484879195L
 	)
 	@Export("fileLength")
 	long fileLength;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		longValue = 6621326623419959019L
+		longValue = 2095185296289778233L
 	)
 	@Export("length")
 	long length;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		longValue = -8187358352341044117L
+		longValue = -4232607220009999679L
 	)
 	@Export("fileOffset")
 	long fileOffset;
 
 	@ObfuscatedSignature(
-		signature = "(Lma;II)V"
+		signature = "(Lmm;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("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "41"
+		garbageValue = "-2018301044"
 	)
 	@Export("close")
 	public void close() throws IOException {
@@ -95,39 +95,40 @@ public class BufferedFile {
 		this.accessFile.close();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("seek")
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
 			throw new IOException("");
+		} else {
+			this.offset = var1;
 		}
-		this.offset = var1;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(S)J",
+		signature = "(B)J",
-		garbageValue = "21690"
+		garbageValue = "54"
 	)
 	@Export("length")
 	public long length() {
 		return this.length;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "-981743247"
+		garbageValue = "-1442283725"
 	)
 	@Export("readFully")
 	public void readFully(byte[] var1) throws IOException {
 		this.read(var1, 0, var1.length);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "1308534455"
+		garbageValue = "-481612055"
 	)
 	@Export("read")
 	public void read(byte[] var1, int var2, int var3) throws IOException {
@@ -136,7 +137,7 @@ public class BufferedFile {
 				throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
 			}
 
-			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+			if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) {
 				System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3);
 				this.offset += (long)var3;
 				return;
@@ -145,7 +146,7 @@ public class BufferedFile {
 			long var4 = this.offset;
 			int var7 = var3;
 			int var8;
-			if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
+			if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
 				var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset));
 				if (var8 > var3) {
 					var8 = var3;
@@ -199,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 < this.writeBufferOffset + (long)this.writeBufferLength) {
 					var13 = var4;
 				}
 
-				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) {
+				if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) {
-					var10 = (long)this.writeBufferLength + this.writeBufferOffset;
+					var10 = this.writeBufferOffset + (long)this.writeBufferLength;
-				} else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
+				} else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) {
 					var10 = var4 + (long)var7;
 				}
 
@@ -230,10 +231,10 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-364747525"
+		garbageValue = "-263792175"
 	)
 	@Export("load")
 	void load() throws IOException {
@@ -260,23 +261,23 @@ public class BufferedFile {
 
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-1530751884"
+		garbageValue = "-516860317"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		try {
-			if (this.offset + (long)var3 > this.length) {
+			if ((long)var3 + this.offset > this.length) {
-				this.length = this.offset + (long)var3;
+				this.length = (long)var3 + this.offset;
 			}
 
 			if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) {
 				this.flush();
 			}
 
-			if (this.writeBufferOffset != -1L && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) {
+			if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) {
 				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;
@@ -300,7 +301,7 @@ public class BufferedFile {
 
 				}
 			} else {
-				if (this.fileOffset != this.offset) {
+				if (this.offset != this.fileOffset) {
 					this.accessFile.seek(this.offset);
 					this.fileOffset = this.offset;
 				}
@@ -313,14 +314,14 @@ public class BufferedFile {
 
 				long var9 = -1L;
 				long var6 = -1L;
-				if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) {
+				if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) {
 					var9 = this.offset;
 				} else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) {
 					var9 = this.readBufferOffset;
 				}
 
-				if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= (long)this.readBufferLength + this.readBufferOffset) {
+				if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) {
-					var6 = (long)var3 + this.offset;
+					var6 = this.offset + (long)var3;
 				} else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) {
 					var6 = (long)this.readBufferLength + this.readBufferOffset;
 				}
@@ -338,36 +339,36 @@ public class BufferedFile {
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "813445771"
+		garbageValue = "2123212638"
 	)
 	@Export("flush")
 	void flush() throws IOException {
-		if (this.writeBufferOffset != -1L) {
+		if (-1L != 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 += -299149629L * (long)(this.writeBufferLength * -1383888405);
+			this.fileOffset += (long)(this.writeBufferLength * 1940047011) * -1286336757L;
 			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 < this.writeBufferOffset + (long)this.writeBufferLength) {
 				var1 = this.readBufferOffset;
 			}
 
-			if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) {
+			if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (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 && this.readBufferOffset + (long)this.readBufferLength <= 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;
 			}
 
@@ -381,28 +382,4 @@ public class BufferedFile {
 		}
 
 	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "(III)I",
-		garbageValue = "-1560259071"
-	)
-	static int method6528(int var0, int var1) {
-		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-		if (var2 == null) {
-			return 0;
-		}
-		if (var1 == -1) {
-			return 0;
-		}
-		int var3 = 0;
-
-		for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
-			if (var2.ids[var4] == var1) {
-				var3 += var2.quantities[var4];
-			}
-		}
-
-		return var3;
-	}
 }

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

@@ -5,26 +5,26 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kb")
+@ObfuscatedName("ko")
 @Implements("BufferedNetSocket")
 public class BufferedNetSocket extends AbstractSocket {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
-	@Export("socket")
-	Socket socket;
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Lks;"
+		signature = "Lkh;"
 	)
 	@Export("source")
 	BufferedSource source;
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
+	@Export("socket")
+	Socket socket;
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lkp;"
+		signature = "Lki;"
 	)
 	@Export("sink")
 	BufferedSink sink;
 
-	BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
+	public BufferedNetSocket(Socket var1, int var2, int var3) throws IOException {
 		this.socket = var1;
 		this.socket.setSoTimeout(30000);
 		this.socket.setTcpNoDelay(true);
@@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.sink = new BufferedSink(this.socket.getOutputStream(), var3);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1144636612"
+		garbageValue = "-1798752769"
 	)
 	@Export("close")
 	public void close() {
@@ -51,57 +51,65 @@ public class BufferedNetSocket extends AbstractSocket {
 		this.source.close();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "2"
+		garbageValue = "547465689"
 	)
 	@Export("readUnsignedByte")
 	public int readUnsignedByte() throws IOException {
 		return this.source.readUnsignedByte();
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "55"
+		garbageValue = "83"
 	)
 	@Export("available")
 	public int available() throws IOException {
 		return this.source.available();
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "1948150862"
+		garbageValue = "156087109"
 	)
 	@Export("isAvailable")
 	public boolean isAvailable(int var1) throws IOException {
 		return this.source.isAvailable(var1);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "([BIIB)I",
-		garbageValue = "26"
+		garbageValue = "100"
 	)
 	@Export("read")
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		return this.source.read(var1, var2, var3);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "([BIII)V",
-		garbageValue = "-1696227994"
+		garbageValue = "638463675"
 	)
 	@Export("write")
 	public void write(byte[] var1, int var2, int var3) throws IOException {
 		this.sink.write(var1, var2, var3);
 	}
 
+	protected void abt() {
+		this.close();
+	}
+
 	protected void finalize() {
 		this.close();
 	}
+
+	protected void abi() {
+		this.close();
+	}
 }

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("kp")
+@ObfuscatedName("ki")
 @Implements("BufferedSink")
 public class BufferedSink implements Runnable {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("outputStream")
 	OutputStream outputStream;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -273498913
+		intValue = -2122061045
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -173399327
+		intValue = -786239105
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1895147359
+		intValue = -225046667
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("exception")
 	IOException exception;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@Export("closed")
 	boolean closed;
 
@@ -54,10 +54,10 @@ public class BufferedSink implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(B)Z",
-		garbageValue = "-14"
+		garbageValue = "-52"
 	)
 	@Export("isClosed")
 	boolean isClosed() {
@@ -74,14 +74,15 @@ public class BufferedSink implements Runnable {
 			}
 
 			return true;
+		} else {
+			return false;
 		}
-		return false;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "([BIIB)V",
-		garbageValue = "37"
+		garbageValue = "22"
 	)
 	@Export("write")
 	void write(byte[] var1, int var2, int var3) throws IOException {
@@ -89,37 +90,39 @@ public class BufferedSink implements Runnable {
 			synchronized(this) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
-				}
-				int var5;
-				if (this.position <= this.limit) {
-					var5 = this.capacity - this.limit + this.position - 1;
 				} else {
-					var5 = this.position - this.limit - 1;
+					int var5;
-				}
+					if (this.position <= this.limit) {
+						var5 = this.capacity - this.limit + this.position - 1;
+					} else {
+						var5 = this.position - this.limit - 1;
+					}
 
-				if (var5 < var3) {
+					if (var5 < var3) {
-					throw new IOException("");
+						throw new IOException("");
-				}
+					} else {
-				if (var3 + this.limit <= this.capacity) {
+						if (var3 + this.limit <= this.capacity) {
-					System.arraycopy(var1, var2, this.buffer, this.limit, var3);
+							System.arraycopy(var1, var2, this.buffer, this.limit, var3);
-				} else {
+						} else {
-					int var6 = this.capacity - this.limit;
+							int var6 = this.capacity - this.limit;
-					System.arraycopy(var1, var2, this.buffer, this.limit, var6);
+							System.arraycopy(var1, var2, this.buffer, this.limit, var6);
-					System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6);
+							System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6);
-				}
+						}
 
-				this.limit = (var3 + this.limit) % this.capacity;
+						this.limit = (var3 + this.limit) % this.capacity;
-				this.notifyAll();
+						this.notifyAll();
+					}
+				}
 			}
 		} else {
 			throw new IOException();
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "1881137071"
+		garbageValue = "4"
 	)
 	@Export("close")
 	void close() {

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("ks")
+@ObfuscatedName("kh")
 @Implements("BufferedSource")
 public class BufferedSource implements Runnable {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("thread")
 	Thread thread;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("inputStream")
 	InputStream inputStream;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 491736021
+		intValue = -219567751
 	)
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("buffer")
 	byte[] buffer;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -570790809
+		intValue = 779012297
 	)
 	@Export("position")
 	int position;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -902879681
+		intValue = 1500766173
 	)
 	@Export("limit")
 	int limit;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("exception")
 	IOException exception;
 
@@ -52,17 +52,16 @@ public class BufferedSource implements Runnable {
 		this.thread.start();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(II)Z",
-		garbageValue = "-1294773775"
+		garbageValue = "188903163"
 	)
 	@Export("isAvailable")
 	boolean isAvailable(int var1) throws IOException {
 		if (var1 == 0) {
 			return true;
-		}
+		} else if (var1 > 0 && var1 < this.capacity) {
-		if (var1 > 0 && var1 < this.capacity) {
 			synchronized(this) {
 				int var3;
 				if (this.position <= this.limit) {
@@ -74,20 +73,23 @@ public class BufferedSource implements Runnable {
 				if (var3 < var1) {
 					if (this.exception != null) {
 						throw new IOException(this.exception.toString());
+					} else {
+						this.notifyAll();
+						return false;
 					}
-					this.notifyAll();
+				} else {
-					return false;
+					return true;
 				}
-				return true;
 			}
+		} else {
+			throw new IOException();
 		}
-		throw new IOException();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-72711599"
+		garbageValue = "-85"
 	)
 	@Export("available")
 	int available() throws IOException {
@@ -101,16 +103,17 @@ public class BufferedSource implements Runnable {
 
 			if (var2 <= 0 && this.exception != null) {
 				throw new IOException(this.exception.toString());
+			} else {
+				this.notifyAll();
+				return var2;
 			}
-			this.notifyAll();
-			return var2;
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "797723305"
+		garbageValue = "1102638305"
 	)
 	@Export("readUnsignedByte")
 	int readUnsignedByte() throws IOException {
@@ -118,20 +121,22 @@ public class BufferedSource implements Runnable {
 			if (this.limit == this.position) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
+				} else {
+					return -1;
 				}
-				return -1;
+			} else {
+				int var2 = this.buffer[this.position] & 255;
+				this.position = (this.position + 1) % this.capacity;
+				this.notifyAll();
+				return var2;
 			}
-			int var2 = this.buffer[this.position] & 255;
-			this.position = (this.position + 1) % this.capacity;
-			this.notifyAll();
-			return var2;
 		}
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "([BIIS)I",
-		garbageValue = "28253"
+		garbageValue = "128"
 	)
 	@Export("read")
 	int read(byte[] var1, int var2, int var3) throws IOException {
@@ -150,27 +155,29 @@ public class BufferedSource implements Runnable {
 
 				if (var3 == 0 && this.exception != null) {
 					throw new IOException(this.exception.toString());
-				}
-				if (var3 + this.position <= this.capacity) {
-					System.arraycopy(this.buffer, this.position, var1, var2, var3);
 				} else {
-					int var6 = this.capacity - this.position;
+					if (var3 + this.position <= this.capacity) {
-					System.arraycopy(this.buffer, this.position, var1, var2, var6);
+						System.arraycopy(this.buffer, this.position, var1, var2, var3);
-					System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
+					} else {
-				}
+						int var6 = this.capacity - this.position;
+						System.arraycopy(this.buffer, this.position, var1, var2, var6);
+						System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
+					}
 
-				this.position = (var3 + this.position) % this.capacity;
+					this.position = (var3 + this.position) % this.capacity;
-				this.notifyAll();
+					this.notifyAll();
-				return var3;
+					return var3;
+				}
 			}
+		} else {
+			throw new IOException();
 		}
-		throw new IOException();
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(S)V",
-		garbageValue = "-1361407903"
+		garbageValue = "6608"
 	)
 	@Export("close")
 	void close() {
@@ -236,85 +243,4 @@ public class BufferedSource implements Runnable {
 			}
 		}
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;ZII)V",
-		garbageValue = "-273498913"
-	)
-	static void method5892(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
-		if (Login.field1179) {
-			if (var3 == 4) {
-				Login.loginIndex = 4;
-			}
-			return;
-		}
-		Login.loginIndex = var3;
-		Rasterizer2D.Rasterizer2D_clear();
-		byte[] var4 = var0.takeFileByNames("title.jpg", "");
-		GrandExchangeOfferWorldComparator.leftTitleSprite = BuddyRankComparator.convertJpgToSprite(var4);
-		NPC.rightTitleSprite = GrandExchangeOfferWorldComparator.leftTitleSprite.mirrorHorizontally();
-		if ((Client.worldProperties & 536870912) != 0) {
-			TileItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
-		} else {
-			TileItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
-		}
-
-		Login.titleboxSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
-		VarpDefinition.titlebuttonSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
-		int var6 = var1.getGroupId("runes");
-		int var7 = var1.getFileId(var6, "");
-		IndexedSprite[] var5 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var6, var7);
-		Login.runesSprite = var5;
-		var7 = var1.getGroupId("title_mute");
-		int var8 = var1.getFileId(var7, "");
-		IndexedSprite[] var9 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var7, var8);
-		Login.title_muteSprite = var9;
-		Login.options_buttons_0Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
-		Message.field606 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
-		Decimator.options_buttons_2Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
-		Login.field1185 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
-		class237.field3191 = Login.options_buttons_0Sprite.subWidth;
-		WorldMapDecoration.field212 = Login.options_buttons_0Sprite.subHeight;
-		Ignored.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite);
-		if (var2) {
-			Login.Login_username = "";
-			Login.Login_password = "";
-		}
-
-		GrandExchangeOffer.field65 = 0;
-		WorldMapManager.otp = "";
-		Login.field1201 = true;
-		Login.worldSelectOpen = false;
-		if (!WorldMapLabelSize.clientPreferences.titleMusicDisabled) {
-			WorldMapRegion.playMusicTrackByName(2, WorldMapRegion.archive6, "scape main", "", 255, false);
-		} else {
-			class40.method729(2);
-		}
-
-		if (NetCache.NetCache_socket != null) {
-			try {
-				Buffer var10 = new Buffer(4);
-				var10.writeByte(3);
-				var10.writeMedium(0);
-				NetCache.NetCache_socket.write(var10.array, 0, 4);
-			} catch (IOException var13) {
-				try {
-					NetCache.NetCache_socket.close();
-				} catch (Exception var12) {
-				}
-
-				++NetCache.NetCache_ioExceptions;
-				NetCache.NetCache_socket = null;
-			}
-		}
-
-		Login.field1179 = true;
-		Login.xPadding = (GrandExchangeEvent.canvasWidth - 765) / 2;
-		Login.loginBoxX = Login.xPadding + 202;
-		ScriptEvent.loginBoxCenter = Login.loginBoxX + 180;
-		GrandExchangeOfferWorldComparator.leftTitleSprite.drawAt(Login.xPadding, 0);
-		NPC.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
-		TileItem.logoSprite.drawAt(Login.xPadding + 382 - TileItem.logoSprite.subWidth / 2, 18);
-	}
 }

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

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

@@ -4,39 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kr")
+@ObfuscatedName("km")
 @Implements("ByteArrayPool")
 public class ByteArrayPool {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -2074547709
+		intValue = -2023224885
 	)
 	@Export("ByteArrayPool_smallCount")
 	static int ByteArrayPool_smallCount;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 371626607
+		intValue = -770015567
 	)
 	@Export("ByteArrayPool_mediumCount")
 	static int ByteArrayPool_mediumCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1320623185
+		intValue = -155376471
 	)
 	@Export("ByteArrayPool_largeCount")
 	static int ByteArrayPool_largeCount;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("ByteArrayPool_small")
 	static byte[][] ByteArrayPool_small;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("ByteArrayPool_medium")
 	static byte[][] ByteArrayPool_medium;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("ByteArrayPool_large")
 	static byte[][] ByteArrayPool_large;
-	@ObfuscatedName("b")
+	@ObfuscatedName("q")
-	@Export("ByteArrayPool_alternativeSizes")
+	@Export("ByteArrayPool_altSizeArrayCounts")
-	public static int[] ByteArrayPool_alternativeSizes;
+	public static int[] ByteArrayPool_altSizeArrayCounts;
+	@ObfuscatedName("w")
+	public static String field3708;
 
 	static {
 		ByteArrayPool_smallCount = 0;
@@ -47,10 +49,10 @@ public class ByteArrayPool {
 		ByteArrayPool_large = new byte[50][];
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(IZB)[B",
-		garbageValue = "58"
+		garbageValue = "82"
 	)
 	@Export("ByteArrayPool_getArrayBool")
 	static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) {
@@ -82,14 +84,14 @@ public class ByteArrayPool {
 			return var2;
 		}
 
-		if (class189.ByteArrayPool_arrays != null) {
+		if (FaceNormal.ByteArrayPool_arrays != null) {
-			for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) {
+			for (int var4 = 0; var4 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var4) {
-				if (ByteArrayPool_alternativeSizes[var4] != var0) {
+				if (UserComparator4.ByteArrayPool_alternativeSizes[var4] != var0) {
-					if (var0 < ByteArrayPool_alternativeSizes[var4]) {
+					if (var0 < UserComparator4.ByteArrayPool_alternativeSizes[var4]) {
 					}
-				} else if (class43.ByteArrayPool_altSizeArrayCounts[var4] > 0) {
+				} else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) {
-					byte[] var3 = class189.ByteArrayPool_arrays[var4][--class43.ByteArrayPool_altSizeArrayCounts[var4]];
+					byte[] var3 = FaceNormal.ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]];
-					class189.ByteArrayPool_arrays[var4][class43.ByteArrayPool_altSizeArrayCounts[var4]] = null;
+					FaceNormal.ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null;
 					return var3;
 				}
 			}

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

@@ -4,25 +4,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gv")
+@ObfuscatedName("gz")
 @Implements("Calendar")
 public class Calendar {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("MONTH_NAMES_ENGLISH_GERMAN")
-	public static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
+	static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("DAYS_OF_THE_WEEK")
-	public static final String[] DAYS_OF_THE_WEEK;
+	static final String[] DAYS_OF_THE_WEEK;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("Calendar_calendar")
-	public static java.util.Calendar Calendar_calendar;
+	static java.util.Calendar Calendar_calendar;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Lhj;"
-	)
-	static Widget field2507;
-	@ObfuscatedName("ch")
-	public static char field2508;
 
 	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"}};
@@ -31,16 +24,211 @@ public class Calendar {
 		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("ip")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(IIIII)V",
-		garbageValue = "-50"
+		garbageValue = "516952450"
 	)
-	@Export("Widget_clearCached")
+	@Export("addSceneMenuOptions")
-	public static void Widget_clearCached() {
+	static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
-		Widget.Widget_cachedSprites.clear();
+		if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
-		Widget.Widget_cachedModels.clear();
+			WorldMapData_0.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
-		Widget.Widget_cachedFonts.clear();
+		}
-		Widget.Widget_cachedSpriteMasks.clear();
+
+		long var4 = -1L;
+		long var6 = -1L;
+		int var8 = 0;
+
+		while (true) {
+			int var10 = ViewportMouse.ViewportMouse_entityCount;
+			if (var8 >= var10) {
+				if (-1L != var4) {
+					var8 = (int)(var4 >>> 0 & 127L);
+					var10 = (int)(var4 >>> 7 & 127L);
+					Player var12 = Client.players[Client.combatTargetPlayerIndex];
+					class51.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10);
+				}
+
+				return;
+			}
+
+			long var27 = ViewportMouse.ViewportMouse_entityTags[var8];
+			if (var27 != var6) {
+				label319: {
+					var6 = var27;
+					int var15 = class218.ViewportMouse_unpackX(var8);
+					int var16 = GameObject.ViewportMouse_unpackY(var8);
+					int var17 = class40.method729(ViewportMouse.ViewportMouse_entityTags[var8]);
+					int var19 = BoundaryObject.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]);
+					int var20 = var19;
+					if (var17 == 2 && Player.scene.getObjectFlags(ItemContainer.plane, var15, var16, var27) >= 0) {
+						ObjectDefinition var21 = class215.getObjectDefinition(var19);
+						if (var21.transforms != null) {
+							var21 = var21.transform();
+						}
+
+						if (var21 == null) {
+							break label319;
+						}
+
+						if (Client.isItemSelected == 1) {
+							WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 1, var19, var15, var16);
+						} else if (Client.isSpellSelected) {
+							if ((WorldMapSectionType.selectedSpellFlags & 4) == 4) {
+								WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 2, var19, var15, var16);
+							}
+						} else {
+							String[] var29 = var21.actions;
+							if (var29 != null) {
+								for (int var32 = 4; var32 >= 0; --var32) {
+									if (var29[var32] != null) {
+										short var24 = 0;
+										if (var32 == 0) {
+											var24 = 3;
+										}
+
+										if (var32 == 1) {
+											var24 = 4;
+										}
+
+										if (var32 == 2) {
+											var24 = 5;
+										}
+
+										if (var32 == 3) {
+											var24 = 6;
+										}
+
+										if (var32 == 4) {
+											var24 = 1001;
+										}
+
+										WorldMapData_0.insertMenuItemNoShift(var29[var32], class16.colorStartTag(65535) + var21.name, var24, var20, var15, var16);
+									}
+								}
+							}
+
+							WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(65535) + var21.name, 1002, var21.id, var15, var16);
+						}
+					}
+
+					int var22;
+					NPC var23;
+					Player var25;
+					int[] var36;
+					int var38;
+					if (var17 == 1) {
+						NPC var33 = Client.npcs[var20];
+						if (var33 == null) {
+							break label319;
+						}
+
+						if (var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) {
+							for (var22 = 0; var22 < Client.npcCount; ++var22) {
+								var23 = Client.npcs[Client.npcIndices[var22]];
+								if (var23 != null && var33 != var23 && var23.definition.size == 1 && var23.x == var33.x && var23.y == var33.y) {
+									class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16);
+								}
+							}
+
+							var22 = Players.Players_count;
+							var36 = Players.Players_indices;
+
+							for (var38 = 0; var38 < var22; ++var38) {
+								var25 = Client.players[var36[var38]];
+								if (var25 != null && var33.x == var25.x && var25.y == var33.y) {
+									class51.addPlayerToMenu(var25, var36[var38], var15, var16);
+								}
+							}
+						}
+
+						class65.addNpcToMenu(var33.definition, var20, var15, var16);
+					}
+
+					if (var17 == 0) {
+						Player var34 = Client.players[var20];
+						if (var34 == null) {
+							break label319;
+						}
+
+						if ((var34.x & 127) == 64 && (var34.y & 127) == 64) {
+							for (var22 = 0; var22 < Client.npcCount; ++var22) {
+								var23 = Client.npcs[Client.npcIndices[var22]];
+								if (var23 != null && var23.definition.size == 1 && var34.x == var23.x && var34.y == var23.y) {
+									class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16);
+								}
+							}
+
+							var22 = Players.Players_count;
+							var36 = Players.Players_indices;
+
+							for (var38 = 0; var38 < var22; ++var38) {
+								var25 = Client.players[var36[var38]];
+								if (var25 != null && var25 != var34 && var25.x == var34.x && var34.y == var25.y) {
+									class51.addPlayerToMenu(var25, var36[var38], var15, var16);
+								}
+							}
+						}
+
+						if (var20 != Client.combatTargetPlayerIndex) {
+							class51.addPlayerToMenu(var34, var20, var15, var16);
+						} else {
+							var4 = var27;
+						}
+					}
+
+					if (var17 == 3) {
+						NodeDeque var35 = Client.groundItems[ItemContainer.plane][var15][var16];
+						if (var35 != null) {
+							for (TileItem var39 = (TileItem)var35.first(); var39 != null; var39 = (TileItem)var35.next()) {
+								ItemDefinition var37 = WorldMapData_0.ItemDefinition_get(var39.id);
+								if (Client.isItemSelected == 1) {
+									WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var16);
+								} else if (Client.isSpellSelected) {
+									if ((WorldMapSectionType.selectedSpellFlags & 1) == 1) {
+										WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var16);
+									}
+								} else {
+									String[] var30 = var37.groundActions;
+
+									for (int var31 = 4; var31 >= 0; --var31) {
+										if (var30 != null && var30[var31] != null) {
+											byte var26 = 0;
+											if (var31 == 0) {
+												var26 = 18;
+											}
+
+											if (var31 == 1) {
+												var26 = 19;
+											}
+
+											if (var31 == 2) {
+												var26 = 20;
+											}
+
+											if (var31 == 3) {
+												var26 = 21;
+											}
+
+											if (var31 == 4) {
+												var26 = 22;
+											}
+
+											WorldMapData_0.insertMenuItemNoShift(var30[var31], class16.colorStartTag(16748608) + var37.name, var26, var39.id, var15, var16);
+										} else if (var31 == 2) {
+											WorldMapData_0.insertMenuItemNoShift("Take", class16.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var16);
+										}
+									}
+
+									WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var16);
+								}
+							}
+						}
+					}
+				}
+			}
+
+			++var8;
+		}
 	}
 }

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

@@ -5,21 +5,23 @@ 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("am")
+@ObfuscatedName("ah")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
-	@ObfuscatedName("f")
+	@ObfuscatedName("ob")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = 1323988023
+		signature = "Lfo;"
 	)
-	static int field422;
+	@Export("mouseWheel")
-	@ObfuscatedName("fd")
+	static MouseWheel mouseWheel;
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 983351575
+		intValue = 1288652121
 	)
-	static int field418;
+	static int field389;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("component")
 	Component component;
 
@@ -35,63 +37,228 @@ public final class Canvas extends java.awt.Canvas {
 		this.component.update(var1);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(I)Lbw;",
+		signature = "(IIIII)V",
-		garbageValue = "-1579773205"
+		garbageValue = "260955923"
 	)
-	@Export("getNextWorldListWorld")
+	@Export("itemContainerSetItem")
-	static World getNextWorldListWorld() {
+	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-		return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null;
+		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("au")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(ILcr;ZI)I",
-		garbageValue = "1705541685"
+		garbageValue = "65535"
 	)
-	@Export("runWidgetOnLoadListener")
+	static int method806(int var0, Script var1, boolean var2) {
-	static void runWidgetOnLoadListener(int var0) {
+		int var4 = -1;
-		if (var0 == -1 || !class162.loadInterface(var0)) {
+		Widget var3;
-			return;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			var3 = WorldMapElement.getWidget(var4);
+		} else {
+			var3 = var2 ? class286.field3623 : class297.field3693;
 		}
-		Widget[] var1 = Widget.Widget_interfaceComponents[var0];
 
-		for (int var2 = 0; var2 < var1.length; ++var2) {
+		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) {
-			Widget var3 = var1[var2];
+			Interpreter.Interpreter_intStackSize -= 2;
-			if (var3.onLoad != null) {
+			var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-				ScriptEvent var4 = new ScriptEvent();
+			if (var3.scrollX > var3.scrollWidth - var3.width) {
-				var4.widget = var3;
+				var3.scrollX = var3.scrollWidth - var3.width;
-				var4.args = var3.onLoad;
+			}
-				class96.runScript(var4, 5000000);
+
+			if (var3.scrollX < 0) {
+				var3.scrollX = 0;
+			}
+
+			var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			if (var3.scrollY > var3.scrollHeight - var3.height) {
+				var3.scrollY = var3.scrollHeight - var3.height;
+			}
+
+			if (var3.scrollY < 0) {
+				var3.scrollY = 0;
+			}
+
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
+			var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETFILL) {
+			var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETTRANS) {
+			var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
+			var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
+			var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
+			var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETTILING) {
+			var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETMODEL) {
+			var3.modelType = 1;
+			var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
+			Interpreter.Interpreter_intStackSize -= 6;
+			var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
+			var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4];
+			var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5];
+			FriendSystem.invalidateWidget(var3);
+			return 1;
+		} else {
+			int var8;
+			if (var0 == ScriptOpcodes.CC_SETMODELANIM) {
+				var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				if (var8 != var3.sequenceId) {
+					var3.sequenceId = var8;
+					var3.modelFrame = 0;
+					var3.modelFrameCycle = 0;
+					FriendSystem.invalidateWidget(var3);
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
+				var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETTEXT) {
+				String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+				if (!var7.equals(var3.text)) {
+					var3.text = var7;
+					FriendSystem.invalidateWidget(var3);
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
+				var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
+				Interpreter.Interpreter_intStackSize -= 3;
+				var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+				var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+				var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
+				var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
+				var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
+				var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
+				var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
+				var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
+				Interpreter.Interpreter_intStackSize -= 2;
+				var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+				var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+				FriendSystem.invalidateWidget(var3);
+				if (var4 != -1 && var3.type == 0) {
+					WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false);
+				}
+
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
+				GameShell.resumePauseWidget(var3.id, var3.childIndex);
+				Client.meslayerContinueWidget = var3;
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == 1122) {
+				var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
+				var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == 1124) {
+				var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FriendSystem.invalidateWidget(var3);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETFILLMODE) {
+				var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				FillMode var6 = (FillMode)FriendSystem.findEnumerated(SequenceDefinition.FillMode_values(), var8);
+				if (var6 != null) {
+					var3.fillMode = var6;
+					FriendSystem.invalidateWidget(var3);
+				}
+
+				return 1;
+			} else {
+				boolean var5;
+				if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) {
+					var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+					var3.field2601 = var5;
+					return 1;
+				} else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) {
+					var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
+					var3.modelTransparency = var5;
+					return 1;
+				} else {
+					return 2;
+				}
 			}
 		}
-
-	}
-
-	@ObfuscatedName("jb")
-	@ObfuscatedSignature(
-		signature = "(IIIILly;Lhg;I)V",
-		garbageValue = "-1460314936"
-	)
-	@Export("worldToMinimap")
-	static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-		int var6 = var3 * var3 + var2 * var2;
-		if (var6 > 4225 && var6 < 90000) {
-			int var7 = Client.camAngleY & 2047;
-			int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
-			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
-			int var10 = var9 * var2 + var3 * var8 >> 16;
-			int var11 = var3 * var9 - var8 * var2 >> 16;
-			double var12 = Math.atan2((double)var10, (double)var11);
-			int var14 = var5.width / 2 - 25;
-			int var15 = (int)(Math.sin(var12) * (double)var14);
-			int var16 = (int)(Math.cos(var12) * (double)var14);
-			byte var17 = 20;
-			UserComparator4.redHintArrowSprite.method6193(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
-		} else {
-			Interpreter.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
-		}
-
 	}
 }

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

@@ -1,29 +1,27 @@
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("cs")
+@ObfuscatedName("cg")
 @Implements("ChatChannel")
 public class ChatChannel {
-	@ObfuscatedName("gr")
+	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 1055466439
-	)
-	static int field1306;
-	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "[Lbj;"
+		signature = "[Lbl;"
+	)
+	@Export("World_worlds")
+	static World[] World_worlds;
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "[Lbi;"
 	)
 	@Export("messages")
 	Message[] messages;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 754027225
+		intValue = 532462751
 	)
 	@Export("count")
 	int count;
@@ -32,10 +30,10 @@ public class ChatChannel {
 		this.messages = new Message[100];
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbj;",
+		signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbi;",
-		garbageValue = "0"
+		garbageValue = "125041712"
 	)
 	@Export("addMessage")
 	Message addMessage(int var1, String var2, String var3, String var4) {
@@ -63,200 +61,138 @@ public class ChatChannel {
 		return var5;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(II)Lbj;",
+		signature = "(II)Lbi;",
-		garbageValue = "-55997964"
+		garbageValue = "673075059"
 	)
 	@Export("getMessage")
 	Message getMessage(int var1) {
 		return var1 >= 0 && var1 < this.count ? this.messages[var1] : null;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-410884165"
+		garbageValue = "76"
 	)
 	@Export("size")
 	int size() {
 		return this.count;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;IB)V",
+		signature = "(IB)V",
-		garbageValue = "67"
+		garbageValue = "1"
 	)
-	@Export("readReflectionCheck")
+	public static void method2163(int var0) {
-	public static void readReflectionCheck(Buffer var0, int var1) {
+		if (class197.field2378 != 0) {
-		ReflectionCheck var2 = new ReflectionCheck();
+			WorldMapSprite.field222 = var0;
-		var2.size = var0.readUnsignedByte();
+		} else {
-		var2.id = var0.readInt();
+			class197.midiPcmStream.method3670(var0);
-		var2.operations = new int[var2.size];
-		var2.creationErrors = new int[var2.size];
-		var2.fields = new Field[var2.size];
-		var2.intReplaceValues = new int[var2.size];
-		var2.methods = new Method[var2.size];
-		var2.arguments = new byte[var2.size][][];
-
-		for (int var3 = 0; var3 < var2.size; ++var3) {
-			try {
-				int var4 = var0.readUnsignedByte();
-				String var5;
-				String var6;
-				int var7;
-				if (var4 == 0 || var4 == 1 || var4 == 2) {
-					var5 = var0.readStringCp1252NullTerminated();
-					var6 = var0.readStringCp1252NullTerminated();
-					var7 = 0;
-					if (var4 == 1) {
-						var7 = var0.readInt();
-					}
-
-					var2.operations[var3] = var4;
-					var2.intReplaceValues[var3] = var7;
-					if (User.loadClassFromDescriptor(var5).getClassLoader() == null) {
-						throw new SecurityException();
-					}
-
-					var2.fields[var3] = Reflection.findField(User.loadClassFromDescriptor(var5), var6);
-				} else if (var4 == 3 || var4 == 4) {
-					var5 = var0.readStringCp1252NullTerminated();
-					var6 = var0.readStringCp1252NullTerminated();
-					var7 = var0.readUnsignedByte();
-					String[] var8 = new String[var7];
-
-					for (int var9 = 0; var9 < var7; ++var9) {
-						var8[var9] = var0.readStringCp1252NullTerminated();
-					}
-
-					String var20 = var0.readStringCp1252NullTerminated();
-					byte[][] var10 = new byte[var7][];
-					int var12;
-					if (var4 == 3) {
-						for (int var11 = 0; var11 < var7; ++var11) {
-							var12 = var0.readInt();
-							var10[var11] = new byte[var12];
-							var0.readBytes(var10[var11], 0, var12);
-						}
-					}
-
-					var2.operations[var3] = var4;
-					Class[] var21 = new Class[var7];
-
-					for (var12 = 0; var12 < var7; ++var12) {
-						var21[var12] = User.loadClassFromDescriptor(var8[var12]);
-					}
-
-					Class var22 = User.loadClassFromDescriptor(var20);
-					if (User.loadClassFromDescriptor(var5).getClassLoader() == null) {
-						throw new SecurityException();
-					}
-
-					Method[] var13 = User.loadClassFromDescriptor(var5).getDeclaredMethods();
-					Method[] var14 = var13;
-
-					for (int var15 = 0; var15 < var14.length; ++var15) {
-						Method var16 = var14[var15];
-						if (!Reflection.getMethodName(var16).equals(var6)) {
-							continue;
-						}
-						Class[] var17 = Reflection.getParameterTypes(var16);
-						if (var17.length != var21.length) {
-							continue;
-						}
-						boolean var18 = true;
-
-						for (int var19 = 0; var19 < var21.length; ++var19) {
-							if (var17[var19] != var21[var19]) {
-								var18 = false;
-								break;
-							}
-						}
-
-						if (var18 && var22 == var16.getReturnType()) {
-							var2.methods[var3] = var16;
-						}
-					}
-
-					var2.arguments[var3] = var10;
-				}
-			} catch (ClassNotFoundException var24) {
-				var2.creationErrors[var3] = -1;
-			} catch (SecurityException var25) {
-				var2.creationErrors[var3] = -2;
-			} catch (NullPointerException var26) {
-				var2.creationErrors[var3] = -3;
-			} catch (Exception var27) {
-				var2.creationErrors[var3] = -4;
-			} catch (Throwable var28) {
-				var2.creationErrors[var3] = -5;
-			}
-		}
-
-		class96.reflectionChecks.addFirst(var2);
-	}
-
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-4"
-	)
-	@Export("openWorldSelect")
-	static void openWorldSelect() {
-		if (UserComparator3.loadWorlds()) {
-			Login.worldSelectOpen = true;
-			Login.worldSelectPage = 0;
-			Login.worldSelectPagesCount = 0;
 		}
 
 	}
 
-	@ObfuscatedName("hh")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(Ljava/lang/CharSequence;II[BII)I",
-		garbageValue = "-2069013220"
+		garbageValue = "-1719820728"
 	)
-	static final void method2215(int var0, int var1, int var2, int var3) {
+	@Export("encodeStringCp1252")
-		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
+	public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
-			if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
+		int var5 = var2 - var1;
-				Client.field843[var4] = true;
+
+		for (int var6 = 0; var6 < var5; ++var6) {
+			char var7 = var0.charAt(var6 + var1);
+			if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
+				var3[var6 + var4] = (byte)var7;
+			} else if (var7 == 8364) {
+				var3[var6 + var4] = -128;
+			} else if (var7 == 8218) {
+				var3[var6 + var4] = -126;
+			} else if (var7 == 402) {
+				var3[var6 + var4] = -125;
+			} else if (var7 == 8222) {
+				var3[var6 + var4] = -124;
+			} else if (var7 == 8230) {
+				var3[var6 + var4] = -123;
+			} else if (var7 == 8224) {
+				var3[var6 + var4] = -122;
+			} else if (var7 == 8225) {
+				var3[var6 + var4] = -121;
+			} else if (var7 == 710) {
+				var3[var6 + var4] = -120;
+			} else if (var7 == 8240) {
+				var3[var6 + var4] = -119;
+			} else if (var7 == 352) {
+				var3[var6 + var4] = -118;
+			} else if (var7 == 8249) {
+				var3[var6 + var4] = -117;
+			} else if (var7 == 338) {
+				var3[var6 + var4] = -116;
+			} else if (var7 == 381) {
+				var3[var6 + var4] = -114;
+			} else if (var7 == 8216) {
+				var3[var6 + var4] = -111;
+			} else if (var7 == 8217) {
+				var3[var6 + var4] = -110;
+			} else if (var7 == 8220) {
+				var3[var6 + var4] = -109;
+			} else if (var7 == 8221) {
+				var3[var6 + var4] = -108;
+			} else if (var7 == 8226) {
+				var3[var6 + var4] = -107;
+			} else if (var7 == 8211) {
+				var3[var6 + var4] = -106;
+			} else if (var7 == 8212) {
+				var3[var6 + var4] = -105;
+			} else if (var7 == 732) {
+				var3[var6 + var4] = -104;
+			} else if (var7 == 8482) {
+				var3[var6 + var4] = -103;
+			} else if (var7 == 353) {
+				var3[var6 + var4] = -102;
+			} else if (var7 == 8250) {
+				var3[var6 + var4] = -101;
+			} else if (var7 == 339) {
+				var3[var6 + var4] = -100;
+			} else if (var7 == 382) {
+				var3[var6 + var4] = -98;
+			} else if (var7 == 376) {
+				var3[var6 + var4] = -97;
+			} else {
+				var3[var6 + var4] = 63;
 			}
 		}
 
+		return var5;
 	}
 
-	@ObfuscatedName("ie")
+	@ObfuscatedName("ac")
 	@ObfuscatedSignature(
-		signature = "(Lhj;I)Z",
+		signature = "(II)I",
-		garbageValue = "-1045685499"
+		garbageValue = "1934933433"
 	)
-	@Export("runCs1")
+	static int method2165(int var0) {
-	static final boolean runCs1(Widget var0) {
+		return (int)((Math.log((double)var0) / Interpreter.field1078 - 7.0D) * 256.0D);
-		if (var0.cs1Comparisons == null) {
+	}
-			return false;
+
-		}
+	@ObfuscatedName("hg")
-		for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
+	@ObfuscatedSignature(
-			int var2 = Varps.method3969(var0, var1);
+		signature = "(I)V",
-			int var3 = var0.cs1ComparisonValues[var1];
+		garbageValue = "-595413655"
-			if (var0.cs1Comparisons[var1] == 2) {
+	)
-				if (var2 >= var3) {
+	static final void method2161() {
-					return false;
+		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
-				}
+			if (var0.hitpoints == -1) {
-			} else if (var0.cs1Comparisons[var1] == 3) {
+				var0.delay = 0;
-				if (var2 <= var3) {
+				WorldMapManager.method607(var0);
-					return false;
+			} else {
-				}
+				var0.remove();
-			} else if (var0.cs1Comparisons[var1] == 4) {
-				if (var2 == var3) {
-					return false;
-				}
-			} else if (var2 != var3) {
-				return false;
 			}
 		}
 
-		return true;
 	}
 }

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

@@ -4,134 +4,163 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jx")
+@ObfuscatedName("jl")
 @Implements("ClanChat")
 public class ClanChat extends UserList {
-	@ObfuscatedName("gi")
+	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
-		signature = "[Llx;"
+		signature = "Llq;"
 	)
-	@Export("mapSceneSprites")
+	@Export("worldSelectRightSprite")
-	static IndexedSprite[] mapSceneSprites;
+	static IndexedSprite worldSelectRightSprite;
-	@ObfuscatedName("w")
+	@ObfuscatedName("go")
+	@Export("regionLandArchiveIds")
+	static int[] regionLandArchiveIds;
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lmu;"
+		signature = "Llu;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Ljg;"
+		signature = "Ljs;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = 737707483
+		intValue = 1566602861
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 1009556639
+		intValue = 984476847
 	)
-	int field3659;
+	int field3616;
 
 	@ObfuscatedSignature(
-		signature = "(Lmu;Ljg;)V"
+		signature = "(Llu;Ljs;)V"
 	)
 	public ClanChat(LoginType var1, Usernamed var2) {
 		super(100);
 		this.name = null;
 		this.owner = null;
-		this.field3659 = 1;
+		this.field3616 = 1;
 		this.loginType = var1;
 		this.localUser = var2;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)Ljd;",
+		signature = "(I)Lju;",
-		garbageValue = "2016619159"
+		garbageValue = "-192021045"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljd;",
+		signature = "(II)[Lju;",
-		garbageValue = "2126056206"
+		garbageValue = "518998026"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1];
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-1948396413"
+		garbageValue = "-16"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = VarcInt.base37Decode(var1);
+		this.name = FaceNormal.base37Decode(var1);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "537403926"
+		garbageValue = "1"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = VarcInt.base37Decode(var1);
+		this.owner = FaceNormal.base37Decode(var1);
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("ck")
 	@ObfuscatedSignature(
-		signature = "(Lkf;I)V",
+		signature = "(Lky;B)V",
-		garbageValue = "-1982298123"
+		garbageValue = "8"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
 		this.setOwner(var1.readStringCp1252NullTerminated());
 		long var2 = var1.readLong();
-		this.readName(Tile.method2855(var2));
+		long var5 = var2;
+		String var4;
+		int var7;
+		if (var2 > 0L && var2 < 6582952005840035281L) {
+			if (var2 % 37L == 0L) {
+				var4 = null;
+			} else {
+				var7 = 0;
+
+				for (long var13 = var2; var13 != 0L; var13 /= 37L) {
+					++var7;
+				}
+
+				StringBuilder var15 = new StringBuilder(var7);
+
+				while (0L != var5) {
+					long var11 = var5;
+					var5 /= 37L;
+					var15.append(class288.base37Table[(int)(var11 - 37L * var5)]);
+				}
+
+				var4 = var15.reverse().toString();
+			}
+		} else {
+			var4 = null;
+		}
+
+		this.readName(var4);
 		this.minKick = var1.readByte();
-		int var4 = var1.readUnsignedByte();
+		var7 = var1.readUnsignedByte();
-		if (var4 == 255) {
+		if (var7 != 255) {
-			return;
+			this.clear();
-		}
-		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.field3659 - 1);
+				var9.set(var10, ++this.field3616 - 1);
-			var6.rank = var1.readByte();
+				var9.rank = var1.readByte();
-			var1.readStringCp1252NullTerminated();
+				var1.readStringCp1252NullTerminated();
-			this.isLocalPlayer(var6);
+				this.isLocalPlayer(var9);
-		}
+			}
 
+		}
 	}
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cc")
 	@ObfuscatedSignature(
-		signature = "(Lkf;I)V",
+		signature = "(Lky;I)V",
-		garbageValue = "-891757405"
+		garbageValue = "-1757818732"
 	)
-	public final void method5234(Buffer var1) {
+	public final void method5135(Buffer var1) {
 		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
 		int var3 = var1.readUnsignedShort();
 		byte var4 = var1.readByte();
@@ -161,17 +190,17 @@ public class ClanChat extends UserList {
 				var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
 			}
 
-			var6.set(var3, ++this.field3659 - 1);
+			var6.set(var3, ++this.field3616 - 1);
 			var6.rank = var4;
 			this.isLocalPlayer(var6);
 		}
 
 	}
 
-	@ObfuscatedName("cq")
+	@ObfuscatedName("cd")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-415731818"
+		garbageValue = "-1788817000"
 	)
 	@Export("clearFriends")
 	public final void clearFriends() {
@@ -181,10 +210,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("cp")
+	@ObfuscatedName("cf")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "17638925"
+		garbageValue = "-109825958"
 	)
 	@Export("invalidateIgnoreds")
 	public final void invalidateIgnoreds() {
@@ -194,10 +223,10 @@ public class ClanChat extends UserList {
 
 	}
 
-	@ObfuscatedName("ch")
+	@ObfuscatedName("cw")
 	@ObfuscatedSignature(
-		signature = "(Ljw;I)V",
+		signature = "(Ljr;I)V",
-		garbageValue = "1755545327"
+		garbageValue = "-54614880"
 	)
 	@Export("isLocalPlayer")
 	final void isLocalPlayer(ClanMate var1) {

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

@@ -3,18 +3,18 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jw")
+@ObfuscatedName("jr")
 @Implements("ClanMate")
 public class ClanMate extends Buddy {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Ljy;"
+		signature = "Ljj;"
 	)
 	@Export("friend")
 	TriBool friend;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Ljy;"
+		signature = "Ljj;"
 	)
 	@Export("ignored")
 	TriBool ignored;
@@ -24,20 +24,20 @@ public class ClanMate extends Buddy {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "1319461047"
+		garbageValue = "1629200475"
 	)
 	@Export("clearIsFriend")
 	void clearIsFriend() {
 		this.friend = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "16711935"
+		garbageValue = "-431370449"
 	)
 	@Export("isFriend")
 	public final boolean isFriend() {
@@ -48,30 +48,30 @@ public class ClanMate extends Buddy {
 		return this.friend == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "78"
+		garbageValue = "-2053877048"
 	)
 	@Export("fillIsFriend")
 	void fillIsFriend() {
-		this.friend = ArchiveLoader.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.friend = class32.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1980920067"
+		garbageValue = "-72"
 	)
 	@Export("clearIsIgnored")
 	void clearIsIgnored() {
 		this.ignored = TriBool.TriBool_unknown;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(B)Z",
+		signature = "(I)Z",
-		garbageValue = "15"
+		garbageValue = "1045653770"
 	)
 	@Export("isIgnored")
 	public final boolean isIgnored() {
@@ -82,13 +82,23 @@ public class ClanMate extends Buddy {
 		return this.ignored == TriBool.TriBool_true;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1426345969"
+		garbageValue = "-1531975898"
 	)
 	@Export("fillIsIgnored")
 	void fillIsIgnored() {
-		this.ignored = ArchiveLoader.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+		this.ignored = class32.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		signature = "(CB)Z",
+		garbageValue = "96"
+	)
+	@Export("isCharAlphabetic")
+	public static boolean isCharAlphabetic(char var0) {
+		return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
 	}
 }

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

@@ -1,7 +0,0 @@
-import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("fh")
-@Implements("ClientPacketMarker")
-public interface ClientPacketMarker {
-}

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

@@ -1,157 +0,0 @@
-import net.runelite.mapping.Export;
-import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedName;
-import net.runelite.mapping.ObfuscatedSignature;
-
-@ObfuscatedName("jj")
-@Implements("ClientParameter")
-public class ClientParameter {
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3589;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3582;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3583;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3591;
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3585;
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3581;
-	@ObfuscatedName("b")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3584;
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3588;
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3600;
-	@ObfuscatedName("f")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3593;
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3590;
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3592;
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	public static final ClientParameter field3587;
-	@ObfuscatedName("r")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	public static final ClientParameter field3594;
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3595;
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3596;
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3586;
-	@ObfuscatedName("a")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3598;
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "Ljj;"
-	)
-	static final ClientParameter field3599;
-	@ObfuscatedName("t")
-	@Export("id")
-	public final String id;
-
-	static {
-		field3589 = new ClientParameter("8", "8");
-		field3582 = new ClientParameter("15", "15");
-		field3583 = new ClientParameter("7", "7");
-		field3591 = new ClientParameter("10", "10");
-		field3585 = new ClientParameter("16", "16");
-		field3581 = new ClientParameter("12", "12");
-		field3584 = new ClientParameter("3", "3");
-		field3588 = new ClientParameter("6", "6");
-		field3600 = new ClientParameter("17", "17");
-		field3593 = new ClientParameter("5", "5");
-		field3590 = new ClientParameter("9", "9");
-		field3592 = new ClientParameter("14", "14");
-		field3587 = new ClientParameter("18", "18");
-		field3594 = new ClientParameter("13", "13");
-		field3595 = new ClientParameter("4", "4");
-		field3596 = new ClientParameter("1", "1");
-		field3586 = new ClientParameter("11", "11");
-		field3598 = new ClientParameter("2", "2");
-		field3599 = new ClientParameter("19", "19");
-	}
-
-	ClientParameter(String var1, String var2) {
-		this.id = var2;
-	}
-
-	@ObfuscatedName("q")
-	static double method4991(double var0) {
-		return Math.exp(-var0 * var0 / 2.0D) / Math.sqrt(6.283185307179586D);
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(DDII)[D",
-		garbageValue = "-694088627"
-	)
-	public static double[] method4992(double var0, double var2, int var4) {
-		int var5 = var4 * 2 + 1;
-		double[] var6 = new double[var5];
-		int var7 = -var4;
-
-		for (int var8 = 0; var7 <= var4; ++var8) {
-			double var11 = method4991(((double)var7 - var0) / var2) / var2;
-			var6[var8] = var11;
-			++var7;
-		}
-
-		return var6;
-	}
-}

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

@@ -6,39 +6,41 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bk")
+@ObfuscatedName("bx")
 @Implements("ClientPreferences")
 public class ClientPreferences {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -802793057
+		intValue = -1051861033
 	)
 	@Export("ClientPreferences_optionCount")
 	static int ClientPreferences_optionCount;
-	@ObfuscatedName("ef")
+	@ObfuscatedName("gb")
-	@Export("worldHost")
+	@ObfuscatedSignature(
-	static String worldHost;
+		signature = "[Llq;"
-	@ObfuscatedName("e")
+	)
+	@Export("scrollBarSprites")
+	static IndexedSprite[] scrollBarSprites;
+	@ObfuscatedName("i")
 	@Export("roofsHidden")
 	boolean roofsHidden;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("titleMusicDisabled")
 	boolean titleMusicDisabled;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1863029767
+		intValue = -1686961453
 	)
 	@Export("windowMode")
 	int windowMode;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("rememberedUsername")
 	String rememberedUsername;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("hideUsername")
 	boolean hideUsername;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@Export("parameters")
 	LinkedHashMap parameters;
 
@@ -51,11 +53,11 @@ public class ClientPreferences {
 		this.rememberedUsername = null;
 		this.hideUsername = false;
 		this.parameters = new LinkedHashMap();
-		this.method1749(true);
+		this.method1763(true);
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkf;)V"
+		signature = "(Lky;)V"
 	)
 	ClientPreferences(Buffer var1) {
 		this.windowMode = 1;
@@ -95,26 +97,26 @@ public class ClientPreferences {
 					this.hideUsername = var1.readBoolean();
 				}
 			} else {
-				this.method1749(true);
+				this.method1763(true);
 			}
 		} else {
-			this.method1749(true);
+			this.method1763(true);
 		}
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(ZS)V",
+		signature = "(ZI)V",
-		garbageValue = "-11262"
+		garbageValue = "912146837"
 	)
-	void method1749(boolean var1) {
+	void method1763(boolean var1) {
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)Lkf;",
+		signature = "(I)Lky;",
-		garbageValue = "-2138331500"
+		garbageValue = "1073230660"
 	)
 	@Export("toBuffer")
 	Buffer toBuffer() {
@@ -136,373 +138,4 @@ public class ClientPreferences {
 		var1.writeBoolean(this.hideUsername);
 		return var1;
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "([BIII)Ljava/lang/String;",
-		garbageValue = "917330802"
-	)
-	public static String method1755(byte[] var0, int var1, int var2) {
-		char[] var3 = new char[var2];
-		int var4 = 0;
-		int var5 = var1;
-
-		int var8;
-		for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) {
-			int var7 = var0[var5++] & 255;
-			if (var7 < 128) {
-				if (var7 == 0) {
-					var8 = 65533;
-				} else {
-					var8 = var7;
-				}
-			} else if (var7 < 192) {
-				var8 = 65533;
-			} else if (var7 < 224) {
-				if (var5 < var6 && (var0[var5] & 192) == 128) {
-					var8 = (var7 & 31) << 6 | var0[var5++] & 63;
-					if (var8 < 128) {
-						var8 = 65533;
-					}
-				} else {
-					var8 = 65533;
-				}
-			} else if (var7 < 240) {
-				if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) {
-					var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63;
-					if (var8 < 2048) {
-						var8 = 65533;
-					}
-				} else {
-					var8 = 65533;
-				}
-			} else if (var7 < 248) {
-				if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) {
-					var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63;
-					if (var8 >= 65536 && var8 <= 1114111) {
-						var8 = 65533;
-					} else {
-						var8 = 65533;
-					}
-				} else {
-					var8 = 65533;
-				}
-			} else {
-				var8 = 65533;
-			}
-		}
-
-		return new String(var3, 0, var4);
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-844505624"
-	)
-	@Export("colorStartTag")
-	static String colorStartTag(int var0) {
-		return "<col=" + Integer.toHexString(var0) + ">";
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "(IIB)I",
-		garbageValue = "-46"
-	)
-	public static int method1757(int var0, int var1) {
-		int var2;
-		for (var2 = 0; var1 > 0; --var1) {
-			var2 = var2 << 1 | var0 & 1;
-			var0 >>>= 1;
-		}
-
-		return var2;
-	}
-
-	@ObfuscatedName("ae")
-	@ObfuscatedSignature(
-		signature = "(ILcx;ZB)I",
-		garbageValue = "-94"
-	)
-	static int method1753(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.publicChatMode;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
-			HealthBarUpdate.Interpreter_intStackSize -= 3;
-			Client.publicChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			class226.privateChatMode = NetSocket.ChatMode_find(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
-			if (class226.privateChatMode == null) {
-				class226.privateChatMode = PrivateChatMode.field3816;
-			}
-
-			Client.tradeChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
-			PacketBufferNode var18 = Archive.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher);
-			var18.packetBuffer.writeByte(Client.publicChatMode);
-			var18.packetBuffer.writeByte(class226.privateChatMode.field3815);
-			var18.packetBuffer.writeByte(Client.tradeChatMode);
-			Client.packetWriter.addNode(var18);
-			return 1;
-		}
-		String var3;
-		int var4;
-		if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
-			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			PacketBufferNode var6 = Archive.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher);
-			var6.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var3) + 2);
-			var6.packetBuffer.writeStringCp1252NullTerminated(var3);
-			var6.packetBuffer.writeByte(var4 - 1);
-			var6.packetBuffer.writeByte(var5);
-			Client.packetWriter.addNode(var6);
-			return 1;
-		}
-		int var10;
-		if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Message var15 = TileItem.Messages_getByChannelAndID(var10, var4);
-			if (var15 != null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle;
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
-			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Message var16 = WorldMapIcon_1.Messages_getMessage(var10);
-			if (var16 != null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.type;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.cycle;
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
-			if (class226.privateChatMode == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.privateChatMode.field3815;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
-			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-			var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			String var14 = var3.toLowerCase();
-			byte var17 = 0;
-			if (var14.startsWith("yellow:")) {
-				var17 = 0;
-				var3 = var3.substring("yellow:".length());
-			} else if (var14.startsWith("red:")) {
-				var17 = 1;
-				var3 = var3.substring("red:".length());
-			} else if (var14.startsWith("green:")) {
-				var17 = 2;
-				var3 = var3.substring("green:".length());
-			} else if (var14.startsWith("cyan:")) {
-				var17 = 3;
-				var3 = var3.substring("cyan:".length());
-			} else if (var14.startsWith("purple:")) {
-				var17 = 4;
-				var3 = var3.substring("purple:".length());
-			} else if (var14.startsWith("white:")) {
-				var17 = 5;
-				var3 = var3.substring("white:".length());
-			} else if (var14.startsWith("flash1:")) {
-				var17 = 6;
-				var3 = var3.substring("flash1:".length());
-			} else if (var14.startsWith("flash2:")) {
-				var17 = 7;
-				var3 = var3.substring("flash2:".length());
-			} else if (var14.startsWith("flash3:")) {
-				var17 = 8;
-				var3 = var3.substring("flash3:".length());
-			} else if (var14.startsWith("glow1:")) {
-				var17 = 9;
-				var3 = var3.substring("glow1:".length());
-			} else if (var14.startsWith("glow2:")) {
-				var17 = 10;
-				var3 = var3.substring("glow2:".length());
-			} else if (var14.startsWith("glow3:")) {
-				var17 = 11;
-				var3 = var3.substring("glow3:".length());
-			} else if (ScriptFrame.clientLanguage != Language.Language_EN) {
-				if (var14.startsWith("yellow:")) {
-					var17 = 0;
-					var3 = var3.substring("yellow:".length());
-				} else if (var14.startsWith("red:")) {
-					var17 = 1;
-					var3 = var3.substring("red:".length());
-				} else if (var14.startsWith("green:")) {
-					var17 = 2;
-					var3 = var3.substring("green:".length());
-				} else if (var14.startsWith("cyan:")) {
-					var17 = 3;
-					var3 = var3.substring("cyan:".length());
-				} else if (var14.startsWith("purple:")) {
-					var17 = 4;
-					var3 = var3.substring("purple:".length());
-				} else if (var14.startsWith("white:")) {
-					var17 = 5;
-					var3 = var3.substring("white:".length());
-				} else if (var14.startsWith("flash1:")) {
-					var17 = 6;
-					var3 = var3.substring("flash1:".length());
-				} else if (var14.startsWith("flash2:")) {
-					var17 = 7;
-					var3 = var3.substring("flash2:".length());
-				} else if (var14.startsWith("flash3:")) {
-					var17 = 8;
-					var3 = var3.substring("flash3:".length());
-				} else if (var14.startsWith("glow1:")) {
-					var17 = 9;
-					var3 = var3.substring("glow1:".length());
-				} else if (var14.startsWith("glow2:")) {
-					var17 = 10;
-					var3 = var3.substring("glow2:".length());
-				} else if (var14.startsWith("glow3:")) {
-					var17 = 11;
-					var3 = var3.substring("glow3:".length());
-				}
-			}
-
-			var14 = var3.toLowerCase();
-			byte var7 = 0;
-			if (var14.startsWith("wave:")) {
-				var7 = 1;
-				var3 = var3.substring("wave:".length());
-			} else if (var14.startsWith("wave2:")) {
-				var7 = 2;
-				var3 = var3.substring("wave2:".length());
-			} else if (var14.startsWith("shake:")) {
-				var7 = 3;
-				var3 = var3.substring("shake:".length());
-			} else if (var14.startsWith("scroll:")) {
-				var7 = 4;
-				var3 = var3.substring("scroll:".length());
-			} else if (var14.startsWith("slide:")) {
-				var7 = 5;
-				var3 = var3.substring("slide:".length());
-			} else if (Language.Language_EN != ScriptFrame.clientLanguage) {
-				if (var14.startsWith("wave:")) {
-					var7 = 1;
-					var3 = var3.substring("wave:".length());
-				} else if (var14.startsWith("wave2:")) {
-					var7 = 2;
-					var3 = var3.substring("wave2:".length());
-				} else if (var14.startsWith("shake:")) {
-					var7 = 3;
-					var3 = var3.substring("shake:".length());
-				} else if (var14.startsWith("scroll:")) {
-					var7 = 4;
-					var3 = var3.substring("scroll:".length());
-				} else if (var14.startsWith("slide:")) {
-					var7 = 5;
-					var3 = var3.substring("slide:".length());
-				}
-			}
-
-			PacketBufferNode var8 = Archive.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher);
-			var8.packetBuffer.writeByte(0);
-			int var9 = var8.packetBuffer.offset;
-			var8.packetBuffer.writeByte(var4);
-			var8.packetBuffer.writeByte(var17);
-			var8.packetBuffer.writeByte(var7);
-			Skeleton.method3063(var8.packetBuffer, var3);
-			var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
-			Client.packetWriter.addNode(var8);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
-			Skills.Interpreter_stringStackSize -= 2;
-			var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize];
-			String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1];
-			PacketBufferNode var11 = Archive.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher);
-			var11.packetBuffer.writeShort(0);
-			int var13 = var11.packetBuffer.offset;
-			var11.packetBuffer.writeStringCp1252NullTerminated(var3);
-			Skeleton.method3063(var11.packetBuffer, var12);
-			var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
-			Client.packetWriter.addNode(var11);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_PLAYERNAME) {
-			if (Client.localPlayer != null && Client.localPlayer.username != null) {
-				var3 = Client.localPlayer.username.getName();
-			} else {
-				var3 = "";
-			}
-
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.tradeChatMode;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
-			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.Messages_getHistorySize(var10);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
-			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.Messages_getNextChatID(var10);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
-			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.Messages_getLastChatID(var10);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.DOCHEAT) {
-			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-			UserComparator1.doCheat(var3);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
-			Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762;
-			return 1;
-		}
-		if (var0 == 5023) {
-			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-			System.out.println(var3);
-			return 1;
-		}
-		return 2;
-	}
 }

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

@@ -3,58 +3,52 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fu")
+@ObfuscatedName("fs")
 @Implements("Clock")
 public abstract class Clock {
-	@ObfuscatedName("oi")
+	@ObfuscatedName("by")
-	@ObfuscatedSignature(
+	static String field2037;
-		signature = "Lca;"
-	)
-	@Export("varcs")
-	static Varcs varcs;
 
 	Clock() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1402657312"
+		garbageValue = "-779324795"
 	)
 	@Export("mark")
 	public abstract void mark();
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(III)I",
-		garbageValue = "-333181863"
+		garbageValue = "930751718"
 	)
 	@Export("wait")
-	public abstract int wait(int tickLength, int fiveOrOne);
+	public abstract int wait(int var1, int var2);
 
-	@ObfuscatedName("fx")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(Lhz;IIB)Llq;",
-		garbageValue = "-1434133306"
+		garbageValue = "-2"
 	)
-	@Export("setWindowedMode")
+	@Export("SpriteBuffer_getIndexedSprite")
-	static void setWindowedMode(int var0) {
+	static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) {
-		Client.field868 = 0L;
+		if (!World.SpriteBuffer_bufferFile(var0, var1, var2)) {
-		if (var0 >= 2) {
+			return null;
-			Client.isResizable = true;
 		} else {
-			Client.isResizable = false;
+			IndexedSprite var4 = new IndexedSprite();
+			var4.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth;
+			var4.height = class325.SpriteBuffer_spriteHeight;
+			var4.xOffset = class325.SpriteBuffer_xOffsets[0];
+			var4.yOffset = class325.SpriteBuffer_yOffsets[0];
+			var4.subWidth = class325.SpriteBuffer_spriteWidths[0];
+			var4.subHeight = class225.SpriteBuffer_spriteHeights[0];
+			var4.palette = class325.SpriteBuffer_spritePalette;
+			var4.pixels = WorldMapSection1.SpriteBuffer_pixels[0];
+			UserComparator7.SpriteBuffer_clear();
+			return var4;
 		}
-
-		if (AbstractWorldMapIcon.getWindowedMode() == 1) {
-			WorldMapSprite.client.setMaxCanvasSize(765, 503);
-		} else {
-			WorldMapSprite.client.setMaxCanvasSize(7680, 2160);
-		}
-
-		if (Client.gameState >= 25) {
-			HealthBarUpdate.method1677();
-		}
-
 	}
 }

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

@@ -4,40 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("fv")
+@ObfuscatedName("fm")
 @Implements("CollisionMap")
 public class CollisionMap {
-	@ObfuscatedName("k")
+	@ObfuscatedName("at")
 	@ObfuscatedGetter(
-		intValue = -1785681501
+		intValue = 379779745
-	)
-	@Export("PcmPlayer_sampleRate")
-	public static int PcmPlayer_sampleRate;
-	@ObfuscatedName("ax")
-	@ObfuscatedGetter(
-		intValue = -1007844033
 	)
 	@Export("xInset")
 	public int xInset;
-	@ObfuscatedName("az")
+	@ObfuscatedName("as")
 	@ObfuscatedGetter(
-		intValue = 97844873
+		intValue = 899493249
 	)
 	@Export("yInset")
 	public int yInset;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("ak")
 	@ObfuscatedGetter(
-		intValue = -1249565113
+		intValue = -67571785
 	)
 	@Export("xSize")
 	int xSize;
 	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 1188758843
+		intValue = 1623106677
 	)
 	@Export("ySize")
 	int ySize;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("ac")
 	@Export("flags")
 	public int[][] flags;
 
@@ -50,195 +44,195 @@ public class CollisionMap {
 		this.clear();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(S)V",
-		garbageValue = "-1772918444"
+		garbageValue = "8482"
 	)
 	@Export("clear")
 	public void clear() {
 		for (int var1 = 0; var1 < this.xSize; ++var1) {
 			for (int var2 = 0; var2 < this.ySize; ++var2) {
 				if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) {
-					this.flags[var1][var2] = 0x1000000;
+					this.flags[var1][var2] = 16777216;
 				} else {
-					this.flags[var1][var2] = 0xffffff;
+					this.flags[var1][var2] = 16777215;
 				}
 			}
 		}
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(IIIIZB)V",
-		garbageValue = "91"
+		garbageValue = "-37"
 	)
-	public void method3559(int x, int y, int objectType, int rotation, boolean var5) {
+	public void method3495(int var1, int var2, int var3, int var4, boolean var5) {
-		x -= this.xInset;
+		var1 -= this.xInset;
-		y -= this.yInset;
+		var2 -= this.yInset;
-		if (objectType == 0) {
+		if (var3 == 0) {
-			if (rotation == 0) {
+			if (var4 == 0) {
-				this.setFlag(x, y, 0x80);
+				this.setFlag(var1, var2, 128);
-				this.setFlag(x - 1, y, 8);
+				this.setFlag(var1 - 1, var2, 8);
 			}
 
-			if (rotation == 1) {
+			if (var4 == 1) {
-				this.setFlag(x, y, 2);
+				this.setFlag(var1, var2, 2);
-				this.setFlag(x, y + 1, 32);
+				this.setFlag(var1, var2 + 1, 32);
 			}
 
-			if (rotation == 2) {
+			if (var4 == 2) {
-				this.setFlag(x, y, 8);
+				this.setFlag(var1, var2, 8);
-				this.setFlag(x + 1, y, 128);
+				this.setFlag(var1 + 1, var2, 128);
 			}
 
-			if (rotation == 3) {
+			if (var4 == 3) {
-				this.setFlag(x, y, 32);
+				this.setFlag(var1, var2, 32);
-				this.setFlag(x, y - 1, 2);
+				this.setFlag(var1, var2 - 1, 2);
 			}
 		}
 
-		if (objectType == 1 || objectType == 3) {
+		if (var3 == 1 || var3 == 3) {
-			if (rotation == 0) {
+			if (var4 == 0) {
-				this.setFlag(x, y, 1);
+				this.setFlag(var1, var2, 1);
-				this.setFlag(x - 1, y + 1, 16);
+				this.setFlag(var1 - 1, var2 + 1, 16);
 			}
 
-			if (rotation == 1) {
+			if (var4 == 1) {
-				this.setFlag(x, y, 4);
+				this.setFlag(var1, var2, 4);
-				this.setFlag(x + 1, y + 1, 64);
+				this.setFlag(var1 + 1, var2 + 1, 64);
 			}
 
-			if (rotation == 2) {
+			if (var4 == 2) {
-				this.setFlag(x, y, 16);
+				this.setFlag(var1, var2, 16);
-				this.setFlag(x + 1, y - 1, 1);
+				this.setFlag(var1 + 1, var2 - 1, 1);
 			}
 
-			if (rotation == 3) {
+			if (var4 == 3) {
-				this.setFlag(x, y, 64);
+				this.setFlag(var1, var2, 64);
-				this.setFlag(x - 1, y - 1, 4);
+				this.setFlag(var1 - 1, var2 - 1, 4);
 			}
 		}
 
-		if (objectType == 2) {
+		if (var3 == 2) {
-			if (rotation == 0) {
+			if (var4 == 0) {
-				this.setFlag(x, y, 130);
+				this.setFlag(var1, var2, 130);
-				this.setFlag(x - 1, y, 8);
+				this.setFlag(var1 - 1, var2, 8);
-				this.setFlag(x, y + 1, 32);
+				this.setFlag(var1, var2 + 1, 32);
 			}
 
-			if (rotation == 1) {
+			if (var4 == 1) {
-				this.setFlag(x, y, 10);
+				this.setFlag(var1, var2, 10);
-				this.setFlag(x, y + 1, 32);
+				this.setFlag(var1, var2 + 1, 32);
-				this.setFlag(x + 1, y, 128);
+				this.setFlag(var1 + 1, var2, 128);
 			}
 
-			if (rotation == 2) {
+			if (var4 == 2) {
-				this.setFlag(x, y, 40);
+				this.setFlag(var1, var2, 40);
-				this.setFlag(x + 1, y, 128);
+				this.setFlag(var1 + 1, var2, 128);
-				this.setFlag(x, y - 1, 2);
+				this.setFlag(var1, var2 - 1, 2);
 			}
 
-			if (rotation == 3) {
+			if (var4 == 3) {
-				this.setFlag(x, y, 160);
+				this.setFlag(var1, var2, 160);
-				this.setFlag(x, y - 1, 2);
+				this.setFlag(var1, var2 - 1, 2);
-				this.setFlag(x - 1, y, 8);
+				this.setFlag(var1 - 1, var2, 8);
 			}
 		}
 
 		if (var5) {
-			if (objectType == 0) {
+			if (var3 == 0) {
-				if (rotation == 0) {
+				if (var4 == 0) {
-					this.setFlag(x, y, 65536);
+					this.setFlag(var1, var2, 65536);
-					this.setFlag(x - 1, y, 4096);
+					this.setFlag(var1 - 1, var2, 4096);
 				}
 
-				if (rotation == 1) {
+				if (var4 == 1) {
-					this.setFlag(x, y, 1024);
+					this.setFlag(var1, var2, 1024);
-					this.setFlag(x, y + 1, 16384);
+					this.setFlag(var1, var2 + 1, 16384);
 				}
 
-				if (rotation == 2) {
+				if (var4 == 2) {
-					this.setFlag(x, y, 4096);
+					this.setFlag(var1, var2, 4096);
-					this.setFlag(x + 1, y, 65536);
+					this.setFlag(var1 + 1, var2, 65536);
 				}
 
-				if (rotation == 3) {
+				if (var4 == 3) {
-					this.setFlag(x, y, 16384);
+					this.setFlag(var1, var2, 16384);
-					this.setFlag(x, y - 1, 1024);
+					this.setFlag(var1, var2 - 1, 1024);
 				}
 			}
 
-			if (objectType == 1 || objectType == 3) {
+			if (var3 == 1 || var3 == 3) {
-				if (rotation == 0) {
+				if (var4 == 0) {
-					this.setFlag(x, y, 512);
+					this.setFlag(var1, var2, 512);
-					this.setFlag(x - 1, y + 1, 8192);
+					this.setFlag(var1 - 1, var2 + 1, 8192);
 				}
 
-				if (rotation == 1) {
+				if (var4 == 1) {
-					this.setFlag(x, y, 2048);
+					this.setFlag(var1, var2, 2048);
-					this.setFlag(x + 1, y + 1, 32768);
+					this.setFlag(var1 + 1, var2 + 1, 32768);
 				}
 
-				if (rotation == 2) {
+				if (var4 == 2) {
-					this.setFlag(x, y, 8192);
+					this.setFlag(var1, var2, 8192);
-					this.setFlag(x + 1, y - 1, 512);
+					this.setFlag(var1 + 1, var2 - 1, 512);
 				}
 
-				if (rotation == 3) {
+				if (var4 == 3) {
-					this.setFlag(x, y, 32768);
+					this.setFlag(var1, var2, 32768);
-					this.setFlag(x - 1, y - 1, 2048);
+					this.setFlag(var1 - 1, var2 - 1, 2048);
 				}
 			}
 
-			if (objectType == 2) {
+			if (var3 == 2) {
-				if (rotation == 0) {
+				if (var4 == 0) {
-					this.setFlag(x, y, 66560);
+					this.setFlag(var1, var2, 66560);
-					this.setFlag(x - 1, y, 4096);
+					this.setFlag(var1 - 1, var2, 4096);
-					this.setFlag(x, y + 1, 16384);
+					this.setFlag(var1, var2 + 1, 16384);
 				}
 
-				if (rotation == 1) {
+				if (var4 == 1) {
-					this.setFlag(x, y, 5120);
+					this.setFlag(var1, var2, 5120);
-					this.setFlag(x, y + 1, 16384);
+					this.setFlag(var1, var2 + 1, 16384);
-					this.setFlag(x + 1, y, 65536);
+					this.setFlag(var1 + 1, var2, 65536);
 				}
 
-				if (rotation == 2) {
+				if (var4 == 2) {
-					this.setFlag(x, y, 20480);
+					this.setFlag(var1, var2, 20480);
-					this.setFlag(x + 1, y, 65536);
+					this.setFlag(var1 + 1, var2, 65536);
-					this.setFlag(x, y - 1, 1024);
+					this.setFlag(var1, var2 - 1, 1024);
 				}
 
-				if (rotation == 3) {
+				if (var4 == 3) {
-					this.setFlag(x, y, 0x14000);
+					this.setFlag(var1, var2, 81920);
-					this.setFlag(x, y - 1, 1024);
+					this.setFlag(var1, var2 - 1, 1024);
-					this.setFlag(x - 1, y, 4096);
+					this.setFlag(var1 - 1, var2, 4096);
 				}
 			}
 		}
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "-1502680936"
+		garbageValue = "-1939556917"
 	)
 	@Export("addGameObject")
-	public void addGameObject(int x, int y, int w, int h, boolean blockSight) {
+	public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) {
-		int var6 = 0x100;
+		int var6 = 256;
-		if (blockSight) {
+		if (var5) {
-			var6 += 0x20000;
+			var6 += 131072;
 		}
 
-		x -= this.xInset;
+		var1 -= this.xInset;
-		y -= this.yInset;
+		var2 -= this.yInset;
 
-		for (int var7 = x; var7 < w + x; ++var7) {
+		for (int var7 = var1; var7 < var3 + var1; ++var7) {
 			if (var7 >= 0 && var7 < this.xSize) {
-				for (int var8 = y; var8 < y + h; ++var8) {
+				for (int var8 = var2; var8 < var2 + var4; ++var8) {
 					if (var8 >= 0 && var8 < this.ySize) {
 						this.setFlag(var7, var8, var6);
 					}
@@ -248,46 +242,49 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(III)V",
-		garbageValue = "-2087203619"
+		garbageValue = "-2081310668"
 	)
 	@Export("setBlockedByFloor")
 	public void setBlockedByFloor(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
-		this.flags[var1][var2] |= 0x200000;
+		int[] var10000 = this.flags[var1];
+		var10000[var2] |= 2097152;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(III)V",
+		signature = "(IIS)V",
-		garbageValue = "-363679248"
+		garbageValue = "5864"
 	)
 	@Export("setBlockedByFloorDec")
 	public void setBlockedByFloorDec(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
-		this.flags[var1][var2] |= 0x40000;
+		int[] var10000 = this.flags[var1];
+		var10000[var2] |= 262144;
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(IIII)V",
+		signature = "(IIIB)V",
-		garbageValue = "-883048141"
+		garbageValue = "79"
 	)
 	@Export("setFlag")
 	void setFlag(int var1, int var2, int var3) {
-		this.flags[var1][var2] |= var3;
+		int[] var10000 = this.flags[var1];
+		var10000[var2] |= var3;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
 		signature = "(IIIIZI)V",
-		garbageValue = "-1166825819"
+		garbageValue = "1397124488"
 	)
-	public void method3564(int var1, int var2, int var3, int var4, boolean var5) {
+	public void method3497(int var1, int var2, int var3, int var4, boolean var5) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
 		if (var3 == 0) {
@@ -434,30 +431,30 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(IIIIIZB)V",
-		garbageValue = "-77"
+		garbageValue = "25"
 	)
 	@Export("setFlagOffNonSquare")
-	public void setFlagOffNonSquare(int x, int y, int w, int h, int rotation, boolean var6) {
+	public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) {
-		int var7 = 0x100;
+		int var7 = 256;
 		if (var6) {
-			var7 += 0x20000;
+			var7 += 131072;
 		}
 
-		x -= this.xInset;
+		var1 -= this.xInset;
-		y -= this.yInset;
+		var2 -= this.yInset;
 		int var8;
-		if (rotation == 1 || rotation == 3) {
+		if (var5 == 1 || var5 == 3) {
-			var8 = w;
+			var8 = var3;
-			w = h;
+			var3 = var4;
-			h = var8;
+			var4 = var8;
 		}
 
-		for (var8 = x; var8 < w + x; ++var8) {
+		for (var8 = var1; var8 < var3 + var1; ++var8) {
 			if (var8 >= 0 && var8 < this.xSize) {
-				for (int var9 = y; var9 < y + h; ++var9) {
+				for (int var9 = var2; var9 < var2 + var4; ++var9) {
 					if (var9 >= 0 && var9 < this.ySize) {
 						this.setFlagOff(var8, var9, var7);
 					}
@@ -467,24 +464,48 @@ public class CollisionMap {
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "(IIII)V",
-		garbageValue = "-1617846942"
+		garbageValue = "1656686360"
 	)
 	@Export("setFlagOff")
 	void setFlagOff(int var1, int var2, int var3) {
-		this.flags[var1][var2] &= ~var3;
+		int[] var10000 = this.flags[var1];
+		var10000[var2] &= ~var3;
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(IIB)V",
+		signature = "(III)V",
-		garbageValue = "-34"
+		garbageValue = "-1414783341"
 	)
-	public void method3567(int var1, int var2) {
+	public void method3527(int var1, int var2) {
 		var1 -= this.xInset;
 		var2 -= this.yInset;
-		this.flags[var1][var2] &= 0xfffbffff;
+		int[] var10000 = this.flags[var1];
+		var10000[var2] &= -262145;
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(Lhz;I)V",
+		garbageValue = "-1914788069"
+	)
+	@Export("FloorUnderlayDefinition_setArchives")
+	public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) {
+		FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0;
+	}
+
+	@ObfuscatedName("js")
+	@ObfuscatedSignature(
+		signature = "(IS)V",
+		garbageValue = "-3946"
+	)
+	@Export("drawInterfaceModelComponents")
+	static final void drawInterfaceModelComponents(int var0) {
+		if (Projectile.loadInterface(var0)) {
+			Tile.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1);
+		}
 	}
 }

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

@@ -4,36 +4,44 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hv")
+@ObfuscatedName("hd")
 @Implements("Coord")
 public class Coord {
-	@ObfuscatedName("fy")
+	@ObfuscatedName("m")
-	@ObfuscatedSignature(
+	@Export("BZip2Decompressor_block")
-		signature = "Lke;"
+	static int[] BZip2Decompressor_block;
-	)
+	@ObfuscatedName("dc")
-	@Export("fontPlain11")
-	static Font fontPlain11;
-	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -618740747
+		longValue = 8705560174832439427L
+	)
+	static long field2511;
+	@ObfuscatedName("hp")
+	@ObfuscatedGetter(
+		intValue = -312378443
+	)
+	@Export("cameraY")
+	static int cameraY;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -22513413
 	)
 	@Export("plane")
 	public int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -224554023
+		intValue = -611305657
 	)
 	@Export("x")
 	public int x;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1025191447
+		intValue = -2088749017
 	)
 	@Export("y")
 	public int y;
 
 	@ObfuscatedSignature(
-		signature = "(Lhv;)V"
+		signature = "(Lhd;)V"
 	)
 	public Coord(Coord var1) {
 		this.plane = var1.plane;
@@ -58,74 +66,63 @@ public class Coord {
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "-1529444039"
+		garbageValue = "2"
 	)
 	@Export("packed")
 	public int packed() {
 		return this.plane << 28 | this.x << 14 | this.y;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lhv;I)Z",
+		signature = "(Lhd;B)Z",
-		garbageValue = "2096599249"
+		garbageValue = "-61"
 	)
 	@Export("equalsCoord")
 	boolean equalsCoord(Coord var1) {
 		if (this.plane != var1.plane) {
 			return false;
-		}
+		} else if (this.x != var1.x) {
-		if (this.x != var1.x) {
 			return false;
+		} else {
+			return this.y == var1.y;
 		}
-		return this.y == var1.y;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1242820641"
+		garbageValue = "-1334181457"
 	)
 	@Export("toString")
 	String toString(String var1) {
 		return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63);
 	}
 
-	public int hashCode() {
+	public String toString() {
-		return this.packed();
+		return this.toString(",");
 	}
 
 	public boolean equals(Object var1) {
 		if (this == var1) {
 			return true;
+		} else {
+			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
 		}
-		return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
 	}
 
-	public String toString() {
+	public int hashCode() {
+		return this.packed();
+	}
+
+	public String abd() {
 		return this.toString(",");
 	}
 
-	@ObfuscatedName("b")
+	public String abb() {
-	@ObfuscatedSignature(
+		return this.toString(",");
-		signature = "(I)V",
-		garbageValue = "1626401232"
-	)
-	@Export("ParamDefinition_clearCached")
-	public static void ParamDefinition_clearCached() {
-		ParamDefinition.ParamDefinition_cached.clear();
-	}
-
-	@ObfuscatedName("y")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-40"
-	)
-	static void method3990() {
-		Login.loginIndex = 24;
-		class268.setLoginResponseString("", "You were disconnected from the server.", "");
 	}
 }

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

@@ -4,134 +4,145 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dz")
+@ObfuscatedName("db")
 @Implements("Decimator")
 public class Decimator {
-	@ObfuscatedName("x")
+	@ObfuscatedName("a")
 	@ObfuscatedSignature(
-		signature = "Llx;"
+		signature = "Lky;"
 	)
-	@Export("options_buttons_2Sprite")
+	@Export("NetCache_reference")
-	static IndexedSprite options_buttons_2Sprite;
+	static Buffer NetCache_reference;
-	@ObfuscatedName("p")
+	@ObfuscatedName("l")
+	public static String field1439;
+	@ObfuscatedName("as")
+	@ObfuscatedSignature(
+		signature = "Llh;"
+	)
+	static Bounds field1443;
+	@ObfuscatedName("bq")
+	@ObfuscatedSignature(
+		signature = "[Llq;"
+	)
+	@Export("worldSelectArrows")
+	static IndexedSprite[] worldSelectArrows;
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1067673039
+		intValue = -617171721
 	)
 	@Export("inputRate")
 	int inputRate;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 1870278153
+		intValue = 72965647
 	)
 	@Export("outputRate")
 	int outputRate;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("table")
 	int[][] table;
 
 	public Decimator(int var1, int var2) {
-		if (var2 == var1) {
+		if (var2 != var1) {
-			return;
+			int var3 = WorldMapIcon_1.method301(var1, var2);
-		}
+			var1 /= var3;
-		int var3 = FriendSystem.method1819(var1, var2);
+			var2 /= var3;
-		var1 /= var3;
+			this.inputRate = var1;
-		var2 /= var3;
+			this.outputRate = var2;
-		this.inputRate = var1;
+			this.table = new int[var1][14];
-		this.outputRate = var2;
-		this.table = new int[var1][14];
 
-		for (int var4 = 0; var4 < var1; ++var4) {
+			for (int var4 = 0; var4 < var1; ++var4) {
-			int[] var5 = this.table[var4];
+				int[] var5 = this.table[var4];
-			double var6 = (double)var4 / (double)var1 + 6.0D;
+				double var6 = 6.0D + (double)var4 / (double)var1;
-			int var8 = (int)Math.floor(1.0D + (var6 - 7.0D));
+				int var8 = (int)Math.floor(var6 - 7.0D + 1.0D);
-			if (var8 < 0) {
+				if (var8 < 0) {
-				var8 = 0;
+					var8 = 0;
-			}
-
-			int var9 = (int)Math.ceil(7.0D + var6);
-			if (var9 > 14) {
-				var9 = 14;
-			}
-
-			for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) {
-				double var12 = 3.141592653589793D * ((double)var8 - var6);
-				double var14 = var10;
-				if (var12 < -1.0E-4D || var12 > 1.0E-4D) {
-					var14 = var10 * (Math.sin(var12) / var12);
 				}
 
-				var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D);
+				int var9 = (int)Math.ceil(var6 + 7.0D);
-				var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D);
+				if (var9 > 14) {
-			}
+					var9 = 14;
-		}
+				}
 
+				for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) {
+					double var12 = ((double)var8 - var6) * 3.141592653589793D;
+					double var14 = var10;
+					if (var12 < -1.0E-4D || var12 > 1.0E-4D) {
+						var14 = var10 * (Math.sin(var12) / var12);
+					}
+
+					var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D);
+					var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D);
+				}
+			}
+
+		}
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "([BB)[B",
-		garbageValue = "68"
+		garbageValue = "1"
 	)
 	@Export("resample")
 	byte[] resample(byte[] var1) {
-		if (this.table == null) {
+		if (this.table != null) {
-			return var1;
+			int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14;
-		}
+			int[] var3 = new int[var2];
-		int var2 = (int)((long)this.outputRate * (long)var1.length / (long)this.inputRate) + 14;
+			int var4 = 0;
-		int[] var3 = new int[var2];
+			int var5 = 0;
-		int var4 = 0;
-		int var5 = 0;
 
-		int var6;
+			int var6;
-		for (var6 = 0; var6 < var1.length; ++var6) {
+			for (var6 = 0; var6 < var1.length; ++var6) {
-			byte var7 = var1[var6];
+				byte var7 = var1[var6];
-			int[] var8 = this.table[var5];
+				int[] var8 = this.table[var5];
 
-			int var9;
+				int var9;
-			for (var9 = 0; var9 < 14; ++var9) {
+				for (var9 = 0; var9 < 14; ++var9) {
-				var3[var4 + var9] += var7 * var8[var9];
+					var3[var9 + var4] += var7 * var8[var9];
+				}
+
+				var5 += this.outputRate;
+				var9 = var5 / this.inputRate;
+				var4 += var9;
+				var5 -= var9 * this.inputRate;
 			}
 
-			var5 += this.outputRate;
+			var1 = new byte[var2];
-			var9 = var5 / this.inputRate;
-			var4 += var9;
-			var5 -= var9 * this.inputRate;
-		}
 
-		var1 = new byte[var2];
+			for (var6 = 0; var6 < var2; ++var6) {
-
+				int var10 = var3[var6] + 32768 >> 16;
-		for (var6 = 0; var6 < var2; ++var6) {
+				if (var10 < -128) {
-			int var10 = var3[var6] + 32768 >> 16;
+					var1[var6] = -128;
-			if (var10 < -128) {
+				} else if (var10 > 127) {
-				var1[var6] = -128;
+					var1[var6] = 127;
-			} else if (var10 > 127) {
+				} else {
-				var1[var6] = 127;
+					var1[var6] = (byte)var10;
-			} else {
+				}
-				var1[var6] = (byte)var10;
 			}
 		}
 
 		return var1;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "(II)I",
-		garbageValue = "1569802818"
+		garbageValue = "-2098361715"
 	)
 	@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("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IB)I",
-		garbageValue = "1732624791"
+		garbageValue = "45"
 	)
 	@Export("scalePosition")
 	int scalePosition(int var1) {
@@ -142,679 +153,80 @@ public class Decimator {
 		return var1;
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("s")
-	@ObfuscatedSignature(
+	public static final int method2452(double var0, double var2, double var4) {
-		signature = "(IIB)I",
+		double var6 = var4;
-		garbageValue = "1"
+		double var8 = var4;
-	)
+		double var10 = var4;
-	static final int method2517(int var0, int var1) {
+		if (0.0D != var2) {
-		if (var0 == -2) {
+			double var12;
-			return 12345678;
+			if (var4 < 0.5D) {
-		}
+				var12 = (var2 + 1.0D) * var4;
-		if (var0 == -1) {
+			} else {
-			if (var1 < 2) {
+				var12 = var4 + var2 - var4 * var2;
-				var1 = 2;
-			} else if (var1 > 126) {
-				var1 = 126;
 			}
 
-			return var1;
+			double var14 = 2.0D * var4 - var12;
-		}
+			double var16 = 0.3333333333333333D + var0;
-		var1 = (var0 & 127) * var1 / 128;
+			if (var16 > 1.0D) {
-		if (var1 < 2) {
+				--var16;
-			var1 = 2;
+			}
-		} else if (var1 > 126) {
+
-			var1 = 126;
+			double var20 = var0 - 0.3333333333333333D;
+			if (var20 < 0.0D) {
+				++var20;
+			}
+
+			if (var16 * 6.0D < 1.0D) {
+				var6 = var16 * 6.0D * (var12 - var14) + var14;
+			} else if (2.0D * var16 < 1.0D) {
+				var6 = var12;
+			} else if (3.0D * var16 < 2.0D) {
+				var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14;
+			} else {
+				var6 = var14;
+			}
+
+			if (6.0D * var0 < 1.0D) {
+				var8 = var14 + (var12 - var14) * 6.0D * var0;
+			} else if (var0 * 2.0D < 1.0D) {
+				var8 = var12;
+			} else if (3.0D * var0 < 2.0D) {
+				var8 = 6.0D * (var12 - var14) * (0.6666666666666666D - var0) + var14;
+			} else {
+				var8 = var14;
+			}
+
+			if (var20 * 6.0D < 1.0D) {
+				var10 = var20 * 6.0D * (var12 - var14) + var14;
+			} else if (2.0D * var20 < 1.0D) {
+				var10 = var12;
+			} else if (var20 * 3.0D < 2.0D) {
+				var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14;
+			} else {
+				var10 = var14;
+			}
 		}
 
-		return (var0 & 65408) + var1;
+		int var22 = (int)(var6 * 256.0D);
+		int var13 = (int)(var8 * 256.0D);
+		int var23 = (int)(256.0D * var10);
+		int var15 = var23 + (var13 << 8) + (var22 << 16);
+		return var15;
 	}
 
-	@ObfuscatedName("ge")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lbq;IIIIII)V",
+		signature = "(III)I",
-		garbageValue = "-1193836953"
+		garbageValue = "-882236217"
 	)
-	@Export("drawActor2d")
+	@Export("ItemContainer_getCount")
-	static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
+	static int ItemContainer_getCount(int var0, int var1) {
-		if (var0 == null || !var0.isVisible()) {
+		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-			return;
+		if (var2 == null) {
-		}
+			return 0;
-		if (var0 instanceof NPC) {
-			NPCDefinition var6 = ((NPC)var0).definition;
-			if (var6.transforms != null) {
-				var6 = var6.transform();
-			}
-
-			if (var6 == null) {
-				return;
-			}
-		}
-
-		int var75 = Players.Players_count;
-		int[] var7 = Players.Players_indices;
-		byte var8 = 0;
-		Player var10;
-		if (var1 < var75 && var0.playerCycle == Client.cycle) {
-			var10 = (Player)var0;
-			boolean var9;
-			if (Client.drawPlayerNames == 0) {
-				var9 = false;
-			} else {
-				boolean var78;
-				if (var10 != Client.localPlayer) {
-					var78 = (Client.drawPlayerNames & 4) != 0;
-					boolean var79 = var78;
-					boolean var13;
-					if (!var78) {
-						var13 = (Client.drawPlayerNames & 1) != 0;
-						var79 = var13 && var10.isFriend();
-					}
-
-					var13 = var79;
-					if (!var79) {
-						boolean var80 = (Client.drawPlayerNames & 2) != 0;
-						var13 = var80 && var10.isClanMember();
-					}
-
-					var9 = var13;
-				} else {
-					var78 = (Client.drawPlayerNames & 8) != 0;
-					var9 = var78;
-				}
-			}
-
-			if (var9) {
-				Player var11 = (Player)var0;
-				if (var1 < var75) {
-					class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
-					AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
-					byte var92 = 9;
-					var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 0xffffff, 0);
-					var8 = 18;
-				}
-			}
-		}
-
-		int var87 = -2;
-		int var15;
-		int var22;
-		int var23;
-		if (!var0.healthBars.isEmpty()) {
-			class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
-
-			for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) {
-				HealthBarUpdate var89 = var88.get(Client.cycle);
-				if (var89 == null) {
-					if (var88.isEmpty()) {
-						var88.remove();
-					}
-					continue;
-				}
-
-				HealthBarDefinition var91 = var88.definition;
-				Sprite var76 = var91.getBackSprite();
-				Sprite var14 = var91.getFrontSprite();
-				int var16 = 0;
-				if (var76 != null && var14 != null) {
-					if (var91.widthPadding * 2 < var14.subWidth) {
-						var16 = var91.widthPadding;
-					}
-
-					var15 = var14.subWidth - var16 * 2;
-				} else {
-					var15 = var91.width;
-				}
-
-				int var17 = 255;
-				boolean var18 = true;
-				int var19 = Client.cycle - var89.cycle;
-				int var20 = var15 * var89.health2 / var91.width;
-				int var21;
-				int var93;
-				if (var89.cycleOffset > var19) {
-					var21 = var91.int4 == 0 ? 0 : var91.int4 * (var19 / var91.int4);
-					var22 = var15 * var89.health / var91.width;
-					var93 = var21 * (var20 - var22) / var89.cycleOffset + var22;
-				} else {
-					var93 = var20;
-					var21 = var89.cycleOffset + var91.int5 - var19;
-					if (var91.int3 >= 0) {
-						var17 = (var21 << 8) / (var91.int5 - var91.int3);
-					}
-				}
-
-				if (var89.health2 > 0 && var93 < 1) {
-					var93 = 1;
-				}
-
-				if (var76 == null || var14 == null) {
-					var87 += 5;
-					if (Client.viewportTempX > -1) {
-						var21 = var2 + Client.viewportTempX - (var15 >> 1);
-						var22 = var3 + Client.viewportTempY - var87;
-						Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00);
-						Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000);
-					}
-
-					var87 += 2;
-					continue;
-				}
-
-				if (var93 == var15) {
-					var93 += var16 * 2;
-				} else {
-					var93 += var16;
-				}
-
-				var21 = var76.subHeight;
-				var87 += var21;
-				var22 = var2 + Client.viewportTempX - (var15 >> 1);
-				var23 = var3 + Client.viewportTempY - var87;
-				var22 -= var16;
-				if (var17 >= 0 && var17 < 255) {
-					var76.drawTransAt(var22, var23, var17);
-					Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
-					var14.drawTransAt(var22, var23, var17);
-				} else {
-					var76.drawTransBgAt(var22, var23);
-					Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
-					var14.drawTransBgAt(var22, var23);
-				}
-
-				Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
-				var87 += 2;
-			}
-		}
-
-		if (var87 == -2) {
-			var87 += 7;
-		}
-
-		var87 += var8;
-		if (var1 < var75) {
-			var10 = (Player)var0;
-			if (var10.isHidden) {
-				return;
-			}
-
-			if (var10.headIconPk != -1 || var10.headIconPrayer != -1) {
-				class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
-				if (Client.viewportTempX > -1) {
-					if (var10.headIconPk != -1) {
-						var87 += 25;
-						UserComparator3.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
-					}
-
-					if (var10.headIconPrayer != -1) {
-						var87 += 25;
-						SoundCache.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
-					}
-				}
-			}
-
-			if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
-				class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
-				if (Client.viewportTempX > -1) {
-					var87 += class173.headIconHintSprites[1].subHeight;
-					class173.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
-				}
-			}
 		} else {
-			NPCDefinition var90 = ((NPC)var0).definition;
+			return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0;
-			if (var90.transforms != null) {
-				var90 = var90.transform();
-			}
-
-			if (var90.headIconPrayer >= 0 && var90.headIconPrayer < SoundCache.headIconPrayerSprites.length) {
-				class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
-				if (Client.viewportTempX > -1) {
-					SoundCache.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
-				}
-			}
-
-			if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
-				class219.getActorScreenLocation(var0, var0.defaultHeight + 15);
-				if (Client.viewportTempX > -1) {
-					class173.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
-				}
-			}
 		}
-
-		if (var0.overheadText != null && (var1 >= var75 || !var0.field998 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
-			class219.getActorScreenLocation(var0, var0.defaultHeight);
-			if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
-				Client.overheadTextXOffsets[Client.overheadTextCount] = WorldMapIcon_1.fontBold12.stringWidth(var0.overheadText) / 2;
-				Client.overheadTextAscents[Client.overheadTextCount] = WorldMapIcon_1.fontBold12.ascent;
-				Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX;
-				Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY;
-				Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor;
-				Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect;
-				Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining;
-				Client.overheadText[Client.overheadTextCount] = var0.overheadText;
-				++Client.overheadTextCount;
-			}
-		}
-
-		for (int var77 = 0; var77 < 4; ++var77) {
-			int var96 = var0.hitSplatCycles[var77];
-			int var97 = var0.hitSplatTypes[var77];
-			HitSplatDefinition var95 = null;
-			int var98 = 0;
-			if (var97 >= 0) {
-				if (var96 <= Client.cycle) {
-					continue;
-				}
-
-				var95 = Projectile.HitSplatDefinition_get(var0.hitSplatTypes[var77]);
-				var98 = var95.field3344;
-				if (var95 != null && var95.transforms != null) {
-					var95 = var95.transform();
-					if (var95 == null) {
-						var0.hitSplatCycles[var77] = -1;
-						continue;
-					}
-				}
-			} else if (var96 < 0) {
-				continue;
-			}
-
-			var15 = var0.hitSplatTypes2[var77];
-			HitSplatDefinition var81 = null;
-			if (var15 >= 0) {
-				var81 = Projectile.HitSplatDefinition_get(var15);
-				if (var81 != null && var81.transforms != null) {
-					var81 = var81.transform();
-				}
-			}
-
-			if (var96 - var98 > Client.cycle) {
-				continue;
-			}
-			if (var95 == null) {
-				var0.hitSplatCycles[var77] = -1;
-				continue;
-			}
-			class219.getActorScreenLocation(var0, var0.defaultHeight / 2);
-			if (Client.viewportTempX <= -1) {
-				continue;
-			}
-			if (var77 == 1) {
-				Client.viewportTempY -= 20;
-			}
-
-			if (var77 == 2) {
-				Client.viewportTempX -= 15;
-				Client.viewportTempY -= 10;
-			}
-
-			if (var77 == 3) {
-				Client.viewportTempX += 15;
-				Client.viewportTempY -= 10;
-			}
-
-			Sprite var82 = null;
-			Sprite var83 = null;
-			Sprite var84 = null;
-			Sprite var85 = null;
-			var22 = 0;
-			var23 = 0;
-			int var24 = 0;
-			int var25 = 0;
-			int var26 = 0;
-			int var27 = 0;
-			int var28 = 0;
-			int var29 = 0;
-			Sprite var30 = null;
-			Sprite var31 = null;
-			Sprite var32 = null;
-			Sprite var33 = null;
-			int var34 = 0;
-			int var35 = 0;
-			int var36 = 0;
-			int var37 = 0;
-			int var38 = 0;
-			int var39 = 0;
-			int var40 = 0;
-			int var41 = 0;
-			int var42 = 0;
-			var82 = var95.method4551();
-			int var43;
-			if (var82 != null) {
-				var22 = var82.subWidth;
-				var43 = var82.subHeight;
-				if (var43 > var42) {
-					var42 = var43;
-				}
-
-				var26 = var82.xOffset;
-			}
-
-			var83 = var95.method4557();
-			if (var83 != null) {
-				var23 = var83.subWidth;
-				var43 = var83.subHeight;
-				if (var43 > var42) {
-					var42 = var43;
-				}
-
-				var27 = var83.xOffset;
-			}
-
-			var84 = var95.method4558();
-			if (var84 != null) {
-				var24 = var84.subWidth;
-				var43 = var84.subHeight;
-				if (var43 > var42) {
-					var42 = var43;
-				}
-
-				var28 = var84.xOffset;
-			}
-
-			var85 = var95.method4583();
-			if (var85 != null) {
-				var25 = var85.subWidth;
-				var43 = var85.subHeight;
-				if (var43 > var42) {
-					var42 = var43;
-				}
-
-				var29 = var85.xOffset;
-			}
-
-			if (var81 != null) {
-				var30 = var81.method4551();
-				if (var30 != null) {
-					var34 = var30.subWidth;
-					var43 = var30.subHeight;
-					if (var43 > var42) {
-						var42 = var43;
-					}
-
-					var38 = var30.xOffset;
-				}
-
-				var31 = var81.method4557();
-				if (var31 != null) {
-					var35 = var31.subWidth;
-					var43 = var31.subHeight;
-					if (var43 > var42) {
-						var42 = var43;
-					}
-
-					var39 = var31.xOffset;
-				}
-
-				var32 = var81.method4558();
-				if (var32 != null) {
-					var36 = var32.subWidth;
-					var43 = var32.subHeight;
-					if (var43 > var42) {
-						var42 = var43;
-					}
-
-					var40 = var32.xOffset;
-				}
-
-				var33 = var81.method4583();
-				if (var33 != null) {
-					var37 = var33.subWidth;
-					var43 = var33.subHeight;
-					if (var43 > var42) {
-						var42 = var43;
-					}
-
-					var41 = var33.xOffset;
-				}
-			}
-
-			Font var86 = var95.getFont();
-			if (var86 == null) {
-				var86 = Coord.fontPlain11;
-			}
-
-			Font var44;
-			if (var81 != null) {
-				var44 = var81.getFont();
-				if (var44 == null) {
-					var44 = Coord.fontPlain11;
-				}
-			} else {
-				var44 = Coord.fontPlain11;
-			}
-
-			String var45 = null;
-			String var46 = null;
-			boolean var47 = false;
-			int var48 = 0;
-			var45 = var95.getString(var0.hitSplatValues[var77]);
-			int var94 = var86.stringWidth(var45);
-			if (var81 != null) {
-				var46 = var81.getString(var0.hitSplatValues2[var77]);
-				var48 = var44.stringWidth(var46);
-			}
-
-			int var49 = 0;
-			int var50 = 0;
-			if (var23 > 0) {
-				if (var84 == null && var85 == null) {
-					var49 = 1;
-				} else {
-					var49 = var94 / var23 + 1;
-				}
-			}
-
-			if (var81 != null && var35 > 0) {
-				if (var32 == null && var33 == null) {
-					var50 = 1;
-				} else {
-					var50 = var48 / var35 + 1;
-				}
-			}
-
-			int var51 = 0;
-			int var52 = var51;
-			if (var22 > 0) {
-				var51 += var22;
-			}
-
-			var51 += 2;
-			int var53 = var51;
-			if (var24 > 0) {
-				var51 += var24;
-			}
-
-			int var54 = var51;
-			int var55 = var51;
-			int var56;
-			if (var23 > 0) {
-				var56 = var23 * var49;
-				var51 += var56;
-				var55 += (var56 - var94) / 2;
-			} else {
-				var51 += var94;
-			}
-
-			var56 = var51;
-			if (var25 > 0) {
-				var51 += var25;
-			}
-
-			int var57 = 0;
-			int var58 = 0;
-			int var59 = 0;
-			int var60 = 0;
-			int var61 = 0;
-			int var62;
-			if (var81 != null) {
-				var51 += 2;
-				var57 = var51;
-				if (var34 > 0) {
-					var51 += var34;
-				}
-
-				var51 += 2;
-				var58 = var51;
-				if (var36 > 0) {
-					var51 += var36;
-				}
-
-				var59 = var51;
-				var61 = var51;
-				if (var35 > 0) {
-					var62 = var50 * var35;
-					var51 += var62;
-					var61 += (var62 - var48) / 2;
-				} else {
-					var51 += var48;
-				}
-
-				var60 = var51;
-				if (var37 > 0) {
-					var51 += var37;
-				}
-			}
-
-			var62 = var0.hitSplatCycles[var77] - Client.cycle;
-			int var63 = var95.field3335 - var62 * var95.field3335 / var95.field3344;
-			int var64 = var62 * var95.field3340 / var95.field3344 + -var95.field3340;
-			int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1));
-			int var66 = var3 + Client.viewportTempY - 12 + var64;
-			int var67 = var66;
-			int var68 = var42 + var66;
-			int var69 = var66 + var95.field3328 + 15;
-			int var70 = var69 - var86.maxAscent;
-			int var71 = var69 + var86.maxDescent;
-			if (var70 < var66) {
-				var67 = var70;
-			}
-
-			if (var71 > var68) {
-				var68 = var71;
-			}
-
-			int var72 = 0;
-			int var73;
-			int var74;
-			if (var81 != null) {
-				var72 = var66 + var81.field3328 + 15;
-				var73 = var72 - var44.maxAscent;
-				var74 = var72 + var44.maxDescent;
-				if (var73 < var67) {
-					;
-				}
-
-				if (var74 > var68) {
-					;
-				}
-			}
-
-			var73 = 255;
-			if (var95.field3341 >= 0) {
-				var73 = (var62 << 8) / (var95.field3344 - var95.field3341);
-			}
-
-			if (var73 >= 0 && var73 < 255) {
-				if (var82 != null) {
-					var82.drawTransAt(var65 + var52 - var26, var66, var73);
-				}
-
-				if (var84 != null) {
-					var84.drawTransAt(var65 + var53 - var28, var66, var73);
-				}
-
-				if (var83 != null) {
-					for (var74 = 0; var74 < var49; ++var74) {
-						var83.drawTransAt(var23 * var74 + (var54 + var65 - var27), var66, var73);
-					}
-				}
-
-				if (var85 != null) {
-					var85.drawTransAt(var56 + var65 - var29, var66, var73);
-				}
-
-				var86.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73);
-				if (var81 != null) {
-					if (var30 != null) {
-						var30.drawTransAt(var65 + var57 - var38, var66, var73);
-					}
-
-					if (var32 != null) {
-						var32.drawTransAt(var65 + var58 - var40, var66, var73);
-					}
-
-					if (var31 != null) {
-						for (var74 = 0; var74 < var50; ++var74) {
-							var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73);
-						}
-					}
-
-					if (var33 != null) {
-						var33.drawTransAt(var60 + var65 - var41, var66, var73);
-					}
-
-					var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73);
-				}
-			} else {
-				if (var82 != null) {
-					var82.drawTransBgAt(var52 + var65 - var26, var66);
-				}
-
-				if (var84 != null) {
-					var84.drawTransBgAt(var53 + var65 - var28, var66);
-				}
-
-				if (var83 != null) {
-					for (var74 = 0; var74 < var49; ++var74) {
-						var83.drawTransBgAt(var74 * var23 + (var65 + var54 - var27), var66);
-					}
-				}
-
-				if (var85 != null) {
-					var85.drawTransBgAt(var65 + var56 - var29, var66);
-				}
-
-				var86.draw(var45, var65 + var55, var69, var95.textColor | 0xff000000, 0);
-				if (var81 == null) {
-					continue;
-				}
-				if (var30 != null) {
-					var30.drawTransBgAt(var57 + var65 - var38, var66);
-				}
-
-				if (var32 != null) {
-					var32.drawTransBgAt(var58 + var65 - var40, var66);
-				}
-
-				if (var31 != null) {
-					for (var74 = 0; var74 < var50; ++var74) {
-						var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66);
-					}
-				}
-
-				if (var33 != null) {
-					var33.drawTransBgAt(var60 + var65 - var41, var66);
-				}
-
-				var44.draw(var46, var61 + var65, var72, var81.textColor | 0xff000000, 0);
-			}
-		}
-
-	}
-
-	@ObfuscatedName("je")
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-1767057302"
-	)
-	@Export("saveTempMenuAction")
-	static void saveTempMenuAction(int var0) {
-		Client.tempMenuAction = new MenuAction();
-		Client.tempMenuAction.argument1 = Client.menuArguments1[var0];
-		Client.tempMenuAction.argument2 = Client.menuArguments2[var0];
-		Client.tempMenuAction.opcode = Client.menuOpcodes[var0];
-		Client.tempMenuAction.argument0 = Client.menuIdentifiers[var0];
-		Client.tempMenuAction.action = Client.menuActions[var0];
 	}
 }

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

@@ -4,40 +4,32 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kt")
+@ObfuscatedName("ka")
 @Implements("DefaultsGroup")
 public class DefaultsGroup {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lkt;"
+		signature = "Lka;"
 	)
-	static final DefaultsGroup field3821;
+	static final DefaultsGroup field3794;
-	@ObfuscatedName("go")
+	@ObfuscatedName("gs")
-	@ObfuscatedGetter(
+	@ObfuscatedSignature(
-		intValue = -909445377
+		signature = "[Lls;"
 	)
-	static int field3819;
+	@Export("crossSprites")
-	@ObfuscatedName("w")
+	static Sprite[] crossSprites;
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1207021413
+		intValue = 879655985
 	)
 	@Export("group")
 	final int group;
 
 	static {
-		field3821 = new DefaultsGroup(3);
+		field3794 = new DefaultsGroup(3);
 	}
 
 	DefaultsGroup(int var1) {
 		this.group = var1;
 	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(Lkf;B)Ljava/lang/String;",
-		garbageValue = "39"
-	)
-	public static String method5898(Buffer var0) {
-		return WorldMapIcon_0.method194(var0, 0x7fff);
-	}
 }

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("ed")
+@ObfuscatedName("es")
 @Implements("DemotingHashTable")
 public final class DemotingHashTable {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("remaining")
 	int remaining;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lla;"
+		signature = "Lln;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Ljk;"
+		signature = "Ljm;"
 	)
 	@Export("queue")
 	IterableDualNodeQueue queue;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lep;"
+		signature = "Lek;"
 	)
-	class146 field1966;
+	class146 field1944;
 
 	public DemotingHashTable(int var1, int var2) {
 		this.queue = new IterableDualNodeQueue();
@@ -42,45 +42,47 @@ public final class DemotingHashTable {
 		this.hashTable = new IterableNodeHashTable(var3);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("get")
 	public Object get(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		if (var3 == null) {
 			return null;
-		}
-		Object var4 = var3.get();
-		if (var4 == null) {
-			var3.remove();
-			var3.removeDual();
-			this.remaining += var3.size;
-			return null;
-		}
-		if (var3.isSoft()) {
-			DirectWrapper var5 = new DirectWrapper(var4, var3.size);
-			this.hashTable.put(var5, var3.key);
-			this.queue.add(var5);
-			var5.keyDual = 0L;
-			var3.remove();
-			var3.removeDual();
 		} else {
-			this.queue.add(var3);
+			Object var4 = var3.get();
-			var3.keyDual = 0L;
+			if (var4 == null) {
-		}
+				var3.remove();
+				var3.removeDual();
+				this.remaining += var3.size;
+				return null;
+			} else {
+				if (var3.isSoft()) {
+					DirectWrapper var5 = new DirectWrapper(var4, var3.size);
+					this.hashTable.put(var5, var3.key);
+					this.queue.add(var5);
+					var5.keyDual = 0L;
+					var3.remove();
+					var3.removeDual();
+				} else {
+					this.queue.add(var3);
+					var3.keyDual = 0L;
+				}
 
-		return var4;
+				return var4;
+			}
+		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("remove")
 	void remove(long var1) {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		this.removeWrapper(var3);
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lew;)V"
+		signature = "(Led;)V"
 	)
 	@Export("removeWrapper")
 	void removeWrapper(Wrapper var1) {
@@ -92,37 +94,38 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("put")
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
 			throw new IllegalStateException();
+		} else {
+			this.remove(var2);
+			this.remaining -= var4;
+
+			while (this.remaining < 0) {
+				Wrapper var5 = (Wrapper)this.queue.removeLast();
+				if (var5 == null) {
+					throw new RuntimeException("");
+				}
+
+				if (!var5.isSoft()) {
+				}
+
+				this.removeWrapper(var5);
+				if (this.field1944 != null) {
+					this.field1944.method3280(var5.get());
+				}
+			}
+
+			DirectWrapper var6 = new DirectWrapper(var1, var4);
+			this.hashTable.put(var6, var2);
+			this.queue.add(var6);
+			var6.keyDual = 0L;
 		}
-		this.remove(var2);
-		this.remaining -= var4;
-
-		while (this.remaining < 0) {
-			Wrapper var5 = (Wrapper)this.queue.removeLast();
-			if (var5 == null) {
-				throw new RuntimeException("");
-			}
-
-			if (!var5.isSoft()) {
-			}
-
-			this.removeWrapper(var5);
-			if (this.field1966 != null) {
-				this.field1966.method3338(var5.get());
-			}
-		}
-
-		DirectWrapper var6 = new DirectWrapper(var1, var4);
-		this.hashTable.put(var6, var2);
-		this.queue.add(var6);
-		var6.keyDual = 0L;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("demote")
 	public void demote(int var1) {
 		for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
@@ -143,7 +146,7 @@ public final class DemotingHashTable {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("clear")
 	public void clear() {
 		this.queue.clear();

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

@@ -5,38 +5,38 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lf")
+@ObfuscatedName("lk")
 @Implements("DesktopPlatformInfoProvider")
 public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 1888864715
-	)
-	int field3930;
 	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -1057820263
+		intValue = -1435561195
 	)
-	int field3928;
+	int field3903;
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1079401835
+		intValue = -1717280991
 	)
-	int field3926;
+	int field3901;
+	@ObfuscatedName("n")
+	@ObfuscatedGetter(
+		intValue = 1506800737
+	)
+	int field3904;
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)Llo;",
+		signature = "(I)Llx;",
-		garbageValue = "1619784372"
+		garbageValue = "-1719381077"
 	)
 	@Export("get")
 	public PlatformInfo get() {
 		byte var1;
-		if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("win")) {
+		if (ByteArrayPool.field3708.startsWith("win")) {
 			var1 = 1;
-		} else if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("mac")) {
+		} else if (ByteArrayPool.field3708.startsWith("mac")) {
 			var1 = 2;
-		} else if (GrandExchangeOfferOwnWorldComparator.operatingSystemLC.startsWith("linux")) {
+		} else if (ByteArrayPool.field3708.startsWith("linux")) {
 			var1 = 3;
 		} else {
 			var1 = 4;
@@ -134,11 +134,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 			var8 = 4;
 		}
 
-		this.method6258(var5);
+		this.method6147(var5);
 		Runtime.getRuntime();
 		int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
 		int var11;
-		if (this.field3930 > 3) {
+		if (this.field3903 > 3) {
 			var11 = Runtime.getRuntime().availableProcessors();
 		} else {
 			var11 = 0;
@@ -152,55 +152,127 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
 		String var17 = "";
 		String var18 = "";
 		int[] var23 = new int[3];
-		return new PlatformInfo(var1, var24, var7, var8, this.field3930, this.field3928, this.field3926, 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.field3903, this.field3901, this.field3904, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, "");
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-1874796410"
-	)
-	void method6258(String var1) {
-		if (var1.startsWith("1.")) {
-			this.method6260(var1);
-		} else {
-			this.method6261(var1);
-		}
-
-	}
-
-	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "93"
+		garbageValue = "28"
 	)
-	void method6260(String var1) {
+	void method6147(String var1) {
-		String[] var2 = var1.split("\\.");
+		if (var1.startsWith("1.")) {
-
+			this.method6148(var1);
-		try {
+		} else {
-			this.field3930 = Integer.parseInt(var2[1]);
+			this.method6145(var1);
-			var2 = var2[2].split("_");
-			this.field3928 = Integer.parseInt(var2[0]);
-			this.field3926 = Integer.parseInt(var2[1]);
-		} catch (Exception var4) {
 		}
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "-265029998"
+		garbageValue = "1225882646"
 	)
-	void method6261(String var1) {
+	void method6148(String var1) {
 		String[] var2 = var1.split("\\.");
 
 		try {
-			this.field3930 = Integer.parseInt(var2[0]);
+			this.field3903 = Integer.parseInt(var2[1]);
-			this.field3928 = Integer.parseInt(var2[1]);
+			var2 = var2[2].split("_");
-			this.field3926 = Integer.parseInt(var2[2]);
+			this.field3901 = Integer.parseInt(var2[0]);
+			this.field3904 = Integer.parseInt(var2[1]);
 		} catch (Exception var4) {
 		}
 
 	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;S)V",
+		garbageValue = "-31875"
+	)
+	void method6145(String var1) {
+		String[] var2 = var1.split("\\.");
+
+		try {
+			this.field3903 = Integer.parseInt(var2[0]);
+			this.field3901 = Integer.parseInt(var2[1]);
+			this.field3904 = Integer.parseInt(var2[2]);
+		} catch (Exception var4) {
+		}
+
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "([BS)Lcr;",
+		garbageValue = "10322"
+	)
+	@Export("newScript")
+	static Script newScript(byte[] var0) {
+		Script var1 = new Script();
+		Buffer var2 = new Buffer(var0);
+		var2.offset = var2.array.length - 2;
+		int var3 = var2.readUnsignedShort();
+		int var4 = var2.array.length - 2 - var3 - 12;
+		var2.offset = var4;
+		int var5 = var2.readInt();
+		var1.localIntCount = var2.readUnsignedShort();
+		var1.localStringCount = var2.readUnsignedShort();
+		var1.intArgumentCount = var2.readUnsignedShort();
+		var1.stringArgumentCount = var2.readUnsignedShort();
+		int var6 = var2.readUnsignedByte();
+		int var7;
+		int var8;
+		if (var6 > 0) {
+			var1.switches = var1.newIterableNodeHashTable(var6);
+
+			for (var7 = 0; var7 < var6; ++var7) {
+				var8 = var2.readUnsignedShort();
+				int var9;
+				int var11;
+				if (var8 > 0) {
+					var11 = var8 - 1;
+					var11 |= var11 >>> 1;
+					var11 |= var11 >>> 2;
+					var11 |= var11 >>> 4;
+					var11 |= var11 >>> 8;
+					var11 |= var11 >>> 16;
+					int var10 = var11 + 1;
+					var9 = var10;
+				} else {
+					var9 = 1;
+				}
+
+				IterableNodeHashTable var13 = new IterableNodeHashTable(var9);
+				var1.switches[var7] = var13;
+
+				while (var8-- > 0) {
+					var11 = var2.readInt();
+					int var12 = var2.readInt();
+					var13.put(new IntegerNode(var12), (long)var11);
+				}
+			}
+		}
+
+		var2.offset = 0;
+		var2.readStringCp1252NullTerminatedOrNull();
+		var1.opcodes = new int[var5];
+		var1.intOperands = new int[var5];
+		var1.stringOperands = new String[var5];
+
+		for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) {
+			var8 = var2.readUnsignedShort();
+			if (var8 == 3) {
+				var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
+			} else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+				var1.intOperands[var7] = var2.readInt();
+			} else {
+				var1.intOperands[var7] = var2.readUnsignedByte();
+			}
+		}
+
+		return var1;
+	}
 }

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

@@ -9,48 +9,48 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("af")
+@ObfuscatedName("aw")
 @Implements("DevicePcmPlayer")
 public class DevicePcmPlayer extends PcmPlayer {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("format")
 	AudioFormat format;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("line")
 	SourceDataLine line;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1783357217
+		intValue = 305940879
 	)
 	@Export("capacity2")
 	int capacity2;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("byteSamples")
 	byte[] byteSamples;
 
 	DevicePcmPlayer() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-1518489339"
+		garbageValue = "1"
 	)
 	@Export("init")
 	protected void init() {
-		this.format = new AudioFormat((float)CollisionMap.PcmPlayer_sampleRate, 16, FileSystem.PcmPlayer_stereo ? 2 : 1, true, false);
+		this.format = new AudioFormat((float)PcmPlayer.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false);
-		this.byteSamples = new byte[256 << (FileSystem.PcmPlayer_stereo ? 2 : 1)];
+		this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)];
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "2"
+		garbageValue = "1939802329"
 	)
 	@Export("open")
 	protected void open(int var1) throws LineUnavailableException {
 		try {
-			Info var2 = new Info(SourceDataLine.class, this.format, var1 << (FileSystem.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();
@@ -78,27 +78,27 @@ public class DevicePcmPlayer extends PcmPlayer {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "97"
+		garbageValue = "428413683"
 	)
 	@Export("position")
 	protected int position() {
-		return this.capacity2 - (this.line.available() >> (FileSystem.PcmPlayer_stereo ? 2 : 1));
+		return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1));
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("write")
 	protected void write() {
 		int var1 = 256;
-		if (FileSystem.PcmPlayer_stereo) {
+		if (PcmPlayer.PcmPlayer_stereo) {
 			var1 <<= 1;
 		}
 
 		for (int var2 = 0; var2 < var1; ++var2) {
 			int var3 = super.samples[var2];
-			if ((var3 + 8388608 & 0xff000000) != 0) {
+			if ((var3 + 8388608 & -16777216) != 0) {
 				var3 = 8388607 ^ var3 >> 31;
 			}
 
@@ -109,10 +109,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 		this.line.write(this.byteSamples, 0, var1 << 1);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(I)V",
-		garbageValue = "57"
+		garbageValue = "37766209"
 	)
 	@Export("close")
 	protected void close() {
@@ -123,10 +123,10 @@ public class DevicePcmPlayer extends PcmPlayer {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-313753219"
+		garbageValue = "645078569"
 	)
 	@Export("discard")
 	protected void discard() {

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

@@ -1,52 +1,56 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ak")
+@ObfuscatedName("ad")
 @Implements("DevicePcmPlayerProvider")
 public class DevicePcmPlayerProvider implements PcmPlayerProvider {
-	@ObfuscatedName("pf")
-	@ObfuscatedSignature(
-		signature = "Ljx;"
-	)
-	@Export("clanChat")
-	static ClanChat clanChat;
-	@ObfuscatedName("qn")
-	@ObfuscatedGetter(
-		intValue = 490221952
-	)
-	static int field412;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		longValue = 95792887242414313L
-	)
-	static long field416;
-	@ObfuscatedName("ci")
-	@Export("mouseCam")
-	static boolean mouseCam;
-
 	DevicePcmPlayerProvider() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(B)Ldn;",
+		signature = "(S)Ldd;",
-		garbageValue = "1"
+		garbageValue = "-22145"
 	)
 	@Export("player")
 	public PcmPlayer player() {
 		return new DevicePcmPlayer();
 	}
 
-	@ObfuscatedName("kn")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(B)V",
+		signature = "(IIB)Z",
-		garbageValue = "-5"
+		garbageValue = "1"
 	)
-	static void method805() {
+	static boolean method794(int var0, int var1) {
-		Client.packetWriter.addNode(Archive.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher));
+		return var0 != 4 || var1 < 8;
-		Client.oculusOrbState = 0;
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		signature = "(II)V",
+		garbageValue = "895453465"
+	)
+	public static void method793(int var0) {
+		class197.field2378 = 1;
+		WorldMapDecoration.musicTrackArchive = null;
+		class197.musicTrackGroupId = -1;
+		class197.musicTrackFileId = -1;
+		WorldMapSprite.field222 = 0;
+		Varcs.musicTrackBoolean = false;
+		class16.field98 = var0;
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(I)Lbl;",
+		garbageValue = "-1981262323"
+	)
+	@Export("worldListStart")
+	static World worldListStart() {
+		World.World_listCount = 0;
+		return GrandExchangeOfferAgeComparator.getNextWorldListWorld();
 	}
 }

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

@@ -4,26 +4,20 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("gn")
+@ObfuscatedName("gb")
 @Implements("DirectByteArrayCopier")
 public class DirectByteArrayCopier extends AbstractByteArrayCopier {
-	@ObfuscatedName("u")
+	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "Lhp;"
-	)
-	@Export("Widget_fontsArchive")
-	static AbstractArchive Widget_fontsArchive;
-	@ObfuscatedName("gh")
-	@Export("regions")
-	static int[] regions;
-	@ObfuscatedName("q")
 	@Export("directBuffer")
 	ByteBuffer directBuffer;
 
-	@ObfuscatedName("e")
+	DirectByteArrayCopier() {
+	}
+
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
 		signature = "(I)[B",
-		garbageValue = "1071129091"
+		garbageValue = "-1040345200"
 	)
 	@Export("get")
 	byte[] get() {
@@ -33,116 +27,35 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
 		return var1;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "([BI)V",
-		garbageValue = "594076777"
+		garbageValue = "38240743"
 	)
 	@Export("set")
-	public void set(byte[] var1) {
+	void set(byte[] var1) {
 		this.directBuffer = ByteBuffer.allocateDirect(var1.length);
 		this.directBuffer.position(0);
 		this.directBuffer.put(var1);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)J",
+		signature = "(ILjava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-960689616"
+		garbageValue = "2110102488"
 	)
-	@Export("currentTimeMs")
+	@Export("addGameMessage")
-	public static final synchronized long currentTimeMs() {
+	static void addGameMessage(int var0, String var1, String var2) {
-		long var0 = System.currentTimeMillis();
+		MilliClock.addChatMessage(var0, var1, var2, (String)null);
-		if (var0 < DevicePcmPlayerProvider.field416) {
-			class2.field4 += DevicePcmPlayerProvider.field416 - var0;
-		}
-
-		DevicePcmPlayerProvider.field416 = var0;
-		return class2.field4 + var0;
 	}
 
-	@ObfuscatedName("gz")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IIIIIIII)V",
+		signature = "(II)Z",
-		garbageValue = "1456819139"
+		garbageValue = "470994563"
 	)
-	@Export("addPendingSpawnToScene")
+	@Export("isWorldMapEvent")
-	static final void addPendingSpawnToScene(int plane, int type, int x, int y, int id, int orientation, int var6) {
+	public static boolean isWorldMapEvent(int var0) {
-		if (x < 1 || y < 1 || x > 102 || y > 102) {
+		return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17;
-			return;
-		}
-		if (Client.isLowDetail && plane != class42.plane) {
-			return;
-		}
-
-		long var7 = 0L;
-		boolean var9 = true;
-		boolean var10 = false;
-		boolean var11 = false;
-		if (type == 0) {
-			var7 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(plane, x, y);
-		}
-
-		if (type == 1) {
-			var7 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(plane, x, y);
-		}
-
-		if (type == 2) {
-			var7 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(plane, x, y);
-		}
-
-		if (type == 3) {
-			var7 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(plane, x, y);
-		}
-
-		int var12;
-		if (0L != var7) {
-			var12 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(plane, x, y, var7);
-			int var14 = class43.Entity_unpackID(var7);
-			int var15 = var12 & 31;
-			int var16 = var12 >> 6 & 3;
-			ObjectDefinition var13;
-			if (type == 0) {
-				GrandExchangeOfferWorldComparator.scene.removeBoundaryObject(plane, x, y);
-				var13 = ViewportMouse.getObjectDefinition(var14);
-				if (var13.interactType != 0) {
-					Client.collisionMaps[plane].method3564(x, y, var15, var16, var13.boolean1);
-				}
-			}
-
-			if (type == 1) {
-				GrandExchangeOfferWorldComparator.scene.removeWallDecoration(plane, x, y);
-			}
-
-			if (type == 2) {
-				GrandExchangeOfferWorldComparator.scene.removeGameObject(plane, x, y);
-				var13 = ViewportMouse.getObjectDefinition(var14);
-				if (x + var13.sizeX > 103 || y + var13.sizeX > 103 || x + var13.sizeY > 103 || y + var13.sizeY > 103) {
-					return;
-				}
-
-				if (var13.interactType != 0) {
-					Client.collisionMaps[plane].setFlagOffNonSquare(x, y, var13.sizeX, var13.sizeY, var16, var13.boolean1);
-				}
-			}
-
-			if (type == 3) {
-				GrandExchangeOfferWorldComparator.scene.removeFloorDecoration(plane, x, y);
-				var13 = ViewportMouse.getObjectDefinition(var14);
-				if (var13.interactType == 1) {
-					Client.collisionMaps[plane].method3567(x, y);
-				}
-			}
-		}
-
-		if (id >= 0) {
-			var12 = plane;
-			if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) {
-				var12 = plane + 1;
-			}
-
-			ClientPacket.addPendingGameObject(plane, var12, x, y, id, orientation, var6, GrandExchangeOfferWorldComparator.scene, Client.collisionMaps[plane]);
-		}
-
 	}
 }

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("eq")
+@ObfuscatedName("et")
 @Implements("DirectWrapper")
 public class DirectWrapper extends Wrapper {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("obj")
 	Object obj;
 
@@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper {
 		this.obj = var1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("get")
 	Object get() {
 		return this.obj;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@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("fb")
+@ObfuscatedName("fe")
 @Implements("DualNode")
 public class DualNode extends Node {
-	@ObfuscatedName("cx")
+	@ObfuscatedName("cr")
 	@Export("keyDual")
 	public long keyDual;
-	@ObfuscatedName("cu")
+	@ObfuscatedName("cl")
 	@ObfuscatedSignature(
-		signature = "Lfb;"
+		signature = "Lfe;"
 	)
 	@Export("previousDual")
 	public DualNode previousDual;
-	@ObfuscatedName("cs")
+	@ObfuscatedName("cg")
 	@ObfuscatedSignature(
-		signature = "Lfb;"
+		signature = "Lfe;"
 	)
 	@Export("nextDual")
 	public DualNode nextDual;
 
-	@ObfuscatedName("cm")
+	@ObfuscatedName("cl")
 	@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("ix")
+@ObfuscatedName("ih")
 @Implements("DualNodeDeque")
 public final class DualNodeDeque {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lfb;"
+		signature = "Lfe;"
 	)
 	@Export("sentinel")
 	DualNode sentinel;
@@ -19,9 +19,9 @@ public final class DualNodeDeque {
 		this.sentinel.nextDual = this.sentinel;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Lfb;)V"
+		signature = "(Lfe;)V"
 	)
 	@Export("addFirst")
 	public void addFirst(DualNode var1) {
@@ -35,9 +35,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lfb;)V"
+		signature = "(Lfe;)V"
 	)
 	@Export("addLast")
 	public void addLast(DualNode var1) {
@@ -51,9 +51,9 @@ public final class DualNodeDeque {
 		var1.previousDual.nextDual = var1;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "()Lfb;"
+		signature = "()Lfe;"
 	)
 	@Export("removeLast")
 	public DualNode removeLast() {

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

@@ -1,73 +1,77 @@
-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("cu")
+@ObfuscatedName("cl")
 @Implements("DynamicObject")
 public class DynamicObject extends Entity {
-	@ObfuscatedName("x")
+	@ObfuscatedName("at")
-	@Export("Tiles_hueMultiplier")
+	static String field1268;
-	static int[] Tiles_hueMultiplier;
+	@ObfuscatedName("ha")
-	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -982722193
+		intValue = -775717141
+	)
+	@Export("oculusOrbFocalPointX")
+	static int oculusOrbFocalPointX;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -760390045
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1770938715
+		intValue = -980932459
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 187564889
+		intValue = -400059677
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 618802147
+		intValue = 1290123367
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 490427017
+		intValue = -508815789
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 660251733
+		intValue = -490638225
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lis;"
+		signature = "Lij;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1570424885
+		intValue = 156262843
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1283893717
+		intValue = 1843823299
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		signature = "(IIIIIIIZLeo;)V"
+		signature = "(IIIIIIIZLen;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
 		this.id = var1;
@@ -76,32 +80,31 @@ public class DynamicObject extends Entity {
 		this.plane = var4;
 		this.x = var5;
 		this.y = var6;
-		if (var7 == -1) {
+		if (var7 != -1) {
-			return;
+			this.sequenceDefinition = Widget.SequenceDefinition_get(var7);
-		}
+			this.frame = 0;
-		this.sequenceDefinition = GrandExchangeEvent.SequenceDefinition_get(var7);
+			this.cycleStart = Client.cycle - 1;
-		this.frame = 0;
+			if (this.sequenceDefinition.field3492 == 0 && var9 != null && var9 instanceof DynamicObject) {
-		this.cycleStart = Client.cycle - 1;
+				DynamicObject var10 = (DynamicObject)var9;
-		if (this.sequenceDefinition.field3529 == 0 && var9 != null && var9 instanceof DynamicObject) {
+				if (this.sequenceDefinition == var10.sequenceDefinition) {
-			DynamicObject var10 = (DynamicObject)var9;
+					this.frame = var10.frame;
-			if (var10.sequenceDefinition == this.sequenceDefinition) {
+					this.cycleStart = var10.cycleStart;
-				this.frame = var10.frame;
+					return;
-				this.cycleStart = var10.cycleStart;
+				}
-				return;
 			}
-		}
 
-		if (var8 && this.sequenceDefinition.frameCount != -1) {
+			if (var8 && this.sequenceDefinition.frameCount != -1) {
-			this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length);
+				this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length);
-			this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]);
+				this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]);
+			}
 		}
 
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Ldm;",
+		signature = "(I)Ldo;",
-		garbageValue = "759381421"
+		garbageValue = "-419920513"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -111,11 +114,11 @@ public class DynamicObject extends Entity {
 				var1 = 100;
 			}
 
-			label56: {
+			label55: {
 				do {
 					do {
 						if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-							break label56;
+							break label55;
 						}
 
 						var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -131,177 +134,132 @@ public class DynamicObject extends Entity {
 			this.cycleStart = Client.cycle - var1;
 		}
 
-		ObjectDefinition var12 = ViewportMouse.getObjectDefinition(this.id);
+		ObjectDefinition var12 = class215.getObjectDefinition(this.id);
 		if (var12.transforms != null) {
 			var12 = var12.transform();
 		}
 
 		if (var12 == null) {
 			return null;
-		}
-		int var2;
-		int var3;
-		if (this.orientation != 1 && this.orientation != 3) {
-			var2 = var12.sizeX;
-			var3 = var12.sizeY;
 		} else {
-			var2 = var12.sizeY;
+			int var2;
-			var3 = var12.sizeX;
+			int var3;
-		}
+			if (this.orientation != 1 && this.orientation != 3) {
+				var2 = var12.sizeX;
+				var3 = var12.sizeY;
+			} else {
+				var2 = var12.sizeY;
+				var3 = var12.sizeX;
+			}
 
-		int var4 = (var2 >> 1) + this.x;
+			int var4 = (var2 >> 1) + this.x;
-		int var5 = (var2 + 1 >> 1) + this.x;
+			int var5 = (var2 + 1 >> 1) + this.x;
-		int var6 = (var3 >> 1) + this.y;
+			int var6 = (var3 >> 1) + this.y;
-		int var7 = (var3 + 1 >> 1) + this.y;
+			int var7 = (var3 + 1 >> 1) + this.y;
-		int[][] var8 = Tiles.Tiles_heights[this.plane];
+			int[][] var8 = Tiles.Tiles_heights[this.plane];
-		int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
+			int var9 = var8[var5][var6] + var8[var4][var6] + var8[var4][var7] + var8[var5][var7] >> 2;
-		int var10 = (this.x << 7) + (var2 << 6);
+			int var10 = (this.x << 7) + (var2 << 6);
-		int var11 = (this.y << 7) + (var3 << 6);
+			int var11 = (this.y << 7) + (var3 << 6);
-		return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
+			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
+		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Lky;ZS)V",
+		signature = "(Lky;Lln;I)Lln;",
-		garbageValue = "-31468"
+		garbageValue = "796089456"
 	)
-	@Export("NetCache_connect")
+	@Export("readStringIntParameters")
-	public static void NetCache_connect(AbstractSocket var0, boolean var1) {
+	static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
-		if (NetCache.NetCache_socket != null) {
+		int var2 = var0.readUnsignedByte();
-			try {
+		int var3;
-				NetCache.NetCache_socket.close();
+		if (var1 == null) {
-			} catch (Exception var8) {
+			int var4 = var2 - 1;
-			}
+			var4 |= var4 >>> 1;
-
+			var4 |= var4 >>> 2;
-			NetCache.NetCache_socket = null;
+			var4 |= var4 >>> 4;
+			var4 |= var4 >>> 8;
+			var4 |= var4 >>> 16;
+			var3 = var4 + 1;
+			var1 = new IterableNodeHashTable(var3);
 		}
 
-		NetCache.NetCache_socket = var0;
+		for (var3 = 0; var3 < var2; ++var3) {
-		Buffer var2;
+			boolean var7 = var0.readUnsignedByte() == 1;
-		if (NetCache.NetCache_socket != null) {
+			int var5 = var0.readMedium();
-			try {
+			Object var6;
-				var2 = new Buffer(4);
+			if (var7) {
-				var2.writeByte(var1 ? 2 : 3);
+				var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
-				var2.writeMedium(0);
+			} else {
-				NetCache.NetCache_socket.write(var2.array, 0, 4);
+				var6 = new IntegerNode(var0.readInt());
-			} catch (IOException var7) {
-				try {
-					NetCache.NetCache_socket.close();
-				} catch (Exception var6) {
-				}
-
-				++NetCache.NetCache_ioExceptions;
-				NetCache.NetCache_socket = null;
 			}
+
+			var1.put((Node)var6, (long)var5);
 		}
 
-		NetCache.NetCache_responseHeaderBuffer.offset = 0;
+		return var1;
-		class226.NetCache_currentResponse = null;
-		VarpDefinition.NetCache_responseArchiveBuffer = null;
-		NetCache.field3175 = 0;
-
-		while (true) {
-			NetFileRequest var9 = (NetFileRequest) NetCache.NetCache_pendingPriorityResponses.first();
-			if (var9 == null) {
-				break;
-			}
-			NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key);
-			++NetCache.NetCache_pendingPriorityWritesCount;
-			--NetCache.NetCache_pendingPriorityResponsesCount;
-		}
-
-		while (true) {
-			NetFileRequest var9 = (NetFileRequest) NetCache.NetCache_pendingResponses.first();
-			if (var9 == null) {
-				break;
-			}
-			NetCache.NetCache_pendingWritesQueue.addLast(var9);
-			NetCache.NetCache_pendingWrites.put(var9, var9.key);
-			++NetCache.NetCache_pendingWritesCount;
-			--NetCache.NetCache_pendingResponsesCount;
-		}
-
-		if (NetCache.field3181 != 0) {
-			try {
-				var2 = new Buffer(4);
-				var2.writeByte(4);
-				var2.writeByte(NetCache.field3181);
-				var2.writeShort(0);
-				NetCache.NetCache_socket.write(var2.array, 0, 4);
-			} catch (IOException var5) {
-				try {
-					NetCache.NetCache_socket.close();
-				} catch (Exception var4) {
-				}
-
-				++NetCache.NetCache_ioExceptions;
-				NetCache.NetCache_socket = null;
-			}
-		}
-		NetCache.NetCache_loadTime = 0;
-		NetCache.NetCache_timeMs = DirectByteArrayCopier.currentTimeMs();
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lbw;Lbw;IZB)I",
+		signature = "(I)V",
-		garbageValue = "24"
+		garbageValue = "-513328656"
 	)
-	@Export("compareWorlds")
+	static void method2153() {
-	static int compareWorlds(World var0, World var1, int var2, boolean var3) {
+		if (Login.field1146) {
-		if (var2 == 1) {
+			Login.titleboxSprite = null;
-			int var4 = var0.population;
+			Login.titlebuttonSprite = null;
-			int var5 = var1.population;
+			ItemDefinition.runesSprite = null;
-			if (!var3) {
+			Login.leftTitleSprite = null;
-				if (var4 == -1) {
+			Login.rightTitleSprite = null;
-					var4 = 2001;
+			class51.logoSprite = null;
-				}
+			BoundaryObject.title_muteSprite = null;
-
+			Login.options_buttons_0Sprite = null;
-				if (var5 == -1) {
+			Login.options_buttons_2Sprite = null;
-					var5 = 2001;
+			SoundCache.worldSelectBackSprites = null;
-				}
+			class1.worldSelectFlagSprites = null;
-			}
+			Decimator.worldSelectArrows = null;
-
+			NetFileRequest.worldSelectStars = null;
-			return var4 - var5;
+			class195.field2368 = null;
+			Bounds.loginScreenRunesAnimation.method1731();
+			DevicePcmPlayerProvider.method793(2);
+			NPC.method1977(true);
+			Login.field1146 = false;
 		}
-		if (var2 == 2) {
-			return var0.location - var1.location;
-		}
-		if (var2 == 3) {
-			if (var0.activity.equals("-")) {
-				if (var1.activity.equals("-")) {
-					return 0;
-				}
-				return var3 ? -1 : 1;
-			}
-			if (var1.activity.equals("-")) {
-				return var3 ? 1 : -1;
-			}
-			return var0.activity.compareTo(var1.activity);
-		}
-		if (var2 == 4) {
-			return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0);
-		}
-		if (var2 == 5) {
-			return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0);
-		}
-		if (var2 == 6) {
-			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
-		}
-		if (var2 == 7) {
-			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
-		}
-		return var0.id - var1.id;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("jz")
 	@ObfuscatedSignature(
-		signature = "(I)Lbw;",
+		signature = "(Lhp;Liu;IIZB)V",
-		garbageValue = "-1381660129"
+		garbageValue = "41"
 	)
-	@Export("worldListStart")
+	@Export("addWidgetItemMenuItem")
-	static World worldListStart() {
+	static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) {
-		World.World_listCount = 0;
+		String[] var5 = var1.inventoryActions;
-		return Canvas.getNextWorldListWorld();
+		byte var6 = -1;
+		String var7 = null;
+		if (var5 != null && var5[var3] != null) {
+			if (var3 == 0) {
+				var6 = 33;
+			} else if (var3 == 1) {
+				var6 = 34;
+			} else if (var3 == 2) {
+				var6 = 35;
+			} else if (var3 == 3) {
+				var6 = 36;
+			} else {
+				var6 = 37;
+			}
+
+			var7 = var5[var3];
+		} else if (var3 == 4) {
+			var6 = 37;
+			var7 = "Drop";
+		}
+
+		if (var6 != -1 && var7 != null) {
+			NetCache.insertMenuItem(var7, class16.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4);
+		}
+
 	}
 }

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

@@ -3,24 +3,14 @@ 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("eo")
+@ObfuscatedName("en")
 @Implements("Entity")
 public abstract class Entity extends DualNode {
-	@ObfuscatedName("ev")
+	@ObfuscatedName("cn")
-	@ObfuscatedSignature(
-		signature = "Liu;"
-	)
-	@Export("archive20")
-	static Archive archive20;
-	@ObfuscatedName("fz")
 	@ObfuscatedGetter(
-		longValue = -4807383784337722267L
+		intValue = 747190067
-	)
-	static long field1872;
-	@ObfuscatedName("cb")
-	@ObfuscatedGetter(
-		intValue = -1527077961
 	)
 	@Export("height")
 	public int height;
@@ -29,17 +19,17 @@ public abstract class Entity extends DualNode {
 		this.height = 1000;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Ldm;",
+		signature = "(I)Ldo;",
-		garbageValue = "759381421"
+		garbageValue = "-419920513"
 	)
 	@Export("getModel")
 	protected Model getModel() {
 		return null;
 	}
 
-	@ObfuscatedName("ct")
+	@ObfuscatedName("cm")
 	@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();
@@ -50,27 +40,62 @@ public abstract class Entity extends DualNode {
 
 	}
 
-	@ObfuscatedName("hn")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V",
+		signature = "([BZB)Ljava/lang/Object;",
-		garbageValue = "-224975698"
+		garbageValue = "42"
 	)
-	@Export("insertMenuItem")
+	public static Object method3209(byte[] var0, boolean var1) {
-	static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
+		if (var0 == null) {
-		if (Client.isMenuOpen) {
+			return null;
-			return;
+		} else if (var0.length > 136) {
+			DirectByteArrayCopier var2 = new DirectByteArrayCopier();
+			var2.set(var0);
+			return var2;
+		} else {
+			return var0;
 		}
-		if (Client.menuOptionsCount >= 500) {
+	}
-			return;
-		}
-		Client.menuActions[Client.menuOptionsCount] = var0;
-		Client.menuTargets[Client.menuOptionsCount] = var1;
-		Client.menuOpcodes[Client.menuOptionsCount] = var2;
-		Client.menuIdentifiers[Client.menuOptionsCount] = var3;
-		Client.menuArguments1[Client.menuOptionsCount] = var4;
-		Client.menuArguments2[Client.menuOptionsCount] = var5;
-		Client.menuShiftClick[Client.menuOptionsCount] = var6;
-		++Client.menuOptionsCount;
 
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(DDII)[D",
+		garbageValue = "-361048020"
+	)
+	public static double[] method3211(double var0, double var2, int var4) {
+		int var5 = var4 * 2 + 1;
+		double[] var6 = new double[var5];
+		int var7 = -var4;
+
+		for (int var8 = 0; var7 <= var4; ++var8) {
+			var6[var8] = class195.method3623((double)var7, var0, var2);
+			++var7;
+		}
+
+		return var6;
+	}
+
+	@ObfuscatedName("ak")
+	@ObfuscatedSignature(
+		signature = "(ILcr;ZI)I",
+		garbageValue = "-1173626349"
+	)
+	static int method3210(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.LOGOUT) {
+			Client.logoutTimer = 250;
+			return 1;
+		} else {
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("gd")
+	@ObfuscatedSignature(
+		signature = "(Lbu;II)V",
+		garbageValue = "558636836"
+	)
+	@Export("getActorScreenLocation")
+	static final void getActorScreenLocation(Actor var0, int var1) {
+		WorldMapAreaData.worldToScreen(var0.x, var0.y, var1);
 	}
 }

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

@@ -3,56 +3,50 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("iv")
+@ObfuscatedName("ir")
 @Implements("EnumDefinition")
 public class EnumDefinition extends DualNode {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("EnumDefinition_archive")
 	public static AbstractArchive EnumDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
 	)
 	@Export("EnumDefinition_cached")
 	static EvictingDualNodeHashTable EnumDefinition_cached;
-	@ObfuscatedName("ez")
+	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -1722936721
-	)
-	static int field3324;
-	@ObfuscatedName("e")
 	@Export("inputType")
 	public char inputType;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("outputType")
 	public char outputType;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("defaultStr")
 	public String defaultStr;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1879425987
+		intValue = -1123521351
 	)
 	@Export("defaultInt")
 	public int defaultInt;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -1202748617
+		intValue = 1569400369
 	)
 	@Export("outputCount")
 	public int outputCount;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@Export("keys")
 	public int[] keys;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("intVals")
 	public int[] intVals;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("strVals")
 	public String[] strVals;
 
@@ -65,10 +59,10 @@ public class EnumDefinition extends DualNode {
 		this.outputCount = 0;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkf;B)V",
+		signature = "(Lky;I)V",
-		garbageValue = "49"
+		garbageValue = "-339661207"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -82,10 +76,10 @@ public class EnumDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;IB)V",
+		signature = "(Lky;II)V",
-		garbageValue = "19"
+		garbageValue = "-1462723166"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -122,198 +116,13 @@ public class EnumDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(B)I",
-		garbageValue = "-54"
+		garbageValue = "0"
 	)
 	@Export("size")
 	public int size() {
 		return this.outputCount;
 	}
-
-	@ObfuscatedName("q")
-	@Export("sleepMillis")
-	public static final void sleepMillis(long var0) {
-		if (var0 <= 0L) {
-			return;
-		}
-		if (0L != var0 % 10L) {
-			try {
-				Thread.sleep(var0);
-			} catch (InterruptedException var6) {
-			}
-			return;
-		}
-		long var2 = var0 - 1L;
-
-		try {
-			Thread.sleep(var2);
-		} catch (InterruptedException var8) {
-		}
-
-		try {
-			Thread.sleep(1L);
-		} catch (InterruptedException var7) {
-		}
-
-	}
-
-	@ObfuscatedName("ar")
-	@ObfuscatedSignature(
-		signature = "(ILcx;ZI)I",
-		garbageValue = "-2052329100"
-	)
-	static int method4532(int var0, Script var1, boolean var2) {
-		int var3;
-		int var4;
-		if (var0 == ScriptOpcodes.ADD) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4 + var3;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.SUB) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 - var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.MULTIPLY) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 * var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.DIV) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 / var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.RANDOM) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.RANDOMINC) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.INTERPOLATE) {
-			HealthBarUpdate.Interpreter_intStackSize -= 5;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
-			int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3];
-			int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.ADDPERCENT) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.SETBIT) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | 1 << var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CLEARBIT) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TESTBIT) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.MOD) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 % var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.POW) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.INVPOW) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			if (var3 == 0) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				return 1;
-			}
-			switch(var4) {
-				case 0:
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
-					break;
-				case 1:
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
-					break;
-				case 2:
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
-					break;
-				case 3:
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
-					break;
-				case 4:
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
-					break;
-				default:
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
-				}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.AND) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OR) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | var4;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.SCALE) {
-			HealthBarUpdate.Interpreter_intStackSize -= 3;
-			long var9 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			long var11 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			long var13 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
-			return 1;
-		}
-		return 2;
-	}
 }

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("go")
+@ObfuscatedName("gn")
 @Implements("Enumerated")
 public interface Enumerated {
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "320353268"
+		garbageValue = "-32"
 	)
 	@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("el")
+@ObfuscatedName("ep")
 @Implements("EvictingDualNodeHashTable")
 public final class EvictingDualNodeHashTable {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lfb;"
+		signature = "Lfe;"
 	)
-	DualNode field1959;
+	DualNode field1935;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("capacity")
 	int capacity;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("remainingCapacity")
 	int remainingCapacity;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lla;"
+		signature = "Lln;"
 	)
 	@Export("hashTable")
 	IterableNodeHashTable hashTable;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ljk;"
+		signature = "Ljm;"
 	)
 	@Export("deque")
 	IterableDualNodeQueue deque;
 
 	public EvictingDualNodeHashTable(int var1) {
-		this.field1959 = new DualNode();
+		this.field1935 = 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("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(J)Lfb;"
+		signature = "(J)Lfe;"
 	)
 	@Export("get")
 	public DualNode get(long var1) {
@@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable {
 		return var3;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("remove")
 	public void remove(long var1) {
 		DualNode var3 = (DualNode)this.hashTable.get(var1);
@@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable {
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lfb;J)V"
+		signature = "(Lfe;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.field1959) {
+			if (var4 == this.field1935) {
 				var4 = this.deque.removeLast();
 				var4.remove();
 				var4.removeDual();
@@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable {
 		this.deque.add(var1);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("clear")
 	public void clear() {
 		this.deque.clear();
 		this.hashTable.clear();
-		this.field1959 = new DualNode();
+		this.field1935 = new DualNode();
 		this.remainingCapacity = this.capacity;
 	}
 }

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

@@ -4,26 +4,27 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("en")
+@ObfuscatedName("ei")
 @Implements("FaceNormal")
 public class FaceNormal {
-	@ObfuscatedName("v")
+	@ObfuscatedName("x")
-	static int[][][] field1887;
+	@Export("ByteArrayPool_arrays")
-	@ObfuscatedName("q")
+	public static byte[][][] ByteArrayPool_arrays;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 2130535467
+		intValue = 672881507
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 522108407
+		intValue = -1754026933
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1566565487
+		intValue = -2141931209
 	)
 	@Export("z")
 	int z;
@@ -31,190 +32,75 @@ public class FaceNormal {
 	FaceNormal() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)[Ljj;",
+		signature = "(CB)Z",
-		garbageValue = "1137342160"
+		garbageValue = "-36"
 	)
-	@Export("ClientParameter_values")
+	static final boolean method3222(char var0) {
-	public static ClientParameter[] ClientParameter_values() {
+		return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-';
-		return new ClientParameter[]{ClientParameter.field3593, ClientParameter.field3589, ClientParameter.field3594, ClientParameter.field3591, ClientParameter.field3600, ClientParameter.field3599, ClientParameter.field3592, ClientParameter.field3595, ClientParameter.field3585, ClientParameter.field3587, ClientParameter.field3582, ClientParameter.field3586, ClientParameter.field3581, ClientParameter.field3598, ClientParameter.field3590, ClientParameter.field3588, ClientParameter.field3584, ClientParameter.field3596, ClientParameter.field3583};
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;B)V",
+		signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
-		garbageValue = "-92"
+		garbageValue = "1"
 	)
-	@Export("NpcDefinition_setArchives")
+	@Export("base37Decode")
-	public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
+	public static String base37Decode(CharSequence var0) {
-		NPCDefinition.NpcDefinition_archive = var0;
+		long var3 = 0L;
-		NPCDefinition.NpcDefinition_modelArchive = var1;
+		int var5 = var0.length();
-	}
 
-	@ObfuscatedName("k")
+		for (int var6 = 0; var6 < var5; ++var6) {
-	@ObfuscatedSignature(
+			var3 *= 37L;
-		signature = "(ZI)V",
+			char var7 = var0.charAt(var6);
-		garbageValue = "-545171198"
+			if (var7 >= 'A' && var7 <= 'Z') {
-	)
+				var3 += (long)(var7 + 1 - 65);
-	static void method3266(boolean var0) {
+			} else if (var7 >= 'a' && var7 <= 'z') {
-		Login.Login_response1 = "";
+				var3 += (long)(var7 + 1 - 97);
-		Login.Login_response2 = "Enter your username/email & password.";
+			} else if (var7 >= '0' && var7 <= '9') {
-		Login.Login_response3 = "";
+				var3 += (long)(var7 + 27 - 48);
-		Login.loginIndex = 2;
+			}
-		if (var0) {
+
-			Login.Login_password = "";
+			if (var3 >= 177917621779460413L) {
+				break;
+			}
 		}
 
-		class49.method815();
+		while (0L == var3 % 37L && var3 != 0L) {
-		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+			var3 /= 37L;
-			Login.currentLoginField = 1;
+		}
+
+		String var8 = class266.base37DecodeLong(var3);
+		if (var8 == null) {
+			var8 = "";
+		}
+
+		return var8;
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		signature = "(IB)I",
+		garbageValue = "105"
+	)
+	@Export("Messages_getNextChatID")
+	static int Messages_getNextChatID(int var0) {
+		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
+		if (var1 == null) {
+			return -1;
 		} else {
-			Login.currentLoginField = 0;
+			return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count;
 		}
-
 	}
 
-	@ObfuscatedName("eh")
+	@ObfuscatedName("kb")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1702335616"
+		garbageValue = "1280047556"
 	)
-	static void method3264() {
+	static final void method3221() {
-		Client.mouseLastLastPressedTimeMillis = 1L;
+		Client.field817 = Client.cycleCntr;
-		class40.mouseRecorder.index = 0;
+		class13.ClanChat_inClanChat = true;
-		class267.hasFocus = true;
-		Client.hadFocus = true;
-		Client.field879 = -1L;
-		class192.initReflectionChecksDeque();
-		Client.packetWriter.clearBuffer();
-		Client.packetWriter.packetBuffer.offset = 0;
-		Client.packetWriter.serverPacket = null;
-		Client.packetWriter.field1309 = null;
-		Client.packetWriter.field1321 = null;
-		Client.packetWriter.field1317 = null;
-		Client.packetWriter.serverPacketLength = 0;
-		Client.packetWriter.field1318 = 0;
-		Client.rebootTimer = 0;
-		Client.logoutTimer = 0;
-		Client.hintArrowType = 0;
-		Strings.resetMenuEntries();
-		MouseHandler.MouseHandler_idleCycles = 0;
-		Messages.Messages_channels.clear();
-		Messages.Messages_hashTable.clear();
-		Messages.Messages_queue.clear();
-		Messages.Messages_count = 0;
-		Client.isItemSelected = 0;
-		Client.isSpellSelected = false;
-		Client.soundEffectCount = 0;
-		Client.camAngleY = 0;
-		Client.oculusOrbState = 0;
-		PendingSpawn.field944 = null;
-		Client.minimapState = 0;
-		Client.field747 = -1;
-		Client.destinationX = 0;
-		Client.destinationY = 0;
-		Client.playerAttackOption = AttackOption.AttackOption_hidden;
-		Client.npcAttackOption = AttackOption.AttackOption_hidden;
-		Client.npcCount = 0;
-		Players.Players_count = 0;
-
-		int var0;
-		for (var0 = 0; var0 < 2048; ++var0) {
-			Players.field1254[var0] = null;
-			Players.field1250[var0] = 1;
-		}
-
-		for (var0 = 0; var0 < 2048; ++var0) {
-			Client.players[var0] = null;
-		}
-
-		for (var0 = 0; var0 < 32768; ++var0) {
-			Client.npcs[var0] = null;
-		}
-
-		Client.combatTargetPlayerIndex = -1;
-		Client.projectiles.clear();
-		Client.graphicsObjects.clear();
-
-		int var2;
-		for (var0 = 0; var0 < 4; ++var0) {
-			for (int var1 = 0; var1 < 104; ++var1) {
-				for (var2 = 0; var2 < 104; ++var2) {
-					Client.groundItems[var0][var1][var2] = null;
-				}
-			}
-		}
-
-		Client.pendingSpawns = new NodeDeque();
-		ArchiveLoader.friendSystem.clear();
-
-		for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) {
-			VarpDefinition var3 = GrandExchangeOfferWorldComparator.method61(var0);
-			if (var3 != null) {
-				Varps.Varps_temp[var0] = 0;
-				Varps.Varps_main[var0] = 0;
-			}
-		}
-
-		Clock.varcs.clearTransient();
-		Client.followerIndex = -1;
-		if (Client.rootInterface != -1) {
-			var0 = Client.rootInterface;
-			if (var0 != -1 && ViewportMouse.Widget_loadedInterfaces[var0]) {
-				Widget.Widget_archive.clearFilesGroup(var0);
-				if (Widget.Widget_interfaceComponents[var0] != null) {
-					boolean var5 = true;
-
-					for (var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) {
-						if (Widget.Widget_interfaceComponents[var0][var2] == null) {
-							continue;
-						}
-						if (Widget.Widget_interfaceComponents[var0][var2].type != 2) {
-							Widget.Widget_interfaceComponents[var0][var2] = null;
-						} else {
-							var5 = false;
-						}
-					}
-
-					if (var5) {
-						Widget.Widget_interfaceComponents[var0] = null;
-					}
-
-					ViewportMouse.Widget_loadedInterfaces[var0] = false;
-				}
-			}
-		}
-
-		for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) {
-			class197.closeInterface(var4, true);
-		}
-
-		Client.rootInterface = -1;
-		Client.interfaceParents = new NodeHashTable(8);
-		Client.meslayerContinueWidget = null;
-		Strings.resetMenuEntries();
-		Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
-
-		for (var0 = 0; var0 < 8; ++var0) {
-			Client.playerMenuActions[var0] = null;
-			Client.playerOptionsPriorities[var0] = false;
-		}
-
-		ItemContainer.itemContainers = new NodeHashTable(32);
-		Client.isLoading = true;
-
-		for (var0 = 0; var0 < 100; ++var0) {
-			Client.field843[var0] = true;
-		}
-
-		HealthBarUpdate.method1677();
-		DevicePcmPlayerProvider.clanChat = null;
-
-		for (var0 = 0; var0 < 8; ++var0) {
-			Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
-		}
-
-		PendingSpawn.grandExchangeEvents = null;
 	}
 }

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

@@ -4,80 +4,78 @@ 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("fy")
+@ObfuscatedName("fj")
 @Implements("FileSystem")
 public class FileSystem {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("FileSystem_hasPermissions")
-	static boolean FileSystem_hasPermissions;
+	public static boolean FileSystem_hasPermissions;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("FileSystem_cacheDir")
-	static File FileSystem_cacheDir;
+	public static File FileSystem_cacheDir;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("FileSystem_cacheFiles")
 	static Hashtable FileSystem_cacheFiles;
-	@ObfuscatedName("l")
-	@Export("PcmPlayer_stereo")
-	protected static boolean PcmPlayer_stereo;
-	@ObfuscatedName("fj")
-	@ObfuscatedSignature(
-		signature = "Lku;"
-	)
-	@Export("WorldMapElement_fonts")
-	static Fonts WorldMapElement_fonts;
-	@ObfuscatedName("fu")
-	@ObfuscatedSignature(
-		signature = "Lke;"
-	)
-	@Export("fontPlain12")
-	static Font fontPlain12;
 
 	static {
 		FileSystem_hasPermissions = false;
 		FileSystem_cacheFiles = new Hashtable(16);
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Lhp;IIIZI)V",
+		signature = "(II)Lip;",
-		garbageValue = "1090882543"
+		garbageValue = "-760710815"
 	)
-	public static void method3503(AbstractArchive var0, int group, int file, int bitRateMaybe, boolean _false) {
+	public static VarcInt method3447(int var0) {
-		class197.field2402 = 1;
+		VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0);
-		GrandExchangeOfferNameComparator.musicTrackArchive = var0;
+		if (var1 != null) {
-		class197.musicTrackGroupId = group;
+			return var1;
-		class197.musicTrackFileId = file;
+		} else {
-		ScriptFrame.field529 = bitRateMaybe;
+			byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0);
-		BuddyRankComparator.musicTrackBoolean = _false;
+			var1 = new VarcInt();
-		class197.field2404 = 10000;
+			if (var2 != null) {
-	}
+				var1.method4314(new Buffer(var2));
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(ILcx;ZI)I",
-		garbageValue = "-786180451"
-	)
-	static int method3501(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? Interpreter.field1111 : Calendar.field2507;
-		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemId;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CC_GETINVCOUNT) {
-			if (var3.itemId != -1) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemQuantity;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
 			}
 
-			return 1;
+			VarcInt.VarcInt_cached.put(var1, (long)var0);
+			return var1;
 		}
-		if (var0 == ScriptOpcodes.CC_GETID) {
+	}
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.childIndex;
+
-			return 1;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(IIB)Lbi;",
+		garbageValue = "17"
+	)
+	@Export("Messages_getByChannelAndID")
+	static Message Messages_getByChannelAndID(int var0, int var1) {
+		ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
+		return var2.getMessage(var1);
+	}
+
+	@ObfuscatedName("k")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Lhz;III)Lkb;",
+		garbageValue = "1068587353"
+	)
+	@Export("SpriteBuffer_getFont")
+	public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+		if (!World.SpriteBuffer_bufferFile(var0, var2, var3)) {
+			return null;
+		} else {
+			byte[] var5 = var1.takeFile(var2, var3);
+			Font var4;
+			if (var5 == null) {
+				var4 = null;
+			} else {
+				Font var6 = new Font(var5, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, WorldMapSection1.SpriteBuffer_pixels);
+				UserComparator7.SpriteBuffer_clear();
+				var4 = var6;
+			}
+
+			return var4;
 		}
-		return 2;
 	}
 }

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

@@ -4,42 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ll")
+@ObfuscatedName("lb")
 @Implements("FillMode")
 public enum FillMode implements Enumerated {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Llb;"
 	)
 	@Export("SOLID")
 	SOLID(0, 0),
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Llb;"
 	)
-	@Export("GRADIENT")
+	field3858(1, 1),
-	GRADIENT(1, 1),
+	@ObfuscatedName("i")
-	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "Lll;"
+		signature = "Llb;"
 	)
-	@Export("GRADIENTALPHA")
+	field3860(2, 2);
-	GRADIENTALPHA(2, 2);
 
-	@ObfuscatedName("ex")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1628488091
+		intValue = -375665689
-	)
-	static int field3884;
-	@ObfuscatedName("p")
-	@ObfuscatedGetter(
-		intValue = 215627811
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 198667019
+		intValue = -839626013
 	)
 	@Export("id")
 	final int id;
@@ -49,10 +42,10 @@ public enum FillMode implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "320353268"
+		garbageValue = "-32"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {

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

@@ -1,50 +1,58 @@
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
 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("dq")
+@ObfuscatedName("dy")
 @Implements("FloorDecoration")
 public final class FloorDecoration {
-	@ObfuscatedName("q")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -311515591
+		intValue = -513074151
+	)
+	@Export("PcmPlayer_count")
+	static int PcmPlayer_count;
+	@ObfuscatedName("ec")
+	@ObfuscatedGetter(
+		intValue = -1042709879
+	)
+	@Export("port2")
+	static int port2;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = 577791457
 	)
 	@Export("tileHeight")
 	int tileHeight;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1344271777
+		intValue = 2080109751
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -779439179
+		intValue = 748443287
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Leo;"
+		signature = "Len;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		longValue = -3653968665269180135L
+		longValue = 6356128824356996537L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1094759427
+		intValue = -1037477129
 	)
 	@Export("flags")
 	int flags;
@@ -52,70 +60,135 @@ public final class FloorDecoration {
 	FloorDecoration() {
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("er")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(II)V",
-		garbageValue = "3762"
+		garbageValue = "-1136881308"
 	)
-	@Export("KeyHandler_exit")
+	@Export("updateGameState")
-	public static void KeyHandler_exit() {
+	static void updateGameState(int var0) {
-		if (KeyHandler.KeyHandler_instance != null) {
+		if (var0 != Client.gameState) {
-			synchronized(KeyHandler.KeyHandler_instance) {
+			if (Client.gameState == 0) {
-				KeyHandler.KeyHandler_instance = null;
+				WorldMapID.client.method891();
+			}
+
+			if (var0 == 20 || var0 == 40 || var0 == 45) {
+				Client.loginState = 0;
+				Client.field658 = 0;
+				Client.field659 = 0;
+				Client.timer.method4899(var0);
+				if (var0 != 20) {
+					WorldMapArea.method358(false);
+				}
+			}
+
+			if (var0 != 20 && var0 != 40 && Bounds.field3845 != null) {
+				Bounds.field3845.close();
+				Bounds.field3845 = null;
+			}
+
+			if (Client.gameState == 25) {
+				Client.field719 = 0;
+				Client.field676 = 0;
+				Client.field886 = 1;
+				Client.field678 = 0;
+				Client.field718 = 1;
+			}
+
+			if (var0 != 5 && var0 != 10) {
+				if (var0 == 20) {
+					BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, Client.gameState == 11 ? 4 : 0);
+				} else if (var0 == 11) {
+					BoundaryObject.method3213(GameObject.archive10, class2.archive8, false, 4);
+				} else {
+					DynamicObject.method2153();
+				}
+			} else {
+				BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, 0);
+			}
+
+			Client.gameState = var0;
+		}
+	}
+
+	@ObfuscatedName("hd")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1412444391"
+	)
+	static final void method2788() {
+		for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
+			if (var0.hitpoints > 0) {
+				--var0.hitpoints;
+			}
+
+			if (var0.hitpoints == 0) {
+				if (var0.objectId < 0 || WorldMapSprite.method404(var0.objectId, var0.field903)) {
+					Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field907, var0.field903);
+					var0.remove();
+				}
+			} else {
+				if (var0.delay > 0) {
+					--var0.delay;
+				}
+
+				if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || WorldMapSprite.method404(var0.id, var0.field911))) {
+					Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field911);
+					var0.delay = -1;
+					if (var0.id == var0.objectId && var0.objectId == -1) {
+						var0.remove();
+					} else if (var0.id == var0.objectId && var0.orientation == var0.field907 && var0.field903 == var0.field911) {
+						var0.remove();
+					}
+				}
 			}
 		}
 
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("hq")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/Throwable;B)Ljava/lang/String;",
+		signature = "(IIIII)V",
-		garbageValue = "1"
+		garbageValue = "507499403"
 	)
-	@Export("shortenStackTrace")
+	static final void method2786(int var0, int var1, int var2, int var3) {
-	static String shortenStackTrace(Throwable var0) throws IOException {
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
-		String var1;
+			if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
-		if (var0 instanceof RunException) {
+				Client.field703[var4] = true;
-			RunException var2 = (RunException)var0;
+			}
-			var1 = var2.message + " | ";
+		}
-			var0 = var2.throwable;
+
+	}
+
+	@ObfuscatedName("kh")
+	@ObfuscatedSignature(
+		signature = "(Lky;I)V",
+		garbageValue = "183516662"
+	)
+	static void method2787(Buffer var0) {
+		if (Client.randomDatData != null) {
+			var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length);
 		} else {
-			var1 = "";
+			byte[] var2 = new byte[24];
-		}
 
-		StringWriter var12 = new StringWriter();
+			try {
-		PrintWriter var3 = new PrintWriter(var12);
+				JagexCache.JagexCache_randomDat.seek(0L);
-		var0.printStackTrace(var3);
+				JagexCache.JagexCache_randomDat.readFully(var2);
-		var3.close();
-		String var4 = var12.toString();
-		BufferedReader var5 = new BufferedReader(new StringReader(var4));
-		String var6 = var5.readLine();
 
-		while (true) {
+				int var3;
-			String var7 = var5.readLine();
+				for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) {
-			if (var7 == null) {
-				break;
-			}
-
-			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 + ' ';
-		}
 
-		var1 = var1 + "| " + var6;
+				if (var3 >= 24) {
-		return var1;
+					throw new IOException();
+				}
+			} catch (Exception var6) {
+				for (int var4 = 0; var4 < 24; ++var4) {
+					var2[var4] = -1;
+				}
+			}
+
+			var0.writeBytes(var2, 0, var2.length);
+		}
 	}
 }

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

@@ -4,81 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("it")
+@ObfuscatedName("iv")
 @Implements("FloorOverlayDefinition")
 public class FloorOverlayDefinition extends DualNode {
-	@ObfuscatedName("sh")
+	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = -739683293
-	)
-	@Export("foundItemIdCount")
-	static int foundItemIdCount;
-	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("FloorOverlayDefinition_archive")
 	public static AbstractArchive FloorOverlayDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
 	)
 	@Export("FloorOverlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1387781245
+		intValue = 1186285675
 	)
 	@Export("primaryRgb")
 	public int primaryRgb;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -138481691
+		intValue = 1987325665
 	)
 	@Export("texture")
 	public int texture;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("hideUnderlay")
 	public boolean hideUnderlay;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1829885045
+		intValue = -375374105
 	)
 	@Export("secondaryRgb")
 	public int secondaryRgb;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1785369295
+		intValue = 1926193945
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 844527765
+		intValue = -1588177313
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -649539923
+		intValue = -1646509357
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 1982106487
+		intValue = -1281479925
 	)
 	@Export("secondaryHue")
 	public int secondaryHue;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -241902903
+		intValue = 1612990267
 	)
 	@Export("secondarySaturation")
 	public int secondarySaturation;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -2090498171
+		intValue = -520563245
 	)
 	@Export("secondaryLightness")
 	public int secondaryLightness;
@@ -94,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.secondaryRgb = -1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-866326245"
+		garbageValue = "-32"
 	)
 	@Export("postDecode")
 	public void postDecode() {
@@ -111,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode {
 		this.setHsl(this.primaryRgb);
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkf;IB)V",
+		signature = "(Lky;II)V",
-		garbageValue = "-93"
+		garbageValue = "-1938903864"
 	)
 	@Export("decode")
 	public void decode(Buffer var1, int var2) {
@@ -128,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;IIB)V",
+		signature = "(Lky;III)V",
-		garbageValue = "0"
+		garbageValue = "-1583990473"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -148,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-1232631755"
+		garbageValue = "923759114"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -179,28 +173,28 @@ public class FloorOverlayDefinition extends DualNode {
 		double var12 = 0.0D;
 		double var14 = 0.0D;
 		double var16 = (var10 + var8) / 2.0D;
-		if (var8 != var10) {
+		if (var10 != var8) {
 			if (var16 < 0.5D) {
-				var14 = (var10 - var8) / (var8 + var10);
+				var14 = (var10 - var8) / (var10 + var8);
 			}
 
 			if (var16 >= 0.5D) {
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var2 == var10) {
+			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
-			} else if (var10 == var4) {
+			} else if (var4 == var10) {
 				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-			} else if (var10 == var6) {
+			} else if (var6 == var10) {
-				var12 = 4.0D + (var2 - var4) / (var10 - var8);
+				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
 			}
 		}
 
 		var12 /= 6.0D;
 		this.hue = (int)(256.0D * var12);
-		this.saturation = (int)(256.0D * var14);
+		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) {
@@ -214,58 +208,4 @@ public class FloorOverlayDefinition extends DualNode {
 		}
 
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(Lhj;I[B[BI)V",
-		garbageValue = "610677249"
-	)
-	@Export("Widget_setKey")
-	static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) {
-		if (var0.field2650 == null) {
-			if (var2 == null) {
-				return;
-			}
-
-			var0.field2650 = new byte[11][];
-			var0.field2625 = new byte[11][];
-			var0.field2641 = new int[11];
-			var0.field2588 = new int[11];
-		}
-
-		var0.field2650[var1] = var2;
-		if (var2 != null) {
-			var0.field2704 = true;
-		} else {
-			var0.field2704 = false;
-
-			for (int var4 = 0; var4 < var0.field2650.length; ++var4) {
-				if (var0.field2650[var4] != null) {
-					var0.field2704 = true;
-					break;
-				}
-			}
-		}
-
-		var0.field2625[var1] = var3;
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		signature = "(IIIB)I",
-		garbageValue = "127"
-	)
-	static final int method4757(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 = TileItemPile.method2765(var3, var5);
-		int var8 = TileItemPile.method2765(var3 + 1, var5);
-		int var9 = TileItemPile.method2765(var3, var5 + 1);
-		int var10 = TileItemPile.method2765(var3 + 1, var5 + 1);
-		int var11 = class4.method49(var7, var8, var4, var2);
-		int var12 = class4.method49(var9, var10, var4, var2);
-		return class4.method49(var11, var12, var6, var2);
-	}
 }

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

@@ -3,50 +3,49 @@ 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("ic")
+@ObfuscatedName("ie")
 @Implements("FloorUnderlayDefinition")
 public class FloorUnderlayDefinition extends DualNode {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("FloorUnderlayDefinition_archive")
-	public static AbstractArchive FloorUnderlayDefinition_archive;
+	static AbstractArchive FloorUnderlayDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
 	)
 	@Export("FloorUnderlayDefinition_cached")
 	public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -361069037
+		intValue = 1690185973
 	)
 	@Export("rgb")
 	int rgb;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1680352847
+		intValue = -1561731435
 	)
 	@Export("hue")
 	public int hue;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1411467289
+		intValue = 56370407
 	)
 	@Export("saturation")
 	public int saturation;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 223485885
+		intValue = -1143874615
 	)
 	@Export("lightness")
 	public int lightness;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -907654805
+		intValue = -780904451
 	)
 	@Export("hueMultiplier")
 	public int hueMultiplier;
@@ -55,27 +54,27 @@ public class FloorUnderlayDefinition extends DualNode {
 		FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
 	}
 
-	public FloorUnderlayDefinition() {
+	FloorUnderlayDefinition() {
 		this.rgb = 0;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "-165448710"
+		garbageValue = "38"
 	)
 	@Export("postDecode")
-	public void postDecode() {
+	void postDecode() {
 		this.setHsl(this.rgb);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Lkf;II)V",
+		signature = "(Lky;IB)V",
-		garbageValue = "1618503924"
+		garbageValue = "118"
 	)
 	@Export("decode")
-	public void decode(Buffer var1, int var2) {
+	void decode(Buffer var1, int var2) {
 		while (true) {
 			int var3 = var1.readUnsignedByte();
 			if (var3 == 0) {
@@ -86,10 +85,10 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(Lkf;IIB)V",
+		signature = "(Lky;III)V",
-		garbageValue = "115"
+		garbageValue = "2131813988"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2, int var3) {
@@ -99,10 +98,10 @@ public class FloorUnderlayDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "-1792138465"
+		garbageValue = "-28210148"
 	)
 	@Export("setHsl")
 	void setHsl(int var1) {
@@ -129,28 +128,28 @@ public class FloorUnderlayDefinition extends DualNode {
 
 		double var12 = 0.0D;
 		double var14 = 0.0D;
-		double var16 = (var8 + var10) / 2.0D;
+		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) {
 				var14 = (var10 - var8) / (2.0D - var10 - var8);
 			}
 
-			if (var2 == var10) {
+			if (var10 == var2) {
 				var12 = (var4 - var6) / (var10 - var8);
 			} else if (var10 == var4) {
-				var12 = (var6 - var2) / (var10 - var8) + 2.0D;
+				var12 = 2.0D + (var6 - var2) / (var10 - var8);
 			} else if (var10 == var6) {
-				var12 = (var2 - var4) / (var10 - var8) + 4.0D;
+				var12 = 4.0D + (var2 - var4) / (var10 - var8);
 			}
 		}
 
 		var12 /= 6.0D;
 		this.saturation = (int)(256.0D * var14);
-		this.lightness = (int)(var16 * 256.0D);
+		this.lightness = (int)(256.0D * var16);
 		if (this.saturation < 0) {
 			this.saturation = 0;
 		} else if (this.saturation > 255) {
@@ -164,9 +163,9 @@ public class FloorUnderlayDefinition extends DualNode {
 		}
 
 		if (var16 > 0.5D) {
-			this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D);
+			this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16));
 		} else {
-			this.hueMultiplier = (int)(var14 * var16 * 512.0D);
+			this.hueMultiplier = (int)(var16 * var14 * 512.0D);
 		}
 
 		if (this.hueMultiplier < 1) {
@@ -175,38 +174,4 @@ public class FloorUnderlayDefinition extends DualNode {
 
 		this.hue = (int)(var12 * (double)this.hueMultiplier);
 	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		signature = "(ILcx;ZI)I",
-		garbageValue = "1586535295"
-	)
-	static int method4433(int var0, Script var1, boolean var2) {
-		Widget var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3));
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.IF_GETOP) {
-			int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			--var4;
-			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.actions[var4];
-			} else {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.IF_GETOPBASE) {
-			if (var3.dataText == null) {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-			} else {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
-			}
-
-			return 1;
-		}
-		return 2;
-	}
 }

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

@@ -2,7 +2,7 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("ke")
+@ObfuscatedName("kb")
 @Implements("Font")
 public final class Font extends AbstractFont {
 	public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
@@ -13,7 +13,7 @@ public final class Font extends AbstractFont {
 		super(var1);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@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("w")
+	@ObfuscatedName("j")
 	@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,49 +1,72 @@
 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("kd")
+@ObfuscatedName("kz")
 @Implements("FontName")
 public class FontName {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lkd;"
+		signature = "Lkz;"
 	)
 	@Export("FontName_plain11")
 	public static final FontName FontName_plain11;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lkd;"
+		signature = "Lkz;"
 	)
 	@Export("FontName_plain12")
 	public static final FontName FontName_plain12;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lkd;"
+		signature = "Lkz;"
 	)
 	@Export("FontName_bold12")
 	public static final FontName FontName_bold12;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lkd;"
+		signature = "Lkz;"
 	)
 	@Export("FontName_verdana11")
 	public static final FontName FontName_verdana11;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Lkd;"
+		signature = "Lkz;"
 	)
 	@Export("FontName_verdana13")
 	public static final FontName FontName_verdana13;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lkd;"
+		signature = "Lkz;"
 	)
 	@Export("FontName_verdana15")
 	public static final FontName FontName_verdana15;
-	@ObfuscatedName("b")
+	@ObfuscatedName("q")
+	public static short[][] field3651;
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "Lgy;"
+	)
+	@Export("musicTrack")
+	public static MusicTrack musicTrack;
+	@ObfuscatedName("h")
+	@Export("userHomeDirectory")
+	public static String userHomeDirectory;
+	@ObfuscatedName("bz")
+	@ObfuscatedSignature(
+		signature = "Llu;"
+	)
+	@Export("loginType")
+	static LoginType loginType;
+	@ObfuscatedName("ix")
+	@ObfuscatedGetter(
+		intValue = -1325782569
+	)
+	@Export("selectedItemWidget")
+	static int selectedItemWidget;
+	@ObfuscatedName("t")
 	@Export("name")
 	String name;
 
@@ -60,790 +83,65 @@ public class FontName {
 		this.name = var1;
 	}
 
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(B)Z",
+		garbageValue = "-11"
+	)
+	@Export("isKeyDown")
+	public static final boolean isKeyDown() {
+		synchronized(KeyHandler.KeyHandler_instance) {
+			if (KeyHandler.field385 == KeyHandler.field383) {
+				return false;
+			} else {
+				ReflectionCheck.field1307 = KeyHandler.field376[KeyHandler.field385];
+				SpriteMask.field2499 = KeyHandler.field377[KeyHandler.field385];
+				KeyHandler.field385 = KeyHandler.field385 + 1 & 127;
+				return true;
+			}
+		}
+	}
+
 	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "(Lhp;IIII)V",
+		garbageValue = "452430417"
+	)
+	@Export("Widget_setKeyRate")
+	static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) {
+		if (var0.field2623 == null) {
+			throw new RuntimeException();
+		} else {
+			var0.field2623[var1] = var2;
+			var0.field2581[var1] = var3;
+		}
+	}
+
+	@ObfuscatedName("c")
+	@ObfuscatedSignature(
+		signature = "(CII)Ljava/lang/String;",
+		garbageValue = "993620587"
+	)
+	static String method5230(char var0, int var1) {
+		char[] var2 = new char[var1];
+
+		for (int var3 = 0; var3 < var1; ++var3) {
+			var2[var3] = var0;
+		}
+
+		return new String(var2);
+	}
+
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-201583329"
+		garbageValue = "-1040867769"
 	)
-	public static void method5317() {
+	@Export("ObjectDefinition_clearCached")
-		ItemDefinition.ItemDefinition_cachedSprites.clear();
+	public static void ObjectDefinition_clearCached() {
-	}
+		ObjectDefinition.ObjectDefinition_cached.clear();
-
+		ObjectDefinition.ObjectDefinition_cachedModelData.clear();
-	@ObfuscatedName("az")
+		ObjectDefinition.ObjectDefinition_cachedEntities.clear();
-	@ObfuscatedSignature(
+		ObjectDefinition.ObjectDefinition_cachedModels.clear();
-		signature = "(ILcx;ZI)I",
-		garbageValue = "-225592066"
-	)
-	static int method5316(int var0, Script var1, boolean var2) {
-		int var3;
-		if (var0 == ScriptOpcodes.OC_NAME) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).name;
-			return 1;
-		}
-		int var4;
-		ItemDefinition var5;
-		if (var0 == ScriptOpcodes.OC_OP) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			var5 = WorldMapArea.ItemDefinition_get(var3);
-			if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
-			} else {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_IOP) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
-			var5 = WorldMapArea.ItemDefinition_get(var3);
-			if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
-			} else {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_COST) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).price;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_STACKABLE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0;
-			return 1;
-		}
-		ItemDefinition var6;
-		if (var0 == ScriptOpcodes.OC_CERT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = WorldMapArea.ItemDefinition_get(var3);
-			if (var6.noteTemplate == -1 && var6.note >= 0) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_UNCERT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = WorldMapArea.ItemDefinition_get(var3);
-			if (var6.noteTemplate >= 0 && var6.note >= 0) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_MEMBERS) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.ItemDefinition_get(var3).isMembersOnly ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = WorldMapArea.ItemDefinition_get(var3);
-			if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = WorldMapArea.ItemDefinition_get(var3);
-			if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_FIND) {
-			String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-			var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			WorldMapDecoration.findItemDefinitions(var7, var4 == 1);
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_FINDNEXT) {
-			if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & 0xffff;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.OC_FINDRESET) {
-			class32.foundItemIndex = 0;
-			return 1;
-		}
-		return 2;
-	}
-
-	@ObfuscatedName("ii")
-	@ObfuscatedSignature(
-		signature = "([Lhj;IIIIIIIII)V",
-		garbageValue = "-414433713"
-	)
-	@Export("drawInterface")
-	static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-		Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-		Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
-
-		for (int var9 = 0; var9 < var0.length; ++var9) {
-			Widget var10 = var0[var9];
-			if (var10 == null || (var10.parentId != var1 && (var1 != 0xabcdabcd || var10 != Client.clickedWidget))) {
-				continue;
-			}
-
-			int var11;
-			if (var8 == -1) {
-				Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
-				Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y;
-				Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width;
-				Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height;
-				var11 = ++Client.rootWidgetCount - 1;
-			} else {
-				var11 = var8;
-			}
-
-			var10.rootIndex = var11;
-			var10.cycle = Client.cycle;
-			if (var10.isIf3 && ScriptEvent.isComponentHidden(var10)) {
-				continue;
-			}
-
-			if (var10.contentType > 0) {
-				GrandExchangeOfferTotalQuantityComparator.method85(var10);
-			}
-
-			int var12 = var10.x + var6;
-			int var13 = var7 + var10.y;
-			int var14 = var10.transparencyTop;
-			int var15;
-			int var16;
-			if (var10 == Client.clickedWidget) {
-				if (var1 != 0xabcdabcd && !var10.isScrollBar) {
-					WorldMapIcon_1.field188 = var0;
-					WorldMapDecorationType.field2742 = var6;
-					ClientPacket.field2305 = var7;
-					continue;
-				}
-
-				if (Client.isDraggingWidget && Client.field873) {
-					var15 = MouseHandler.MouseHandler_x;
-					var16 = MouseHandler.MouseHandler_y;
-					var15 -= Client.widgetClickX;
-					var16 -= Client.widgetClickY;
-					if (var15 < Client.field834) {
-						var15 = Client.field834;
-					}
-
-					if (var15 + var10.width > Client.field834 + Client.clickedWidgetParent.width) {
-						var15 = Client.field834 + Client.clickedWidgetParent.width - var10.width;
-					}
-
-					if (var16 < Client.field835) {
-						var16 = Client.field835;
-					}
-
-					if (var16 + var10.height > Client.field835 + Client.clickedWidgetParent.height) {
-						var16 = Client.field835 + Client.clickedWidgetParent.height - var10.height;
-					}
-
-					var12 = var15;
-					var13 = var16;
-				}
-
-				if (!var10.isScrollBar) {
-					var14 = 128;
-				}
-			}
-
-			int var17;
-			int var18;
-			int var19;
-			int var20;
-			int var21;
-			int var22;
-			if (var10.type == 2) {
-				var15 = var2;
-				var16 = var3;
-				var17 = var4;
-				var18 = var5;
-			} else if (var10.type == 9) {
-				var19 = var12;
-				var20 = var13;
-				var21 = var12 + var10.width;
-				var22 = var13 + var10.height;
-				if (var21 < var12) {
-					var19 = var21;
-					var21 = var12;
-				}
-
-				if (var22 < var13) {
-					var20 = var22;
-					var22 = var13;
-				}
-
-				++var21;
-				++var22;
-				var15 = var19 > var2 ? var19 : var2;
-				var16 = var20 > var3 ? var20 : var3;
-				var17 = var21 < var4 ? var21 : var4;
-				var18 = var22 < var5 ? var22 : var5;
-			} else {
-				var19 = var12 + var10.width;
-				var20 = var13 + var10.height;
-				var15 = var12 > var2 ? var12 : var2;
-				var16 = var13 > var3 ? var13 : var3;
-				var17 = var19 < var4 ? var19 : var4;
-				var18 = var20 < var5 ? var20 : var5;
-			}
-
-			if (var10.isIf3 && (var15 >= var17 || var16 >= var18)) {
-				continue;
-			}
-			if (var10.contentType != 0) {
-				if (var10.contentType == 1336) {
-					if (Client.displayFps) {
-						var13 += 15;
-						FileSystem.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 0xffff00, -1);
-						var13 += 15;
-						Runtime var42 = Runtime.getRuntime();
-						var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L);
-						var21 = 0xffff00;
-						if (var20 > 0x50000 && !Client.isLowDetail) {
-							var21 = 0xff0000;
-						}
-
-						FileSystem.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
-						var13 += 15;
-					}
-					continue;
-				}
-
-				if (var10.contentType == 1337) {
-					Client.viewportX = var12;
-					Client.viewportY = var13;
-					class4.drawEntities(var12, var13, var10.width, var10.height);
-					Client.field843[var10.rootIndex] = true;
-					Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-					continue;
-				}
-
-				if (var10.contentType == 1338) {
-					ArchiveLoader.drawMinimap(var10, var12, var13, var11);
-					Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-					continue;
-				}
-
-				if (var10.contentType == 1339) {
-					WorldMapIcon_0.drawCompass(var10, var12, var13, var11);
-					Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-					continue;
-				}
-
-				if (var10.contentType == 1400) {
-					BoundaryObject.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle);
-				}
-
-				if (var10.contentType == 1401) {
-					BoundaryObject.worldMap.drawOverview(var12, var13, var10.width, var10.height);
-				}
-
-				if (var10.contentType == 1402) {
-					Ignored.loginScreenRunesAnimation.draw(var12, Client.cycle);
-				}
-			}
-
-			if (var10.type == 0) {
-				if (!var10.isIf3 && ScriptEvent.isComponentHidden(var10) && var10 != LoginScreenAnimation.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 var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id);
-				if (var30 != null) {
-					class191.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11);
-				}
-
-				Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-				Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
-			}
-
-			if (!Client.isResizable && !Client.field862[var11] && Client.gameDrawingMode <= 1) {
-				continue;
-			}
-
-			if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
-				NetFileRequest.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
-			}
-
-			if (var10.type == 1) {
-				continue;
-			}
-			int var23;
-			int var24;
-			int var25;
-			int var26;
-			if (var10.type == 2) {
-				var19 = 0;
-
-				for (var20 = 0; var20 < var10.rawHeight; ++var20) {
-					for (var21 = 0; var21 < var10.rawWidth; ++var21, ++var19) {
-						var22 = var12 + var21 * (var10.paddingX + 32);
-						var23 = var13 + var20 * (var10.paddingY + 32);
-						if (var19 < 20) {
-							var22 += var10.inventoryXOffsets[var19];
-							var23 += var10.inventoryYOffsets[var19];
-						}
-
-						if (var10.itemIds[var19] <= 0) {
-							if (var10.inventorySprites != null && var19 < 20) {
-								Sprite var46 = var10.getInventorySprite(var19);
-								if (var46 != null) {
-									var46.drawTransBgAt(var22, var23);
-								} else if (Widget.field2562) {
-									Strings.invalidateWidget(var10);
-								}
-							}
-							continue;
-						}
-						boolean var37 = false;
-						boolean var38 = false;
-						var26 = var10.itemIds[var19] - 1;
-						if ((var22 + 32 <= var2 || var22 >= var4 || var23 + 32 <= var3 || var23 >= var5) && (var10 != WorldMapIcon_0.dragInventoryWidget || var19 != Client.dragItemSlotSource)) {
-							continue;
-						}
-						Sprite var27;
-						if (Client.isItemSelected == 1 && var19 == WorldMapIcon_1.selectedItemSlot && var10.id == MouseRecorder.selectedItemWidget) {
-							var27 = WorldMapSection0.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false);
-						} else {
-							var27 = WorldMapSection0.getItemSprite(var26, var10.itemQuantities[var19], 1, 0x302020, 2, false);
-						}
-
-						if (var27 == null) {
-							Strings.invalidateWidget(var10);
-							continue;
-						}
-						if (var10 == WorldMapIcon_0.dragInventoryWidget && var19 == Client.dragItemSlotSource) {
-							var24 = MouseHandler.MouseHandler_x - Client.field654;
-							var25 = MouseHandler.MouseHandler_y - Client.field763;
-							if (var24 < 5 && var24 > -5) {
-								var24 = 0;
-							}
-
-							if (var25 < 5 && var25 > -5) {
-								var25 = 0;
-							}
-
-							if (Client.itemDragDuration < 5) {
-								var24 = 0;
-								var25 = 0;
-							}
-
-							var27.drawTransAt(var24 + var22, var25 + var23, 128);
-							if (var1 == -1) {
-								continue;
-							}
-							Widget var28 = var0[var1 & 0xffff];
-							int var29;
-							if (var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
-								var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field718 / 3;
-								if (var29 > Client.field718 * 10) {
-									var29 = Client.field718 * 10;
-								}
-
-								if (var29 > var28.scrollY) {
-									var29 = var28.scrollY;
-								}
-
-								var28.scrollY -= var29;
-								Client.field763 += var29;
-								Strings.invalidateWidget(var28);
-							}
-
-							if (var25 + var23 + 32 <= Rasterizer2D.Rasterizer2D_yClipEnd || var28.scrollY >= var28.scrollHeight - var28.height) {
-								continue;
-							}
-							var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field718 / 3;
-							if (var29 > Client.field718 * 10) {
-								var29 = Client.field718 * 10;
-							}
-
-							if (var29 > var28.scrollHeight - var28.height - var28.scrollY) {
-								var29 = var28.scrollHeight - var28.height - var28.scrollY;
-							}
-
-							var28.scrollY += var29;
-							Client.field763 -= var29;
-							Strings.invalidateWidget(var28);
-						} else if (var10 == ItemContainer.field549 && var19 == Client.field698) {
-							var27.drawTransAt(var22, var23, 128);
-						} else {
-							var27.drawTransBgAt(var22, var23);
-						}
-					}
-				}
-				continue;
-			}
-			if (var10.type == 3) {
-				if (ChatChannel.runCs1(var10)) {
-					var19 = var10.color2;
-					if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
-						var19 = var10.mouseOverColor2;
-					}
-				} else {
-					var19 = var10.color;
-					if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
-						var19 = 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, var19);
-						} else {
-							Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255));
-						}
-					}
-				} else if (var14 == 0) {
-					Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19);
-				} else {
-					Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255));
-				}
-				continue;
-			}
-			Font var39;
-			if (var10.type == 4) {
-				var39 = var10.getFont();
-				if (var39 == null) {
-					if (Widget.field2562) {
-						Strings.invalidateWidget(var10);
-					}
-					continue;
-				}
-				String var44 = var10.text;
-				if (ChatChannel.runCs1(var10)) {
-					var20 = var10.color2;
-					if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
-						var20 = var10.mouseOverColor2;
-					}
-
-					if (var10.text2.length() > 0) {
-						var44 = var10.text2;
-					}
-				} else {
-					var20 = var10.color;
-					if (var10 == LoginScreenAnimation.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
-						var20 = var10.mouseOverColor;
-					}
-				}
-
-				if (var10.isIf3 && var10.itemId != -1) {
-					ItemDefinition var45 = WorldMapArea.ItemDefinition_get(var10.itemId);
-					var44 = var45.name;
-					if (var44 == null) {
-						var44 = "null";
-					}
-
-					if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
-						var44 = ClientPreferences.colorStartTag(0xff9040) + var44 + "</col>" + " " + 'x' + class188.formatItemStacks(var10.itemQuantity);
-					}
-				}
-
-				if (var10 == Client.meslayerContinueWidget) {
-					var44 = "Please wait...";
-					var20 = var10.color;
-				}
-
-				if (!var10.isIf3) {
-					var44 = GrandExchangeOfferTotalQuantityComparator.method92(var44, var10);
-				}
-
-				var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
-				continue;
-			}
-			if (var10.type == 5) {
-				Sprite var40;
-				if (!var10.isIf3) {
-					var40 = var10.getSprite(ChatChannel.runCs1(var10));
-					if (var40 != null) {
-						var40.drawTransBgAt(var12, var13);
-					} else if (Widget.field2562) {
-						Strings.invalidateWidget(var10);
-					}
-					continue;
-				}
-				if (var10.itemId != -1) {
-					var40 = WorldMapSection0.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
-				} else {
-					var40 = var10.getSprite(false);
-				}
-
-				if (var40 == null) {
-					if (Widget.field2562) {
-						Strings.invalidateWidget(var10);
-					}
-					continue;
-				}
-				var20 = var40.width;
-				var21 = var40.height;
-				if (!var10.spriteTiling) {
-					var22 = var10.width * 4096 / var20;
-					if (var10.spriteAngle != 0) {
-						var40.method6186(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
-					} else if (var14 != 0) {
-						var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
-					} else if (var20 == var10.width && var21 == var10.height) {
-						var40.drawTransBgAt(var12, var13);
-					} else {
-						var40.drawScaledAt(var12, var13, var10.width, var10.height);
-					}
-					continue;
-				}
-				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) {
-							var40.method6186(var20 / 2 + var12 + var24 * var20, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096);
-						} else if (var14 != 0) {
-							var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255));
-						} else {
-							var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25);
-						}
-					}
-				}
-
-				Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-				continue;
-			}
-			ItemDefinition var33;
-			if (var10.type == 6) {
-				boolean var36 = ChatChannel.runCs1(var10);
-				if (var36) {
-					var20 = var10.sequenceId2;
-				} else {
-					var20 = var10.sequenceId;
-				}
-
-				Model var41 = null;
-				var22 = 0;
-				if (var10.itemId != -1) {
-					var33 = WorldMapArea.ItemDefinition_get(var10.itemId);
-					if (var33 != null) {
-						var33 = var33.getCountObj(var10.itemQuantity);
-						var41 = var33.getModel(1);
-						if (var41 != null) {
-							var41.calculateBoundsCylinder();
-							var22 = var41.height / 2;
-						} else {
-							Strings.invalidateWidget(var10);
-						}
-					}
-				} else if (var10.modelType == 5) {
-					if (var10.modelId == 0) {
-						var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
-					} else {
-						var41 = Client.localPlayer.getModel();
-					}
-				} else if (var20 == -1) {
-					var41 = var10.getModel((SequenceDefinition)null, -1, var36, Client.localPlayer.appearance);
-					if (var41 == null && Widget.field2562) {
-						Strings.invalidateWidget(var10);
-					}
-				} else {
-					SequenceDefinition var47 = GrandExchangeEvent.SequenceDefinition_get(var20);
-					var41 = var10.getModel(var47, var10.modelFrame, var36, Client.localPlayer.appearance);
-					if (var41 == null && Widget.field2562) {
-						Strings.invalidateWidget(var10);
-					}
-				}
-
-				Rasterizer3D.method2976(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.calculateBoundsCylinder();
-						if (var10.modelOrthog) {
-							var41.method2876(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
-						} else {
-							var41.method2866(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY);
-						}
-					} else {
-						var41.method2866(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
-					}
-				}
-
-				Rasterizer3D.Rasterizer3D_method3();
-				continue;
-			}
-			if (var10.type == 7) {
-				var39 = var10.getFont();
-				if (var39 == null) {
-					if (Widget.field2562) {
-						Strings.invalidateWidget(var10);
-					}
-					continue;
-				}
-
-				var20 = 0;
-
-				for (var21 = 0; var21 < var10.rawHeight; ++var21) {
-					for (var22 = 0; var22 < var10.rawWidth; ++var22, ++var20) {
-						if (var10.itemIds[var20] <= 0) {
-							continue;
-						}
-						var33 = WorldMapArea.ItemDefinition_get(var10.itemIds[var20] - 1);
-						String var34;
-						if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) {
-							var34 = ClientPreferences.colorStartTag(0xff9040) + var33.name + "</col>";
-						} else {
-							var34 = ClientPreferences.colorStartTag(0xff9040) + var33.name + "</col>" + " " + 'x' + class188.formatItemStacks(var10.itemQuantities[var20]);
-						}
-
-						var25 = var22 * (var10.paddingX + 115) + var12;
-						var26 = var21 * (var10.paddingY + 12) + var13;
-						if (var10.textXAlignment == 0) {
-							var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1);
-						} else if (var10.textXAlignment == 1) {
-							var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1);
-						} else {
-							var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1);
-						}
-					}
-				}
-			}
-
-			if (var10.type == 8 && var10 == class32.field284 && Client.field833 == Client.field840) {
-				var19 = 0;
-				var20 = 0;
-				Font var31 = FileSystem.fontPlain12;
-				String var32 = var10.text;
-
-				String var43;
-				for (var32 = GrandExchangeOfferTotalQuantityComparator.method92(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) {
-					var24 = var32.indexOf("<br>");
-					if (var24 != -1) {
-						var43 = var32.substring(0, var24);
-						var32 = var32.substring(var24 + 4);
-					} else {
-						var43 = var32;
-						var32 = "";
-					}
-
-					var25 = var31.stringWidth(var43);
-					if (var25 > var19) {
-						var19 = var25;
-					}
-				}
-
-				var19 += 6;
-				var20 += 7;
-				var24 = var12 + var10.width - 5 - var19;
-				var25 = var13 + var10.height + 5;
-				if (var24 < var12 + 5) {
-					var24 = var12 + 5;
-				}
-
-				if (var24 + var19 > var4) {
-					var24 = var4 - var19;
-				}
-
-				if (var20 + var25 > var5) {
-					var25 = var5 - var20;
-				}
-
-				Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 0xffffa0);
-				Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0);
-				var32 = var10.text;
-				var26 = var25 + var31.ascent + 2;
-
-				for (var32 = GrandExchangeOfferTotalQuantityComparator.method92(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) {
-					int var35 = var32.indexOf("<br>");
-					if (var35 != -1) {
-						var43 = var32.substring(0, var35);
-						var32 = var32.substring(var35 + 4);
-					} else {
-						var43 = var32;
-						var32 = "";
-					}
-
-					var31.draw(var43, var24 + 3, var26, 0, -1);
-				}
-			}
-
-			if (var10.type == 9) {
-				if (var10.field2598) {
-					var19 = var12;
-					var20 = var13 + var10.height;
-					var21 = var12 + var10.width;
-					var22 = var13;
-				} else {
-					var19 = var12;
-					var20 = var13;
-					var21 = var12 + var10.width;
-					var22 = var13 + var10.height;
-				}
-
-				if (var10.lineWid == 1) {
-					Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color);
-				} else {
-					MusicPatchPcmStream.method3912(var19, var20, var21, var22, var10.color, var10.lineWid);
-				}
-			}
-		}
-
-	}
-
-	@ObfuscatedName("ka")
-	@ObfuscatedSignature(
-		signature = "(Lhj;B)Ljava/lang/String;",
-		garbageValue = "70"
-	)
-	static String method5318(Widget var0) {
-		if (HealthBar.method1957(class268.getWidgetClickMask(var0)) == 0) {
-			return null;
-		}
-		return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null;
 	}
 }

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

@@ -4,29 +4,27 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ku")
+@ObfuscatedName("kr")
 @Implements("Fonts")
 public class Fonts {
-	@ObfuscatedName("r")
+	@ObfuscatedName("s")
-	static int[] field3689;
-	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("spritesArchive")
 	AbstractArchive spritesArchive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("fontsArchive")
 	AbstractArchive fontsArchive;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("map")
 	HashMap map;
 
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;)V"
+		signature = "(Lhz;Lhz;)V"
 	)
 	public Fonts(AbstractArchive var1, AbstractArchive var2) {
 		this.spritesArchive = var1;
@@ -34,10 +32,10 @@ public class Fonts {
 		this.map = new HashMap();
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "([Lkd;I)Ljava/util/HashMap;",
+		signature = "([Lkz;I)Ljava/util/HashMap;",
-		garbageValue = "-354104614"
+		garbageValue = "2107388628"
 	)
 	@Export("createMap")
 	public HashMap createMap(FontName[] var1) {
@@ -49,7 +47,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = class287.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
+				Font var6 = PcmPlayer.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);
@@ -59,4 +57,24 @@ public class Fonts {
 
 		return var2;
 	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(I)[Lha;",
+		garbageValue = "1384146854"
+	)
+	public static ServerBuild[] method5240() {
+		return new ServerBuild[]{ServerBuild.WIP, ServerBuild.LIVE, ServerBuild.BUILDLIVE, ServerBuild.RC};
+	}
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(Lhz;Lhz;Lhz;I)V",
+		garbageValue = "-1215139257"
+	)
+	public static void method5234(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+		SequenceDefinition.SequenceDefinition_archive = var0;
+		SequenceDefinition.SequenceDefinition_animationsArchive = var1;
+		SequenceDefinition.SequenceDefinition_skeletonsArchive = var2;
+	}
 }

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

@@ -3,23 +3,27 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ek")
+@ObfuscatedName("ee")
 @Implements("Frames")
 public class Frames extends DualNode {
-	@ObfuscatedName("i")
+	@ObfuscatedName("t")
-	@Export("SpriteBuffer_spritePalette")
-	public static int[] SpriteBuffer_spritePalette;
-	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "[Lda;"
+		signature = "Lhz;"
+	)
+	@Export("ItemDefinition_modelArchive")
+	static AbstractArchive ItemDefinition_modelArchive;
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "[Ldi;"
 	)
 	@Export("frames")
 	Animation[] frames;
 
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;IZ)V"
+		signature = "(Lhz;Lhz;IZ)V",
+		garbageValue = "0"
 	)
-	Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
+	public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
 		NodeDeque var5 = new NodeDeque();
 		int var6 = var1.getGroupFileCount(var3);
 		this.frames = new Animation[var6];
@@ -38,13 +42,7 @@ public class Frames extends DualNode {
 			}
 
 			if (var10 == null) {
-				byte[] var13;
+				byte[] var13 = var2.getFile(var11, 0);
-				if (var4) {
-					var13 = var2.getFile(0, var11);
-				} else {
-					var13 = var2.getFile(var11, 0);
-				}
-
 				var10 = new Skeleton(var11, var13);
 				var5.addFirst(var10);
 			}
@@ -54,199 +52,33 @@ public class Frames extends DualNode {
 
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(II)Z",
+		signature = "(IB)Z",
-		garbageValue = "1644534064"
+		garbageValue = "-5"
 	)
 	@Export("hasAlphaTransform")
 	public boolean hasAlphaTransform(int var1) {
 		return this.frames[var1].hasAlphaTransform;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("ix")
 	@ObfuscatedSignature(
-		signature = "(IILfl;Lfv;I)Z",
+		signature = "(II)Ljava/lang/String;",
-		garbageValue = "4377134"
+		garbageValue = "-737033535"
 	)
-	public static final boolean method3267(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+	@Export("formatItemStacks")
-		int var4 = var0;
+	static final String formatItemStacks(int var0) {
-		int var5 = var1;
+		String var1 = Integer.toString(var0);
-		byte var6 = 64;
-		byte var7 = 64;
-		int var8 = var0 - var6;
-		int var9 = var1 - var7;
-		class173.directions[var6][var7] = 99;
-		class173.distances[var6][var7] = 0;
-		byte var10 = 0;
-		int var11 = 0;
-		class173.bufferX[var10] = var0;
-		int var18 = var10 + 1;
-		class173.bufferY[var10] = var1;
-		int[][] var12 = var3.flags;
 
-		while (var11 != var18) {
+		for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
-			var4 = class173.bufferX[var11];
+			var1 = var1.substring(0, var2) + "," + var1.substring(var2);
-			var5 = class173.bufferY[var11];
-			var11 = var11 + 1 & 4095;
-			int var16 = var4 - var8;
-			int var17 = var5 - var9;
-			int var13 = var4 - var3.xInset;
-			int var14 = var5 - var3.yInset;
-			if (var2.hasArrived(2, var4, var5, var3)) {
-				class173.field2088 = var4;
-				class218.field2707 = var5;
-				return true;
-			}
-
-			int var15 = class173.distances[var16][var17] + 1;
-			if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) {
-				class173.bufferX[var18] = var4 - 1;
-				class173.bufferY[var18] = var5;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 - 1][var17] = 2;
-				class173.distances[var16 - 1][var17] = var15;
-			}
-
-			if (var16 < 126 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) {
-				class173.bufferX[var18] = var4 + 1;
-				class173.bufferY[var18] = var5;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 + 1][var17] = 8;
-				class173.distances[var16 + 1][var17] = var15;
-			}
-
-			if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) {
-				class173.bufferX[var18] = var4;
-				class173.bufferY[var18] = var5 - 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16][var17 - 1] = 1;
-				class173.distances[var16][var17 - 1] = var15;
-			}
-
-			if (var17 < 126 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) {
-				class173.bufferX[var18] = var4;
-				class173.bufferY[var18] = var5 + 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16][var17 + 1] = 4;
-				class173.distances[var16][var17 + 1] = var15;
-			}
-
-			if (var16 > 0 && var17 > 0 && class173.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) {
-				class173.bufferX[var18] = var4 - 1;
-				class173.bufferY[var18] = var5 - 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 - 1][var17 - 1] = 3;
-				class173.distances[var16 - 1][var17 - 1] = var15;
-			}
-
-			if (var16 < 126 && var17 > 0 && class173.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) {
-				class173.bufferX[var18] = var4 + 1;
-				class173.bufferY[var18] = var5 - 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 + 1][var17 - 1] = 9;
-				class173.distances[var16 + 1][var17 - 1] = var15;
-			}
-
-			if (var16 > 0 && var17 < 126 && class173.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) {
-				class173.bufferX[var18] = var4 - 1;
-				class173.bufferY[var18] = var5 + 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 - 1][var17 + 1] = 6;
-				class173.distances[var16 - 1][var17 + 1] = var15;
-			}
-
-			if (var16 < 126 && var17 < 126 && class173.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) {
-				class173.bufferX[var18] = var4 + 1;
-				class173.bufferY[var18] = var5 + 1;
-				var18 = var18 + 1 & 4095;
-				class173.directions[var16 + 1][var17 + 1] = 12;
-				class173.distances[var16 + 1][var17 + 1] = var15;
-			}
 		}
 
-		class173.field2088 = var4;
+		if (var1.length() > 9) {
-		class218.field2707 = var5;
+			return " " + class16.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>";
-		return false;
+		} else {
-	}
+			return var1.length() > 6 ? " " + class16.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>" : " " + class16.colorStartTag(16776960) + var1 + "</col>";
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		signature = "(Ldm;IIIB)Z",
-		garbageValue = "44"
-	)
-	@Export("boundingBoxCheck")
-	static final boolean boundingBoxCheck(Model var0, int var1, int var2, int var3) {
-		boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
-		if (!var4) {
-			return false;
 		}
-		int var5;
-		int var6;
-		int var7;
-		int var8;
-		int var11;
-		int var12;
-		int var13;
-		int var16;
-		int var17;
-		if (!ViewportMouse.ViewportMouse_false0) {
-			var5 = Scene.Scene_cameraPitchSine;
-			var6 = Scene.Scene_cameraPitchCosine;
-			var7 = Scene.Scene_cameraYawSine;
-			var8 = Scene.Scene_cameraYawCosine;
-			byte var9 = 50;
-			short var10 = 3500;
-			var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom;
-			var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom;
-			var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom;
-			int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom;
-			int var15 = Rasterizer3D.rot1(var12, var9, var6, var5);
-			var16 = Rasterizer3D.rot2(var12, var9, var6, var5);
-			var12 = var15;
-			var15 = Rasterizer3D.rot1(var14, var10, var6, var5);
-			var17 = Rasterizer3D.rot2(var14, var10, var6, var5);
-			var14 = var15;
-			var15 = Rasterizer3D.rot3(var11, var16, var8, var7);
-			var16 = Rasterizer3D.rot4(var11, var16, var8, var7);
-			var11 = var15;
-			var15 = Rasterizer3D.rot3(var13, var17, var8, var7);
-			var17 = Rasterizer3D.rot4(var13, var17, var8, var7);
-			ModelData0.field1871 = (var11 + var15) / 2;
-			ViewportMouse.field1745 = (var12 + var14) / 2;
-			ViewportMouse.field1746 = (var16 + var17) / 2;
-			TileItem.field1242 = (var15 - var11) / 2;
-			GrandExchangeEvent.field48 = (var14 - var12) / 2;
-			Canvas.field422 = (var17 - var16) / 2;
-			ScriptFrame.field527 = Math.abs(TileItem.field1242);
-			ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48);
-			MenuAction.field1160 = Math.abs(Canvas.field422);
-		}
-
-		var5 = var0.xMid + var1;
-		var6 = var2 + var0.yMid;
-		var7 = var3 + var0.zMid;
-		var8 = var0.xMidOffset;
-		var16 = var0.yMidOffset;
-		var17 = var0.zMidOffset;
-		var11 = ModelData0.field1871 - var5;
-		var12 = ViewportMouse.field1745 - var6;
-		var13 = ViewportMouse.field1746 - var7;
-		if (Math.abs(var11) > var8 + ScriptFrame.field527) {
-			return false;
-		}
-		if (Math.abs(var12) > var16 + ViewportMouse.field1741) {
-			return false;
-		}
-		if (Math.abs(var13) > var17 + MenuAction.field1160) {
-			return false;
-		}
-		if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) {
-			return false;
-		}
-		if (Math.abs(var11 * Canvas.field422 - var13 * TileItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
-			return false;
-		}
-		return Math.abs(var12 * TileItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741;
 	}
 }

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

@@ -3,55 +3,49 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("js")
+@ObfuscatedName("ja")
 @Implements("Friend")
 public class Friend extends Buddy {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
-	boolean field3650;
+	boolean field3607;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
-	boolean field3651;
+	boolean field3606;
 
 	Friend() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljs;I)I",
+		signature = "(Lja;B)I",
-		garbageValue = "-1814764429"
+		garbageValue = "113"
 	)
 	@Export("compareToFriend")
 	int compareToFriend(Friend var1) {
 		if (super.world == Client.worldId && Client.worldId != var1.world) {
 			return -1;
-		}
+		} else if (Client.worldId == var1.world && super.world != Client.worldId) {
-		if (Client.worldId == var1.world && super.world != Client.worldId) {
 			return 1;
-		}
+		} else if (super.world != 0 && var1.world == 0) {
-		if (super.world != 0 && var1.world == 0) {
 			return -1;
-		}
+		} else if (var1.world != 0 && super.world == 0) {
-		if (var1.world != 0 && super.world == 0) {
 			return 1;
-		}
+		} else if (this.field3607 && !var1.field3607) {
-		if (this.field3650 && !var1.field3650) {
 			return -1;
-		}
+		} else if (!this.field3607 && var1.field3607) {
-		if (!this.field3650 && var1.field3650) {
 			return 1;
-		}
+		} else if (this.field3606 && !var1.field3606) {
-		if (this.field3651 && !var1.field3651) {
 			return -1;
-		}
+		} else if (!this.field3606 && var1.field3606) {
-		if (!this.field3651 && var1.field3651) {
 			return 1;
+		} else {
+			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
-		return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		signature = "(Ljd;I)I",
+		signature = "(Lju;B)I",
-		garbageValue = "-1938562722"
+		garbageValue = "1"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -62,100 +56,45 @@ public class Friend extends Buddy {
 		return this.compareToFriend((Friend)var1);
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Lhp;IIB)Z",
+		signature = "(IZB)Ljava/lang/String;",
-		garbageValue = "-3"
+		garbageValue = "104"
 	)
-	@Export("SpriteBuffer_bufferFile")
+	@Export("intToString")
-	public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) {
+	public static String intToString(int var0, boolean var1) {
-		byte[] var3 = var0.takeFile(var1, var2);
+		if (var1 && var0 >= 0) {
-		if (var3 == null) {
+			int var3 = var0;
-			return false;
+			String var2;
-		}
+			if (var1 && var0 >= 0) {
-		class185.SpriteBuffer_decode(var3);
+				int var4 = 2;
-		return true;
-	}
 
-	@ObfuscatedName("fv")
+				for (int var5 = var0 / 10; var5 != 0; ++var4) {
-	@ObfuscatedSignature(
+					var5 /= 10;
-		signature = "(Lbq;I)V",
-		garbageValue = "230469601"
-	)
-	static final void method5226(Actor var0) {
-		if (var0.field948 == 0) {
-			return;
-		}
-		if (var0.targetIndex != -1) {
-			Object var1 = null;
-			if (var0.targetIndex < 32768) {
-				var1 = Client.npcs[var0.targetIndex];
-			} else if (var0.targetIndex >= 32768) {
-				var1 = Client.players[var0.targetIndex - 32768];
-			}
-
-			if (var1 != null) {
-				int var2 = var0.x - ((Actor)var1).x;
-				int var3 = var0.y - ((Actor)var1).y;
-				if (var2 != 0 || var3 != 0) {
-					var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
 				}
-			} else if (var0.false0) {
-				var0.targetIndex = -1;
-				var0.false0 = false;
-			}
-		}
 
-		if (var0.field976 != -1 && (var0.pathLength == 0 || var0.field1007 > 0)) {
+				char[] var6 = new char[var4];
-			var0.orientation = var0.field976;
+				var6[0] = '+';
-			var0.field976 = -1;
-		}
 
-		int var4 = var0.orientation - var0.rotation & 2047;
+				for (int var7 = var4 - 1; var7 > 0; --var7) {
-		if (var4 == 0 && var0.false0) {
+					int var8 = var3;
-			var0.targetIndex = -1;
+					var3 /= 10;
-			var0.false0 = false;
+					int var9 = var8 - var3 * 10;
-		}
+					if (var9 >= 10) {
-
+						var6[var7] = (char)(var9 + 87);
-		if (var4 == 0) {
+					} else {
-			var0.field1009 = 0;
+						var6[var7] = (char)(var9 + 48);
-			return;
+					}
-		}
-		++var0.field1009;
-		boolean var6;
-		if (var4 > 1024) {
-			var0.rotation -= var0.field948;
-			var6 = true;
-			if (var4 < var0.field948 || var4 > 2048 - var0.field948) {
-				var0.rotation = var0.orientation;
-				var6 = false;
-			}
-
-			if (var0.movementSequence == var0.readySequence && (var0.field1009 > 25 || var6)) {
-				if (var0.turnLeftSequence != -1) {
-					var0.movementSequence = var0.turnLeftSequence;
-				} else {
-					var0.movementSequence = var0.walkSequence;
 				}
+
+				var2 = new String(var6);
+			} else {
+				var2 = Integer.toString(var0, 10);
 			}
+
+			return var2;
 		} else {
-			var0.rotation += var0.field948;
+			return Integer.toString(var0);
-			var6 = true;
-			if (var4 < var0.field948 || var4 > 2048 - var0.field948) {
-				var0.rotation = var0.orientation;
-				var6 = false;
-			}
-
-			if (var0.readySequence == var0.movementSequence && (var0.field1009 > 25 || var6)) {
-				if (var0.turnRightSequence != -1) {
-					var0.movementSequence = var0.turnRightSequence;
-				} else {
-					var0.movementSequence = var0.walkSequence;
-				}
-			}
 		}
-
-		var0.rotation &= 2047;
-
 	}
 }

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

@@ -4,31 +4,116 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("kc")
+@ObfuscatedName("jv")
 @Implements("FriendLoginUpdate")
 public class FriendLoginUpdate extends Link {
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 1546177207
+		intValue = -684756909
 	)
-	@Export("friendUpdateTimeSecs")
+	public int field3621;
-	public int friendUpdateTimeSecs;
+	@ObfuscatedName("k")
-	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ljv;"
+		signature = "Ljx;"
 	)
 	@Export("username")
 	public Username username;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("world")
 	public short world;
 
 	@ObfuscatedSignature(
-		signature = "(Ljv;I)V"
+		signature = "(Ljx;I)V"
 	)
 	FriendLoginUpdate(Username var1, int var2) {
-		this.friendUpdateTimeSecs = (int)(DirectByteArrayCopier.currentTimeMs() / 1000L);
+		this.field3621 = (int)(SequenceDefinition.method4686() / 1000L);
 		this.username = var1;
 		this.world = (short)var2;
 	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(CLgk;I)C",
+		garbageValue = "-2143738383"
+	)
+	@Export("standardizeChar")
+	static char standardizeChar(char var0, Language var1) {
+		if (var0 >= 192 && var0 <= 255) {
+			if (var0 >= 192 && var0 <= 198) {
+				return 'A';
+			}
+
+			if (var0 == 199) {
+				return 'C';
+			}
+
+			if (var0 >= 200 && var0 <= 203) {
+				return 'E';
+			}
+
+			if (var0 >= 204 && var0 <= 207) {
+				return 'I';
+			}
+
+			if (var0 == 209 && var1 != Language.Language_ES) {
+				return 'N';
+			}
+
+			if (var0 >= 210 && var0 <= 214) {
+				return 'O';
+			}
+
+			if (var0 >= 217 && var0 <= 220) {
+				return 'U';
+			}
+
+			if (var0 == 221) {
+				return 'Y';
+			}
+
+			if (var0 == 223) {
+				return 's';
+			}
+
+			if (var0 >= 224 && var0 <= 230) {
+				return 'a';
+			}
+
+			if (var0 == 231) {
+				return 'c';
+			}
+
+			if (var0 >= 232 && var0 <= 235) {
+				return 'e';
+			}
+
+			if (var0 >= 236 && var0 <= 239) {
+				return 'i';
+			}
+
+			if (var0 == 241 && var1 != Language.Language_ES) {
+				return 'n';
+			}
+
+			if (var0 >= 242 && var0 <= 246) {
+				return 'o';
+			}
+
+			if (var0 >= 249 && var0 <= 252) {
+				return 'u';
+			}
+
+			if (var0 == 253 || var0 == 255) {
+				return 'y';
+			}
+		}
+
+		if (var0 == 338) {
+			return 'O';
+		} else if (var0 == 339) {
+			return 'o';
+		} else {
+			return var0 == 376 ? 'Y' : var0;
+		}
+	}
 }

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

@@ -5,287 +5,292 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("bf")
+@ObfuscatedName("ba")
 @Implements("FriendSystem")
 public class FriendSystem {
-	@ObfuscatedName("bb")
+	@ObfuscatedName("cs")
-	@ObfuscatedSignature(
+	@Export("mouseCam")
-		signature = "[Llx;"
+	static boolean mouseCam;
+	@ObfuscatedName("hn")
+	@ObfuscatedGetter(
+		intValue = 2015707871
 	)
-	@Export("worldSelectStars")
+	@Export("oculusOrbFocalPointY")
-	static IndexedSprite[] worldSelectStars;
+	static int oculusOrbFocalPointY;
-	@ObfuscatedName("ed")
+	@ObfuscatedName("k")
-	static int[] field1074;
-	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Lmu;"
+		signature = "Llu;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ljc;"
+		signature = "Ljo;"
 	)
 	@Export("friendsList")
 	public final FriendsList friendsList;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ljf;"
+		signature = "Ljk;"
 	)
 	@Export("ignoreList")
 	public final IgnoreList ignoreList;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 1533704569
+		intValue = 1694848325
 	)
-	int field1076;
+	int field1045;
 
 	@ObfuscatedSignature(
-		signature = "(Lmu;)V"
+		signature = "(Llu;)V"
 	)
 	FriendSystem(LoginType var1) {
-		this.field1076 = 0;
+		this.field1045 = 0;
 		this.loginType = var1;
 		this.friendsList = new FriendsList(var1);
 		this.ignoreList = new IgnoreList(var1);
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(S)Z",
-		garbageValue = "-1493055205"
+		garbageValue = "-3646"
 	)
-	boolean method1791() {
+	boolean method1773() {
-		return this.field1076 == 2;
+		return this.field1045 == 2;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)V",
-		garbageValue = "2033101779"
+		garbageValue = "-52"
 	)
-	final void method1760() {
+	final void method1774() {
-		this.field1076 = 1;
+		this.field1045 = 1;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;II)V",
+		signature = "(Lky;II)V",
-		garbageValue = "499123399"
+		garbageValue = "-1957399935"
 	)
 	@Export("readUpdate")
 	final void readUpdate(Buffer var1, int var2) {
 		this.friendsList.read(var1, var2);
-		this.field1076 = 2;
+		this.field1045 = 2;
-		VertexNormal.FriendSystem_invalidateFriends();
+		class3.FriendSystem_invalidateFriends();
-	}
-
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "9"
-	)
-	@Export("processFriendUpdates")
-	final void processFriendUpdates() {
-		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
-			if ((long) var1.friendUpdateTimeSecs >= DirectByteArrayCopier.currentTimeMs() / 1000L - 5L) {
-				continue;
-			}
-			if (var1.world > 0) {
-				ScriptEvent.addGameMessage(5, "", var1.username + " has logged in.");
-			}
-
-			if (var1.world == 0) {
-				ScriptEvent.addGameMessage(5, "", var1.username + " has logged out.");
-			}
-
-			var1.remove();
-		}
-
 	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(S)V",
+		signature = "(I)V",
-		garbageValue = "487"
+		garbageValue = "-688345786"
+	)
+	@Export("processFriendUpdates")
+	final void processFriendUpdates() {
+		for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
+			if ((long)var1.field3621 < SequenceDefinition.method4686() / 1000L - 5L) {
+				if (var1.world > 0) {
+					DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged in.");
+				}
+
+				if (var1.world == 0) {
+					DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged out.");
+				}
+
+				var1.remove();
+			}
+		}
+
+	}
+
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "452224146"
 	)
 	@Export("clear")
 	final void clear() {
-		this.field1076 = 0;
+		this.field1045 = 0;
 		this.friendsList.clear();
 		this.ignoreList.clear();
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(Ljv;ZI)Z",
+		signature = "(Ljx;ZI)Z",
-		garbageValue = "277105745"
+		garbageValue = "1695640889"
 	)
 	@Export("isFriended")
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		}
+		} else if (var1.equals(WorldMapIcon_1.localPlayer.username)) {
-		if (var1.equals(Client.localPlayer.username)) {
 			return true;
+		} else {
+			return this.friendsList.isFriended(var1, var2);
 		}
-		return this.friendsList.isFriended(var1, var2);
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(Ljv;B)Z",
+		signature = "(Ljx;I)Z",
-		garbageValue = "-1"
+		garbageValue = "-33196880"
 	)
 	@Export("isIgnored")
 	final boolean isIgnored(Username var1) {
 		if (var1 == null) {
 			return false;
+		} else {
+			return this.ignoreList.contains(var1);
 		}
-		return this.ignoreList.contains(var1);
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-1616773862"
+		garbageValue = "6"
 	)
 	@Export("addFriend")
 	final void addFriend(String var1) {
-		if (var1 == null) {
+		if (var1 != null) {
-			return;
+			Username var2 = new Username(var1, this.loginType);
-		}
+			if (var2.hasCleanName()) {
-		Username var2 = new Username(var1, this.loginType);
+				if (this.friendsListIsFull()) {
-		if (!var2.hasCleanName()) {
+					class3.method53();
-			return;
+				} else {
-		}
+					StringBuilder var10000;
-		if (this.friendsListIsFull()) {
+					String var4;
-			MouseRecorder.FriendSystem_friendsListFullMes();
+					if (WorldMapIcon_1.localPlayer.username.equals(var2)) {
-		} else {
+						var10000 = null;
-			StringBuilder var10000;
+						var4 = "You can't add yourself to your own friend list";
-			String var4;
+						DirectByteArrayCopier.addGameMessage(30, "", var4);
-			if (Client.localPlayer.username.equals(var2)) {
+					} else if (this.isFriended(var2, false)) {
-				var4 = "You can't add yourself to your own friend list";
+						NPC.method1976(var1);
-				ScriptEvent.addGameMessage(30, "", var4);
+					} else if (this.isIgnored(var2)) {
-			} else if (this.isFriended(var2, false)) {
+						var10000 = new StringBuilder();
-				WorldMapManager.FriendSystem_alreadyFriendMes(var1);
+						Object var10001 = null;
-			} else if (this.isIgnored(var2)) {
+						var10000 = var10000.append("Please remove ").append(var1);
-				var10000 = new StringBuilder();
+						var10001 = null;
-				var10000.append("Please remove ").append(var1);
+						var4 = var10000.append(" from your ignore list first").toString();
-				var4 = var10000.append(" from your ignore list first").toString();
+						DirectByteArrayCopier.addGameMessage(30, "", var4);
-				ScriptEvent.addGameMessage(30, "", var4);
+					} else {
-			} else {
+						PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher);
-				PacketBufferNode var3 = Archive.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher);
+						var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
-				var3.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var1));
+						var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-				var3.packetBuffer.writeStringCp1252NullTerminated(var1);
+						Client.packetWriter.addNode(var3);
-				Client.packetWriter.addNode(var3);
+					}
+				}
 			}
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-1832843555"
+		garbageValue = "-21"
 	)
 	@Export("friendsListIsFull")
 	final boolean friendsListIsFull() {
-		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field771 != 1;
+		return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field741 != 1;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;B)V",
+		signature = "(Ljava/lang/String;I)V",
-		garbageValue = "1"
+		garbageValue = "1615716489"
 	)
 	@Export("addIgnore")
 	final void addIgnore(String var1) {
-		if (var1 == null) {
+		if (var1 != null) {
-			return;
+			Username var2 = new Username(var1, this.loginType);
-		}
+			if (var2.hasCleanName()) {
-		Username var2 = new Username(var1, this.loginType);
+				StringBuilder var10000;
-		if (!var2.hasCleanName()) {
+				String var3;
-			return;
+				if (this.canAddIgnore()) {
-		}
+					var10000 = null;
-		if (this.canAddIgnore()) {
+					var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
-			Object var10000 = null;
+					DirectByteArrayCopier.addGameMessage(30, "", var3);
-			String var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
+				} else if (WorldMapIcon_1.localPlayer.username.equals(var2)) {
-			ScriptEvent.addGameMessage(30, "", var3);
+					var10000 = null;
-		} else if (Client.localPlayer.username.equals(var2)) {
+					var3 = "You can't add yourself to your own ignore list";
-			WorldMapEvent.FriendSystem_cantIgnoreSelfMes();
+					DirectByteArrayCopier.addGameMessage(30, "", var3);
-		} else if (this.isIgnored(var2)) {
+				} else if (this.isIgnored(var2)) {
-			Client.FriendSystem_alreadyIgnoredMes(var1);
+					AbstractWorldMapIcon.method591(var1);
-		} else if (this.isFriended(var2, false)) {
+				} else if (this.isFriended(var2, false)) {
-			WorldMapID.FriendSystem_cantIgnoreFriendMes(var1);
+					var10000 = new StringBuilder();
-		} else {
+					Object var10001 = null;
-			class219.method4111(var1);
+					var10000 = var10000.append("Please remove ").append(var1);
+					var10001 = null;
+					var3 = var10000.append(" from your friend list first").toString();
+					DirectByteArrayCopier.addGameMessage(30, "", var3);
+				} else {
+					Huffman.method3902(var1);
+				}
+			}
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
 		signature = "(I)Z",
-		garbageValue = "-81479393"
+		garbageValue = "1672650441"
 	)
 	@Export("canAddIgnore")
 	final boolean canAddIgnore() {
-		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field771 != 1;
+		return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field741 != 1;
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)V",
+		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "-1086170142"
+		garbageValue = "-123"
 	)
 	@Export("removeFriend")
 	final void removeFriend(String var1) {
-		if (var1 == null) {
+		if (var1 != null) {
-			return;
+			Username var2 = new Username(var1, this.loginType);
-		}
+			if (var2.hasCleanName()) {
-		Username var2 = new Username(var1, this.loginType);
+				if (this.friendsList.removeByUsername(var2)) {
-		if (!var2.hasCleanName()) {
+					class43.method759();
-			return;
+					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher);
-		}
+					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
-		if (this.friendsList.removeByUsername(var2)) {
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-			Client.field672 = Client.cycleCntr;
+					Client.packetWriter.addNode(var3);
-			PacketBufferNode var3 = Archive.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher);
+				}
-			var3.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var1));
-			var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-			Client.packetWriter.addNode(var3);
-		}
 
-		VertexNormal.FriendSystem_invalidateFriends();
+				class3.FriendSystem_invalidateFriends();
+			}
+		}
 	}
 
-	@ObfuscatedName("d")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		signature = "(Ljava/lang/String;B)V",
-		garbageValue = "8"
+		garbageValue = "2"
 	)
 	@Export("removeIgnore")
 	final void removeIgnore(String var1) {
-		if (var1 == null) {
+		if (var1 != null) {
-			return;
+			Username var2 = new Username(var1, this.loginType);
-		}
+			if (var2.hasCleanName()) {
-		Username var2 = new Username(var1, this.loginType);
+				if (this.ignoreList.removeByUsername(var2)) {
-		if (!var2.hasCleanName()) {
+					class43.method759();
-			return;
+					PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher);
-		}
+					var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
-		if (this.ignoreList.removeByUsername(var2)) {
+					var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-			Client.field672 = Client.cycleCntr;
+					Client.packetWriter.addNode(var3);
-			PacketBufferNode var3 = Archive.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher);
+				}
-			var3.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var1));
-			var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-			Client.packetWriter.addNode(var3);
-		}
 
-		class2.FriendSystem_invalidateIgnoreds();
+				InterfaceParent.FriendSystem_invalidateIgnoreds();
+			}
+		}
 	}
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "(Ljv;I)Z",
+		signature = "(Ljx;I)Z",
-		garbageValue = "1053718867"
+		garbageValue = "2127242291"
 	)
 	@Export("isFriendAndHasWorld")
 	final boolean isFriendAndHasWorld(Username var1) {
@@ -293,226 +298,146 @@ public class FriendSystem {
 		return var2 != null && var2.hasWorld();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(III)I",
+		signature = "([Lgn;II)Lgn;",
-		garbageValue = "1745629182"
+		garbageValue = "-2035427993"
 	)
-	public static int method1819(int var0, int var1) {
+	@Export("findEnumerated")
-		int var2;
+	public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-		if (var1 > var0) {
+		Enumerated[] var2 = var0;
-			var2 = var0;
+
-			var0 = var1;
+		for (int var3 = 0; var3 < var2.length; ++var3) {
-			var1 = var2;
+			Enumerated var4 = var2[var3];
+			if (var1 == var4.rsOrdinal()) {
+				return var4;
+			}
 		}
 
-		while (var1 != 0) {
+		return null;
-			var2 = var0 % var1;
-			var0 = var1;
-			var1 = var2;
-		}
-
-		return var0;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "([BIIB)Ljava/lang/String;",
+		signature = "(I)[Lia;",
-		garbageValue = "52"
+		garbageValue = "173195137"
 	)
-	@Export("decodeStringCp1252")
+	static VerticalAlignment[] method1830() {
-	public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
+		return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3172, VerticalAlignment.field3174};
-		char[] var3 = new char[var2];
-		int var4 = 0;
-
-		for (int var5 = 0; var5 < var2; ++var5) {
-			int var6 = var0[var5 + var1] & 255;
-			if (var6 == 0) {
-				continue;
-			}
-			if (var6 >= 128 && var6 < 160) {
-				char var7 = class288.cp1252AsciiExtension[var6 - 128];
-				if (var7 == 0) {
-					var7 = '?';
-				}
-
-				var6 = var7;
-			}
-
-			var3[var4++] = (char)var6;
-		}
-
-		return new String(var3, 0, var4);
 	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(ILcr;ZI)I",
-		garbageValue = "-77884497"
+		garbageValue = "1342968347"
 	)
-	@Export("ViewportMouse_unpackID")
+	static int method1831(int var0, Script var1, boolean var2) {
-	public static int ViewportMouse_unpackID(int i) {
+		int var3;
-		return class43.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[i]);
+		int var4;
+		if (var0 == ScriptOpcodes.CC_CREATE) {
+			Interpreter.Interpreter_intStackSize -= 3;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			if (var4 == 0) {
+				throw new RuntimeException();
+			} else {
+				Widget var6 = WorldMapElement.getWidget(var3);
+				if (var6.children == null) {
+					var6.children = new Widget[var5 + 1];
+				}
+
+				if (var6.children.length <= var5) {
+					Widget[] var7 = new Widget[var5 + 1];
+
+					for (int var8 = 0; var8 < var6.children.length; ++var8) {
+						var7[var8] = var6.children[var8];
+					}
+
+					var6.children = var7;
+				}
+
+				if (var5 > 0 && var6.children[var5 - 1] == null) {
+					throw new RuntimeException("" + (var5 - 1));
+				} else {
+					Widget var12 = new Widget();
+					var12.type = var4;
+					var12.parentId = var12.id = var6.id;
+					var12.childIndex = var5;
+					var12.isIf3 = true;
+					var6.children[var5] = var12;
+					if (var2) {
+						class286.field3623 = var12;
+					} else {
+						class297.field3693 = var12;
+					}
+
+					invalidateWidget(var6);
+					return 1;
+				}
+			}
+		} else {
+			Widget var9;
+			if (var0 == ScriptOpcodes.CC_DELETE) {
+				var9 = var2 ? class286.field3623 : class297.field3693;
+				Widget var10 = WorldMapElement.getWidget(var9.id);
+				var10.children[var9.childIndex] = null;
+				invalidateWidget(var10);
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
+				var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
+				var9.children = null;
+				invalidateWidget(var9);
+				return 1;
+			} else if (var0 != ScriptOpcodes.CC_FIND) {
+				if (var0 == ScriptOpcodes.IF_FIND) {
+					var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
+					if (var9 != null) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+						if (var2) {
+							class286.field3623 = var9;
+						} else {
+							class297.field3693 = var9;
+						}
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else {
+					return 2;
+				}
+			} else {
+				Interpreter.Interpreter_intStackSize -= 2;
+				var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+				Widget var11 = ModelData0.getWidgetChild(var3, var4);
+				if (var11 != null && var4 != -1) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+					if (var2) {
+						class286.field3623 = var11;
+					} else {
+						class297.field3693 = var11;
+					}
+				} else {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+				}
+
+				return 1;
+			}
+		}
 	}
 
-	@ObfuscatedName("ag")
+	@ObfuscatedName("jk")
 	@ObfuscatedSignature(
-		signature = "(ILcx;ZI)I",
+		signature = "(Lhp;I)V",
-		garbageValue = "-680519065"
+		garbageValue = "-1019792182"
 	)
-	static int method1817(int var0, Script var1, boolean var2) {
+	@Export("invalidateWidget")
-		int var3;
+	static void invalidateWidget(Widget var0) {
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) {
+		if (var0.cycle == Client.field752) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
+			Client.field703[var0.rootIndex] = true;
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
-			return 1;
 		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
-			return 1;
-		}
-		int var12;
-		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var12 = Client.grandExchangeOffers[var3].status();
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var12 = Client.grandExchangeOffers[var3].status();
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var12 = Client.grandExchangeOffers[var3].status();
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var12 = Client.grandExchangeOffers[var3].status();
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
-			return 1;
-		}
-		boolean var13;
-		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
-			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
-			if (PendingSpawn.grandExchangeEvents != null) {
-				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
-			}
 
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
-			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
-			if (PendingSpawn.grandExchangeEvents != null) {
-				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1;
-			boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
-			if (PendingSpawn.grandExchangeEvents != null) {
-				Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
-				PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
-			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
-			if (PendingSpawn.grandExchangeEvents != null) {
-				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
-			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
-			if (PendingSpawn.grandExchangeEvents != null) {
-				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size();
-			return 1;
-		}
-		GrandExchangeEvent var11;
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age;
-			int var7 = (int)(var5 / 3600000L);
-			int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
-			int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
-			String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
-			return 1;
-		}
-		return 2;
 	}
 }

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

@@ -4,152 +4,202 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jc")
+@ObfuscatedName("jo")
 @Implements("FriendsList")
 public class FriendsList extends UserList {
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lmu;"
+		signature = "Llu;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -374978569
+		intValue = 1273879743
 	)
-	int field3643;
+	int field3600;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "Lje;"
+		signature = "Ljf;"
 	)
 	@Export("friendLoginUpdates")
 	public LinkDeque friendLoginUpdates;
 
 	@ObfuscatedSignature(
-		signature = "(Lmu;)V"
+		signature = "(Llu;)V"
 	)
 	public FriendsList(LoginType var1) {
 		super(400);
-		this.field3643 = 1;
+		this.field3600 = 1;
 		this.friendLoginUpdates = new LinkDeque();
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)Ljd;",
+		signature = "(I)Lju;",
-		garbageValue = "2016619159"
+		garbageValue = "-192021045"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Friend();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljd;",
+		signature = "(II)[Lju;",
-		garbageValue = "2126056206"
+		garbageValue = "518998026"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Friend[var1];
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Ljv;ZI)Z",
+		signature = "(Ljx;ZI)Z",
-		garbageValue = "547540517"
+		garbageValue = "-1515368457"
 	)
 	@Export("isFriended")
 	public boolean isFriended(Username var1, boolean var2) {
 		Friend var3 = (Friend)this.getByUsername(var1);
 		if (var3 == null) {
 			return false;
+		} else {
+			return !var2 || var3.world != 0;
 		}
-		return !var2 || var3.world != 0;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkf;II)V",
+		signature = "(Lky;IB)V",
-		garbageValue = "2066125669"
+		garbageValue = "0"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
-		while (var1.offset < var2) {
+		while (true) {
-			boolean var3 = var1.readUnsignedByte() == 1;
+			if (var1.offset < var2) {
-			Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
+				boolean var3 = var1.readUnsignedByte() == 1;
-			Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
+				Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-			int var6 = var1.readUnsignedShort();
+				Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-			int var7 = var1.readUnsignedByte();
+				int var6 = var1.readUnsignedShort();
-			int var8 = var1.readUnsignedByte();
+				int var7 = var1.readUnsignedByte();
-			boolean var9 = (var8 & 2) != 0;
+				int var8 = var1.readUnsignedByte();
-			boolean var10 = (var8 & 1) != 0;
+				boolean var9 = (var8 & 2) != 0;
-			if (var6 > 0) {
+				boolean var10 = (var8 & 1) != 0;
-				var1.readStringCp1252NullTerminated();
+				if (var6 > 0) {
-				var1.readUnsignedByte();
+					var1.readStringCp1252NullTerminated();
-				var1.readInt();
+					var1.readUnsignedByte();
-			}
+					var1.readInt();
-
-			var1.readStringCp1252NullTerminated();
-			if (var4 != null && var4.hasCleanName()) {
-				Friend var11 = (Friend) this.getByCurrentUsername(var4);
-				if (var3) {
-					Friend var12 = (Friend) this.getByCurrentUsername(var5);
-					if (var12 != null && var11 != var12) {
-						if (var11 != null) {
-							this.remove(var12);
-						} else {
-							var11 = var12;
-						}
-					}
 				}
 
-				if (var11 != null) {
+				var1.readStringCp1252NullTerminated();
-					this.changeName(var11, var4, var5);
+				if (var4 != null && var4.hasCleanName()) {
-					if (var6 != var11.world) {
+					Friend var11 = (Friend)this.getByCurrentUsername(var4);
-						boolean var14 = true;
+					if (var3) {
-
+						Friend var12 = (Friend)this.getByCurrentUsername(var5);
-						for (FriendLoginUpdate var13 = (FriendLoginUpdate) this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate) this.friendLoginUpdates.previous()) {
+						if (var12 != null && var12 != var11) {
-							if (var13.username.equals(var4)) {
+							if (var11 != null) {
-								if (var6 != 0 && var13.world == 0) {
+								this.remove(var12);
-									var13.remove();
+							} else {
-									var14 = false;
+								var11 = var12;
-								} else if (var6 == 0 && var13.world != 0) {
-									var13.remove();
-									var14 = false;
-								}
 							}
 						}
+					}
 
-						if (var14) {
+					if (var11 != null) {
-							this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6));
+						this.changeName(var11, var4, var5);
+						if (var6 != var11.world) {
+							boolean var14 = true;
+
+							for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) {
+								if (var13.username.equals(var4)) {
+									if (var6 != 0 && var13.world == 0) {
+										var13.remove();
+										var14 = false;
+									} else if (var6 == 0 && var13.world != 0) {
+										var13.remove();
+										var14 = false;
+									}
+								}
+							}
+
+							if (var14) {
+								this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6));
+							}
 						}
-					}
+					} else {
-				} else {
+						if (this.getSize() >= 400) {
-					if (this.getSize() >= 400) {
+							continue;
-						continue;
+						}
+
+						var11 = (Friend)this.addLast(var4, var5);
 					}
 
-					var11 = (Friend) this.addLast(var4, var5);
+					if (var6 != var11.world) {
+						var11.int2 = ++this.field3600 - 1;
+						if (var11.world == -1 && var6 == 0) {
+							var11.int2 = -(var11.int2 * 1037739243) * 1487463363;
+						}
+
+						var11.world = var6;
+					}
+
+					var11.rank = var7;
+					var11.field3607 = var9;
+					var11.field3606 = var10;
+					continue;
 				}
 
-				if (var6 != var11.world) {
-					var11.int2 = ++this.field3643 - 1;
-					if (var11.world == -1 && var6 == 0) {
-						var11.int2 = -(var11.int2 * -782754599) * -1246846103;
-					}
-
-					var11.world = var6;
-				}
-
-				var11.rank = var7;
-				var11.field3650 = var9;
-				var11.field3651 = var10;
-			} else {
 				throw new IllegalStateException();
 			}
+
+			this.sort();
+			return;
 		}
-		this.sort();
+	}
+
+	@ObfuscatedName("fk")
+	@ObfuscatedSignature(
+		signature = "(Lbd;III)V",
+		garbageValue = "1475900100"
+	)
+	@Export("performPlayerAnimation")
+	static void performPlayerAnimation(Player var0, int var1, int var2) {
+		if (var0.sequence == var1 && var1 != -1) {
+			int var3 = Widget.SequenceDefinition_get(var1).field3492;
+			if (var3 == 1) {
+				var0.sequenceFrame = 0;
+				var0.sequenceFrameCycle = 0;
+				var0.sequenceDelay = var2;
+				var0.field964 = 0;
+			}
+
+			if (var3 == 2) {
+				var0.field964 = 0;
+			}
+		} else if (var1 == -1 || var0.sequence == -1 || Widget.SequenceDefinition_get(var1).field3508 >= Widget.SequenceDefinition_get(var0.sequence).field3508) {
+			var0.sequence = var1;
+			var0.sequenceFrame = 0;
+			var0.sequenceFrameCycle = 0;
+			var0.sequenceDelay = var2;
+			var0.field964 = 0;
+			var0.field947 = var0.pathLength;
+		}
+
+	}
+
+	@ObfuscatedName("ht")
+	@ObfuscatedSignature(
+		signature = "(IIIIB)V",
+		garbageValue = "-11"
+	)
+	static final void method5102(int var0, int var1, int var2, int var3) {
+		for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
+			if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
+				Client.field829[var4] = true;
+			}
+		}
+
 	}
 }

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("ld")
+@ObfuscatedName("lc")
 @Implements("GZipDecompressor")
 public class GZipDecompressor {
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
-	@Export("Interpreter_stringLocals")
+	@ObfuscatedGetter(
-	static String[] Interpreter_stringLocals;
+		intValue = -145342191
-	@ObfuscatedName("q")
+	)
+	public static int field4007;
+	@ObfuscatedName("s")
 	@Export("inflater")
 	Inflater inflater;
 
+	public GZipDecompressor() {
+		this(-1, 1000000, 1000000);
+	}
+
 	@ObfuscatedSignature(
 		signature = "(III)V",
 		garbageValue = "1000000"
@@ -21,14 +28,10 @@ public class GZipDecompressor {
 	GZipDecompressor(int var1, int var2, int var3) {
 	}
 
-	public GZipDecompressor() {
+	@ObfuscatedName("s")
-		this(-1, 1000000, 1000000);
-	}
-
-	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Lkf;[BI)V",
+		signature = "(Lky;[BI)V",
-		garbageValue = "1327705943"
+		garbageValue = "-1662982609"
 	)
 	@Export("decompress")
 	public void decompress(Buffer var1, byte[] var2) {
@@ -50,4 +53,27 @@ public class GZipDecompressor {
 			throw new RuntimeException("");
 		}
 	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		signature = "(ZI)V",
+		garbageValue = "-2077179875"
+	)
+	static void method6390(boolean var0) {
+		Login.Login_response1 = "";
+		Login.Login_response2 = "Enter your username/email & password.";
+		Login.Login_response3 = "";
+		Login.loginIndex = 2;
+		if (var0) {
+			Login.Login_password = "";
+		}
+
+		ItemContainer.method1120();
+		if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+			Login.currentLoginField = 1;
+		} else {
+			Login.currentLoginField = 0;
+		}
+
+	}
 }

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

@@ -4,89 +4,100 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("es")
+@ObfuscatedName("ej")
 @Implements("GameObject")
 public final class GameObject {
-	@ObfuscatedName("q")
+	@ObfuscatedName("sg")
+	@ObfuscatedSignature(
+		signature = "Lic;"
+	)
+	public static class237 field1921;
+	@ObfuscatedName("dg")
+	@ObfuscatedSignature(
+		signature = "Lid;"
+	)
+	@Export("archive10")
+	static Archive archive10;
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 1570301061
+		intValue = 744501361
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -1372995053
+		intValue = 2026651009
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = 3597047
+		intValue = -500411517
 	)
 	@Export("centerX")
 	int centerX;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1286023919
+		intValue = -560576891
 	)
 	@Export("centerY")
 	int centerY;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Leo;"
+		signature = "Len;"
 	)
 	@Export("entity")
 	public Entity entity;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1679497939
+		intValue = 939156699
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 2072838249
+		intValue = 86850281
 	)
 	@Export("startX")
 	int startX;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1679068867
+		intValue = -698919929
 	)
 	@Export("endX")
 	int endX;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1593954751
+		intValue = 1676112193
 	)
 	@Export("startY")
 	int startY;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 614764075
+		intValue = 2114738955
 	)
 	@Export("endY")
 	int endY;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -2081842773
+		intValue = -1792624973
 	)
-	int field1939;
+	int field1916;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = -1806951057
+		intValue = 1739525873
 	)
 	@Export("lastDrawn")
 	int lastDrawn;
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		longValue = -3308425322664563893L
+		longValue = 7927595607641920085L
 	)
 	@Export("tag")
 	public long tag;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = -320745509
+		intValue = 692610593
 	)
 	@Export("flags")
 	int flags;
@@ -96,13 +107,25 @@ public final class GameObject {
 		this.flags = 0;
 	}
 
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;ZZI)V",
+		garbageValue = "-1828723850"
+	)
+	@Export("openURL")
+	public static void openURL(String var0, boolean var1, boolean var2) {
+		StudioGame.method4056(var0, var1, "openjs", var2);
+	}
+
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Lhp;Lhp;III)Lke;",
+		signature = "(II)I",
-		garbageValue = "-1252480817"
+		garbageValue = "-2110373438"
 	)
-	@Export("SpriteBuffer_getFont")
+	@Export("ViewportMouse_unpackY")
-	public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+	public static int ViewportMouse_unpackY(int var0) {
-		return !Friend.SpriteBuffer_bufferFile(var0, var2, var3) ? null : WallDecoration.SpriteBuffer_createFont(var1.takeFile(var2, var3));
+		long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
+		int var1 = (int)(var2 >>> 7 & 127L);
+		return var1;
 	}
 }

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

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

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

@@ -6,29 +6,24 @@ 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("b")
+@ObfuscatedName("t")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("GrandExchangeEvents_ageComparator")
 	public static Comparator GrandExchangeEvents_ageComparator;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("GrandExchangeEvents_priceComparator")
 	public static Comparator GrandExchangeEvents_priceComparator;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("GrandExchangeEvents_nameComparator")
 	public static Comparator GrandExchangeEvents_nameComparator;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("GrandExchangeEvents_quantityComparator")
 	public static Comparator GrandExchangeEvents_quantityComparator;
-	@ObfuscatedName("jb")
+	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "Ldo;"
-	)
-	@Export("textureProvider")
-	static TextureProvider textureProvider;
-	@ObfuscatedName("q")
 	@Export("events")
 	public final List events;
 
@@ -41,7 +36,7 @@ public class GrandExchangeEvents {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkf;Z)V",
+		signature = "(Lky;Z)V",
 		garbageValue = "1"
 	)
 	public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -63,10 +58,10 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljava/util/Comparator;ZS)V",
+		signature = "(Ljava/util/Comparator;ZB)V",
-		garbageValue = "128"
+		garbageValue = "64"
 	)
 	@Export("sort")
 	public void sort(Comparator var1, boolean var2) {
@@ -78,562 +73,50 @@ public class GrandExchangeEvents {
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		signature = "(I)[Lgw;",
+		signature = "(ILcr;ZS)I",
-		garbageValue = "-249126537"
+		garbageValue = "-10184"
 	)
-	public static class185[] method70() {
+	static int method84(int var0, Script var1, boolean var2) {
-		return new class185[]{class185.field2322, class185.field2316, class185.field2318, class185.field2317, class185.field2324, class185.field2319, class185.field2320, class185.field2321, class185.field2315, class185.field2323};
+		Widget var3;
-	}
+		if (var0 == ScriptOpcodes.IF_GETINVOBJECT) {
-
+			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-	@ObfuscatedName("q")
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId;
-	@ObfuscatedSignature(
+			return 1;
-		signature = "(Lhp;Lhp;B)V",
+		} else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) {
-		garbageValue = "-127"
+			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-	)
+			if (var3.itemId != -1) {
-	@Export("KitDefinition_setArchives")
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity;
-	public static void KitDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) {
+			} else {
-		KitDefinition.KitDefinition_archive = var0;
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-		class288.KitDefinition_modelsArchive = var1;
-		KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3);
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(Lhp;B)V",
-		garbageValue = "1"
-	)
-	@Export("VarpDefinition_setArchives")
-	public static void VarpDefinition_setArchives(AbstractArchive var0) {
-		VarpDefinition.VarpDefinition_archive = var0;
-		VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16);
-	}
-
-	@ObfuscatedName("i")
-	@ObfuscatedSignature(
-		signature = "(Ler;[Lfv;I)V",
-		garbageValue = "-1548454076"
-	)
-	static final void method72(Scene var0, CollisionMap[] var1) {
-		for (int var2 = 0; var2 < 4; ++var2) {
-			for (int var3 = 0; var3 < 104; ++var3) {
-				for (int var4 = 0; var4 < 104; ++var4) {
-					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) != 1) {
-						continue;
-					}
-					int var5 = var2;
-					if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
-						var5 = var2 - 1;
-					}
-
-					if (var5 >= 0) {
-						var1[var5].setBlockedByFloor(var3, var4);
-					}
-				}
-			}
-		}
-
-		Tiles.field519 += (int)(Math.random() * 5.0D) - 2;
-		if (Tiles.field519 < -8) {
-			Tiles.field519 = -8;
-		}
-
-		if (Tiles.field519 > 8) {
-			Tiles.field519 = 8;
-		}
-
-		Tiles.field510 += (int)(Math.random() * 5.0D) - 2;
-		if (Tiles.field510 < -16) {
-			Tiles.field510 = -16;
-		}
-
-		if (Tiles.field510 > 16) {
-			Tiles.field510 = 16;
-		}
-
-		int var9;
-		int var10;
-		int var11;
-		int var12;
-		int var13;
-		int var14;
-		int var15;
-		int var16;
-		int var17;
-		int var18;
-		for (int var2 = 0; var2 < 4; ++var2) {
-			byte[][] var44 = class32.field282[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 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96;
-					var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1);
-					Tiles.field515[var12][var11] = var19 - var20;
-				}
 			}
 
-			for (var11 = 0; var11 < 104; ++var11) {
+			return 1;
-				ServerBuild.Tiles_hue[var11] = 0;
+		} else if (var0 == ScriptOpcodes.IF_HASSUB) {
-				Tiles.Tiles_saturation[var11] = 0;
+			int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
-				Tiles.Tiles_lightness[var11] = 0;
+			InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5);
-				DynamicObject.Tiles_hueMultiplier[var11] = 0;
+			if (var4 != null) {
-				Fonts.field3689[var11] = 0;
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
+			} else {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
 			}
 
-			for (var11 = -5; var11 < 109; ++var11) {
+			return 1;
-				for (var12 = 0; var12 < 104; ++var12) {
+		} else if (var0 == ScriptOpcodes.IF_GETTOP) {
-					var13 = var11 + 5;
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface;
-					if (var13 >= 0 && var13 < 104) {
+			return 1;
-						var14 = Tiles.field504[var2][var13][var12] & 255;
-						if (var14 > 0) {
-							FloorUnderlayDefinition var45 = ItemContainer.FloorUnderlayDefinition_get(var14 - 1);
-							ServerBuild.Tiles_hue[var12] += var45.hue;
-							Tiles.Tiles_saturation[var12] += var45.saturation;
-							Tiles.Tiles_lightness[var12] += var45.lightness;
-							DynamicObject.Tiles_hueMultiplier[var12] += var45.hueMultiplier;
-							Fonts.field3689[var12]++;
-						}
-					}
-
-					var14 = var11 - 5;
-					if (var14 >= 0 && var14 < 104) {
-						var15 = Tiles.field504[var2][var14][var12] & 255;
-						if (var15 > 0) {
-							var17 = var15 - 1;
-							FloorUnderlayDefinition var46 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17);
-							FloorUnderlayDefinition var47;
-							if (var46 != null) {
-								var47 = var46;
-							} else {
-								byte[] var48 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17);
-								var46 = new FloorUnderlayDefinition();
-								if (var48 != null) {
-									var46.decode(new Buffer(var48), var17);
-								}
-
-								var46.postDecode();
-								FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var46, (long)var17);
-								var47 = var46;
-							}
-
-							ServerBuild.Tiles_hue[var12] -= var47.hue;
-							Tiles.Tiles_saturation[var12] -= var47.saturation;
-							Tiles.Tiles_lightness[var12] -= var47.lightness;
-							DynamicObject.Tiles_hueMultiplier[var12] -= var47.hueMultiplier;
-							Fonts.field3689[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 += ServerBuild.Tiles_hue[var18];
-							var13 += Tiles.Tiles_saturation[var18];
-							var14 += Tiles.Tiles_lightness[var18];
-							var15 += DynamicObject.Tiles_hueMultiplier[var18];
-							var16 += Fonts.field3689[var18];
-						}
-
-						var19 = var17 - 5;
-						if (var19 >= 0 && var19 < 104) {
-							var12 -= ServerBuild.Tiles_hue[var19];
-							var13 -= Tiles.Tiles_saturation[var19];
-							var14 -= Tiles.Tiles_lightness[var19];
-							var15 -= DynamicObject.Tiles_hueMultiplier[var19];
-							var16 -= Fonts.field3689[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.field504[var2][var11][var17] & 255;
-							int var21 = Tiles.field505[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.field515[var11][var17];
-								int var27 = Tiles.field515[var11 + 1][var17];
-								int var28 = Tiles.field515[var11 + 1][var17 + 1];
-								int var29 = Tiles.field515[var11][var17 + 1];
-								int var30 = -1;
-								int var31 = -1;
-								int var32;
-								int var33;
-								int var34;
-								if (var20 > 0) {
-									var32 = var12 * 256 / var15;
-									var33 = var13 / var16;
-									var34 = var14 / var16;
-									var30 = class327.hslToRgb(var32, var33, var34);
-									var32 = var32 + Tiles.field519 & 255;
-									var34 += Tiles.field510;
-									if (var34 < 0) {
-										var34 = 0;
-									} else if (var34 > 255) {
-										var34 = 255;
-									}
-
-									var31 = class327.hslToRgb(var32, var33, var34);
-								}
-
-								FloorOverlayDefinition var35;
-								if (var2 > 0) {
-									boolean var53 = true;
-									if (var20 == 0 && Tiles.field506[var2][var11][var17] != 0) {
-										var53 = false;
-									}
-
-									if (var21 > 0) {
-										var34 = var21 - 1;
-										var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34);
-										FloorOverlayDefinition var49;
-										if (var35 != null) {
-											var49 = var35;
-										} else {
-											byte[] var36 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34);
-											var35 = new FloorOverlayDefinition();
-											if (var36 != null) {
-												var35.decode(new Buffer(var36), var34);
-											}
-
-											var35.postDecode();
-											FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34);
-											var49 = var35;
-										}
-
-										if (!var49.hideUnderlay) {
-											var53 = false;
-										}
-									}
-
-									if (var53 && var23 == var22 && var22 == var24 && var25 == var22) {
-										FaceNormal.field1887[var2][var11][var17] |= 2340;
-									}
-								}
-
-								var32 = 0;
-								if (var31 != -1) {
-									var32 = Rasterizer3D.Rasterizer3D_colorPalette[GraphicsObject.method1948(var31, 96)];
-								}
-
-								if (var21 == 0) {
-									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, GraphicsObject.method1948(var30, var26), GraphicsObject.method1948(var30, var27), GraphicsObject.method1948(var30, var28), GraphicsObject.method1948(var30, var29), 0, 0, 0, 0, var32, 0);
-								} else {
-									var33 = Tiles.field506[var2][var11][var17] + 1;
-									byte var54 = class268.field3561[var2][var11][var17];
-									int var50 = var21 - 1;
-									FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var50);
-									if (var37 != null) {
-										var35 = var37;
-									} else {
-										byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var50);
-										var37 = new FloorOverlayDefinition();
-										if (var38 != null) {
-											var37.decode(new Buffer(var38), var50);
-										}
-
-										var37.postDecode();
-										FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var50);
-										var35 = var37;
-									}
-
-									int var51 = var35.texture;
-									int var39;
-									int var40;
-									int var41;
-									int var42;
-									if (var51 >= 0) {
-										var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var51);
-										var39 = -1;
-									} else if (var35.primaryRgb == 0xff00ff) {
-										var39 = -2;
-										var51 = -1;
-										var40 = -2;
-									} else {
-										var39 = class327.hslToRgb(var35.hue, var35.saturation, var35.lightness);
-										var41 = var35.hue + Tiles.field519 & 255;
-										var42 = var35.lightness + Tiles.field510;
-										if (var42 < 0) {
-											var42 = 0;
-										} else if (var42 > 255) {
-											var42 = 255;
-										}
-
-										var40 = class327.hslToRgb(var41, var35.saturation, var42);
-									}
-
-									var41 = 0;
-									if (var40 != -2) {
-										var41 = Rasterizer3D.Rasterizer3D_colorPalette[Decimator.method2517(var40, 96)];
-									}
-
-									if (var35.secondaryRgb != -1) {
-										var42 = var35.secondaryHue + Tiles.field519 & 255;
-										int var43 = var35.secondaryLightness + Tiles.field510;
-										if (var43 < 0) {
-											var43 = 0;
-										} else if (var43 > 255) {
-											var43 = 255;
-										}
-
-										var40 = class327.hslToRgb(var42, var35.secondarySaturation, var43);
-										var41 = Rasterizer3D.Rasterizer3D_colorPalette[Decimator.method2517(var40, 96)];
-									}
-
-									var0.addTile(var2, var11, var17, var33, var54, var51, var22, var23, var24, var25, GraphicsObject.method1948(var30, var26), GraphicsObject.method1948(var30, var27), GraphicsObject.method1948(var30, var28), GraphicsObject.method1948(var30, var29), Decimator.method2517(var39, var26), Decimator.method2517(var39, var27), Decimator.method2517(var39, var28), Decimator.method2517(var39, var29), var32, var41);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			for (var11 = 1; var11 < 103; ++var11) {
-				for (var12 = 1; var12 < 103; ++var12) {
-					var0.setTileMinPlane(var2, var12, var11, MilliClock.method3468(var2, var12, var11));
-				}
-			}
-
-			Tiles.field504[var2] = null;
-			Tiles.field505[var2] = null;
-			Tiles.field506[var2] = null;
-			class268.field3561[var2] = null;
-			class32.field282[var2] = null;
-		}
-
-		var0.method3097(-50, -10, -50);
-
-		for (int var2 = 0; var2 < 104; ++var2) {
-			for (int var3 = 0; var3 < 104; ++var3) {
-				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-					var0.setLinkBelow(var2, var3);
-				}
-			}
-		}
-
-		for (int var2 = 1, var3 = 2, var4 = 4, 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) {
-						if ((FaceNormal.field1887[var6][var8][var7] & var2) != 0) {
-							var9 = var7;
-							var10 = var7;
-							var11 = var6;
-
-							for (var12 = var6; var9 > 0 && (FaceNormal.field1887[var6][var8][var9 - 1] & var2) != 0; --var9) {
-							}
-
-							while (var10 < 104 && (FaceNormal.field1887[var6][var8][var10 + 1] & var2) != 0) {
-								++var10;
-							}
-
-							label478:
-							while (var11 > 0) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((FaceNormal.field1887[var11 - 1][var8][var13] & var2) == 0) {
-										break label478;
-									}
-								}
-
-								--var11;
-							}
-
-							label467:
-							while (var12 < var5) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((FaceNormal.field1887[var12 + 1][var8][var13] & var2) == 0) {
-										break label467;
-									}
-								}
-
-								++var12;
-							}
-
-							var13 = (var12 + 1 - var11) * (var10 - var9 + 1);
-							if (var13 >= 8) {
-								var15 = Tiles.Tiles_heights[var12][var8][var9] - 240;
-								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) {
-										FaceNormal.field1887[var17][var8][var18] &= ~var2;
-									}
-								}
-							}
-						}
-
-						if ((FaceNormal.field1887[var6][var8][var7] & var3) != 0) {
-							var9 = var8;
-							var10 = var8;
-							var11 = var6;
-
-							for (var12 = var6; var9 > 0 && (FaceNormal.field1887[var6][var9 - 1][var7] & var3) != 0; --var9) {
-							}
-
-							while (var10 < 104 && (FaceNormal.field1887[var6][var10 + 1][var7] & var3) != 0) {
-								++var10;
-							}
-
-							label531:
-							while (var11 > 0) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((FaceNormal.field1887[var11 - 1][var13][var7] & var3) == 0) {
-										break label531;
-									}
-								}
-
-								--var11;
-							}
-
-							label520:
-							while (var12 < var5) {
-								for (var13 = var9; var13 <= var10; ++var13) {
-									if ((FaceNormal.field1887[var12 + 1][var13][var7] & var3) == 0) {
-										break label520;
-									}
-								}
-
-								++var12;
-							}
-
-							var13 = (var10 - var9 + 1) * (var12 + 1 - var11);
-							if (var13 >= 8) {
-								var15 = Tiles.Tiles_heights[var12][var9][var7] - 240;
-								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) {
-										FaceNormal.field1887[var17][var18][var7] &= ~var3;
-									}
-								}
-							}
-						}
-
-						if ((FaceNormal.field1887[var6][var8][var7] & var4) != 0) {
-							var9 = var8;
-							var10 = var8;
-							var11 = var7;
-
-							for (var12 = var7; var11 > 0 && (FaceNormal.field1887[var6][var8][var11 - 1] & var4) != 0; --var11) {
-							}
-
-							while (var12 < 104 && (FaceNormal.field1887[var6][var8][var12 + 1] & var4) != 0) {
-								++var12;
-							}
-
-							label584:
-							while (var9 > 0) {
-								for (var13 = var11; var13 <= var12; ++var13) {
-									if ((FaceNormal.field1887[var6][var9 - 1][var13] & var4) == 0) {
-										break label584;
-									}
-								}
-
-								--var9;
-							}
-
-							label573:
-							while (var10 < 104) {
-								for (var13 = var11; var13 <= var12; ++var13) {
-									if ((FaceNormal.field1887[var6][var10 + 1][var13] & var4) == 0) {
-										break label573;
-									}
-								}
-
-								++var10;
-							}
-
-							if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) {
-								var13 = Tiles.Tiles_heights[var6][var9][var11];
-								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13);
-
-								for (var14 = var9; var14 <= var10; ++var14) {
-									for (var15 = var11; var15 <= var12; ++var15) {
-										FaceNormal.field1887[var6][var14][var15] &= ~var4;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-	}
-
-	@ObfuscatedName("il")
-	@ObfuscatedSignature(
-		signature = "(Lhj;IIIIIII)V",
-		garbageValue = "-2024126373"
-	)
-	static final void method71(Widget var0, int x, int y, int height, int scrollHeight, int mouseX, int mouseY) {
-		if (Client.field719) {
-			Client.alternativeScrollbarWidth = 32;
 		} else {
-			Client.alternativeScrollbarWidth = 0;
+			return 2;
-		}
-
-		Client.field719 = false;
-		int var7;
-		if (MouseHandler.MouseHandler_currentButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
-			if (mouseX >= x && mouseX < x + 16 && mouseY >= y && mouseY < y + 16) {
-				var0.scrollY -= 4;
-				Strings.invalidateWidget(var0);
-			} else if (mouseX >= x && mouseX < x + 16 && mouseY >= height + y - 16 && mouseY < height + y) {
-				var0.scrollY += 4;
-				Strings.invalidateWidget(var0);
-			} else if (mouseX >= x - Client.alternativeScrollbarWidth && mouseX < Client.alternativeScrollbarWidth + x + 16 && mouseY >= y + 16 && mouseY < height + y - 16) {
-				var7 = height * (height - 32) / scrollHeight;
-				if (var7 < 8) {
-					var7 = 8;
-				}
-
-				int var8 = mouseY - y - 16 - var7 / 2;
-				int var9 = height - 32 - var7;
-				var0.scrollY = var8 * (scrollHeight - height) / var9;
-				Strings.invalidateWidget(var0);
-				Client.field719 = true;
-			}
-		}
-
-		if (Client.mouseWheelRotation != 0) {
-			var7 = var0.width;
-			if (mouseX >= x - var7 && mouseY >= y && mouseX < x + 16 && mouseY <= height + y) {
-				var0.scrollY += Client.mouseWheelRotation * 45;
-				Strings.invalidateWidget(var0);
-			}
 		}
+	}
 
+	@ObfuscatedName("gc")
+	@ObfuscatedSignature(
+		signature = "(B)Z",
+		garbageValue = "0"
+	)
+	static boolean method81() {
+		return (Client.drawPlayerNames & 1) != 0;
 	}
 }

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

@@ -5,44 +5,51 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("f")
+@ObfuscatedName("d")
 @Implements("GrandExchangeOffer")
 public class GrandExchangeOffer {
-	@ObfuscatedName("ab")
+	@ObfuscatedName("st")
 	@ObfuscatedGetter(
-		intValue = 1444342479
+		intValue = 549974423
 	)
-	static int field65;
+	@Export("foundItemIndex")
-	@ObfuscatedName("q")
+	static int foundItemIndex;
+	@ObfuscatedName("se")
+	@ObfuscatedSignature(
+		signature = "Lbx;"
+	)
+	@Export("clientPreferences")
+	static ClientPreferences clientPreferences;
+	@ObfuscatedName("s")
 	@Export("state")
 	byte state;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1838555809
+		intValue = 416922963
 	)
 	@Export("id")
 	public int id;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -2108350067
+		intValue = 1858157699
 	)
 	@Export("unitPrice")
 	public int unitPrice;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = -725683921
+		intValue = -214524093
 	)
 	@Export("totalQuantity")
 	public int totalQuantity;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = 663706157
+		intValue = 280180281
 	)
 	@Export("currentQuantity")
 	public int currentQuantity;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1954345153
+		intValue = 24514895
 	)
 	@Export("currentPrice")
 	public int currentPrice;
@@ -51,7 +58,7 @@ public class GrandExchangeOffer {
 	}
 
 	@ObfuscatedSignature(
-		signature = "(Lkf;Z)V",
+		signature = "(Lky;Z)V",
 		garbageValue = "0"
 	)
 	public GrandExchangeOffer(Buffer var1, boolean var2) {
@@ -63,42 +70,42 @@ public class GrandExchangeOffer {
 		this.currentPrice = var1.readInt();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(B)I",
+		signature = "(I)I",
-		garbageValue = "0"
+		garbageValue = "-1032509365"
 	)
 	@Export("status")
 	public int status() {
 		return this.state & 7;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
 		signature = "(I)I",
-		garbageValue = "-1998926597"
+		garbageValue = "-636010194"
 	)
 	@Export("type")
 	public int type() {
 		return (this.state & 8) == 8 ? 1 : 0;
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)V",
-		garbageValue = "126"
+		garbageValue = "1701823469"
 	)
-	void method115(int var1) {
+	void method108(int var1) {
 		this.state &= -8;
 		this.state = (byte)(this.state | var1 & 7);
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		signature = "(II)V",
-		garbageValue = "874487771"
+		garbageValue = "-184114003"
 	)
-	void method100(int var1) {
+	void method124(int var1) {
 		this.state &= -9;
 		if (var1 == 1) {
 			this.state = (byte)(this.state | 8);
@@ -106,488 +113,269 @@ public class GrandExchangeOffer {
 
 	}
 
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "([Ljava/lang/String;[SIIB)V",
-		garbageValue = "32"
-	)
-	@Export("sortItemsByName")
-	static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
-		if (var2 >= var3) {
-			return;
-		}
-		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("k")
 	@ObfuscatedSignature(
-		signature = "(IIIZIZB)V",
+		signature = "(Ljava/lang/String;II)Z",
-		garbageValue = "1"
+		garbageValue = "-1475643333"
 	)
-	@Export("doWorldSorting")
+	static boolean method109(String var0, int var1) {
-	static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
+		return WorldMapSection0.method232(var0, var1, "openjs");
-		if (var0 >= var1) {
-			return;
-		}
-		int var6 = (var0 + var1) / 2;
-		int var7 = var0;
-		World var8 = World.World_worlds[var6];
-		World.World_worlds[var6] = World.World_worlds[var1];
-		World.World_worlds[var1] = var8;
-
-		for (int var9 = var0; var9 < var1; ++var9) {
-			World var11 = World.World_worlds[var9];
-			int var12 = DynamicObject.compareWorlds(var11, var8, var2, var3);
-			int var10;
-			if (var12 != 0) {
-				if (var3) {
-					var10 = -var12;
-				} else {
-					var10 = var12;
-				}
-			} else if (var4 == -1) {
-				var10 = 0;
-			} else {
-				int var13 = DynamicObject.compareWorlds(var11, var8, var4, var5);
-				if (var5) {
-					var10 = -var13;
-				} else {
-					var10 = var13;
-				}
-			}
-
-			if (var10 <= 0) {
-				World var14 = World.World_worlds[var9];
-				World.World_worlds[var9] = World.World_worlds[var7];
-				World.World_worlds[var7++] = var14;
-			}
-		}
-
-		World.World_worlds[var1] = World.World_worlds[var7];
-		World.World_worlds[var7] = var8;
-		doWorldSorting(var0, var7 - 1, var2, var3, var4, var5);
-		doWorldSorting(var7 + 1, var1, var2, var3, var4, var5);
-
 	}
 
-	@ObfuscatedName("an")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(ILcx;ZI)I",
+		signature = "(ILcr;ZB)I",
-		garbageValue = "1926107602"
+		garbageValue = "5"
 	)
-	static int method114(int var0, Script var1, boolean var2) {
+	static int method123(int var0, Script var1, boolean var2) {
-		int var3;
+		Widget var3;
-		if (var0 == 6600) {
+		if (var0 >= 2000) {
-			var3 = class42.plane;
+			var0 -= 1000;
-			int var9 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7);
+			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
-			int var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7);
-			WorldMapID.getWorldMap().method6309(var3, var9, var5, true);
-			return 1;
-		}
-		WorldMapArea var11;
-		if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			String var16 = "";
-			var11 = WorldMapID.getWorldMap().getMapArea(var3);
-			if (var11 != null) {
-				var16 = var11.getExternalName();
-			}
-
-			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			WorldMapID.getWorldMap().setCurrentMapAreaId(var3);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			WorldMapID.getWorldMap().setZoomPercentage(var3);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0;
-			return 1;
-		}
-		Coord var15;
-		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX();
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY();
-			return 1;
-		}
-		WorldMapArea var13;
-		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var13 = WorldMapID.getWorldMap().getMapArea(var3);
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getOrigin().packed();
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var13 = WorldMapID.getWorldMap().getMapArea(var3);
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var13 = WorldMapID.getWorldMap().getMapArea(var3);
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var13 = WorldMapID.getWorldMap().getMapArea(var3);
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getZoom();
-			}
-
-			return 1;
-		}
-		if (var0 == 6615) {
-			var15 = WorldMapID.getWorldMap().getDisplayCoord();
-			if (var15 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.x;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.y;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			var13 = WorldMapID.getWorldMap().getCurrentMapArea();
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				return 1;
-			}
-			int[] var14 = var13.position(var15.plane, var15.x, var15.y);
-			if (var14 == null) {
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				} else {
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[0];
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[1];
-				}
-
-			return 1;
-		}
-		Coord var7;
-		if (var0 == 6618) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			var13 = WorldMapID.getWorldMap().getCurrentMapArea();
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				return 1;
-			}
-			var7 = var13.coord(var15.x, var15.y);
-			if (var7 == null) {
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				} else {
-					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed();
-				}
-
-			return 1;
-		}
-		Coord var12;
-		if (var0 == 6619) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
-			ObjectSound.method1824(var3, var12, false);
-			return 1;
-		}
-		if (var0 == 6620) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
-			ObjectSound.method1824(var3, var12, true);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
-			var11 = WorldMapID.getWorldMap().getMapArea(var3);
-			if (var11 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-				return 1;
-			}
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith();
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight();
-			return 1;
-		}
-		if (var0 == 6623) {
-			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
-			if (var13 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getId();
-			}
-
-			return 1;
-		}
-		if (var0 == 6624) {
-			WorldMapID.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			return 1;
-		}
-		if (var0 == 6625) {
-			WorldMapID.getWorldMap().resetMaxFlashCount();
-			return 1;
-		}
-		if (var0 == 6626) {
-			WorldMapID.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-			return 1;
-		}
-		if (var0 == 6627) {
-			WorldMapID.getWorldMap().resetCyclesPerFlash();
-			return 1;
-		}
-		boolean var10;
-		if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
-			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
-			WorldMapID.getWorldMap().setPerpetualFlash(var10);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			WorldMapID.getWorldMap().flashElement(var3);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			WorldMapID.getWorldMap().flashCategory(var3);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
-			WorldMapID.getWorldMap().stopCurrentFlashes();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
-			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
-			WorldMapID.getWorldMap().setElementsDisabled(var10);
-			return 1;
-		}
-		boolean var4;
-		if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
-			WorldMapID.getWorldMap().disableElement(var3, var4);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
-			WorldMapID.getWorldMap().setCategoryDisabled(var3, var4);
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0;
-			return 1;
-		}
-		if (var0 == 6638) {
-			HealthBarUpdate.Interpreter_intStackSize -= 2;
-			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
-			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
-			var7 = WorldMapID.getWorldMap().method6352(var3, var12);
-			if (var7 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed();
-			}
-
-			return 1;
-		}
-		AbstractWorldMapIcon var8;
-		if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
-			var8 = WorldMapID.getWorldMap().iconStart();
-			if (var8 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement();
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed();
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
-			var8 = WorldMapID.getWorldMap().iconNext();
-			if (var8 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement();
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed();
-			}
-
-			return 1;
-		}
-		WorldMapElement var6;
-		if (var0 == ScriptOpcodes.MEC_TEXT) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = class222.WorldMapElement_get(var3);
-			if (var6.name == null) {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-			} else {
-				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6.name;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = class222.WorldMapElement_get(var3);
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.MEC_CATEGORY) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = class222.WorldMapElement_get(var3);
-			if (var6 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.category;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.MEC_SPRITE) {
-			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-			var6 = class222.WorldMapElement_get(var3);
-			if (var6 == null) {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
-			} else {
-				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.sprite1;
-			}
-
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement;
-			return 1;
-		}
-		if (var0 == 6698) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed();
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed();
-			return 1;
-		}
-		return 2;
-	}
-
-	@ObfuscatedName("fk")
-	@ObfuscatedSignature(
-		signature = "(ZI)V",
-		garbageValue = "-1093013043"
-	)
-	static final void method99(boolean var0) {
-		if (var0) {
-			Client.field690 = Login.field1201 ? class160.field2004 : class160.field2002;
 		} else {
-			Client.field690 = WorldMapLabelSize.clientPreferences.parameters.containsKey(ViewportMouse.method2971(Login.Login_username)) ? class160.field2005 : class160.field2001;
+			var3 = var2 ? class286.field3623 : class297.field3693;
+		}
+
+		FriendSystem.invalidateWidget(var3);
+		if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) {
+			if (var0 == ScriptOpcodes.CC_SETNPCHEAD) {
+				var3.modelType = 2;
+				var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+				return 1;
+			} else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) {
+				var3.modelType = 3;
+				var3.modelId = WorldMapIcon_1.localPlayer.appearance.getChatHeadId();
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			Interpreter.Interpreter_intStackSize -= 2;
+			int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			var3.itemId = var4;
+			var3.itemQuantity = var5;
+			ItemDefinition var6 = WorldMapData_0.ItemDefinition_get(var4);
+			var3.modelAngleX = var6.xan2d;
+			var3.modelAngleY = var6.yan2d;
+			var3.modelAngleZ = var6.zan2d;
+			var3.modelOffsetX = var6.offsetX2d;
+			var3.modelOffsetY = var6.offsetY2d;
+			var3.modelZoom = var6.zoom2d;
+			if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
+				var3.itemQuantityMode = 0;
+			} else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) {
+				var3.itemQuantityMode = 1;
+			} else {
+				var3.itemQuantityMode = 2;
+			}
+
+			if (var3.field2638 > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.field2638;
+			} else if (var3.rawWidth > 0) {
+				var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
+			}
+
+			return 1;
+		}
+	}
+
+	@ObfuscatedName("hs")
+	@ObfuscatedSignature(
+		signature = "(ZLkx;B)V",
+		garbageValue = "104"
+	)
+	@Export("updateNpcs")
+	static final void updateNpcs(boolean var0, PacketBuffer var1) {
+		Client.field899 = 0;
+		Client.field861 = 0;
+		GrandExchangeOfferUnitPriceComparator.readNpcUpdates();
+		BoundaryObject.method3216(var0, var1);
+		method112(var1);
+
+		int var2;
+		for (var2 = 0; var2 < Client.field899; ++var2) {
+			int var3 = Client.field655[var2];
+			if (Client.npcs[var3].npcCycle != Client.cycle) {
+				Client.npcs[var3].definition = null;
+				Client.npcs[var3] = null;
+			}
+		}
+
+		if (var1.offset != Client.packetWriter.serverPacketLength) {
+			throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
+		} else {
+			for (var2 = 0; var2 < Client.npcCount; ++var2) {
+				if (Client.npcs[Client.npcIndices[var2]] == null) {
+					throw new RuntimeException(var2 + "," + Client.npcCount);
+				}
+			}
+
+		}
+	}
+
+	@ObfuscatedName("hj")
+	@ObfuscatedSignature(
+		signature = "(Lkx;I)V",
+		garbageValue = "494584381"
+	)
+	static final void method112(PacketBuffer var0) {
+		for (int var1 = 0; var1 < Client.field861; ++var1) {
+			int var2 = Client.field669[var1];
+			NPC var3 = Client.npcs[var2];
+			int var4 = var0.readUnsignedByte();
+			if ((var4 & 1) != 0) {
+				var3.targetIndex = var0.method5445();
+				if (var3.targetIndex == 65535) {
+					var3.targetIndex = -1;
+				}
+			}
+
+			int var5;
+			int var6;
+			int var7;
+			int var8;
+			if ((var4 & 64) != 0) {
+				var5 = var0.method5447();
+				var6 = var0.method5447();
+				var7 = var3.x - (var5 - PacketWriter.baseX * 64 - PacketWriter.baseX * 64) * 64;
+				var8 = var3.y - (var6 - RouteStrategy.baseY * 64 - RouteStrategy.baseY * 64) * 64;
+				if (var7 != 0 || var8 != 0) {
+					var3.field946 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
+				}
+			}
+
+			if ((var4 & 32) != 0) {
+				var5 = var0.readUnsignedShort();
+				if (var5 == 65535) {
+					var5 = -1;
+				}
+
+				var6 = var0.method5438();
+				if (var5 == var3.sequence && var5 != -1) {
+					var7 = Widget.SequenceDefinition_get(var5).field3492;
+					if (var7 == 1) {
+						var3.sequenceFrame = 0;
+						var3.sequenceFrameCycle = 0;
+						var3.sequenceDelay = var6;
+						var3.field964 = 0;
+					}
+
+					if (var7 == 2) {
+						var3.field964 = 0;
+					}
+				} else if (var5 == -1 || var3.sequence == -1 || Widget.SequenceDefinition_get(var5).field3508 >= Widget.SequenceDefinition_get(var3.sequence).field3508) {
+					var3.sequence = var5;
+					var3.sequenceFrame = 0;
+					var3.sequenceFrameCycle = 0;
+					var3.sequenceDelay = var6;
+					var3.field964 = 0;
+					var3.field947 = var3.pathLength;
+				}
+			}
+
+			if ((var4 & 4) != 0) {
+				var3.definition = ViewportMouse.getNpcDefinition(var0.readUnsignedShort());
+				var3.size = var3.definition.size * 64;
+				var3.field971 = var3.definition.rotation;
+				var3.walkSequence = var3.definition.walkSequence;
+				var3.walkBackSequence = var3.definition.walkBackSequence;
+				var3.walkLeftSequence = var3.definition.walkLeftSequence;
+				var3.walkRightSequence = var3.definition.walkRightSequence;
+				var3.readySequence = var3.definition.readySequence;
+				var3.turnLeftSequence = var3.definition.turnLeftSequence;
+				var3.turnRightSequence = var3.definition.turnRightSequence;
+			}
+
+			if ((var4 & 16) != 0) {
+				var5 = var0.readUnsignedByteNegate();
+				int var9;
+				int var10;
+				int var11;
+				if (var5 > 0) {
+					for (var6 = 0; var6 < var5; ++var6) {
+						var8 = -1;
+						var9 = -1;
+						var10 = -1;
+						var7 = var0.readUShortSmart();
+						if (var7 == 32767) {
+							var7 = var0.readUShortSmart();
+							var9 = var0.readUShortSmart();
+							var8 = var0.readUShortSmart();
+							var10 = var0.readUShortSmart();
+						} else if (var7 != 32766) {
+							var9 = var0.readUShortSmart();
+						} else {
+							var7 = -1;
+						}
+
+						var11 = var0.readUShortSmart();
+						var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
+					}
+				}
+
+				var6 = var0.method5436();
+				if (var6 > 0) {
+					for (var7 = 0; var7 < var6; ++var7) {
+						var8 = var0.readUShortSmart();
+						var9 = var0.readUShortSmart();
+						if (var9 != 32767) {
+							var10 = var0.readUShortSmart();
+							var11 = var0.readUnsignedByte();
+							int var12 = var9 > 0 ? var0.method5438() : var11;
+							var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
+						} else {
+							var3.removeHealthBar(var8);
+						}
+					}
+				}
+			}
+
+			if ((var4 & 8) != 0) {
+				var3.spotAnimation = var0.method5445();
+				var5 = var0.method5455();
+				var3.heightOffset = var5 >> 16;
+				var3.field958 = (var5 & 65535) + Client.cycle;
+				var3.spotAnimationFrame = 0;
+				var3.spotAnimationFrameCycle = 0;
+				if (var3.field958 > Client.cycle) {
+					var3.spotAnimationFrame = -1;
+				}
+
+				if (var3.spotAnimation == 65535) {
+					var3.spotAnimation = -1;
+				}
+			}
+
+			if ((var4 & 2) != 0) {
+				var3.overheadText = var0.readStringCp1252NullTerminated();
+				var3.overheadTextCyclesRemaining = 100;
+			}
+		}
+
+	}
+
+	@ObfuscatedName("li")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "869899201"
+	)
+	static void method122() {
+		if (Client.field706 && WorldMapIcon_1.localPlayer != null) {
+			int var0 = WorldMapIcon_1.localPlayer.pathX[0];
+			int var1 = WorldMapIcon_1.localPlayer.pathY[0];
+			if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) {
+				return;
+			}
+
+			DynamicObject.oculusOrbFocalPointX = WorldMapIcon_1.localPlayer.x;
+			int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - Client.camFollowHeight;
+			if (var2 < ScriptEvent.field559) {
+				ScriptEvent.field559 = var2;
+			}
+
+			FriendSystem.oculusOrbFocalPointY = WorldMapIcon_1.localPlayer.y;
+			Client.field706 = false;
 		}
 
 	}

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

@@ -1,32 +1,20 @@
-import java.awt.FontMetrics;
 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("x")
+@ObfuscatedName("r")
 @Implements("GrandExchangeOfferAgeComparator")
 final class GrandExchangeOfferAgeComparator implements Comparator {
-	@ObfuscatedName("ad")
+	@ObfuscatedName("s")
-	@Export("loginScreenFontMetrics")
-	static FontMetrics loginScreenFontMetrics;
-	@ObfuscatedName("gn")
 	@ObfuscatedSignature(
-		signature = "[Llx;"
+		signature = "(Lq;Lq;B)I",
-	)
+		garbageValue = "-1"
-	@Export("scrollBarSprites")
-	static IndexedSprite[] scrollBarSprites;
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(Li;Li;I)I",
-		garbageValue = "-502692128"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-		return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1);
+		return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1);
 	}
 
 	public boolean equals(Object var1) {
@@ -37,182 +25,129 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(IIIII)V",
+		signature = "(IIIIB)V",
-		garbageValue = "-1058025130"
+		garbageValue = "125"
 	)
-	@Export("itemContainerSetItem")
+	static void method156(int var0, int var1, int var2, int var3) {
-	static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
+		for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-		ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+			if (var4.soundEffectId != -1 || var4.soundEffectIds != null) {
-		if (var4 == null) {
+				int var5 = 0;
-			var4 = new ItemContainer();
+				if (var1 > var4.field1052 * 16384) {
-			ItemContainer.itemContainers.put(var4, (long)var0);
+					var5 += var1 - var4.field1052 * 16384;
-		}
+				} else if (var1 < var4.x * 16384) {
+					var5 += var4.x * 16384 - var1;
+				}
 
-		if (var4.ids.length <= var1) {
+				if (var2 > var4.field1053 * 16384) {
-			int[] var5 = new int[var1 + 1];
+					var5 += var2 - var4.field1053 * 16384;
-			int[] var6 = new int[var1 + 1];
+				} else if (var2 < var4.y * 16384) {
+					var5 += var4.y * 16384 - var2;
+				}
 
-			int var7;
+				if (var5 - 64 <= var4.field1054 && Client.field860 != 0 && var0 == var4.plane) {
-			for (var7 = 0; var7 < var4.ids.length; ++var7) {
+					var5 -= 64;
-				var5[var7] = var4.ids[var7];
+					if (var5 < 0) {
-				var6[var7] = var4.quantities[var7];
+						var5 = 0;
+					}
+
+					int var6 = (var4.field1054 - var5) * Client.field860 / var4.field1054;
+					if (var4.stream1 == null) {
+						if (var4.soundEffectId >= 0) {
+							SoundEffect var7 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectId, 0);
+							if (var7 != null) {
+								RawSound var8 = var7.toRawSound().resample(class247.decimator);
+								RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6);
+								var9.setNumLoops(-1);
+								IgnoreList.pcmStreamMixer.addSubStream(var9);
+								var4.stream1 = var9;
+							}
+						}
+					} else {
+						var4.stream1.method2599(var6);
+					}
+
+					if (var4.stream2 == null) {
+						if (var4.soundEffectIds != null && (var4.field1056 -= var3) <= 0) {
+							int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length);
+							SoundEffect var12 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectIds[var11], 0);
+							if (var12 != null) {
+								RawSound var13 = var12.toRawSound().resample(class247.decimator);
+								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6);
+								var10.setNumLoops(0);
+								IgnoreList.pcmStreamMixer.addSubStream(var10);
+								var4.stream2 = var10;
+								var4.field1056 = var4.field1057 + (int)(Math.random() * (double)(var4.field1058 - var4.field1057));
+							}
+						}
+					} else {
+						var4.stream2.method2599(var6);
+						if (!var4.stream2.hasNext()) {
+							var4.stream2 = null;
+						}
+					}
+				} else {
+					if (var4.stream1 != null) {
+						IgnoreList.pcmStreamMixer.removeSubStream(var4.stream1);
+						var4.stream1 = null;
+					}
+
+					if (var4.stream2 != null) {
+						IgnoreList.pcmStreamMixer.removeSubStream(var4.stream2);
+						var4.stream2 = null;
+					}
+				}
 			}
+		}
 
-			for (var7 = var4.ids.length; var7 < var1; ++var7) {
+	}
-				var5[var7] = -1;
+
-				var6[var7] = 0;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1443594244"
+	)
+	@Export("savePreferences")
+	static void savePreferences() {
+		AccessFile var0 = null;
+
+		try {
+			var0 = TaskHandler.getPreferencesFile("", WorldMapRectangle.field166.name, true);
+			Buffer var1 = GrandExchangeOffer.clientPreferences.toBuffer();
+			var0.write(var1.array, 0, var1.offset);
+		} catch (Exception var3) {
+		}
+
+		try {
+			if (var0 != null) {
+				var0.closeSync(true);
 			}
-
+		} catch (Exception var2) {
-			var4.ids = var5;
-			var4.quantities = var6;
 		}
 
-		var4.ids[var1] = var2;
-		var4.quantities[var1] = var3;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(II)V",
+		signature = "(I)Lbl;",
-		garbageValue = "1192487451"
+		garbageValue = "-1436154979"
 	)
-	@Export("clearItemContainer")
+	@Export("getNextWorldListWorld")
-	static void clearItemContainer(int var0) {
+	static World getNextWorldListWorld() {
-		ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
+		return World.World_listCount < World.World_count ? ChatChannel.World_worlds[++World.World_listCount - 1] : null;
-		if (var1 == null) {
-			return;
-		}
-		for (int var2 = 0; var2 < var1.ids.length; ++var2) {
-			var1.ids[var2] = -1;
-			var1.quantities[var2] = 0;
-		}
-
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;B)I",
-		garbageValue = "65"
-	)
-	@Export("hashString")
-	public static int hashString(CharSequence var0) {
-		int var1 = var0.length();
-		int var2 = 0;
-
-		for (int var3 = 0; var3 < var1; ++var3) {
-			var2 = (var2 << 5) - var2 + ItemDefinition.charToByteCp1252(var0.charAt(var3));
-		}
-
-		return var2;
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(ILcx;ZI)I",
-		garbageValue = "1661608853"
-	)
-	static int method147(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? Interpreter.field1111 : Calendar.field2507;
-		if (var0 == ScriptOpcodes.CC_GETX) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CC_GETY) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CC_GETWIDTH) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CC_GETHIDE) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
-			return 1;
-		}
-		if (var0 == ScriptOpcodes.CC_GETLAYER) {
-			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId;
-			return 1;
-		}
-		return 2;
-	}
-
-	@ObfuscatedName("hb")
 	@ObfuscatedSignature(
 		signature = "(B)V",
-		garbageValue = "20"
+		garbageValue = "4"
 	)
-	@Export("calculateMenuBounds")
+	@Export("Widget_clearCached")
-	static void calculateMenuBounds() {
+	public static void Widget_clearCached() {
-		NetCache.calculateMenuBounds(class42.menuWidth / 2 + class247.menuX, class30.menuY);
+		Widget.Widget_cachedSprites.clear();
-	}
+		Widget.Widget_cachedModels.clear();
-
+		Widget.Widget_cachedFonts.clear();
-	@ObfuscatedName("jt")
+		Widget.Widget_cachedSpriteMasks.clear();
-	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-2136228205"
-	)
-	@Export("Widget_resetModelFrames")
-	static final void Widget_resetModelFrames(int var0) {
-		if (!class162.loadInterface(var0)) {
-			return;
-		}
-		Widget[] var1 = Widget.Widget_interfaceComponents[var0];
-
-		for (int var2 = 0; var2 < var1.length; ++var2) {
-			Widget var3 = var1[var2];
-			if (var3 != null) {
-				var3.modelFrame = 0;
-				var3.modelFrameCycle = 0;
-			}
-		}
-
-	}
-
-	@ObfuscatedName("jd")
-	@ObfuscatedSignature(
-		signature = "(Lhj;B)Z",
-		garbageValue = "34"
-	)
-	static final boolean method149(Widget var0) {
-		int var1 = var0.contentType;
-		if (var1 == 205) {
-			Client.logoutTimer = 250;
-			return true;
-		}
-		int var2;
-		int var3;
-		if (var1 >= 300 && var1 <= 313) {
-			var2 = (var1 - 300) / 2;
-			var3 = var1 & 1;
-			Client.playerAppearance.changeAppearance(var2, var3 == 1);
-		}
-
-		if (var1 >= 314 && var1 <= 323) {
-			var2 = (var1 - 314) / 2;
-			var3 = var1 & 1;
-			Client.playerAppearance.method3993(var2, var3 == 1);
-		}
-
-		if (var1 == 324) {
-			Client.playerAppearance.changeSex(false);
-		}
-
-		if (var1 == 325) {
-			Client.playerAppearance.changeSex(true);
-		}
-
-		if (var1 == 326) {
-			PacketBufferNode var4 = Archive.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher);
-			Client.playerAppearance.write(var4.packetBuffer);
-			Client.packetWriter.addNode(var4);
-			return true;
-		}
-		return false;
 	}
 }

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

@@ -1,36 +1,17 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
-import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("u")
+@ObfuscatedName("c")
 @Implements("GrandExchangeOfferNameComparator")
 final class GrandExchangeOfferNameComparator implements Comparator {
-	@ObfuscatedName("l")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "(Lq;Lq;B)I",
-	)
+		garbageValue = "68"
-	@Export("musicTrackArchive")
-	public static AbstractArchive musicTrackArchive;
-	@ObfuscatedName("gv")
-	@ObfuscatedSignature(
-		signature = "[Llx;"
-	)
-	@Export("modIconSprites")
-	static IndexedSprite[] modIconSprites;
-	@ObfuscatedName("hm")
-	@ObfuscatedGetter(
-		intValue = 477835103
-	)
-	@Export("cameraPitch")
-	static int cameraPitch;
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(Li;Li;B)I",
-		garbageValue = "-74"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -44,4 +25,426 @@ final class GrandExchangeOfferNameComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
+
+	@ObfuscatedName("an")
+	@ObfuscatedSignature(
+		signature = "(ILcr;ZB)I",
+		garbageValue = "68"
+	)
+	static int method150(int var0, Script var1, boolean var2) {
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
+			Interpreter.Interpreter_intStackSize -= 3;
+			Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			WorldMapIcon_0.privateChatMode = class270.method4895(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
+			if (WorldMapIcon_0.privateChatMode == null) {
+				WorldMapIcon_0.privateChatMode = PrivateChatMode.field3788;
+			}
+
+			Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			PacketBufferNode var18 = MenuAction.getPacketBufferNode(ClientPacket.field2200, Client.packetWriter.isaacCipher);
+			var18.packetBuffer.writeByte(Client.publicChatMode);
+			var18.packetBuffer.writeByte(WorldMapIcon_0.privateChatMode.field3791);
+			var18.packetBuffer.writeByte(Client.tradeChatMode);
+			Client.packetWriter.addNode(var18);
+			return 1;
+		} else {
+			String var3;
+			int var4;
+			if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
+				var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+				Interpreter.Interpreter_intStackSize -= 2;
+				var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+				int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+				PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher);
+				var6.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var3) + 2);
+				var6.packetBuffer.writeStringCp1252NullTerminated(var3);
+				var6.packetBuffer.writeByte(var4 - 1);
+				var6.packetBuffer.writeByte(var5);
+				Client.packetWriter.addNode(var6);
+				return 1;
+			} else {
+				int var10;
+				if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
+					Interpreter.Interpreter_intStackSize -= 2;
+					var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+					var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+					Message var15 = FileSystem.Messages_getByChannelAndID(var10, var4);
+					if (var15 != null) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.count;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.cycle;
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
+					var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					Message var16 = class227.Messages_getMessage(var10);
+					if (var16 != null) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.type;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle;
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
+					if (WorldMapIcon_0.privateChatMode == null) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
+					} else {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapIcon_0.privateChatMode.field3791;
+					}
+
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
+					var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+					var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+					String var14 = var3.toLowerCase();
+					byte var17 = 0;
+					if (var14.startsWith("yellow:")) {
+						var17 = 0;
+						var3 = var3.substring("yellow:".length());
+					} else if (var14.startsWith("red:")) {
+						var17 = 1;
+						var3 = var3.substring("red:".length());
+					} else if (var14.startsWith("green:")) {
+						var17 = 2;
+						var3 = var3.substring("green:".length());
+					} else if (var14.startsWith("cyan:")) {
+						var17 = 3;
+						var3 = var3.substring("cyan:".length());
+					} else if (var14.startsWith("purple:")) {
+						var17 = 4;
+						var3 = var3.substring("purple:".length());
+					} else if (var14.startsWith("white:")) {
+						var17 = 5;
+						var3 = var3.substring("white:".length());
+					} else if (var14.startsWith("flash1:")) {
+						var17 = 6;
+						var3 = var3.substring("flash1:".length());
+					} else if (var14.startsWith("flash2:")) {
+						var17 = 7;
+						var3 = var3.substring("flash2:".length());
+					} else if (var14.startsWith("flash3:")) {
+						var17 = 8;
+						var3 = var3.substring("flash3:".length());
+					} else if (var14.startsWith("glow1:")) {
+						var17 = 9;
+						var3 = var3.substring("glow1:".length());
+					} else if (var14.startsWith("glow2:")) {
+						var17 = 10;
+						var3 = var3.substring("glow2:".length());
+					} else if (var14.startsWith("glow3:")) {
+						var17 = 11;
+						var3 = var3.substring("glow3:".length());
+					} else if (class60.clientLanguage != Language.Language_EN) {
+						if (var14.startsWith("yellow:")) {
+							var17 = 0;
+							var3 = var3.substring("yellow:".length());
+						} else if (var14.startsWith("red:")) {
+							var17 = 1;
+							var3 = var3.substring("red:".length());
+						} else if (var14.startsWith("green:")) {
+							var17 = 2;
+							var3 = var3.substring("green:".length());
+						} else if (var14.startsWith("cyan:")) {
+							var17 = 3;
+							var3 = var3.substring("cyan:".length());
+						} else if (var14.startsWith("purple:")) {
+							var17 = 4;
+							var3 = var3.substring("purple:".length());
+						} else if (var14.startsWith("white:")) {
+							var17 = 5;
+							var3 = var3.substring("white:".length());
+						} else if (var14.startsWith("flash1:")) {
+							var17 = 6;
+							var3 = var3.substring("flash1:".length());
+						} else if (var14.startsWith("flash2:")) {
+							var17 = 7;
+							var3 = var3.substring("flash2:".length());
+						} else if (var14.startsWith("flash3:")) {
+							var17 = 8;
+							var3 = var3.substring("flash3:".length());
+						} else if (var14.startsWith("glow1:")) {
+							var17 = 9;
+							var3 = var3.substring("glow1:".length());
+						} else if (var14.startsWith("glow2:")) {
+							var17 = 10;
+							var3 = var3.substring("glow2:".length());
+						} else if (var14.startsWith("glow3:")) {
+							var17 = 11;
+							var3 = var3.substring("glow3:".length());
+						}
+					}
+
+					var14 = var3.toLowerCase();
+					byte var7 = 0;
+					if (var14.startsWith("wave:")) {
+						var7 = 1;
+						var3 = var3.substring("wave:".length());
+					} else if (var14.startsWith("wave2:")) {
+						var7 = 2;
+						var3 = var3.substring("wave2:".length());
+					} else if (var14.startsWith("shake:")) {
+						var7 = 3;
+						var3 = var3.substring("shake:".length());
+					} else if (var14.startsWith("scroll:")) {
+						var7 = 4;
+						var3 = var3.substring("scroll:".length());
+					} else if (var14.startsWith("slide:")) {
+						var7 = 5;
+						var3 = var3.substring("slide:".length());
+					} else if (Language.Language_EN != class60.clientLanguage) {
+						if (var14.startsWith("wave:")) {
+							var7 = 1;
+							var3 = var3.substring("wave:".length());
+						} else if (var14.startsWith("wave2:")) {
+							var7 = 2;
+							var3 = var3.substring("wave2:".length());
+						} else if (var14.startsWith("shake:")) {
+							var7 = 3;
+							var3 = var3.substring("shake:".length());
+						} else if (var14.startsWith("scroll:")) {
+							var7 = 4;
+							var3 = var3.substring("scroll:".length());
+						} else if (var14.startsWith("slide:")) {
+							var7 = 5;
+							var3 = var3.substring("slide:".length());
+						}
+					}
+
+					PacketBufferNode var8 = MenuAction.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher);
+					var8.packetBuffer.writeByte(0);
+					int var9 = var8.packetBuffer.offset;
+					var8.packetBuffer.writeByte(var4);
+					var8.packetBuffer.writeByte(var17);
+					var8.packetBuffer.writeByte(var7);
+					SpotAnimationDefinition.method4334(var8.packetBuffer, var3);
+					var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
+					Client.packetWriter.addNode(var8);
+					return 1;
+				} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
+					Interpreter.Interpreter_stringStackSize -= 2;
+					var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+					String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+					PacketBufferNode var11 = MenuAction.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher);
+					var11.packetBuffer.writeShort(0);
+					int var13 = var11.packetBuffer.offset;
+					var11.packetBuffer.writeStringCp1252NullTerminated(var3);
+					SpotAnimationDefinition.method4334(var11.packetBuffer, var12);
+					var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
+					Client.packetWriter.addNode(var11);
+					return 1;
+				} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
+					if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode;
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
+						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.Messages_getHistorySize(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
+						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FaceNormal.Messages_getNextChatID(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
+						var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+						Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.Messages_getLastChatID(var10);
+						return 1;
+					} else if (var0 == ScriptOpcodes.DOCHEAT) {
+						var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+						BuddyRankComparator.doCheat(var3);
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
+						Client.field668 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
+						return 1;
+					} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
+						Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field668;
+						return 1;
+					} else if (var0 == 5023) {
+						var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+						System.out.println(var3);
+						return 1;
+					} else {
+						return 2;
+					}
+				} else {
+					if (WorldMapIcon_1.localPlayer != null && WorldMapIcon_1.localPlayer.username != null) {
+						var3 = WorldMapIcon_1.localPlayer.username.getName();
+					} else {
+						var3 = "";
+					}
+
+					Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
+					return 1;
+				}
+			}
+		}
+	}
+
+	@ObfuscatedName("fl")
+	@ObfuscatedSignature(
+		signature = "(Lbu;S)V",
+		garbageValue = "134"
+	)
+	static final void method149(Actor var0) {
+		var0.isWalking = false;
+		SequenceDefinition var1;
+		if (var0.movementSequence != -1) {
+			var1 = Widget.SequenceDefinition_get(var0.movementSequence);
+			if (var1 != null && var1.frameIds != null) {
+				++var0.movementFrameCycle;
+				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
+					var0.movementFrameCycle = 1;
+					++var0.movementFrame;
+					class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y);
+				}
+
+				if (var0.movementFrame >= var1.frameIds.length) {
+					var0.movementFrameCycle = 0;
+					var0.movementFrame = 0;
+					class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y);
+				}
+			} else {
+				var0.movementSequence = -1;
+			}
+		}
+
+		if (var0.spotAnimation != -1 && Client.cycle >= var0.field958) {
+			if (var0.spotAnimationFrame < 0) {
+				var0.spotAnimationFrame = 0;
+			}
+
+			int var3 = HealthBarUpdate.SpotAnimationDefinition_get(var0.spotAnimation).sequence;
+			if (var3 != -1) {
+				SequenceDefinition var2 = Widget.SequenceDefinition_get(var3);
+				if (var2 != null && var2.frameIds != null) {
+					++var0.spotAnimationFrameCycle;
+					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
+						var0.spotAnimationFrameCycle = 1;
+						++var0.spotAnimationFrame;
+						class325.addSequenceSoundEffect(var2, var0.spotAnimationFrame, var0.x, var0.y);
+					}
+
+					if (var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
+						var0.spotAnimation = -1;
+					}
+				} else {
+					var0.spotAnimation = -1;
+				}
+			} else {
+				var0.spotAnimation = -1;
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
+			var1 = Widget.SequenceDefinition_get(var0.sequence);
+			if (var1.field3506 == 1 && var0.field947 > 0 && var0.field941 <= Client.cycle && var0.field965 < Client.cycle) {
+				var0.sequenceDelay = 1;
+				return;
+			}
+		}
+
+		if (var0.sequence != -1 && var0.sequenceDelay == 0) {
+			var1 = Widget.SequenceDefinition_get(var0.sequence);
+			if (var1 != null && var1.frameIds != null) {
+				++var0.sequenceFrameCycle;
+				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
+					var0.sequenceFrameCycle = 1;
+					++var0.sequenceFrame;
+					class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y);
+				}
+
+				if (var0.sequenceFrame >= var1.frameIds.length) {
+					var0.sequenceFrame -= var1.frameCount;
+					++var0.field964;
+					if (var0.field964 >= var1.field3502) {
+						var0.sequence = -1;
+					} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
+						class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y);
+					} else {
+						var0.sequence = -1;
+					}
+				}
+
+				var0.isWalking = var1.field3501;
+			} else {
+				var0.sequence = -1;
+			}
+		}
+
+		if (var0.sequenceDelay > 0) {
+			--var0.sequenceDelay;
+		}
+
+	}
+
+	@ObfuscatedName("hh")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "1895114197"
+	)
+	@Export("calculateMenuBounds")
+	static void calculateMenuBounds() {
+		WorldMapData_1.calculateMenuBounds(World.menuWidth / 2 + MilliClock.menuX, class96.menuY);
+	}
+
+	@ObfuscatedName("iu")
+	@ObfuscatedSignature(
+		signature = "(IIIZI)V",
+		garbageValue = "1199898430"
+	)
+	@Export("resizeComponents")
+	static final void resizeComponents(int var0, int var1, int var2, boolean var3) {
+		if (Projectile.loadInterface(var0)) {
+			ItemContainer.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3);
+		}
+	}
+
+	@ObfuscatedName("kc")
+	@ObfuscatedSignature(
+		signature = "(IIIILls;Lhg;I)V",
+		garbageValue = "1652604393"
+	)
+	@Export("worldToMinimap")
+	static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
+		int var6 = var3 * var3 + var2 * var2;
+		if (var6 > 4225 && var6 < 90000) {
+			int var7 = Client.camAngleY & 2047;
+			int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
+			int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
+			int var10 = var9 * var2 + var3 * var8 >> 16;
+			int var11 = var3 * var9 - var8 * var2 >> 16;
+			double var12 = Math.atan2((double)var10, (double)var11);
+			int var14 = var5.width / 2 - 25;
+			int var15 = (int)(Math.sin(var12) * (double)var14);
+			int var16 = (int)(Math.cos(var12) * (double)var14);
+			byte var17 = 20;
+			UserComparator3.redHintArrowSprite.method6022(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
+		} else {
+			class191.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5);
+		}
+
+	}
 }

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

@@ -4,435 +4,159 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("by")
+@ObfuscatedName("br")
 @Implements("GrandExchangeOfferOwnWorldComparator")
 public class GrandExchangeOfferOwnWorldComparator implements Comparator {
-	@ObfuscatedName("h")
+	@ObfuscatedName("gd")
-	@Export("operatingSystemLC")
-	public static String operatingSystemLC;
-	@ObfuscatedName("dm")
 	@ObfuscatedSignature(
-		signature = "Liu;"
+		signature = "[Llq;"
 	)
-	@Export("archive15")
+	@Export("mapSceneSprites")
-	static Archive archive15;
+	static IndexedSprite[] mapSceneSprites;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("filterWorlds")
 	boolean filterWorlds;
 
 	GrandExchangeOfferOwnWorldComparator() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;I)I",
+		signature = "(Lq;Lq;I)I",
-		garbageValue = "150441453"
+		garbageValue = "-1137362043"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		if (var2.world == var1.world) {
 			return 0;
-		}
+		} else {
-		if (this.filterWorlds) {
+			if (this.filterWorlds) {
-			if (Client.worldId == var1.world) {
+				if (Client.worldId == var1.world) {
-				return -1;
+					return -1;
+				}
+
+				if (var2.world == Client.worldId) {
+					return 1;
+				}
 			}
 
-			if (var2.world == Client.worldId) {
+			return var1.world < var2.world ? -1 : 1;
-				return 1;
-			}
 		}
-
-		return var1.world < var2.world ? -1 : 1;
-	}
-
-	public boolean equals(Object var1) {
-		return super.equals(var1);
 	}
 
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
 	}
 
-	@ObfuscatedName("q")
+	public boolean equals(Object var1) {
-	@ObfuscatedSignature(
+		return super.equals(var1);
-		signature = "(II)I",
-		garbageValue = "-836499887"
-	)
-	@Export("getVarbit")
-	public static int getVarbit(int var0) {
-		VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
-		VarbitDefinition var1;
-		if (var2 != null) {
-			var1 = var2;
-		} else {
-			byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0);
-			var2 = new VarbitDefinition();
-			if (var7 != null) {
-				var2.decode(new Buffer(var7));
-			}
-
-			VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0);
-			var1 = var2;
-		}
-
-		int var3 = var1.baseVar;
-		int var4 = var1.startBit;
-		int var5 = var1.endBit;
-		int var6 = Varps.Varps_masks[var5 - var4];
-		return Varps.Varps_main[var3] >> var4 & var6;
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(IIIIIILer;Lfv;S)V",
+		signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V",
-		garbageValue = "-19782"
+		garbageValue = "1333427398"
 	)
-	static final void method1236(int plane, int x, int y, int objectID, int rotation, int objectType, Scene var6, CollisionMap var7) {
+	@Export("setLoginResponseString")
-		if (Client.isLowDetail && (Tiles.Tiles_renderFlags[0][x][y] & 2) == 0 && (Tiles.Tiles_renderFlags[plane][x][y] & 16) != 0) {
+	static void setLoginResponseString(String var0, String var1, String var2) {
-			return;
+		Login.Login_response1 = var0;
-		}
+		Login.Login_response2 = var1;
-		if (plane < Tiles.Tiles_minPlane) {
+		Login.Login_response3 = var2;
-			Tiles.Tiles_minPlane = plane;
+	}
-		}
 
-		ObjectDefinition var8 = ViewportMouse.getObjectDefinition(objectID);
+	@ObfuscatedName("ev")
-		int var9;
+	@ObfuscatedSignature(
-		int var10;
+		signature = "(IB)V",
-		if (rotation != 1 && rotation != 3) {
+		garbageValue = "-84"
-			var9 = var8.sizeX;
+	)
-			var10 = var8.sizeY;
+	@Export("getLoginError")
+	static void getLoginError(int var0) {
+		if (var0 == -3) {
+			setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
+		} else if (var0 == -2) {
+			setLoginResponseString("", "Error connecting to server.", "");
+		} else if (var0 == -1) {
+			setLoginResponseString("No response from server.", "Please try using a different world.", "");
+		} else if (var0 == 3) {
+			Login.loginIndex = 3;
+			Login.field1161 = 1;
+		} else if (var0 == 4) {
+			Login.loginIndex = 12;
+			Login.field1160 = 0;
+		} else if (var0 == 5) {
+			Login.field1161 = 2;
+			setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes.");
+		} else if (var0 == 68 || !Client.onMobile && var0 == 6) {
+			setLoginResponseString("RuneScape has been updated!", "Please reload this page.", "");
+		} else if (var0 == 7) {
+			setLoginResponseString("This world is full.", "Please use a different world.", "");
+		} else if (var0 == 8) {
+			setLoginResponseString("Unable to connect.", "Login server offline.", "");
+		} else if (var0 == 9) {
+			setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
+		} else if (var0 == 10) {
+			setLoginResponseString("Unable to connect.", "Bad session id.", "");
+		} else if (var0 == 11) {
+			setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+		} else if (var0 == 12) {
+			setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
+		} else if (var0 == 13) {
+			setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
+		} else if (var0 == 14) {
+			setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 16) {
+			setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
+		} else if (var0 == 17) {
+			setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
+		} else if (var0 == 18) {
+			Login.loginIndex = 12;
+			Login.field1160 = 1;
+		} else if (var0 == 19) {
+			setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
+		} else if (var0 == 20) {
+			setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
+		} else if (var0 == 22) {
+			setLoginResponseString("Malformed login packet.", "Please try again.", "");
+		} else if (var0 == 23) {
+			setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
+		} else if (var0 == 24) {
+			setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
+		} else if (var0 == 25) {
+			setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
+		} else if (var0 == 26) {
+			setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
+		} else if (var0 == 27) {
+			setLoginResponseString("", "Service unavailable.", "");
+		} else if (var0 == 31) {
+			setLoginResponseString("Your account must have a displayname set", "in order to play the game.  Please set it", "via the website, or the main game.");
+		} else if (var0 == 32) {
+			setLoginResponseString("Your attempt to log into your account was", "unsuccessful.  Don't worry, you can sort", "this out by visiting the billing system.");
+		} else if (var0 == 37) {
+			setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
+		} else if (var0 == 38) {
+			setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
+		} else if (var0 == 55) {
+			Login.loginIndex = 8;
 		} else {
-			var9 = var8.sizeY;
+			if (var0 == 56) {
-			var10 = var8.sizeX;
+				setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", "");
-		}
+				FloorDecoration.updateGameState(11);
-
-		int var11;
-		int var12;
-		if (var9 + x <= 104) {
-			var11 = (var9 >> 1) + x;
-			var12 = (var9 + 1 >> 1) + x;
-		} else {
-			var11 = x;
-			var12 = x + 1;
-		}
-
-		int var13;
-		int var14;
-		if (var10 + y <= 104) {
-			var13 = (var10 >> 1) + y;
-			var14 = y + (var10 + 1 >> 1);
-		} else {
-			var13 = y;
-			var14 = y + 1;
-		}
-
-		int[][] var15 = Tiles.Tiles_heights[plane];
-		int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2;
-		int var17 = (x << 7) + (var9 << 6);
-		int var18 = (y << 7) + (var10 << 6);
-		long var19 = Tile.calculateTag(x, y, 2, var8.int1 == 0, objectID);
-		int var21 = objectType + (rotation << 6);
-		if (var8.int3 == 1) {
-			var21 += 256;
-		}
-
-		if (var8.hasSound()) {
-			class83.newObjectSound(plane, x, y, var8, rotation);
-		}
-
-		Object var22;
-		if (objectType == 22) {
-			if (Client.isLowDetail && var8.int1 == 0 && var8.interactType != 1 && !var8.boolean2) {
 				return;
 			}
-			if (var8.animationId == -1 && var8.transforms == null) {
+
-				var22 = var8.getEntity(22, rotation, var15, var17, var16, var18);
+			if (var0 == 57) {
+				setLoginResponseString("The code you entered was incorrect.", "Please try again.", "");
+				FloorDecoration.updateGameState(11);
+				return;
+			}
+
+			if (var0 == 61) {
+				Login.loginIndex = 7;
 			} else {
-				var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null);
+				setLoginResponseString("Unexpected server response", "Please try using a different world.", "");
 			}
-
-			var6.newFloorDecoration(plane, x, y, var16, (Entity)var22, var19, var21);
-			if (var8.interactType == 1 && var7 != null) {
-				var7.setBlockedByFloorDec(x, y);
-			}
-
-		} else if (objectType == 10 || objectType == 11) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(10, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			if (var22 != null && var6.method3076(plane, x, y, var16, var9, var10, (Entity) var22, objectType == 11 ? 256 : 0, var19, var21) && var8.clipped) {
-				int var23 = 15;
-				if (var22 instanceof Model) {
-					var23 = ((Model) var22).method2864() / 4;
-					if (var23 > 30) {
-						var23 = 30;
-					}
-				}
-
-				for (int var24 = 0; var24 <= var9; ++var24) {
-					for (int var25 = 0; var25 <= var10; ++var25) {
-						if (var23 > class32.field282[plane][var24 + x][var25 + y]) {
-							class32.field282[plane][var24 + x][var25 + y] = (byte) var23;
-						}
-					}
-				}
-			}
-
-			if (var8.interactType != 0 && var7 != null) {
-				var7.addGameObject(x, y, var9, var10, var8.boolean1);
-			}
-
-		} else if (objectType >= 12) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.method3076(plane, x, y, var16, 1, 1, (Entity) var22, 0, var19, var21);
-			if (objectType >= 12 && objectType <= 17 && objectType != 13 && plane > 0) {
-				FaceNormal.field1887[plane][x][y] |= 2340;
-			}
-
-			if (var8.interactType != 0 && var7 != null) {
-				var7.addGameObject(x, y, var9, var10, var8.boolean1);
-			}
-
-		} else if (objectType == 0) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(0, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field512[rotation], 0, var19, var21);
-			if (rotation == 0) {
-				if (var8.clipped) {
-					class32.field282[plane][x][y] = 50;
-					class32.field282[plane][x][y + 1] = 50;
-				}
-
-				if (var8.modelClipped) {
-					FaceNormal.field1887[plane][x][y] |= 585;
-				}
-			} else if (rotation == 1) {
-				if (var8.clipped) {
-					class32.field282[plane][x][y + 1] = 50;
-					class32.field282[plane][x + 1][y + 1] = 50;
-				}
-
-				if (var8.modelClipped) {
-					FaceNormal.field1887[plane][x][1 + y] |= 1170;
-				}
-			} else if (rotation == 2) {
-				if (var8.clipped) {
-					class32.field282[plane][x + 1][y] = 50;
-					class32.field282[plane][x + 1][y + 1] = 50;
-				}
-
-				if (var8.modelClipped) {
-					FaceNormal.field1887[plane][x + 1][y] |= 585;
-				}
-			} else if (rotation == 3) {
-				if (var8.clipped) {
-					class32.field282[plane][x][y] = 50;
-					class32.field282[plane][x + 1][y] = 50;
-				}
-
-				if (var8.modelClipped) {
-					FaceNormal.field1887[plane][x][y] |= 1170;
-				}
-			}
-
-			if (var8.interactType != 0 && var7 != null) {
-				var7.method3559(x, y, objectType, rotation, var8.boolean1);
-			}
-
-			if (var8.int2 != 16) {
-				var6.method3082(plane, x, y, var8.int2);
-			}
-
-		} else if (objectType == 1) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(1, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field513[rotation], 0, var19, var21);
-			if (var8.clipped) {
-				if (rotation == 0) {
-					class32.field282[plane][x][y + 1] = 50;
-				} else if (rotation == 1) {
-					class32.field282[plane][x + 1][y + 1] = 50;
-				} else if (rotation == 2) {
-					class32.field282[plane][x + 1][y] = 50;
-				} else if (rotation == 3) {
-					class32.field282[plane][x][y] = 50;
-				}
-			}
-
-			if (var8.interactType != 0 && var7 != null) {
-				var7.method3559(x, y, objectType, rotation, var8.boolean1);
-			}
-
-		} else if (objectType == 2) {
-			int var28 = rotation + 1 & 3;
-			Object var29;
-			Object var30;
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var29 = var8.getEntity(2, rotation + 4, var15, var17, var16, var18);
-				var30 = var8.getEntity(2, var28, var15, var17, var16, var18);
-			} else {
-				var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
-				var30 = new DynamicObject(objectID, 2, var28, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newBoundaryObject(plane, x, y, var16, (Entity) var29, (Entity) var30, Tiles.field512[rotation], Tiles.field512[var28], var19, var21);
-			if (var8.modelClipped) {
-				if (rotation == 0) {
-					FaceNormal.field1887[plane][x][y] |= 585;
-					FaceNormal.field1887[plane][x][y + 1] |= 1170;
-				} else if (rotation == 1) {
-					FaceNormal.field1887[plane][x][y + 1] |= 1170;
-					FaceNormal.field1887[plane][x + 1][y] |= 585;
-				} else if (rotation == 2) {
-					FaceNormal.field1887[plane][x + 1][y] |= 585;
-					FaceNormal.field1887[plane][x][y] |= 1170;
-				} else if (rotation == 3) {
-					FaceNormal.field1887[plane][x][y] |= 1170;
-					FaceNormal.field1887[plane][x][y] |= 585;
-				}
-			}
-
-			if (var8.interactType != 0 && var7 != null) {
-				var7.method3559(x, y, objectType, rotation, var8.boolean1);
-			}
-
-			if (var8.int2 != 16) {
-				var6.method3082(plane, x, y, var8.int2);
-			}
-
-		} else if (objectType == 3) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(3, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newBoundaryObject(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field513[rotation], 0, var19, var21);
-			if (var8.clipped) {
-				if (rotation == 0) {
-					class32.field282[plane][x][y + 1] = 50;
-				} else if (rotation == 1) {
-					class32.field282[plane][x + 1][y + 1] = 50;
-				} else if (rotation == 2) {
-					class32.field282[plane][x + 1][y] = 50;
-				} else if (rotation == 3) {
-					class32.field282[plane][x][y] = 50;
-				}
-			}
-
-			if (var8.interactType != 0 && var7 != null) {
-				var7.method3559(x, y, objectType, rotation, var8.boolean1);
-			}
-
-		} else if (objectType == 9) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.method3076(plane, x, y, var16, 1, 1, (Entity) var22, 0, var19, var21);
-			if (var8.interactType != 0 && var7 != null) {
-				var7.addGameObject(x, y, var9, var10, var8.boolean1);
-			}
-
-			if (var8.int2 != 16) {
-				var6.method3082(plane, x, y, var8.int2);
-			}
-
-		} else if (objectType == 4) {
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(4, rotation, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newWallDecoration(plane, x, y, var16, (Entity) var22, (Entity) null, Tiles.field512[rotation], 0, 0, 0, var19, var21);
-		} else if (objectType == 5) {
-			int var28 = 16;
-			long var31 = var6.getBoundaryObjectTag(plane, x, y);
-			Object var33;
-			if (var31 != 0L) {
-				var28 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var31)).int2;
-			}
-
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var33 = var8.getEntity(4, rotation, var15, var17, var16, var18);
-			} else {
-				var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) null, Tiles.field512[rotation], 0, var28 * Tiles.field514[rotation], var28 * Tiles.field520[rotation], var19, var21);
-		} else if (objectType == 6) {
-			int var28 = 8;
-			long var31 = var6.getBoundaryObjectTag(plane, x, y);
-			Object var33;
-			if (0L != var31) {
-				var28 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var31)).int2 / 2;
-			}
-
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18);
-			} else {
-				var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) null, 256, rotation, var28 * Tiles.field509[rotation], var28 * Tiles.field517[rotation], var19, var21);
-		} else if (objectType == 7) {
-			int var23 = rotation + 2 & 3;
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
-			} else {
-				var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newWallDecoration(plane, x, y, var16, (Entity) var22, (Entity) null, 256, var23, 0, 0, var19, var21);
-		} else if (objectType == 8) {
-			int var28 = 8;
-			long var31 = var6.getBoundaryObjectTag(plane, x, y);
-			if (var31 != 0L) {
-				var28 = ViewportMouse.getObjectDefinition(class43.Entity_unpackID(var31)).int2 / 2;
-			}
-
-			int var27 = rotation + 2 & 3;
-			Object var26;
-			Object var33;
-			if (var8.animationId == -1 && var8.transforms == null) {
-				var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18);
-				var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18);
-			} else {
-				var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
-				var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null);
-			}
-
-			var6.newWallDecoration(plane, x, y, var16, (Entity) var33, (Entity) var26, 256, rotation, var28 * Tiles.field509[rotation], var28 * Tiles.field517[rotation], var19, var21);
 		}
-	}
 
-	@ObfuscatedName("x")
+		FloorDecoration.updateGameState(10);
-	@ObfuscatedSignature(
-		signature = "(CI)Z",
-		garbageValue = "81197967"
-	)
-	@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/GrandExchangeOfferTotalQuantityComparator.java

@@ -1,147 +1,572 @@
 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("x")
 @Implements("GrandExchangeOfferTotalQuantityComparator")
 final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
-	@ObfuscatedName("q")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;I)I",
+		signature = "Lhz;"
-		garbageValue = "-918016039"
+	)
+	@Export("HitSplatDefinition_spritesArchive")
+	public static AbstractArchive HitSplatDefinition_spritesArchive;
+	@ObfuscatedName("ep")
+	@ObfuscatedGetter(
+		intValue = 349503159
+	)
+	static int field59;
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(Lq;Lq;I)I",
+		garbageValue = "-1907717670"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1);
 	}
 
-	public int compare(Object var1, Object var2) {
-		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-	}
-
 	public boolean equals(Object var1) {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("ft")
+	public int compare(Object var1, Object var2) {
-	@ObfuscatedSignature(
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-		signature = "(II)V",
-		garbageValue = "1523306949"
-	)
-	@Export("playSong")
-	static void playSong(int groupId) {
-		if (groupId == -1 && !Client.field699) {
-			NetSocket.method3553();
-		} else if (groupId != -1 && groupId != Client.field889 && Client.field911 != 0 && !Client.field699) {
-			Archive var1 = WorldMapRegion.archive6;
-			int var2 = Client.field911;
-			class197.field2402 = 1;
-			GrandExchangeOfferNameComparator.musicTrackArchive = var1;
-			class197.musicTrackGroupId = groupId;
-			class197.musicTrackFileId = 0;
-			ScriptFrame.field529 = var2;
-			BuddyRankComparator.musicTrackBoolean = false;
-			class197.field2404 = 2;
-		}
-
-		Client.field889 = groupId;
 	}
 
-	@ObfuscatedName("if")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Lhj;I)Ljava/lang/String;",
+		signature = "(Lea;[Lfm;I)V",
-		garbageValue = "16777215"
+		garbageValue = "-207613599"
 	)
-	static String method92(String var0, Widget var1) {
+	static final void method98(Scene var0, CollisionMap[] var1) {
-		if (var0.indexOf("%") == -1) {
+		int var2;
-			return var0;
+		int var3;
+		int var4;
+		int var5;
+		for (var2 = 0; var2 < 4; ++var2) {
+			for (var3 = 0; var3 < 104; ++var3) {
+				for (var4 = 0; var4 < 104; ++var4) {
+					if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) {
+						var5 = var2;
+						if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
+							var5 = var2 - 1;
+						}
+
+						if (var5 >= 0) {
+							var1[var5].setBlockedByFloor(var3, var4);
+						}
+					}
+				}
+			}
 		}
-		for (int var2 = 1; var2 <= 5; ++var2) {
+
-			while (true) {
+		Tiles.field477 += (int)(Math.random() * 5.0D) - 2;
-				int var3 = var0.indexOf("%" + var2);
+		if (Tiles.field477 < -8) {
-				if (var3 == -1) {
+			Tiles.field477 = -8;
-					break;
+		}
+
+		if (Tiles.field477 > 8) {
+			Tiles.field477 = 8;
+		}
+
+		Tiles.field486 += (int)(Math.random() * 5.0D) - 2;
+		if (Tiles.field486 < -16) {
+			Tiles.field486 = -16;
+		}
+
+		if (Tiles.field486 > 16) {
+			Tiles.field486 = 16;
+		}
+
+		int var9;
+		int var10;
+		int var11;
+		int var12;
+		int var13;
+		int var14;
+		int var15;
+		int var16;
+		int[] var10000;
+		int var17;
+		int var18;
+		for (var2 = 0; var2 < 4; ++var2) {
+			byte[][] var44 = class188.field2321[var2];
+			var9 = (int)Math.sqrt(5100.0D);
+			var10 = var9 * 768 >> 8;
+
+			int var19;
+			int var20;
+			for (var11 = 1; var11 < 103; ++var11) {
+				for (var12 = 1; var12 < 103; ++var12) {
+					var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11];
+					var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1];
+					var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536));
+					var16 = (var13 << 8) / var15;
+					var17 = 65536 / var15;
+					var18 = (var14 << 8) / var15;
+					var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96;
+					var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1);
+					class4.field31[var12][var11] = var19 - var20;
+				}
+			}
+
+			for (var11 = 0; var11 < 104; ++var11) {
+				Tiles.Tiles_hue[var11] = 0;
+				class3.Tiles_saturation[var11] = 0;
+				Buddy.Tiles_lightness[var11] = 0;
+				class49.Tiles_hueMultiplier[var11] = 0;
+				MenuAction.field1129[var11] = 0;
+			}
+
+			for (var11 = -5; var11 < 109; ++var11) {
+				for (var12 = 0; var12 < 104; ++var12) {
+					var13 = var11 + 5;
+					int var10002;
+					if (var13 >= 0 && var13 < 104) {
+						var14 = Tiles.field485[var2][var13][var12] & 255;
+						if (var14 > 0) {
+							FloorUnderlayDefinition var45 = StudioGame.FloorUnderlayDefinition_get(var14 - 1);
+							var10000 = Tiles.Tiles_hue;
+							var10000[var12] += var45.hue;
+							var10000 = class3.Tiles_saturation;
+							var10000[var12] += var45.saturation;
+							var10000 = Buddy.Tiles_lightness;
+							var10000[var12] += var45.lightness;
+							var10000 = class49.Tiles_hueMultiplier;
+							var10000[var12] += var45.hueMultiplier;
+							var10002 = MenuAction.field1129[var12]++;
+						}
+					}
+
+					var14 = var11 - 5;
+					if (var14 >= 0 && var14 < 104) {
+						var15 = Tiles.field485[var2][var14][var12] & 255;
+						if (var15 > 0) {
+							FloorUnderlayDefinition var46 = StudioGame.FloorUnderlayDefinition_get(var15 - 1);
+							var10000 = Tiles.Tiles_hue;
+							var10000[var12] -= var46.hue;
+							var10000 = class3.Tiles_saturation;
+							var10000[var12] -= var46.saturation;
+							var10000 = Buddy.Tiles_lightness;
+							var10000[var12] -= var46.lightness;
+							var10000 = class49.Tiles_hueMultiplier;
+							var10000[var12] -= var46.hueMultiplier;
+							var10002 = MenuAction.field1129[var12]--;
+						}
+					}
 				}
 
-				String var4 = var0.substring(0, var3);
+				if (var11 >= 1 && var11 < 103) {
-				int var6 = Varps.method3969(var1, var2 - 1);
+					var12 = 0;
-				String var5;
+					var13 = 0;
-				if (var6 < 999999999) {
+					var14 = 0;
-					var5 = Integer.toString(var6);
+					var15 = 0;
-				} else {
+					var16 = 0;
-					var5 = "*";
+
+					for (var17 = -5; var17 < 109; ++var17) {
+						var18 = var17 + 5;
+						if (var18 >= 0 && var18 < 104) {
+							var12 += Tiles.Tiles_hue[var18];
+							var13 += class3.Tiles_saturation[var18];
+							var14 += Buddy.Tiles_lightness[var18];
+							var15 += class49.Tiles_hueMultiplier[var18];
+							var16 += MenuAction.field1129[var18];
+						}
+
+						var19 = var17 - 5;
+						if (var19 >= 0 && var19 < 104) {
+							var12 -= Tiles.Tiles_hue[var19];
+							var13 -= class3.Tiles_saturation[var19];
+							var14 -= Buddy.Tiles_lightness[var19];
+							var15 -= class49.Tiles_hueMultiplier[var19];
+							var16 -= MenuAction.field1129[var19];
+						}
+
+						if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) {
+							if (var2 < Tiles.Tiles_minPlane) {
+								Tiles.Tiles_minPlane = var2;
+							}
+
+							var20 = Tiles.field485[var2][var11][var17] & 255;
+							int var21 = AccessFile.field4061[var2][var11][var17] & 255;
+							if (var20 > 0 || var21 > 0) {
+								int var22 = Tiles.Tiles_heights[var2][var11][var17];
+								int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17];
+								int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1];
+								int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1];
+								int var26 = class4.field31[var11][var17];
+								int var27 = class4.field31[var11 + 1][var17];
+								int var28 = class4.field31[var11 + 1][var17 + 1];
+								int var29 = class4.field31[var11][var17 + 1];
+								int var30 = -1;
+								int var31 = -1;
+								int var32;
+								int var33;
+								int var34;
+								if (var20 > 0) {
+									var32 = var12 * 256 / var15;
+									var33 = var13 / var16;
+									var34 = var14 / var16;
+									var30 = BoundaryObject.hslToRgb(var32, var33, var34);
+									var32 = var32 + Tiles.field477 & 255;
+									var34 += Tiles.field486;
+									if (var34 < 0) {
+										var34 = 0;
+									} else if (var34 > 255) {
+										var34 = 255;
+									}
+
+									var31 = BoundaryObject.hslToRgb(var32, var33, var34);
+								}
+
+								FloorOverlayDefinition var35;
+								if (var2 > 0) {
+									boolean var51 = true;
+									if (var20 == 0 && class210.field2492[var2][var11][var17] != 0) {
+										var51 = false;
+									}
+
+									if (var21 > 0) {
+										var34 = var21 - 1;
+										var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34);
+										FloorOverlayDefinition var47;
+										if (var35 != null) {
+											var47 = var35;
+										} else {
+											byte[] var49 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34);
+											var35 = new FloorOverlayDefinition();
+											if (var49 != null) {
+												var35.decode(new Buffer(var49), var34);
+											}
+
+											var35.postDecode();
+											FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34);
+											var47 = var35;
+										}
+
+										if (!var47.hideUnderlay) {
+											var51 = false;
+										}
+									}
+
+									if (var51 && var23 == var22 && var24 == var22 && var22 == var25) {
+										var10000 = Tiles.field483[var2][var11];
+										var10000[var17] |= 2340;
+									}
+								}
+
+								var32 = 0;
+								if (var31 != -1) {
+									var32 = Rasterizer3D.Rasterizer3D_colorPalette[class197.method3645(var31, 96)];
+								}
+
+								if (var21 == 0) {
+									var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), 0, 0, 0, 0, var32, 0);
+								} else {
+									var33 = class210.field2492[var2][var11][var17] + 1;
+									byte var52 = Tiles.field475[var2][var11][var17];
+									int var36 = var21 - 1;
+									FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36);
+									if (var37 != null) {
+										var35 = var37;
+									} else {
+										byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36);
+										var37 = new FloorOverlayDefinition();
+										if (var48 != null) {
+											var37.decode(new Buffer(var48), var36);
+										}
+
+										var37.postDecode();
+										FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36);
+										var35 = var37;
+									}
+
+									int var38 = var35.texture;
+									int var39;
+									int var40;
+									int var41;
+									int var42;
+									if (var38 >= 0) {
+										var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var38);
+										var39 = -1;
+									} else if (var35.primaryRgb == 16711935) {
+										var39 = -2;
+										var38 = -1;
+										var40 = -2;
+									} else {
+										var39 = BoundaryObject.hslToRgb(var35.hue, var35.saturation, var35.lightness);
+										var41 = var35.hue + Tiles.field477 & 255;
+										var42 = var35.lightness + Tiles.field486;
+										if (var42 < 0) {
+											var42 = 0;
+										} else if (var42 > 255) {
+											var42 = 255;
+										}
+
+										var40 = BoundaryObject.hslToRgb(var41, var35.saturation, var42);
+									}
+
+									var41 = 0;
+									if (var40 != -2) {
+										var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)];
+									}
+
+									if (var35.secondaryRgb != -1) {
+										var42 = var35.secondaryHue + Tiles.field477 & 255;
+										int var43 = var35.secondaryLightness + Tiles.field486;
+										if (var43 < 0) {
+											var43 = 0;
+										} else if (var43 > 255) {
+											var43 = 255;
+										}
+
+										var40 = BoundaryObject.hslToRgb(var42, var35.secondarySaturation, var43);
+										var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)];
+									}
+
+									var0.addTile(var2, var11, var17, var33, var52, var38, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), RouteStrategy.method3533(var39, var26), RouteStrategy.method3533(var39, var27), RouteStrategy.method3533(var39, var28), RouteStrategy.method3533(var39, var29), var32, var41);
+								}
+							}
+						}
+					}
 				}
+			}
 
-				var0 = var4 + var5 + var0.substring(var3 + 2);
+			for (var11 = 1; var11 < 103; ++var11) {
+				for (var12 = 1; var12 < 103; ++var12) {
+					var0.setTileMinPlane(var2, var12, var11, ObjectDefinition.method4545(var2, var12, var11));
+				}
+			}
+
+			Tiles.field485[var2] = null;
+			AccessFile.field4061[var2] = null;
+			class210.field2492[var2] = null;
+			Tiles.field475[var2] = null;
+			class188.field2321[var2] = null;
+		}
+
+		var0.method3100(-50, -10, -50);
+
+		for (var2 = 0; var2 < 104; ++var2) {
+			for (var3 = 0; var3 < 104; ++var3) {
+				if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
+					var0.setLinkBelow(var2, var3);
+				}
+			}
+		}
+
+		var2 = 1;
+		var3 = 2;
+		var4 = 4;
+
+		for (var5 = 0; var5 < 4; ++var5) {
+			if (var5 > 0) {
+				var2 <<= 3;
+				var3 <<= 3;
+				var4 <<= 3;
+			}
+
+			for (int var6 = 0; var6 <= var5; ++var6) {
+				for (int var7 = 0; var7 <= 104; ++var7) {
+					for (int var8 = 0; var8 <= 104; ++var8) {
+						short var50;
+						if ((Tiles.field483[var6][var8][var7] & var2) != 0) {
+							var9 = var7;
+							var10 = var7;
+							var11 = var6;
+
+							for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var8][var9 - 1] & var2) != 0; --var9) {
+							}
+
+							while (var10 < 104 && (Tiles.field483[var6][var8][var10 + 1] & var2) != 0) {
+								++var10;
+							}
+
+							label483:
+							while (var11 > 0) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((Tiles.field483[var11 - 1][var8][var13] & var2) == 0) {
+										break label483;
+									}
+								}
+
+								--var11;
+							}
+
+							label472:
+							while (var12 < var5) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((Tiles.field483[var12 + 1][var8][var13] & var2) == 0) {
+										break label472;
+									}
+								}
+
+								++var12;
+							}
+
+							var13 = (var10 - var9 + 1) * (var12 + 1 - var11);
+							if (var13 >= 8) {
+								var50 = 240;
+								var15 = Tiles.Tiles_heights[var12][var8][var9] - var50;
+								var16 = Tiles.Tiles_heights[var11][var8][var9];
+								Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16);
+
+								for (var17 = var11; var17 <= var12; ++var17) {
+									for (var18 = var9; var18 <= var10; ++var18) {
+										var10000 = Tiles.field483[var17][var8];
+										var10000[var18] &= ~var2;
+									}
+								}
+							}
+						}
+
+						if ((Tiles.field483[var6][var8][var7] & var3) != 0) {
+							var9 = var8;
+							var10 = var8;
+							var11 = var6;
+
+							for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var9 - 1][var7] & var3) != 0; --var9) {
+							}
+
+							while (var10 < 104 && (Tiles.field483[var6][var10 + 1][var7] & var3) != 0) {
+								++var10;
+							}
+
+							label536:
+							while (var11 > 0) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((Tiles.field483[var11 - 1][var13][var7] & var3) == 0) {
+										break label536;
+									}
+								}
+
+								--var11;
+							}
+
+							label525:
+							while (var12 < var5) {
+								for (var13 = var9; var13 <= var10; ++var13) {
+									if ((Tiles.field483[var12 + 1][var13][var7] & var3) == 0) {
+										break label525;
+									}
+								}
+
+								++var12;
+							}
+
+							var13 = (var12 + 1 - var11) * (var10 - var9 + 1);
+							if (var13 >= 8) {
+								var50 = 240;
+								var15 = Tiles.Tiles_heights[var12][var9][var7] - var50;
+								var16 = Tiles.Tiles_heights[var11][var9][var7];
+								Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16);
+
+								for (var17 = var11; var17 <= var12; ++var17) {
+									for (var18 = var9; var18 <= var10; ++var18) {
+										var10000 = Tiles.field483[var17][var18];
+										var10000[var7] &= ~var3;
+									}
+								}
+							}
+						}
+
+						if ((Tiles.field483[var6][var8][var7] & var4) != 0) {
+							var9 = var8;
+							var10 = var8;
+							var11 = var7;
+
+							for (var12 = var7; var11 > 0 && (Tiles.field483[var6][var8][var11 - 1] & var4) != 0; --var11) {
+							}
+
+							while (var12 < 104 && (Tiles.field483[var6][var8][var12 + 1] & var4) != 0) {
+								++var12;
+							}
+
+							label589:
+							while (var9 > 0) {
+								for (var13 = var11; var13 <= var12; ++var13) {
+									if ((Tiles.field483[var6][var9 - 1][var13] & var4) == 0) {
+										break label589;
+									}
+								}
+
+								--var9;
+							}
+
+							label578:
+							while (var10 < 104) {
+								for (var13 = var11; var13 <= var12; ++var13) {
+									if ((Tiles.field483[var6][var10 + 1][var13] & var4) == 0) {
+										break label578;
+									}
+								}
+
+								++var10;
+							}
+
+							if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) {
+								var13 = Tiles.Tiles_heights[var6][var9][var11];
+								Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13);
+
+								for (var14 = var9; var14 <= var10; ++var14) {
+									for (var15 = var11; var15 <= var12; ++var15) {
+										var10000 = Tiles.field483[var6][var14];
+										var10000[var15] &= ~var4;
+									}
+								}
+							}
+						}
+					}
+				}
 			}
 		}
 
-		return var0;
 	}
 
-	@ObfuscatedName("jm")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(Lhj;I)V",
+		signature = "(III)I",
-		garbageValue = "-1619270893"
+		garbageValue = "510477713"
 	)
-	static final void method85(Widget var0) {
+	static final int method101(int var0, int var1) {
-		int var1 = var0.contentType;
+		int var2 = User.method4969(var0 + 45365, var1 + 91923, 4) - 128 + (User.method4969(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (User.method4969(var0, var1, 1) - 128 >> 2);
-		if (var1 == 324) {
+		var2 = (int)(0.3D * (double)var2) + 35;
-			if (Client.field919 == -1) {
+		if (var2 < 10) {
-				Client.field919 = var0.spriteId2;
+			var2 = 10;
-				Client.field920 = var0.spriteId;
+		} else if (var2 > 60) {
-			}
+			var2 = 60;
-
-			if (Client.playerAppearance.isFemale) {
-				var0.spriteId2 = Client.field919;
-			} else {
-				var0.spriteId2 = Client.field920;
-			}
-
-		} else if (var1 == 325) {
-			if (Client.field919 == -1) {
-				Client.field919 = var0.spriteId2;
-				Client.field920 = var0.spriteId;
-			}
-
-			if (Client.playerAppearance.isFemale) {
-				var0.spriteId2 = Client.field920;
-			} else {
-				var0.spriteId2 = Client.field919;
-			}
-
-		} 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;
 		}
+
+		return var2;
 	}
 
-	@ObfuscatedName("kx")
+	@ObfuscatedName("gg")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)Ljava/lang/String;",
+		signature = "(IIIB)I",
-		garbageValue = "-282995090"
+		garbageValue = "-30"
 	)
-	@Export("removeImageTag")
+	@Export("getTileHeight")
-	static String removeImageTag(String var0) {
+	static final int getTileHeight(int var0, int var1, int var2) {
-		PlayerType[] var1 = UserComparator5.PlayerType_values();
+		int var3 = var0 >> 7;
-
+		int var4 = var1 >> 7;
-		for (int var2 = 0; var2 < var1.length; ++var2) {
+		if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
-			PlayerType var3 = var1[var2];
+			int var5 = var2;
-			if (var3.modIcon != -1 && var0.startsWith(WorldMapSection1.getModIconString(var3.modIcon))) {
+			if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
-				var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
+				var5 = var2 + 1;
-				break;
 			}
-		}
 
-		return var0;
+			int var6 = var0 & 127;
+			int var7 = var1 & 127;
+			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7;
+			int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7;
+			return var8 * (128 - var7) + var9 * var7 >> 7;
+		} else {
+			return 0;
+		}
 	}
 }

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

@@ -1,20 +1,28 @@
+import java.awt.Image;
 import java.util.Comparator;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("m")
+@ObfuscatedName("f")
 @Implements("GrandExchangeOfferUnitPriceComparator")
 final class GrandExchangeOfferUnitPriceComparator implements Comparator {
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
-	@Export("localPlayerName")
+	@ObfuscatedGetter(
-	public static String localPlayerName;
+		intValue = -1744737453
+	)
+	@Export("SpriteBuffer_spriteWidth")
+	public static int SpriteBuffer_spriteWidth;
+	@ObfuscatedName("as")
+	static Image field74;
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;B)I",
+		signature = "(Lq;Lq;I)I",
-		garbageValue = "-46"
+		garbageValue = "1336373316"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
@@ -29,169 +37,302 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		return super.equals(var1);
 	}
 
-	@ObfuscatedName("jp")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(II)Lig;",
-		garbageValue = "31"
+		garbageValue = "-2004472785"
 	)
-	static final void method124(int var0) {
+	@Export("HealthBarDefinition_get")
-		class65.method1176();
+	public static HealthBarDefinition HealthBarDefinition_get(int var0) {
-
+		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0);
-		for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+		if (var1 != null) {
-			if (var1.obj != null) {
+			return var1;
-				var1.set();
+		} else {
+			byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0);
+			var1 = new HealthBarDefinition();
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
 			}
+
+			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0);
+			return var1;
 		}
+	}
 
-		int var4 = GrandExchangeOfferWorldComparator.method61(var0).type;
+	@ObfuscatedName("k")
-		if (var4 == 0) {
+	@ObfuscatedSignature(
-			return;
+		signature = "(B)V",
-		}
+		garbageValue = "75"
-		int var2 = Varps.Varps_main[var0];
+	)
-		if (var4 == 1) {
+	@Export("VarbitDefinition_clearCached")
-			if (var2 == 1) {
+	public static void VarbitDefinition_clearCached() {
-				Rasterizer3D.Rasterizer3D_setBrightness(0.9D);
+		VarbitDefinition.VarbitDefinition_cached.clear();
-				((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D);
+	}
+
+	@ObfuscatedName("af")
+	@ObfuscatedSignature(
+		signature = "(ILcr;ZI)I",
+		garbageValue = "1195585580"
+	)
+	static int method136(int var0, Script var1, boolean var2) {
+		int var3;
+		int var4;
+		if (var0 == ScriptOpcodes.ADD) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SUB) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 - var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.MULTIPLY) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 * var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.DIV) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 / var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.RANDOM) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
+			return 1;
+		} else if (var0 == ScriptOpcodes.RANDOMINC) {
+			var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
+			return 1;
+		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
+			Interpreter.Interpreter_intStackSize -= 5;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
+			int var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (var6 - var5);
+			return 1;
+		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SETBIT) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | 1 << var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CLEARBIT) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
+			return 1;
+		} else if (var0 == ScriptOpcodes.TESTBIT) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
+			return 1;
+		} else if (var0 == ScriptOpcodes.MOD) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 % var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.POW) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			if (var3 == 0) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
+			} else {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
 			}
 
-			if (var2 == 2) {
+			return 1;
-				Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
+		} else if (var0 == ScriptOpcodes.INVPOW) {
-				((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D);
+			Interpreter.Interpreter_intStackSize -= 2;
-			}
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
-
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
-			if (var2 == 3) {
+			if (var3 == 0) {
-				Rasterizer3D.Rasterizer3D_setBrightness(0.7D);
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
-				((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D);
+				return 1;
-			}
+			} else {
-
+				switch(var4) {
-			if (var2 == 4) {
+				case 0:
-				Rasterizer3D.Rasterizer3D_setBrightness(0.6D);
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
-				((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D);
+					break;
-			}
+				case 1:
-
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3;
-			FontName.method5317();
+					break;
-		}
+				case 2:
-
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3);
-		if (var4 == 3) {
+					break;
-			short var3 = 0;
+				case 3:
-			if (var2 == 0) {
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3);
-				var3 = 255;
+					break;
-			}
+				case 4:
-
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3));
-			if (var2 == 1) {
+					break;
-				var3 = 192;
+				default:
-			}
+					Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4);
-
-			if (var2 == 2) {
-				var3 = 128;
-			}
-
-			if (var2 == 3) {
-				var3 = 64;
-			}
-
-			if (var2 == 4) {
-				var3 = 0;
-			}
-
-			if (var3 != Client.field911) {
-				if (Client.field911 == 0 && Client.field889 != -1) {
-					FileSystem.method3503(WorldMapRegion.archive6, Client.field889, 0, var3, false);
-					Client.field699 = false;
-				} else if (var3 == 0) {
-					NetSocket.method3553();
-					Client.field699 = false;
-				} else if (class197.field2402 != 0) {
-					ScriptFrame.field529 = var3;
-				} else {
-					Interpreter.midiPcmStream.method3706(var3);
 				}
 
-				Client.field911 = var3;
+				return 1;
 			}
+		} else if (var0 == ScriptOpcodes.AND) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.OR) {
+			Interpreter.Interpreter_intStackSize -= 2;
+			var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 | var4;
+			return 1;
+		} else if (var0 == ScriptOpcodes.SCALE) {
+			Interpreter.Interpreter_intStackSize -= 3;
+			long var9 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
+			long var11 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
+			long var13 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11);
+			return 1;
+		} else {
+			return 2;
 		}
+	}
 
-		if (var4 == 4) {
+	@ObfuscatedName("fg")
-			if (var2 == 0) {
+	@ObfuscatedSignature(
-				Client.soundEffectVolume = 127;
+		signature = "(IIII)V",
-			}
+		garbageValue = "773083265"
-
+	)
-			if (var2 == 1) {
+	@Export("queueSoundEffect")
-				Client.soundEffectVolume = 96;
+	static void queueSoundEffect(int var0, int var1, int var2) {
-			}
+		if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
-
+			Client.soundEffectIds[Client.soundEffectCount] = var0;
-			if (var2 == 2) {
+			Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
-				Client.soundEffectVolume = 64;
+			Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
-			}
+			Client.soundEffects[Client.soundEffectCount] = null;
-
+			Client.soundLocations[Client.soundEffectCount] = 0;
-			if (var2 == 3) {
+			++Client.soundEffectCount;
-				Client.soundEffectVolume = 32;
-			}
-
-			if (var2 == 4) {
-				Client.soundEffectVolume = 0;
-			}
-		}
-
-		if (var4 == 5) {
-			Client.leftClickOpensMenu = var2;
-		}
-
-		if (var4 == 6) {
-			Client.chatEffects = var2;
-		}
-
-		if (var4 == 9) {
-			Client.field809 = var2;
-		}
-
-		if (var4 == 10) {
-			if (var2 == 0) {
-				Client.field892 = 127;
-			}
-
-			if (var2 == 1) {
-				Client.field892 = 96;
-			}
-
-			if (var2 == 2) {
-				Client.field892 = 64;
-			}
-
-			if (var2 == 3) {
-				Client.field892 = 32;
-			}
-
-			if (var2 == 4) {
-				Client.field892 = 0;
-			}
-		}
-
-		if (var4 == 17) {
-			Client.followerIndex = var2 & 0xffff;
-		}
-
-		if (var4 == 18) {
-			Client.playerAttackOption = (AttackOption)SoundSystem.findEnumerated(AbstractArchive.AttackOption_values(), var2);
-			if (Client.playerAttackOption == null) {
-				Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-			}
-		}
-
-		if (var4 == 19) {
-			if (var2 == -1) {
-				Client.combatTargetPlayerIndex = -1;
-			} else {
-				Client.combatTargetPlayerIndex = var2 & 2047;
-			}
-		}
-
-		if (var4 == 22) {
-			Client.npcAttackOption = (AttackOption)SoundSystem.findEnumerated(AbstractArchive.AttackOption_values(), var2);
-			if (Client.npcAttackOption == null) {
-				Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-			}
 		}
 
 	}
+
+	@ObfuscatedName("fh")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "-38"
+	)
+	static final void method133() {
+		if (Client.field651 != ItemContainer.plane) {
+			Client.field651 = ItemContainer.plane;
+			AbstractWorldMapData.method264(ItemContainer.plane);
+		}
+
+	}
+
+	@ObfuscatedName("hp")
+	@ObfuscatedSignature(
+		signature = "(B)V",
+		garbageValue = "78"
+	)
+	@Export("readNpcUpdates")
+	static final void readNpcUpdates() {
+		PacketBuffer var0 = Client.packetWriter.packetBuffer;
+		var0.importIndex();
+		int var1 = var0.readBits(8);
+		int var2;
+		if (var1 < Client.npcCount) {
+			for (var2 = var1; var2 < Client.npcCount; ++var2) {
+				Client.field655[++Client.field899 - 1] = Client.npcIndices[var2];
+			}
+		}
+
+		if (var1 > Client.npcCount) {
+			throw new RuntimeException("");
+		} else {
+			Client.npcCount = 0;
+
+			for (var2 = 0; var2 < var1; ++var2) {
+				int var3 = Client.npcIndices[var2];
+				NPC var4 = Client.npcs[var3];
+				int var5 = var0.readBits(1);
+				if (var5 == 0) {
+					Client.npcIndices[++Client.npcCount - 1] = var3;
+					var4.npcCycle = Client.cycle;
+				} else {
+					int var6 = var0.readBits(2);
+					if (var6 == 0) {
+						Client.npcIndices[++Client.npcCount - 1] = var3;
+						var4.npcCycle = Client.cycle;
+						Client.field669[++Client.field861 - 1] = var3;
+					} else {
+						int var7;
+						int var8;
+						if (var6 == 1) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method1961(var7, (byte)1);
+							var8 = var0.readBits(1);
+							if (var8 == 1) {
+								Client.field669[++Client.field861 - 1] = var3;
+							}
+						} else if (var6 == 2) {
+							Client.npcIndices[++Client.npcCount - 1] = var3;
+							var4.npcCycle = Client.cycle;
+							var7 = var0.readBits(3);
+							var4.method1961(var7, (byte)2);
+							var8 = var0.readBits(3);
+							var4.method1961(var8, (byte)2);
+							int var9 = var0.readBits(1);
+							if (var9 == 1) {
+								Client.field669[++Client.field861 - 1] = var3;
+							}
+						} else if (var6 == 3) {
+							Client.field655[++Client.field899 - 1] = var3;
+						}
+					}
+				}
+			}
+
+		}
+	}
+
+	@ObfuscatedName("jp")
+	@ObfuscatedSignature(
+		signature = "(II)Ljava/lang/String;",
+		garbageValue = "-59560739"
+	)
+	static final String method127(int var0) {
+		return var0 < 999999999 ? Integer.toString(var0) : "*";
+	}
+
+	@ObfuscatedName("km")
+	@ObfuscatedSignature(
+		signature = "(Lhp;IB)Ljava/lang/String;",
+		garbageValue = "0"
+	)
+	static String method125(Widget var0, int var1) {
+		int var3 = ParamDefinition.getWidgetClickMask(var0);
+		boolean var2 = (var3 >> var1 + 1 & 1) != 0;
+		if (!var2 && var0.onOp == null) {
+			return null;
+		} else {
+			return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null;
+		}
+	}
 }

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

@@ -1,185 +1,125 @@
 import java.util.Comparator;
+import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("l")
+@ObfuscatedName("n")
 @Implements("GrandExchangeOfferWorldComparator")
 final class GrandExchangeOfferWorldComparator implements Comparator {
-	@ObfuscatedName("b")
+	@ObfuscatedName("rr")
-	@ObfuscatedSignature(
+	@ObfuscatedGetter(
-		signature = "Lly;"
+		intValue = 133251749
 	)
-	@Export("leftTitleSprite")
+	static int field34;
-	static Sprite leftTitleSprite;
-	@ObfuscatedName("gu")
-	@ObfuscatedSignature(
-		signature = "Ler;"
-	)
-	@Export("scene")
-	static Scene scene;
-
 	@ObfuscatedName("q")
+	@Export("soundSystemExecutor")
+	static ScheduledExecutorService soundSystemExecutor;
+	@ObfuscatedName("do")
 	@ObfuscatedSignature(
-		signature = "(Li;Li;I)I",
+		signature = "Lid;"
-		garbageValue = "1850890964"
+	)
+	@Export("archive15")
+	static Archive archive15;
+
+	@ObfuscatedName("s")
+	@ObfuscatedSignature(
+		signature = "(Lq;Lq;I)I",
+		garbageValue = "1902979302"
 	)
 	@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("q")
+	public int compare(Object var1, Object var2) {
-	@ObfuscatedSignature(
+		return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-		signature = "(Lhp;B)V",
-		garbageValue = "0"
-	)
-	@Export("VarcInt_setArchives")
-	public static void VarcInt_setArchives(AbstractArchive var0) {
-		VarcInt.VarcInt_archive = var0;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
+		signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;",
-		garbageValue = "-2102370448"
+		garbageValue = "1594628992"
 	)
-	public static String method63(CharSequence var0) {
+	public static String method74(CharSequence[] var0, int var1, int var2) {
-		int var1 = var0.length();
+		if (var2 == 0) {
-		StringBuilder var2 = new StringBuilder(var1);
+			return "";
-
+		} else if (var2 == 1) {
-		for (int var3 = 0; var3 < var1; ++var3) {
+			CharSequence var3 = var0[var1];
-			char var4 = var0.charAt(var3);
+			return var3 == null ? "null" : var3.toString();
-			if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
-				if (var4 == ' ') {
-					var2.append('+');
-				} else {
-					byte var5 = ItemDefinition.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("w")
-	@ObfuscatedSignature(
-		signature = "(Lla;ILjava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "-9"
-	)
-	static String method54(IterableNodeHashTable var0, int var1, String var2) {
-		if (var0 == null) {
-			return var2;
-		}
-		ObjectNode var3 = (ObjectNode)var0.get((long)var1);
-		return var3 == null ? var2 : (String)var3.obj;
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(II)Lik;",
-		garbageValue = "-1961052460"
-	)
-	public static VarpDefinition method61(int var0) {
-		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
-		if (var1 != null) {
-			return var1;
-		}
-		byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
-		var1 = new VarpDefinition();
-		if (var2 != null) {
-			var1.decode(new Buffer(var2));
-		}
-
-		VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
-		return var1;
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;ZZI)V",
-		garbageValue = "-1344972354"
-	)
-	@Export("openURL")
-	public static void openURL(String var0, boolean var1, boolean var2) {
-		SpriteBuffer.method6243(var0, var1, "openjs", var2);
-	}
-
-	@ObfuscatedName("gn")
-	@ObfuscatedSignature(
-		signature = "(IIB)V",
-		garbageValue = "-51"
-	)
-	@Export("updateItemPile")
-	static final void updateItemPile(int var0, int var1) {
-		NodeDeque var2 = Client.groundItems[class42.plane][var0][var1];
-		if (var2 == null) {
-			scene.removeGroundItemPile(class42.plane, var0, var1);
-			return;
-		}
-		long var3 = -99999999L;
-		TileItem var5 = null;
-
-		TileItem var6;
-		for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
-			ItemDefinition var7 = WorldMapArea.ItemDefinition_get(var6.id);
-			long var8 = (long)var7.price;
-			if (var7.isStackable == 1) {
-				var8 *= (long)(var6.quantity + 1);
-			}
-
-			if (var8 > var3) {
-				var3 = var8;
-				var5 = var6;
-			}
-		}
-
-		if (var5 == null) {
-			scene.removeGroundItemPile(class42.plane, var0, var1);
 		} else {
-			var2.addLast(var5);
+			int var8 = var2 + var1;
-			TileItem var12 = null;
+			int var4 = 0;
-			TileItem var11 = null;
 
-			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) {
+			for (int var5 = var1; var5 < var8; ++var5) {
-				if (var5.id != var6.id) {
+				CharSequence var6 = var0[var5];
-					if (var12 == null) {
+				if (var6 == null) {
-						var12 = var6;
+					var4 += 4;
-					}
+				} else {
-
+					var4 += var6.length();
-					if (var6.id != var12.id && var11 == null) {
-						var11 = var6;
-					}
 				}
 			}
 
-			long var9 = Tile.calculateTag(var0, var1, 3, false, 0);
+			StringBuilder var9 = new StringBuilder(var4);
-			scene.newGroundItemPile(class42.plane, var0, var1, ScriptEvent.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class42.plane), var5, var9, var12, var11);
+
+			for (int var10 = var1; var10 < var8; ++var10) {
+				CharSequence var7 = var0[var10];
+				if (var7 == null) {
+					var9.append("null");
+				} else {
+					var9.append(var7);
+				}
+			}
+
+			return var9.toString();
 		}
 	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "(ILcr;ZI)I",
+		garbageValue = "-1665010136"
+	)
+	static int method79(int var0, Script var1, boolean var2) {
+		Widget var3;
+		if (var0 >= 2000) {
+			var0 -= 1000;
+			var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
+		} else {
+			var3 = var2 ? class286.field3623 : class297.field3693;
+		}
+
+		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
+			if (Interpreter.field1064 >= 10) {
+				throw new RuntimeException();
+			} else if (var3.onResize == null) {
+				return 0;
+			} else {
+				ScriptEvent var4 = new ScriptEvent();
+				var4.widget = var3;
+				var4.args = var3.onResize;
+				var4.field555 = Interpreter.field1064 + 1;
+				Client.scriptEvents.addFirst(var4);
+				return 1;
+			}
+		} else {
+			return 2;
+		}
+	}
+
+	@ObfuscatedName("bo")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)I",
+		garbageValue = "516723982"
+	)
+	public static int method80(String var0) {
+		return var0.length() + 2;
+	}
 }

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

@@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lp")
+@ObfuscatedName("kp")
 @Implements("GraphicsDefaults")
 public class GraphicsDefaults {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = -598930279
+		intValue = -2112004677
 	)
 	@Export("compass")
 	public int compass;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -996722769
+		intValue = -258294563
 	)
-	public int field3823;
+	public int field3806;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -1830782467
+		intValue = 701602469
 	)
 	@Export("mapScenes")
 	public int mapScenes;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 2115046595
+		intValue = -2141260483
 	)
 	@Export("headIconsPk")
 	public int headIconsPk;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1511309833
+		intValue = -479103763
 	)
-	public int field3830;
+	public int field3805;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -1434571323
+		intValue = -556598901
 	)
-	public int field3827;
+	public int field3802;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = -385142187
+		intValue = 885733673
 	)
-	public int field3828;
+	public int field3798;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 326746637
+		intValue = 1784857591
 	)
-	public int field3829;
+	public int field3804;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = 1387311669
+		intValue = 2055927251
 	)
-	public int field3832;
+	public int field3797;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = -1869072211
+	)
+	public int field3801;
 	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1775888463
+		intValue = 1312425167
 	)
-	public int field3831;
+	public int field3807;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 347558277
-	)
-	public int field3822;
 
 	public GraphicsDefaults() {
 		this.compass = -1;
-		this.field3823 = -1;
+		this.field3806 = -1;
 		this.mapScenes = -1;
 		this.headIconsPk = -1;
-		this.field3830 = -1;
+		this.field3805 = -1;
-		this.field3827 = -1;
+		this.field3802 = -1;
-		this.field3828 = -1;
+		this.field3798 = -1;
-		this.field3829 = -1;
+		this.field3804 = -1;
-		this.field3832 = -1;
+		this.field3797 = -1;
-		this.field3831 = -1;
+		this.field3801 = -1;
-		this.field3822 = -1;
+		this.field3807 = -1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Lhp;B)V",
+		signature = "(Lhz;I)V",
-		garbageValue = "104"
+		garbageValue = "-2074842335"
 	)
 	@Export("decode")
 	public void decode(AbstractArchive var1) {
-		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3821.group);
+		byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3794.group);
 		Buffer var3 = new Buffer(var2);
 
 		while (true) {
@@ -101,28 +101,18 @@ public class GraphicsDefaults {
 				var3.readMedium();
 				break;
 			case 2:
-				this.compass = var3.method5511();
+				this.compass = var3.method5602();
-				this.field3823 = var3.method5511();
+				this.field3806 = var3.method5602();
-				this.mapScenes = var3.method5511();
+				this.mapScenes = var3.method5602();
-				this.headIconsPk = var3.method5511();
+				this.headIconsPk = var3.method5602();
-				this.field3830 = var3.method5511();
+				this.field3805 = var3.method5602();
-				this.field3827 = var3.method5511();
+				this.field3802 = var3.method5602();
-				this.field3828 = var3.method5511();
+				this.field3798 = var3.method5602();
-				this.field3829 = var3.method5511();
+				this.field3804 = var3.method5602();
-				this.field3832 = var3.method5511();
+				this.field3797 = var3.method5602();
-				this.field3831 = var3.method5511();
+				this.field3801 = var3.method5602();
-				this.field3822 = var3.method5511();
+				this.field3807 = var3.method5602();
 			}
 		}
 	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(IIB)I",
-		garbageValue = "-122"
-	)
-	@Export("getWorldMapScriptIdCategory")
-	public static int getWorldMapScriptIdCategory(int var0, int var1) {
-		return var1 + (var0 + 40000 << 8);
-	}
 }

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

@@ -5,64 +5,72 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("ba")
+@ObfuscatedName("bc")
 @Implements("GraphicsObject")
 public final class GraphicsObject extends Entity {
-	@ObfuscatedName("q")
+	@ObfuscatedName("qe")
 	@ObfuscatedGetter(
-		intValue = -1729585911
+		intValue = -487309312
+	)
+	static int field1079;
+	@ObfuscatedName("gx")
+	@Export("regionLandArchives")
+	static byte[][] regionLandArchives;
+	@ObfuscatedName("s")
+	@ObfuscatedGetter(
+		intValue = -609520515
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = 1383922821
+		intValue = 528073861
 	)
 	@Export("cycleStart")
 	int cycleStart;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -973375147
+		intValue = 1305204903
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1889549973
+		intValue = 1986692437
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -938790661
+		intValue = 575337647
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -955418477
+		intValue = -893117639
 	)
 	@Export("height")
 	int height;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Lis;"
+		signature = "Lij;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1315114867
+		intValue = -1568571077
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1432178363
+		intValue = -1439045539
 	)
 	@Export("frameCycle")
 	int frameCycle;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("isFinished")
 	boolean isFinished;
 
@@ -76,47 +84,46 @@ public final class GraphicsObject extends Entity {
 		this.y = var4;
 		this.height = var5;
 		this.cycleStart = var7 + var6;
-		int var8 = MusicPatch.SpotAnimationDefinition_get(this.id).sequence;
+		int var8 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence;
 		if (var8 != -1) {
 			this.isFinished = false;
-			this.sequenceDefinition = GrandExchangeEvent.SequenceDefinition_get(var8);
+			this.sequenceDefinition = Widget.SequenceDefinition_get(var8);
 		} else {
 			this.isFinished = true;
 		}
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IB)V",
+		signature = "(IS)V",
-		garbageValue = "4"
+		garbageValue = "-9690"
 	)
 	@Export("advance")
 	final void advance(int var1) {
-		if (this.isFinished) {
+		if (!this.isFinished) {
-			return;
+			this.frameCycle += var1;
-		}
-		this.frameCycle += var1;
 
-		while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
+			while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
-			this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame];
+				this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame];
-			++this.frame;
+				++this.frame;
-			if (this.frame >= this.sequenceDefinition.frameIds.length) {
+				if (this.frame >= this.sequenceDefinition.frameIds.length) {
-				this.isFinished = true;
+					this.isFinished = true;
-				break;
+					break;
+				}
 			}
-		}
 
+		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Ldm;",
+		signature = "(I)Ldo;",
-		garbageValue = "759381421"
+		garbageValue = "-419920513"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
-		SpotAnimationDefinition var1 = MusicPatch.SpotAnimationDefinition_get(this.id);
+		SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id);
 		Model var2;
 		if (!this.isFinished) {
 			var2 = var1.getModel(this.frame);
@@ -127,164 +134,49 @@ public final class GraphicsObject extends Entity {
 		return var2 == null ? null : var2;
 	}
 
-	@ObfuscatedName("r")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(ILcx;ZS)I",
+		signature = "(II)Z",
-		garbageValue = "-11723"
+		garbageValue = "971415890"
 	)
-	static int method1943(int var0, Script var1, boolean var2) {
+	public static boolean method1946(int var0) {
-		Widget var3;
+		return var0 == WorldMapDecorationType.field2722.id;
-		if (var0 >= 2000) {
+	}
-			var0 -= 1000;
-			var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-		} else {
-			var3 = var2 ? Interpreter.field1111 : Calendar.field2507;
-		}
 
-		String var4 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
+	@ObfuscatedName("s")
-		int[] var5 = null;
+	@ObfuscatedSignature(
-		if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
+		signature = "(I)Z",
-			int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
+		garbageValue = "85520367"
-			if (var6 > 0) {
+	)
-				for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]) {
+	@Export("hasReflectionCheck")
-				}
+	public static boolean hasReflectionCheck() {
-			}
+		ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last();
+		return var0 != null;
+	}
 
-			var4 = var4.substring(0, var4.length() - 1);
+	@ObfuscatedName("p")
-		}
+	@ObfuscatedSignature(
-
+		signature = "(ILcr;ZI)I",
-		Object[] var8 = new Object[var4.length() + 1];
+		garbageValue = "886521701"
-
+	)
-		int var7;
+	static int method1939(int var0, Script var1, boolean var2) {
-		for (var7 = var8.length - 1; var7 >= 1; --var7) {
+		Widget var3 = var2 ? class286.field3623 : class297.field3693;
-			if (var4.charAt(var7 - 1) == 's') {
+		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
-				var8[var7] = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId;
+			return 1;
+		} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) {
+			if (var3.itemId != -1) {
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity;
 			} else {
-				var8[var7] = new Integer(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
+				Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
 			}
-		}
 
-		var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
+			return 1;
-		if (var7 != -1) {
+		} else if (var0 == ScriptOpcodes.CC_GETID) {
-			var8[0] = new Integer(var7);
+			Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex;
-		} else {
+			return 1;
-			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.field2681 = var8;
-		} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) {
-			var3.onResize = var8;
 		} else {
 			return 2;
 		}
-
-		var3.hasListener = true;
-		return 1;
-	}
-
-	@ObfuscatedName("g")
-	@ObfuscatedSignature(
-		signature = "(III)I",
-		garbageValue = "1550273173"
-	)
-	static final int method1948(int var0, int var1) {
-		if (var0 == -1) {
-			return 12345678;
-		}
-		var1 = (var0 & 127) * var1 / 128;
-		if (var1 < 2) {
-			var1 = 2;
-		} else if (var1 > 126) {
-			var1 = 126;
-		}
-
-		return (var0 & 65408) + var1;
-	}
-
-	@ObfuscatedName("az")
-	@ObfuscatedSignature(
-		signature = "(Ldx;I)V",
-		garbageValue = "-1064292468"
-	)
-	@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);
-		}
-
-	}
-
-	@ObfuscatedName("he")
-	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-1819884546"
-	)
-	@Export("addCancelMenuEntry")
-	static void addCancelMenuEntry() {
-		Strings.resetMenuEntries();
-		Client.menuActions[0] = "Cancel";
-		Client.menuTargets[0] = "";
-		Client.menuOpcodes[0] = 1006;
-		Client.menuShiftClick[0] = false;
-		Client.menuOptionsCount = 1;
 	}
 }

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

@@ -3,40 +3,34 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cr")
+@ObfuscatedName("ce")
 @Implements("HealthBar")
 public class HealthBar extends Node {
-	@ObfuscatedName("x")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lke;"
+		signature = "Lig;"
-	)
-	@Export("ItemDefinition_fontPlain11")
-	public static Font ItemDefinition_fontPlain11;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "Lip;"
 	)
 	@Export("definition")
 	HealthBarDefinition definition;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lju;"
+		signature = "Ljp;"
 	)
 	@Export("updates")
 	IterableNodeDeque updates;
 
 	@ObfuscatedSignature(
-		signature = "(Lip;)V"
+		signature = "(Lig;)V"
 	)
 	HealthBar(HealthBarDefinition var1) {
 		this.updates = new IterableNodeDeque();
 		this.definition = var1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(IIIIB)V",
+		signature = "(IIIII)V",
-		garbageValue = "87"
+		garbageValue = "1581438808"
 	)
 	@Export("put")
 	void put(int var1, int var2, int var3, int var4) {
@@ -69,45 +63,38 @@ public class HealthBar extends Node {
 		}
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(IB)Lbu;",
+		signature = "(IB)Lbb;",
-		garbageValue = "41"
+		garbageValue = "-77"
 	)
 	@Export("get")
 	HealthBarUpdate get(int var1) {
 		HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last();
-		if (var2 == null || var2.cycle > var1) {
+		if (var2 != null && var2.cycle <= var1) {
-			return null;
+			for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) {
-		}
+				var2.remove();
-		for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) {
+				var2 = var3;
-			var2.remove();
+			}
-			var2 = var3;
-		}
 
-		if (this.definition.int5 + var2.cycle + var2.cycleOffset <= var1) {
+			if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
-			var2.remove();
+				return var2;
+			} else {
+				var2.remove();
+				return null;
+			}
+		} else {
 			return null;
 		}
-		return var2;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(I)Z",
+		signature = "(B)Z",
-		garbageValue = "-16711936"
+		garbageValue = "88"
 	)
 	@Export("isEmpty")
 	boolean isEmpty() {
-		return this.updates.isEmpty();
+		return this.updates.method4729();
-	}
-
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "(IB)I",
-		garbageValue = "35"
-	)
-	public static int method1957(int var0) {
-		return var0 >> 11 & 63;
 	}
 }

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

@@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ip")
+@ObfuscatedName("ig")
 @Implements("HealthBarDefinition")
 public class HealthBarDefinition extends DualNode {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("HealthBarDefinition_archive")
 	public static AbstractArchive HealthBarDefinition_archive;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("HealthBarDefinition_spritesArchive")
 	public static AbstractArchive HealthBarDefinition_spritesArchive;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
 	)
 	@Export("HealthBarDefinition_cached")
 	static EvictingDualNodeHashTable HealthBarDefinition_cached;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
 	)
 	@Export("HealthBarDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1770918457
+		intValue = -1504637567
 	)
-	public int field3279;
+	public int field3264;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 2068006773
+		intValue = -1807788243
 	)
 	@Export("int1")
 	public int int1;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -63517075
+		intValue = 1909708279
 	)
 	@Export("int2")
 	public int int2;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -177821987
+		intValue = -1885853349
 	)
 	@Export("int3")
 	public int int3;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1811876659
+		intValue = -563818397
 	)
 	@Export("int4")
 	public int int4;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1986405241
+		intValue = -74768593
 	)
 	@Export("int5")
 	public int int5;
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1715225113
+		intValue = -1506111747
 	)
 	@Export("frontSpriteID")
 	int frontSpriteID;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 124716389
+		intValue = -1208608669
 	)
 	@Export("backSpriteID")
 	int backSpriteID;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 502151103
+		intValue = -567354113
 	)
 	@Export("width")
 	public int width;
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 485619037
+		intValue = 1929001923
 	)
 	@Export("widthPadding")
 	public int widthPadding;
@@ -108,23 +108,27 @@ public class HealthBarDefinition extends DualNode {
 		this.widthPadding = 0;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkf;B)V",
+		signature = "(Lky;I)V",
-		garbageValue = "-11"
+		garbageValue = "-2108312426"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
-		int var2;
+		while (true) {
-		while ((var2 = var1.readUnsignedByte()) != 0) {
+			int var2 = var1.readUnsignedByte();
+			if (var2 == 0) {
+				return;
+			}
+
 			this.decodeNext(var1, var2);
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;IB)V",
+		signature = "(Lky;II)V",
-		garbageValue = "-62"
+		garbageValue = "1232956083"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
@@ -141,9 +145,9 @@ public class HealthBarDefinition extends DualNode {
 		} else if (var2 == 6) {
 			var1.readUnsignedByte();
 		} else if (var2 == 7) {
-			this.frontSpriteID = var1.method5511();
+			this.frontSpriteID = var1.method5602();
 		} else if (var2 == 8) {
-			this.backSpriteID = var1.method5511();
+			this.backSpriteID = var1.method5602();
 		} else if (var2 == 11) {
 			this.int3 = var1.readUnsignedShort();
 		} else if (var2 == 14) {
@@ -154,47 +158,51 @@ public class HealthBarDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(B)Lly;",
+		signature = "(I)Lls;",
-		garbageValue = "39"
+		garbageValue = "32246110"
 	)
 	@Export("getFrontSprite")
 	public Sprite getFrontSprite() {
 		if (this.frontSpriteID < 0) {
 			return null;
-		}
+		} else {
-		Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
+			Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
-		if (var1 != null) {
+			if (var1 != null) {
-			return var1;
+				return var1;
-		}
+			} else {
-		var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
+				var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
-		if (var1 != null) {
+				if (var1 != null) {
-			HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
-		}
+				}
 
-		return var1;
+				return var1;
+			}
+		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(I)Lly;",
+		signature = "(I)Lls;",
-		garbageValue = "879066493"
+		garbageValue = "2113280722"
 	)
 	@Export("getBackSprite")
 	public Sprite getBackSprite() {
 		if (this.backSpriteID < 0) {
 			return null;
-		}
+		} else {
-		Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID);
+			Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID);
-		if (var1 != null) {
+			if (var1 != null) {
-			return var1;
+				return var1;
-		}
+			} else {
-		var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
+				var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
-		if (var1 != null) {
+				if (var1 != null) {
-			HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
-		}
+				}
 
-		return var1;
+				return var1;
+			}
+		}
 	}
 }

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

@@ -1,62 +1,48 @@
-import java.io.ByteArrayInputStream;
+import java.awt.FontMetrics;
-import java.io.IOException;
-import java.io.InvalidClassException;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.Reflection;
 
-@ObfuscatedName("bu")
+@ObfuscatedName("bb")
 @Implements("HealthBarUpdate")
 public class HealthBarUpdate extends Node {
-	@ObfuscatedName("rb")
+	@ObfuscatedName("nk")
 	@ObfuscatedGetter(
-		intValue = 1430067072
+		intValue = -1632744841
 	)
-	static int field1017;
+	static int field986;
-	@ObfuscatedName("i")
+	@ObfuscatedName("az")
-	@ObfuscatedGetter(
+	@Export("loginScreenFontMetrics")
-		intValue = -1252480817
+	static FontMetrics loginScreenFontMetrics;
-	)
+	@ObfuscatedName("dp")
-	@Export("Interpreter_intStackSize")
-	static int Interpreter_intStackSize;
-	@ObfuscatedName("df")
 	@ObfuscatedSignature(
-		signature = "Lky;"
+		signature = "Lid;"
 	)
-	@Export("js5Socket")
+	@Export("archive2")
-	static AbstractSocket js5Socket;
+	static Archive archive2;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 520006407
+		intValue = 1232956083
 	)
 	@Export("cycle")
 	int cycle;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -381285951
+		intValue = -840023753
 	)
 	@Export("health")
 	int health;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedGetter(
-		intValue = -881200951
+		intValue = -207161283
 	)
 	@Export("health2")
 	int health2;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1165972721
+		intValue = 309403729
 	)
 	@Export("cycleOffset")
 	int cycleOffset;
@@ -68,10 +54,10 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		signature = "(IIIII)V",
-		garbageValue = "1833806724"
+		garbageValue = "-782735751"
 	)
 	@Export("set")
 	void set(int var1, int var2, int var3, int var4) {
@@ -81,165 +67,35 @@ public class HealthBarUpdate extends Node {
 		this.cycleOffset = var4;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)Z",
+		signature = "(II)Lil;",
-		garbageValue = "-1155103111"
+		garbageValue = "-790003135"
 	)
-	@Export("isValidURL")
+	@Export("SpotAnimationDefinition_get")
-	static boolean isValidURL(String var0) {
+	public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) {
-		if (var0 == null) {
+		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
-			return false;
+		if (var1 != null) {
-		}
+			return var1;
-		try {
-			new URL(var0);
-			return true;
-		} catch (MalformedURLException var2) {
-			return false;
-		}
-	}
-
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "(Lkx;I)V",
-		garbageValue = "-2067523200"
-	)
-	@Export("performReflectionCheck")
-	public static void performReflectionCheck(PacketBuffer var0) {
-		ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last();
-		if (var1 == null) {
-			return;
-		}
-		int var2 = var0.offset;
-		var0.writeInt(var1.id);
-
-		for (int var3 = 0; var3 < var1.size; ++var3) {
-			if (var1.creationErrors[var3] != 0) {
-				var0.writeByte(var1.creationErrors[var3]);
-				continue;
-			}
-			try {
-				int var4 = var1.operations[var3];
-				Field var5;
-				int var6;
-				if (var4 == 0) {
-					var5 = var1.fields[var3];
-					var6 = Reflection.getInt(var5, (Object)null);
-					var0.writeByte(0);
-					var0.writeInt(var6);
-				} else if (var4 == 1) {
-					var5 = var1.fields[var3];
-					Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]);
-					var0.writeByte(0);
-				} else if (var4 == 2) {
-					var5 = var1.fields[var3];
-					var6 = var5.getModifiers();
-					var0.writeByte(0);
-					var0.writeInt(var6);
-				}
-
-				Method var25;
-				if (var4 == 3) {
-					var25 = var1.methods[var3];
-					byte[][] var10 = var1.arguments[var3];
-					Object[] var7 = new Object[var10.length];
-
-					for (int var8 = 0; var8 < var10.length; ++var8) {
-						ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
-						var7[var8] = var9.readObject();
-					}
-
-					Object var11 = Reflection.invoke(var25, (Object)null, var7);
-					if (var11 == null) {
-						var0.writeByte(0);
-					} else if (var11 instanceof Number) {
-						var0.writeByte(1);
-						var0.writeLong(((Number)var11).longValue());
-					} else if (var11 instanceof String) {
-						var0.writeByte(2);
-						var0.writeStringCp1252NullTerminated((String)var11);
-					} else {
-						var0.writeByte(4);
-					}
-				} else if (var4 == 4) {
-					var25 = var1.methods[var3];
-					var6 = var25.getModifiers();
-					var0.writeByte(0);
-					var0.writeInt(var6);
-				}
-			} catch (ClassNotFoundException var13) {
-				var0.writeByte(-10);
-			} catch (InvalidClassException var14) {
-				var0.writeByte(-11);
-			} catch (StreamCorruptedException var15) {
-				var0.writeByte(-12);
-			} catch (OptionalDataException var16) {
-				var0.writeByte(-13);
-			} catch (IllegalAccessException var17) {
-				var0.writeByte(-14);
-			} catch (IllegalArgumentException var18) {
-				var0.writeByte(-15);
-			} catch (InvocationTargetException var19) {
-				var0.writeByte(-16);
-			} catch (SecurityException var20) {
-				var0.writeByte(-17);
-			} catch (IOException var21) {
-				var0.writeByte(-18);
-			} catch (NullPointerException var22) {
-				var0.writeByte(-19);
-			} catch (Exception var23) {
-				var0.writeByte(-20);
-			} catch (Throwable var24) {
-				var0.writeByte(-21);
-			}
-		}
-
-		var0.writeCrc(var2);
-		var1.remove();
-	}
-
-	@ObfuscatedName("ax")
-	@ObfuscatedSignature(
-		signature = "([BI)[B",
-		garbageValue = "-303237660"
-	)
-	@Export("decompressBytes")
-	static final byte[] decompressBytes(byte[] var0) {
-		Buffer var1 = new Buffer(var0);
-		int var2 = var1.readUnsignedByte();
-		int var3 = var1.readInt();
-		if (var3 < 0 || AbstractArchive.field3143 != 0 && var3 > AbstractArchive.field3143) {
-			throw new RuntimeException();
-		}
-		if (var2 == 0) {
-			byte[] var4 = new byte[var3];
-			var1.readBytes(var4, 0, var3);
-			return var4;
-		}
-		int var6 = var1.readInt();
-		if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) {
-			throw new RuntimeException();
-		}
-		byte[] var5 = new byte[var6];
-		if (var2 == 1) {
-			BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9);
 		} else {
-			AbstractArchive.gzipDecompressor.decompress(var1, var5);
+			byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
-		}
+			var1 = new SpotAnimationDefinition();
+			var1.id = var0;
+			if (var2 != null) {
+				var1.decode(new Buffer(var2));
+			}
 
-		return var5;
+			SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0);
+			return var1;
+		}
 	}
 
-	@ObfuscatedName("fd")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)V",
+		signature = "(B)I",
-		garbageValue = "-1624187030"
+		garbageValue = "0"
 	)
-	static void method1677() {
+	static int method1683() {
-		PacketBufferNode var0 = Archive.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
+		return 11;
-		var0.packetBuffer.writeByte(AbstractWorldMapIcon.getWindowedMode());
-		var0.packetBuffer.writeShort(GrandExchangeEvent.canvasWidth);
-		var0.packetBuffer.writeShort(ParamDefinition.canvasHeight);
-		Client.packetWriter.addNode(var0);
 	}
 }

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

@@ -1,5 +1,3 @@
-import java.io.DataInputStream;
-import java.net.URL;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -9,118 +7,106 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("io")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Lhp;"
+		signature = "Lhz;"
 	)
 	@Export("HitSplatDefinition_archive")
 	public static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("w")
-	@ObfuscatedSignature(
-		signature = "Lhp;"
-	)
-	@Export("HitSplatDefinition_spritesArchive")
-	public static AbstractArchive HitSplatDefinition_spritesArchive;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		signature = "Lhp;"
-	)
-	@Export("HitSplatDefinition_fontsArchive")
-	public static AbstractArchive HitSplatDefinition_fontsArchive;
-	@ObfuscatedName("p")
-	@ObfuscatedSignature(
-		signature = "Lel;"
-	)
-	@Export("HitSplatDefinition_cached")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
+	)
+	@Export("HitSplatDefinition_cached")
+	static EvictingDualNodeHashTable HitSplatDefinition_cached;
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		signature = "Lep;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
+	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Lel;"
+		signature = "Lep;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
-	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
+	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 676904717
+		intValue = -1215732899
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		intValue = -1445466235
+		intValue = -1479775449
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -1814689987
-	)
-	public int field3344;
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = 499426669
-	)
-	int field3334;
 	@ObfuscatedName("y")
 	@ObfuscatedGetter(
-		intValue = 919035525
+		intValue = -999843627
 	)
-	int field3336;
+	public int field3314;
+	@ObfuscatedName("p")
+	@ObfuscatedGetter(
+		intValue = -478859311
+	)
+	int field3315;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 1276859251
+	)
+	int field3316;
 	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -1569596867
+		intValue = -348958833
 	)
-	int field3337;
+	int field3311;
-	@ObfuscatedName("a")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2118170041
+		intValue = 740187387
 	)
-	int field3338;
+	int field3312;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = -751318081
-	)
-	public int field3335;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = 184032475
-	)
-	public int field3340;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -604427311
-	)
-	public int field3341;
-	@ObfuscatedName("o")
-	String field3342;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -916102957
-	)
-	public int field3348;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 1597610159
-	)
-	public int field3328;
-	@ObfuscatedName("s")
-	@Export("transforms")
-	public int[] transforms;
 	@ObfuscatedName("z")
 	@ObfuscatedGetter(
-		intValue = 1769273857
+		intValue = 417347841
+	)
+	public int field3319;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 1914679
+	)
+	public int field3307;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = 348395975
+	)
+	public int field3318;
+	@ObfuscatedName("l")
+	String field3322;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -172728541
+	)
+	public int field3323;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = 1823926687
+	)
+	public int field3324;
+	@ObfuscatedName("m")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1435373639
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("al")
+	@ObfuscatedName("av")
 	@ObfuscatedGetter(
-		intValue = 468792805
+		intValue = -1817930543
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -133,26 +119,26 @@ public class HitSplatDefinition extends DualNode {
 
 	HitSplatDefinition() {
 		this.fontId = -1;
-		this.textColor = 0xffffff;
+		this.textColor = 16777215;
-		this.field3344 = 70;
+		this.field3314 = 70;
-		this.field3334 = -1;
+		this.field3315 = -1;
-		this.field3336 = -1;
+		this.field3316 = -1;
-		this.field3337 = -1;
+		this.field3311 = -1;
-		this.field3338 = -1;
+		this.field3312 = -1;
-		this.field3335 = 0;
+		this.field3319 = 0;
-		this.field3340 = 0;
+		this.field3307 = 0;
-		this.field3341 = -1;
+		this.field3318 = -1;
-		this.field3342 = "";
+		this.field3322 = "";
-		this.field3348 = -1;
+		this.field3323 = -1;
-		this.field3328 = 0;
+		this.field3324 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(Lkf;B)V",
+		signature = "(Lky;I)V",
-		garbageValue = "1"
+		garbageValue = "513120287"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -166,56 +152,56 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;II)V",
+		signature = "(Lky;II)V",
-		garbageValue = "1504666290"
+		garbageValue = "198357624"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5511();
+			this.fontId = var1.method5602();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3334 = var1.method5511();
+			this.field3315 = var1.method5602();
 		} else if (var2 == 4) {
-			this.field3337 = var1.method5511();
+			this.field3311 = var1.method5602();
 		} else if (var2 == 5) {
-			this.field3336 = var1.method5511();
+			this.field3316 = var1.method5602();
 		} else if (var2 == 6) {
-			this.field3338 = var1.method5511();
+			this.field3312 = var1.method5602();
 		} else if (var2 == 7) {
-			this.field3335 = var1.readShort();
+			this.field3319 = var1.readShort();
 		} else if (var2 == 8) {
-			this.field3342 = var1.readStringCp1252NullCircumfixed();
+			this.field3322 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) {
-			this.field3344 = var1.readUnsignedShort();
+			this.field3314 = var1.readUnsignedShort();
 		} else if (var2 == 10) {
-			this.field3340 = var1.readShort();
+			this.field3307 = var1.readShort();
 		} else if (var2 == 11) {
-			this.field3341 = 0;
+			this.field3318 = 0;
 		} else if (var2 == 12) {
-			this.field3348 = var1.readUnsignedByte();
+			this.field3323 = var1.readUnsignedByte();
 		} else if (var2 == 13) {
-			this.field3328 = var1.readShort();
+			this.field3324 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3341 = var1.readUnsignedShort();
+			this.field3318 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
-			if (this.transformVarbit == 0xffff) {
+			if (this.transformVarbit == 65535) {
 				this.transformVarbit = -1;
 			}
 
 			this.transformVarp = var1.readUnsignedShort();
-			if (this.transformVarp == 0xffff) {
+			if (this.transformVarp == 65535) {
 				this.transformVarp = -1;
 			}
 
 			int var3 = -1;
 			if (var2 == 18) {
 				var3 = var1.readUnsignedShort();
-				if (var3 == 0xffff) {
+				if (var3 == 65535) {
 					var3 = -1;
 				}
 			}
@@ -225,7 +211,7 @@ public class HitSplatDefinition extends DualNode {
 
 			for (int var5 = 0; var5 <= var4; ++var5) {
 				this.transforms[var5] = var1.readUnsignedShort();
-				if (this.transforms[var5] == 0xffff) {
+				if (this.transforms[var5] == 65535) {
 					this.transforms[var5] = -1;
 				}
 			}
@@ -235,16 +221,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(B)Lio;",
+		signature = "(I)Lio;",
-		garbageValue = "0"
+		garbageValue = "-1634643296"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit);
+			var1 = class208.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -256,17 +242,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? Projectile.HitSplatDefinition_get(var2) : null;
+		return var2 != -1 ? StructDefinition.HitSplatDefinition_get(var2) : null;
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
 		signature = "(II)Ljava/lang/String;",
-		garbageValue = "-1319187584"
+		garbageValue = "188489511"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3342;
+		String var2 = this.field3322;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -274,165 +260,159 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + class195.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + Friend.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "(I)Lly;",
+		signature = "(B)Lls;",
-		garbageValue = "-1354583226"
+		garbageValue = "108"
 	)
-	public Sprite method4551() {
+	public Sprite method4494() {
-		if (this.field3334 < 0) {
+		if (this.field3315 < 0) {
 			return null;
-		}
+		} else {
-		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3315);
-		if (var1 != null) {
+			if (var1 != null) {
-			return var1;
+				return var1;
-		}
+			} else {
-		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3334, 0);
+				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3315, 0);
-		if (var1 != null) {
+				if (var1 != null) {
-			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3315);
-		}
+				}
 
-		return var1;
+				return var1;
+			}
+		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Lly;",
+		signature = "(I)Lls;",
-		garbageValue = "-2099712719"
+		garbageValue = "1004292382"
 	)
-	public Sprite method4557() {
+	public Sprite method4468() {
-		if (this.field3336 < 0) {
+		if (this.field3316 < 0) {
 			return null;
-		}
+		} else {
-		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3316);
-		if (var1 != null) {
+			if (var1 != null) {
-			return var1;
+				return var1;
-		}
+			} else {
-		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3336, 0);
+				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3316, 0);
-		if (var1 != null) {
+				if (var1 != null) {
-			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3316);
-		}
+				}
 
-		return var1;
+				return var1;
+			}
+		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)Lly;",
+		signature = "(B)Lls;",
-		garbageValue = "-48"
+		garbageValue = "101"
 	)
-	public Sprite method4558() {
+	public Sprite method4472() {
-		if (this.field3337 < 0) {
+		if (this.field3311 < 0) {
 			return null;
-		}
+		} else {
-		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3311);
-		if (var1 != null) {
+			if (var1 != null) {
-			return var1;
+				return var1;
-		}
+			} else {
-		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3337, 0);
+				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3311, 0);
-		if (var1 != null) {
+				if (var1 != null) {
-			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3311);
-		}
+				}
 
-		return var1;
+				return var1;
+			}
+		}
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "(I)Lly;",
+		signature = "(B)Lls;",
-		garbageValue = "-1606516448"
+		garbageValue = "-74"
 	)
-	public Sprite method4583() {
+	public Sprite method4470() {
-		if (this.field3338 < 0) {
+		if (this.field3312 < 0) {
 			return null;
-		}
+		} else {
-		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312);
-		if (var1 != null) {
+			if (var1 != null) {
-			return var1;
+				return var1;
-		}
+			} else {
-		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3338, 0);
+				var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3312, 0);
-		if (var1 != null) {
+				if (var1 != null) {
-			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312);
-		}
+				}
 
-		return var1;
+				return var1;
+			}
+		}
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(I)Lke;",
+		signature = "(I)Lkb;",
-		garbageValue = "-1472977599"
+		garbageValue = "489170470"
 	)
 	@Export("getFont")
 	public Font getFont() {
 		if (this.fontId == -1) {
 			return null;
-		}
-		Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
-		if (var1 != null) {
-			return var1;
-		}
-		AbstractArchive var3 = HitSplatDefinition_spritesArchive;
-		AbstractArchive var4 = HitSplatDefinition_fontsArchive;
-		int var5 = this.fontId;
-		Font var2;
-		if (!Friend.SpriteBuffer_bufferFile(var3, var5, 0)) {
-			var2 = null;
 		} else {
-			var2 = WallDecoration.SpriteBuffer_createFont(var4.takeFile(var5, 0));
+			Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
-		}
-
-		if (var2 != null) {
-			HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
-		}
-
-		return var2;
-	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;Ljava/lang/Throwable;B)V",
-		garbageValue = "40"
-	)
-	@Export("RunException_sendStackTrace")
-	public static void RunException_sendStackTrace(String var0, Throwable var1) {
-		if (var1 != null) {
-			var1.printStackTrace();
-			return;
-		}
-		try {
-			String var2 = "";
 			if (var1 != null) {
-				var2 = FloorDecoration.shortenStackTrace(var1);
+				return var1;
-			}
+			} else {
-
+				var1 = FileSystem.SpriteBuffer_getFont(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, class43.HitSplatDefinition_fontsArchive, this.fontId, 0);
-			if (var0 != null) {
 				if (var1 != null) {
-					var2 = var2 + " | ";
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
 				}
 
-				var2 = var2 + var0;
+				return var1;
 			}
+		}
+	}
 
-			System.out.println("Error: " + var2);
+	@ObfuscatedName("gn")
-			var2 = var2.replace(':', '.');
+	@ObfuscatedSignature(
-			var2 = var2.replace('@', '_');
+		signature = "(I)Z",
-			var2 = var2.replace('&', '_');
+		garbageValue = "-977763631"
-			var2 = var2.replace('#', '_');
+	)
-			if (RunException.RunException_applet == null) {
+	static boolean method4497() {
-				return;
+		return (Client.drawPlayerNames & 4) != 0;
-			}
+	}
 
-			URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + GrandExchangeOfferUnitPriceComparator.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.RunException_clientType + "&e=" + var2);
+	@ObfuscatedName("ih")
-			DataInputStream var4 = new DataInputStream(var3.openStream());
+	@ObfuscatedSignature(
-			var4.read();
+		signature = "(IIIIII)V",
-			var4.close();
+		garbageValue = "-380288285"
-		} catch (Exception var5) {
+	)
+	@Export("drawScrollBar")
+	static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
+		ClientPreferences.scrollBarSprites[0].drawAt(var0, var1);
+		ClientPreferences.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field702);
+		int var5 = var3 * (var3 - 32) / var4;
+		if (var5 < 8) {
+			var5 = 8;
 		}
 
+		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
+		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field687);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field689);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field689);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field689);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field689);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field688);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field688);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field688);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field688);
 	}
 }

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

@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("iz")
+@ObfuscatedName("ib")
 @Implements("HorizontalAlignment")
 public enum HorizontalAlignment implements Enumerated {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Lib;"
 	)
-	field3461(0, 0),
+	field3436(2, 0),
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Lib;"
 	)
 	@Export("HorizontalAlignment_centered")
-	HorizontalAlignment_centered(2, 1),
+	HorizontalAlignment_centered(1, 1),
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Liz;"
+		signature = "Lib;"
 	)
-	field3460(1, 2);
+	field3435(0, 2);
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedGetter(
-		intValue = 1984645021
+		intValue = -1418723399
 	)
 	@Export("value")
 	public final int value;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -2141408149
+		intValue = 1581275369
 	)
 	@Export("id")
 	final int id;
@@ -42,22 +42,13 @@ public enum HorizontalAlignment implements Enumerated {
 		this.id = var4;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(I)I",
+		signature = "(B)I",
-		garbageValue = "320353268"
+		garbageValue = "-32"
 	)
 	@Export("rsOrdinal")
 	public int rsOrdinal() {
 		return this.id;
 	}
-
-	@ObfuscatedName("q")
-	@ObfuscatedSignature(
-		signature = "(I)I",
-		garbageValue = "-71692752"
-	)
-	static int method4701() {
-		return ++Messages.Messages_count - 1;
-	}
 }

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

@@ -3,16 +3,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("hk")
+@ObfuscatedName("hr")
 @Implements("Huffman")
 public class Huffman {
-	@ObfuscatedName("q")
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "Lhz;"
+	)
+	@Export("Widget_modelsArchive")
+	static AbstractArchive Widget_modelsArchive;
+	@ObfuscatedName("r")
+	static boolean field2486;
+	@ObfuscatedName("s")
 	@Export("masks")
 	int[] masks;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("bits")
 	byte[] bits;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("keys")
 	int[] keys;
 
@@ -26,84 +34,83 @@ public class Huffman {
 
 		for (int var5 = 0; var5 < var2; ++var5) {
 			byte var6 = var1[var5];
-			if (var6 == 0) {
+			if (var6 != 0) {
-				continue;
+				int var7 = 1 << 32 - var6;
-			}
+				int var8 = var3[var6];
-			int var7 = 1 << 32 - var6;
+				this.masks[var5] = var8;
-			int var8 = var3[var6];
+				int var9;
-			this.masks[var5] = var8;
+				int var10;
-			int var9;
+				int var11;
-			int var10;
+				int var12;
-			int var11;
+				if ((var8 & var7) != 0) {
-			int var12;
+					var9 = var3[var6 - 1];
-			if ((var8 & var7) != 0) {
-				var9 = var3[var6 - 1];
-			} else {
-				var9 = var8 | var7;
-
-				for (var10 = var6 - 1; var10 >= 1; --var10) {
-					var11 = var3[var10];
-					if (var11 != var8) {
-						break;
-					}
-
-					var12 = 1 << 32 - var10;
-					if ((var11 & var12) != 0) {
-						var3[var10] = var3[var10 - 1];
-						break;
-					}
-
-					var3[var10] = var11 | var12;
-				}
-			}
-
-			var3[var6] = var9;
-
-			for (var10 = var6 + 1; var10 <= 32; ++var10) {
-				if (var8 == var3[var10]) {
-					var3[var10] = var9;
-				}
-			}
-
-			var10 = 0;
-
-			for (var11 = 0; var11 < var6; ++var11) {
-				var12 = Integer.MIN_VALUE >>> var11;
-				if ((var8 & var12) != 0) {
-					if (this.keys[var10] == 0) {
-						this.keys[var10] = var4;
-					}
-
-					var10 = this.keys[var10];
 				} else {
-					++var10;
+					var9 = var8 | var7;
+
+					for (var10 = var6 - 1; var10 >= 1; --var10) {
+						var11 = var3[var10];
+						if (var8 != var11) {
+							break;
+						}
+
+						var12 = 1 << 32 - var10;
+						if ((var11 & var12) != 0) {
+							var3[var10] = var3[var10 - 1];
+							break;
+						}
+
+						var3[var10] = var11 | var12;
+					}
 				}
 
-				if (var10 >= this.keys.length) {
+				var3[var6] = var9;
-					int[] var13 = new int[this.keys.length * 2];
 
-					for (int var14 = 0; var14 < this.keys.length; ++var14) {
+				for (var10 = var6 + 1; var10 <= 32; ++var10) {
-						var13[var14] = this.keys[var14];
+					if (var8 == var3[var10]) {
+						var3[var10] = var9;
+					}
+				}
+
+				var10 = 0;
+
+				for (var11 = 0; var11 < var6; ++var11) {
+					var12 = Integer.MIN_VALUE >>> var11;
+					if ((var8 & var12) != 0) {
+						if (this.keys[var10] == 0) {
+							this.keys[var10] = var4;
+						}
+
+						var10 = this.keys[var10];
+					} else {
+						++var10;
 					}
 
-					this.keys = var13;
+					if (var10 >= this.keys.length) {
+						int[] var13 = new int[this.keys.length * 2];
+
+						for (int var14 = 0; var14 < this.keys.length; ++var14) {
+							var13[var14] = this.keys[var14];
+						}
+
+						this.keys = var13;
+					}
+
+					var12 >>>= 1;
 				}
 
-				var12 >>>= 1;
+				this.keys[var10] = ~var5;
-			}
+				if (var10 >= var4) {
-
+					var4 = var10 + 1;
-			this.keys[var10] = ~var5;
+				}
-			if (var10 >= var4) {
-				var4 = var10 + 1;
 			}
 		}
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "([BII[BII)I",
+		signature = "([BII[BIB)I",
-		garbageValue = "-1706453276"
+		garbageValue = "75"
 	)
 	@Export("compress")
 	int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
@@ -151,215 +158,177 @@ public class Huffman {
 		return (var7 + 7 >> 3) - var5;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
 		signature = "([BI[BIII)I",
-		garbageValue = "2122202814"
+		garbageValue = "-1981194731"
 	)
 	@Export("decompress")
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
 		if (var5 == 0) {
 			return 0;
-		}
+		} else {
-		int var6 = 0;
+			int var6 = 0;
-		var5 += var4;
+			var5 += var4;
-		int var7 = var2;
+			int var7 = var2;
 
-		while (true) {
+			while (true) {
-			byte var8 = var1[var7];
+				byte var8 = var1[var7];
-			if (var8 < 0) {
+				if (var8 < 0) {
-				var6 = this.keys[var6];
+					var6 = this.keys[var6];
-			} else {
+				} else {
-				++var6;
+					++var6;
-			}
-
-			int var9;
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
 				}
 
-				var6 = 0;
+				int var9;
-			}
+				if ((var9 = this.keys[var6]) < 0) {
-
+					var3[var4++] = (byte)(~var9);
-			if ((var8 & 64) != 0) {
+					if (var4 >= var5) {
-				var6 = this.keys[var6];
+						break;
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			if ((var8 & 32) != 0) {
-				var6 = this.keys[var6];
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			if ((var8 & 16) != 0) {
-				var6 = this.keys[var6];
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			if ((var8 & 8) != 0) {
-				var6 = this.keys[var6];
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			if ((var8 & 4) != 0) {
-				var6 = this.keys[var6];
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			if ((var8 & 2) != 0) {
-				var6 = this.keys[var6];
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			if ((var8 & 1) != 0) {
-				var6 = this.keys[var6];
-			} else {
-				++var6;
-			}
-
-			if ((var9 = this.keys[var6]) < 0) {
-				var3[var4++] = (byte)(~var9);
-				if (var4 >= var5) {
-					break;
-				}
-
-				var6 = 0;
-			}
-
-			++var7;
-		}
-
-		return var7 + 1 - var2;
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "(IIB)I",
-		garbageValue = "5"
-	)
-	static int method3948(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1);
-		return class226.NetCache_currentResponse != null && class226.NetCache_currentResponse.key == var2 ? VarpDefinition.NetCache_responseArchiveBuffer.offset * 99 / (VarpDefinition.NetCache_responseArchiveBuffer.array.length - class226.NetCache_currentResponse.padding) + 1 : 0;
-	}
-
-	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		signature = "([BIII)Z",
-		garbageValue = "-1212406127"
-	)
-	static final boolean method3947(byte[] var0, int var1, int var2) {
-		boolean var3 = true;
-		Buffer var4 = new Buffer(var0);
-		int var5 = -1;
-		int var6;
-
-		while ((var6 = var4.method5509()) != 0) {
-			var5 += var6;
-			int var7 = 0;
-			boolean var8 = false;
-			int var9;
-			while (!var8) {
-				var9 = var4.readUShortSmart();
-				if (var9 == 0) {
-					continue;
-				}
-				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 = ViewportMouse.getObjectDefinition(var5);
-					if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
-						if (!var15.needsModelFiles()) {
-							++Client.field707;
-							var3 = false;
-						}
-
-						var8 = true;
 					}
+
+					var6 = 0;
 				}
+
+				if ((var8 & 64) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				if ((var8 & 32) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				if ((var8 & 16) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				if ((var8 & 8) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				if ((var8 & 4) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				if ((var8 & 2) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				if ((var8 & 1) != 0) {
+					var6 = this.keys[var6];
+				} else {
+					++var6;
+				}
+
+				if ((var9 = this.keys[var6]) < 0) {
+					var3[var4++] = (byte)(~var9);
+					if (var4 >= var5) {
+						break;
+					}
+
+					var6 = 0;
+				}
+
+				++var7;
 			}
 
-			var9 = var4.readUShortSmart();
+			return var7 + 1 - var2;
-			if (var9 == 0) {
-				continue;
-			}
-			var4.readUnsignedByte();
 		}
-		return var3;
 	}
 
-	@ObfuscatedName("bp")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Ljava/lang/String;I)I",
+		signature = "(II)Z",
-		garbageValue = "350180445"
+		garbageValue = "762083438"
 	)
-	@Export("stringCp1252NullTerminatedByteSize")
+	public static boolean method3901(int var0) {
-	public static int stringCp1252NullTerminatedByteSize(String var0) {
+		return (var0 >> 30 & 1) != 0;
-		return var0.length() + 1;
+	}
+
+	@ObfuscatedName("r")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
+		garbageValue = "24"
+	)
+	public static String method3903(CharSequence var0) {
+		return FontName.method5230('*', var0.length());
+	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		signature = "(Ljava/lang/String;I)V",
+		garbageValue = "191831617"
+	)
+	static final void method3902(String var0) {
+		PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher);
+		var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0));
+		var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+		Client.packetWriter.addNode(var1);
 	}
 }

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

@@ -3,48 +3,60 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jf")
+@ObfuscatedName("jk")
 @Implements("IgnoreList")
 public class IgnoreList extends UserList {
-	@ObfuscatedName("e")
+	@ObfuscatedName("qz")
 	@ObfuscatedSignature(
-		signature = "Lmu;"
+		signature = "Lcq;"
+	)
+	@Export("pcmStreamMixer")
+	static PcmStreamMixer pcmStreamMixer;
+	@ObfuscatedName("d")
+	@ObfuscatedSignature(
+		signature = "Ler;"
+	)
+	@Export("World_request")
+	static UrlRequest World_request;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Llu;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
 
 	@ObfuscatedSignature(
-		signature = "(Lmu;)V"
+		signature = "(Llu;)V"
 	)
 	public IgnoreList(LoginType var1) {
 		super(400);
 		this.loginType = var1;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(I)Ljd;",
+		signature = "(I)Lju;",
-		garbageValue = "2016619159"
+		garbageValue = "-192021045"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new Ignored();
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "(II)[Ljd;",
+		signature = "(II)[Lju;",
-		garbageValue = "2126056206"
+		garbageValue = "518998026"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new Ignored[var1];
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;II)V",
+		signature = "(Lky;II)V",
-		garbageValue = "-726342746"
+		garbageValue = "-1855918635"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {

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

@@ -4,24 +4,12 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("jo")
+@ObfuscatedName("jb")
 @Implements("Ignored")
 public class Ignored extends User {
-	@ObfuscatedName("v")
+	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		signature = "Lbr;"
-	)
-	@Export("loginScreenRunesAnimation")
-	static LoginScreenAnimation loginScreenRunesAnimation;
-	@ObfuscatedName("fn")
-	@ObfuscatedSignature(
-		signature = "Lfa;"
-	)
-	@Export("socketTask")
-	static Task socketTask;
-	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -361646417
+		intValue = -1012205769
 	)
 	@Export("id")
 	int id;
@@ -29,20 +17,20 @@ public class Ignored extends User {
 	Ignored() {
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(Ljo;I)I",
+		signature = "(Ljb;I)I",
-		garbageValue = "-1242016495"
+		garbageValue = "-765920098"
 	)
 	@Export("compareTo_ignored")
 	int compareTo_ignored(Ignored var1) {
 		return this.id - var1.id;
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
-		signature = "(Ljd;I)I",
+		signature = "(Lju;B)I",
-		garbageValue = "-1938562722"
+		garbageValue = "1"
 	)
 	@Export("compareTo_user")
 	public int compareTo_user(User var1) {
@@ -53,19 +41,69 @@ public class Ignored extends User {
 		return this.compareTo_ignored((Ignored)var1);
 	}
 
-	@ObfuscatedName("y")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(CB)Z",
+		signature = "(Ljava/lang/CharSequence;IZI)I",
-		garbageValue = "103"
+		garbageValue = "-1916519196"
 	)
-	@Export("isCharPrintable")
+	@Export("parseIntCustomRadix")
-	public static boolean isCharPrintable(char var0) {
+	public static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) {
-		if (var0 >= ' ' && var0 <= '~') {
+		if (var1 >= 2 && var1 <= 36) {
-			return true;
+			boolean var3 = false;
+			boolean var4 = false;
+			int var5 = 0;
+			int var6 = var0.length();
+
+			for (int var7 = 0; var7 < var6; ++var7) {
+				char var8 = var0.charAt(var7);
+				if (var7 == 0) {
+					if (var8 == '-') {
+						var3 = true;
+						continue;
+					}
+
+					if (var8 == '+') {
+						continue;
+					}
+				}
+
+				int var10;
+				if (var8 >= '0' && var8 <= '9') {
+					var10 = var8 - '0';
+				} else if (var8 >= 'A' && var8 <= 'Z') {
+					var10 = var8 - '7';
+				} else {
+					if (var8 < 'a' || var8 > 'z') {
+						throw new NumberFormatException();
+					}
+
+					var10 = var8 - 'W';
+				}
+
+				if (var10 >= var1) {
+					throw new NumberFormatException();
+				}
+
+				if (var3) {
+					var10 = -var10;
+				}
+
+				int var9 = var10 + var5 * var1;
+				if (var9 / var1 != var5) {
+					throw new NumberFormatException();
+				}
+
+				var5 = var9;
+				var4 = true;
+			}
+
+			if (!var4) {
+				throw new NumberFormatException();
+			} else {
+				return var5;
+			}
+		} else {
+			throw new IllegalArgumentException("" + var1);
 		}
-		if (var0 >= 160 && var0 <= 255) {
-			return true;
-		}
-		return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
 	}
 }

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

@@ -2,35 +2,35 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 
-@ObfuscatedName("lx")
+@ObfuscatedName("lq")
 @Implements("IndexedSprite")
 public final class IndexedSprite extends Rasterizer2D {
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("pixels")
 	public byte[] pixels;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("palette")
 	public int[] palette;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@Export("subWidth")
 	public int subWidth;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@Export("subHeight")
 	public int subHeight;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@Export("xOffset")
 	public int xOffset;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@Export("yOffset")
 	public int yOffset;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@Export("width")
 	public int width;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@Export("height")
 	public int height;
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@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("w")
+	@ObfuscatedName("j")
 	@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("e")
+	@ObfuscatedName("i")
 	@Export("drawAt")
 	public void drawAt(int var1, int var2) {
 		var1 += this.xOffset;
@@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D {
 		}
 	}
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
-	public void method6093(int var1, int var2, int var3, int var4) {
+	public void method5979(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("p")
+	@ObfuscatedName("k")
 	@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("l")
+	@ObfuscatedName("n")
 	@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,109 +4,109 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("de")
+@ObfuscatedName("dn")
 @Implements("Instrument")
 public class Instrument {
-	@ObfuscatedName("a")
+	@ObfuscatedName("e")
 	@Export("Instrument_samples")
 	static int[] Instrument_samples;
-	@ObfuscatedName("j")
+	@ObfuscatedName("z")
 	@Export("Instrument_noise")
 	static int[] Instrument_noise;
-	@ObfuscatedName("t")
+	@ObfuscatedName("a")
 	@Export("Instrument_sine")
 	static int[] Instrument_sine;
-	@ObfuscatedName("o")
+	@ObfuscatedName("l")
 	@Export("Instrument_phases")
 	static int[] Instrument_phases;
-	@ObfuscatedName("n")
+	@ObfuscatedName("h")
 	@Export("Instrument_delays")
 	static int[] Instrument_delays;
-	@ObfuscatedName("d")
+	@ObfuscatedName("v")
 	@Export("Instrument_volumeSteps")
 	static int[] Instrument_volumeSteps;
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
 	@Export("Instrument_pitchSteps")
 	static int[] Instrument_pitchSteps;
-	@ObfuscatedName("z")
+	@ObfuscatedName("o")
 	@Export("Instrument_pitchBaseSteps")
 	static int[] Instrument_pitchBaseSteps;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("pitch")
 	SoundEnvelope pitch;
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("volume")
 	SoundEnvelope volume;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("pitchModifier")
 	SoundEnvelope pitchModifier;
-	@ObfuscatedName("p")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("pitchModifierAmplitude")
 	SoundEnvelope pitchModifierAmplitude;
-	@ObfuscatedName("k")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("volumeMultiplier")
 	SoundEnvelope volumeMultiplier;
-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("volumeMultiplierAmplitude")
 	SoundEnvelope volumeMultiplierAmplitude;
-	@ObfuscatedName("b")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("release")
 	SoundEnvelope release;
-	@ObfuscatedName("i")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("attack")
 	SoundEnvelope attack;
-	@ObfuscatedName("c")
+	@ObfuscatedName("x")
 	@Export("oscillatorVolume")
 	int[] oscillatorVolume;
-	@ObfuscatedName("f")
+	@ObfuscatedName("d")
 	@Export("oscillatorPitch")
 	int[] oscillatorPitch;
-	@ObfuscatedName("m")
+	@ObfuscatedName("f")
 	@Export("oscillatorDelays")
 	int[] oscillatorDelays;
-	@ObfuscatedName("u")
+	@ObfuscatedName("c")
 	@Export("delayTime")
 	int delayTime;
-	@ObfuscatedName("x")
+	@ObfuscatedName("r")
 	@Export("delayDecay")
 	int delayDecay;
-	@ObfuscatedName("r")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		signature = "Ldy;"
+		signature = "Ldp;"
 	)
 	@Export("filter")
 	AudioFilter filter;
-	@ObfuscatedName("v")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "Ldw;"
+		signature = "Ldv;"
 	)
 	@Export("filterEnvelope")
 	SoundEnvelope filterEnvelope;
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@Export("duration")
 	int duration;
 	@ObfuscatedName("g")
@@ -146,219 +146,230 @@ public class Instrument {
 		this.offset = 0;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("synthesize")
 	final int[] synthesize(int var1, int var2) {
-		class301.clearIntArray(Instrument_samples, 0, var1);
+		class300.clearIntArray(Instrument_samples, 0, var1);
 		if (var2 < 10) {
 			return Instrument_samples;
-		}
+		} else {
-		double var3 = (double)var1 / ((double)var2 + 0.0D);
+			double var3 = (double)var1 / ((double)var2 + 0.0D);
-		this.pitch.reset();
+			this.pitch.reset();
-		this.volume.reset();
+			this.volume.reset();
-		int var5 = 0;
+			int var5 = 0;
-		int var6 = 0;
+			int var6 = 0;
-		int var7 = 0;
+			int var7 = 0;
-		if (this.pitchModifier != null) {
-			this.pitchModifier.reset();
-			this.pitchModifierAmplitude.reset();
-			var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3);
-			var6 = (int)((double)this.pitchModifier.start * 32.768D / var3);
-		}
-
-		int var8 = 0;
-		int var9 = 0;
-		int var10 = 0;
-		if (this.volumeMultiplier != null) {
-			this.volumeMultiplier.reset();
-			this.volumeMultiplierAmplitude.reset();
-			var8 = (int)((this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3);
-			var9 = (int)(this.volumeMultiplier.start * 32.768D / var3);
-		}
-
-		for (int var11 = 0; var11 < 5; ++var11) {
-			if (this.oscillatorVolume[var11] != 0) {
-				Instrument_phases[var11] = 0;
-				Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3);
-				Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100;
-				Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
-				Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3);
-			}
-		}
-
-		for (int var11 = 0; var11 < var1; ++var11) {
-			int var12 = this.pitch.doStep(var1);
-			int var13 = this.volume.doStep(var1);
 			if (this.pitchModifier != null) {
-				int var14 = this.pitchModifier.doStep(var1);
+				this.pitchModifier.reset();
-				int var15 = this.pitchModifierAmplitude.doStep(var1);
+				this.pitchModifierAmplitude.reset();
-				var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1;
+				var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3);
-				var7 = var7 + var6 + (var14 * var5 >> 16);
+				var6 = (int)((double)this.pitchModifier.start * 32.768D / var3);
 			}
 
+			int var8 = 0;
+			int var9 = 0;
+			int var10 = 0;
 			if (this.volumeMultiplier != null) {
-				int var14 = this.volumeMultiplier.doStep(var1);
+				this.volumeMultiplier.reset();
-				int var15 = this.volumeMultiplierAmplitude.doStep(var1);
+				this.volumeMultiplierAmplitude.reset();
-				var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15;
+				var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3);
-				var10 = var10 + var9 + (var14 * var8 >> 16);
+				var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3);
 			}
 
-			for (int var14 = 0; var14 < 5; ++var14) {
+			int var11;
-				if (this.oscillatorVolume[var14] != 0) {
+			for (var11 = 0; var11 < 5; ++var11) {
-					int var15 = Instrument_delays[var14] + var11;
+				if (this.oscillatorVolume[var11] != 0) {
-					if (var15 < var1) {
+					Instrument_phases[var11] = 0;
-						Instrument_samples[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
+					Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3);
-						Instrument_phases[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
+					Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100;
+					Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
+					Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3);
+				}
+			}
+
+			int var12;
+			int var13;
+			int var14;
+			int var15;
+			int[] var10000;
+			for (var11 = 0; var11 < var1; ++var11) {
+				var12 = this.pitch.doStep(var1);
+				var13 = this.volume.doStep(var1);
+				if (this.pitchModifier != null) {
+					var14 = this.pitchModifier.doStep(var1);
+					var15 = this.pitchModifierAmplitude.doStep(var1);
+					var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1;
+					var7 = var7 + var6 + (var14 * var5 >> 16);
+				}
+
+				if (this.volumeMultiplier != null) {
+					var14 = this.volumeMultiplier.doStep(var1);
+					var15 = this.volumeMultiplierAmplitude.doStep(var1);
+					var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15;
+					var10 = var10 + var9 + (var14 * var8 >> 16);
+				}
+
+				for (var14 = 0; var14 < 5; ++var14) {
+					if (this.oscillatorVolume[var14] != 0) {
+						var15 = Instrument_delays[var14] + var11;
+						if (var15 < var1) {
+							var10000 = Instrument_samples;
+							var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
+							var10000 = Instrument_phases;
+							var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
+						}
 					}
 				}
 			}
-		}
 
-		if (this.release != null) {
+			int var16;
-			this.release.reset();
+			if (this.release != null) {
-			this.attack.reset();
+				this.release.reset();
-			int var11 = 0;
+				this.attack.reset();
-			boolean var19 = false;
+				var11 = 0;
-			boolean var20 = true;
+				boolean var19 = false;
-			for (int var14 = 0; var14 < var1; ++var14) {
+				boolean var20 = true;
-				int var12;
-				int var15 = this.release.doStep(var1);
-				int var16 = this.attack.doStep(var1);
-				if (var20) {
-					var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
-				} else {
-					var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start;
-				}
 
-				var11 += 256;
+				for (var14 = 0; var14 < var1; ++var14) {
-				if (var11 >= var12) {
+					var15 = this.release.doStep(var1);
-					var11 = 0;
+					var16 = this.attack.doStep(var1);
-					var20 = !var20;
+					if (var20) {
-				}
+						var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
-
+					} else {
-				if (var20) {
+						var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start;
-					Instrument_samples[var14] = 0;
-				}
-			}
-		}
-
-		if (this.delayTime > 0 && this.delayDecay > 0) {
-			int var11 = (int)((double)this.delayTime * var3);
-
-			for (int var12 = var11; var12 < var1; ++var12) {
-				Instrument_samples[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
-			}
-		}
-
-		if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) {
-			this.filterEnvelope.reset();
-			int var11 = this.filterEnvelope.doStep(var1 + 1);
-			int var12 = this.filter.compute(0, (float)var11 / 65536.0F);
-			int var13 = this.filter.compute(1, (float)var11 / 65536.0F);
-			if (var1 >= var12 + var13) {
-				int var14 = 0;
-				int var15 = var13;
-				if (var13 > var1 - var12) {
-					var15 = var1 - var12;
-				}
-
-				while (var14 < var15) {
-					int var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
-
-					for (int var17 = 0; var17 < var12; ++var17) {
-						var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16);
 					}
 
-					for (int var17 = 0; var17 < var14; ++var17) {
+					var11 += 256;
-						var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16);
+					if (var11 >= var12) {
+						var11 = 0;
+						var20 = !var20;
 					}
 
-					Instrument_samples[var14] = var16;
+					if (var20) {
-					var11 = this.filterEnvelope.doStep(var1 + 1);
+						Instrument_samples[var14] = 0;
-					++var14;
+					}
 				}
+			}
 
-				var15 = 128;
+			if (this.delayTime > 0 && this.delayDecay > 0) {
+				var11 = (int)((double)this.delayTime * var3);
 
-				while (true) {
+				for (var12 = var11; var12 < var1; ++var12) {
-					if (var15 > var1 - var12) {
+					var10000 = Instrument_samples;
+					var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
+				}
+			}
+
+			if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) {
+				this.filterEnvelope.reset();
+				var11 = this.filterEnvelope.doStep(var1 + 1);
+				var12 = this.filter.compute(0, (float)var11 / 65536.0F);
+				var13 = this.filter.compute(1, (float)var11 / 65536.0F);
+				if (var1 >= var12 + var13) {
+					var14 = 0;
+					var15 = var13;
+					if (var13 > var1 - var12) {
 						var15 = var1 - var12;
 					}
 
+					int var17;
 					while (var14 < var15) {
-						int var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
+						var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
 
-						for (int var18 = 0; var18 < var12; ++var18) {
+						for (var17 = 0; var17 < var12; ++var17) {
-							var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16);
+							var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16);
 						}
 
-						for (int var18 = 0; var18 < var13; ++var18) {
+						for (var17 = 0; var17 < var14; ++var17) {
-							var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16);
+							var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16);
 						}
 
-						Instrument_samples[var14] = var17;
+						Instrument_samples[var14] = var16;
 						var11 = this.filterEnvelope.doStep(var1 + 1);
 						++var14;
 					}
 
-					if (var14 < var1 - var12) {
+					var15 = 128;
-						var12 = this.filter.compute(0, (float) var11 / 65536.0F);
+
-						var13 = this.filter.compute(1, (float) var11 / 65536.0F);
+					while (true) {
+						if (var15 > var1 - var12) {
+							var15 = var1 - var12;
+						}
+
+						int var18;
+						while (var14 < var15) {
+							var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
+
+							for (var18 = 0; var18 < var12; ++var18) {
+								var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16);
+							}
+
+							for (var18 = 0; var18 < var13; ++var18) {
+								var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16);
+							}
+
+							Instrument_samples[var14] = var17;
+							var11 = this.filterEnvelope.doStep(var1 + 1);
+							++var14;
+						}
+
+						if (var14 >= var1 - var12) {
+							while (var14 < var1) {
+								var17 = 0;
+
+								for (var18 = var14 + var12 - var1; var18 < var12; ++var18) {
+									var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16);
+								}
+
+								for (var18 = 0; var18 < var13; ++var18) {
+									var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16);
+								}
+
+								Instrument_samples[var14] = var17;
+								this.filterEnvelope.doStep(var1 + 1);
+								++var14;
+							}
+							break;
+						}
+
+						var12 = this.filter.compute(0, (float)var11 / 65536.0F);
+						var13 = this.filter.compute(1, (float)var11 / 65536.0F);
 						var15 += 128;
-					} else {
-						break;
 					}
-
-				}
-				while (var14 < var1) {
-					int var17 = 0;
-
-					for (int var18 = var14 + var12 - var1; var18 < var12; ++var18) {
-						var17 += (int) ((long) Instrument_samples[var14 + var12 - 1 - var18] * (long) AudioFilter.coefficients[0][var18] >> 16);
-					}
-
-					for (int var18 = 0; var18 < var13; ++var18) {
-						var17 -= (int) ((long) Instrument_samples[var14 - 1 - var18] * (long) AudioFilter.coefficients[1][var18] >> 16);
-					}
-
-					Instrument_samples[var14] = var17;
-					this.filterEnvelope.doStep(var1 + 1);
-					++var14;
 				}
 			}
-		}
 
-		for (int var11 = 0; var11 < var1; ++var11) {
+			for (var11 = 0; var11 < var1; ++var11) {
-			if (Instrument_samples[var11] < -32768) {
+				if (Instrument_samples[var11] < -32768) {
-				Instrument_samples[var11] = -32768;
+					Instrument_samples[var11] = -32768;
+				}
+
+				if (Instrument_samples[var11] > 32767) {
+					Instrument_samples[var11] = 32767;
+				}
 			}
 
-			if (Instrument_samples[var11] > 0x7fff) {
+			return Instrument_samples;
-				Instrument_samples[var11] = 0x7fff;
-			}
 		}
-
-		return Instrument_samples;
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("j")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
-			return (var1 & 0x7fff) < 16384 ? var2 : -var2;
+			return (var1 & 32767) < 16384 ? var2 : -var2;
+		} else if (var3 == 2) {
+			return Instrument_sine[var1 & 32767] * var2 >> 14;
+		} else if (var3 == 3) {
+			return (var2 * (var1 & 32767) >> 14) - var2;
+		} else {
+			return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0;
 		}
-		if (var3 == 2) {
-			return Instrument_sine[var1 & 0x7fff] * var2 >> 14;
-		}
-		if (var3 == 3) {
-			return (var2 * (var1 & 0x7fff) >> 14) - var2;
-		}
-		return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 0x7fff] : 0;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		signature = "(Lkf;)V"
+		signature = "(Lky;)V"
 	)
 	@Export("decode")
 	final void decode(Buffer var1) {
@@ -410,6 +421,6 @@ public class Instrument {
 		this.offset = var1.readUnsignedShort();
 		this.filter = new AudioFilter();
 		this.filterEnvelope = new SoundEnvelope();
-		this.filter.method2680(var1, this.filterEnvelope);
+		this.filter.method2637(var1, this.filterEnvelope);
 	}
 }

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

@@ -3,10 +3,16 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lj")
+@ObfuscatedName("ly")
 @Implements("IntHashTable")
 public class IntHashTable {
-	@ObfuscatedName("q")
+	@ObfuscatedName("gg")
+	@ObfuscatedSignature(
+		signature = "[Lls;"
+	)
+	@Export("headIconPrayerSprites")
+	static Sprite[] headIconPrayerSprites;
+	@ObfuscatedName("s")
 	@Export("array")
 	int[] array;
 
@@ -32,10 +38,10 @@ public class IntHashTable {
 
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		signature = "(II)I",
+		signature = "(IS)I",
-		garbageValue = "1528091447"
+		garbageValue = "2215"
 	)
 	@Export("get")
 	public int get(int var1) {